Creating a branch to patch problems with x.7.6

2084 files changed, 51813 insertions, 59175 deletions

diff --git a/ACE/ACE-INSTALL.html b/ACE/ACE-INSTALL.html
index 5c3fdd59458..74e6a211a21 100644
--- a/ACE/ACE-INSTALL.html
+++ b/ACE/ACE-INSTALL.html
@@ -154,7 +154,7 @@ document</a>.</p><p>
     <th>Remedy IT</th>
     <td>Maintains ACE on many platforms required for their ACE and
         TAO service offerings. We support AIX,  
-        CodeGear C++ Builder 2007/2009, CodeGear RAD Studio 2007, Embarcadero C++ Builder 2010,
+        CodeGear C++ Builder 2007/2009, CodeGear RAD Studio 2007, 
         CBuilderX 1.0, Windows CE, MinGW, Microsoft Visual C++ 7.1/8/9, GCC,
         Cygwin, VxWorks 5.5.x - 6.x (kernel and rtp), OpenVMS 8.2-1 &            8.3 on Alpha and IA64,
         BlueCAT Linux, RedHat Linux, Fedora, MacOSX, Solaris, 
@@ -798,8 +798,6 @@ to check <a href="#win32nonic">here</a> first. <p>
       <br>
       <code>set PATH=C:\ACE_wrappers\lib;C:\ACE_wrappers\bin;%PATH%</code><br>
       <br>
-  </li><li>Generate the bmake makefiles using <a href="#MPC">MPC</a>. Use the <code>bmake</code> project type for C++ Builder.
-      <br><br>
   </li><li>Change to the ACE_ROOT\ace directory.<br>
       <br>
   </li><li>Build release DLLs for ACE by going:<br>
@@ -836,7 +834,7 @@ to check <a href="#win32nonic">here</a> first. <p>
 
 Note that when you run <code>make</code> in a sub directory you give <code>make -f Makefile.bmak all</code>. The <code>all</code> is needed to make sure the complete project is build.<p>
 
-The Borland/CodeGear C++ Builder 4.0/5.0/6.0/2006/2007/2009/2010 port has been done by Jody Hagins, <a href="mailto:chris@kohlhoff.com">Christopher Kohlhoff</a> and <a href="mailto:jwillemsen@remedy.nl">Johnny Willemsen</a>. </p><p>
+The Borland/CodeGear C++ Builder 4.0/5.0/6.0/2006/2007/2009 port has been done by Jody Hagins, <a href="mailto:chris@kohlhoff.com">Christopher Kohlhoff</a> and <a href="mailto:jwillemsen@remedy.nl">Johnny Willemsen</a>. </p><p>
 
 <b>ACE TESTS</b></p><p>
 
diff --git a/ACE/ASNMP/asnmp/address.cpp b/ACE/ASNMP/asnmp/address.cpp
index fc509f8d978..edc46f00e3c 100644
--- a/ACE/ASNMP/asnmp/address.cpp
+++ b/ACE/ASNMP/asnmp/address.cpp
@@ -312,8 +312,7 @@ IpAddress::~IpAddress()
 int IpAddress::is_loopback() const
 {
  if (valid()) {
-   u_long *pl = (u_long *)&address_buffer;
-   return (*pl == INADDR_LOOPBACK);
+   return (*(u_long *)&address_buffer == INADDR_LOOPBACK);
  }
   return 0;
 }
@@ -321,8 +320,7 @@ int IpAddress::is_loopback() const
 int IpAddress::is_multicast() const
 {
  if (valid()) {
-   u_long *pl = (u_long *)&address_buffer;
-   return (IN_MULTICAST(*pl));
+   return (IN_MULTICAST(*(u_long *)&address_buffer));
  }
   return 0;
 }
@@ -360,8 +358,7 @@ void IpAddress::to_octet(OctetStr& octet) const
 int IpAddress::is_broadcast() const
 {
  if (valid()) {
-   u_long *pl = (u_long *)&address_buffer;
-   return ( (*pl) & INADDR_BROADCAST);
+   return ( (*(u_long *)&address_buffer) & INADDR_BROADCAST);
  }
   return 0;
 }
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 9f29ff41d0e..534e4f4ae89 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,554 +1,6 @@
-Wed Feb 24 15:15:00 UTC 2010  Simon Massey  <sma at prismtech dot com>
-
-        * ace/config-lynxos.h:
-          #define ACE_LACKS_CEILL & ACE_LACKS_FLOORL
-          Correct placement of these defines for the version of Lynxos
-
-Wed Feb 24 11:41:54 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * include/makeinclude/platform_g++_common.GNU:
-          Added support for no_strict_aliasing, when this is set, we add
-          -fno-strict-aliasing to the compiler flags
-
-Wed Feb 24 08:45:54 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/run_test.lst:
-          2434 should run now
-
-Wed Feb 24 08:41:54 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-hpux-11.00.h:
-          #define ACE_LACKS_CEILL & ACE_LACKS_FLOORL
-
-Wed Feb 24 08:01:54 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/NonBlocking_Conn_Test.cpp:
-          Unicode fixes
-
-        * tests/Atomic_Op_Test.cpp:
-          Calculate how long each test takes and print this to the log
-
-Wed Feb 24 02:48:37 UTC 2010  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/config-sunos5.5.h:
-          #define ACE_LACKS_CEILL & ACE_LACKS_FLOORL
-
-Tue Feb 23 19:45:39 UTC 2010  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * tests/OS_Test.cpp: Added tests for floorl() and ceill().  Thanks
-          to Olivier Langlois <olivier at olivierlanglois dot net> for
-          this fix.
-
-Tue Feb 23 19:43:36 UTC 2010  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * configure.ac: Added a check for ACE_CHECK_LACKS_FUNCS(floor ceil
-          floorl ceill).  Thanks to Olivier Langlois <olivier at
-          olivierlanglois dot net> for this fix.
-
-Tue Feb 23 15:15:00 UTC 2010  Simon Massey  <sma at prismtech dot com>
-
-        * ace/config-lynxos.h:
-          #define ACE_LACKS_CEILL & ACE_LACKS_FLOORL
-
-Tue Feb 23 08:59:54 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-vxworks6.4.h:
-          VxWorks lacks floorl and ceill
-
-Mon Feb 22 20:01:54 UTC 2010  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/Time_Value.{h,cpp}: Applied some patches from Olivier Langlois
-          <olivier at olivierlanglois dot net> to fix some warnings.
-
-Mon Feb 22 19:57:02 UTC 2010  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/Thread_Mutex.inl (ACE_Thread_Mutex::lock): Added a non-const
-          lock() method.  Thanks to Phil for suggesting this.
-
-Mon Feb 22 18:08:20 UTC 2010  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/Condition_Recursive_Thread_Mutex.cpp (ACE_Condition): Fixed
-          a stray occurrence of the mutex() accessor that should be
-          lock().  Thanks to Phil Mesnier for reporting this.
-
-Mon Feb 22 15:00:11 UTC 2010  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/Time_Value.{h,cpp}: Reformatted/renamed the code to conform
-          to ACE programming guidelines.
-
-Mon Feb 22 13:40:14 UTC 2010  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/Condition_T.cpp: Changed the mutex() accessor to lock() to
-          be consistent.
-
-Mon Feb 22 13:39:09 UTC 2010  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/Recursive_Thread_Mutex.{h,inl}: Created a new lock() accessor
-          so it's consistent with the other synchronizer accessors in ACE.
-
-Sun Feb 21 21:25:21 UTC 2010  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * tests/Time_Value_Test.cpp: Added a test for the new operator<<
-          implementation for ACE_Time_Value.  Thanks to Olivier Langlois
-          <olivier at olivierlanglois dot net> for contributing this.
-
-Sun Feb 21 21:28:03 UTC 2010  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/OS_NS_math.{h,inl}: Added support for floor() and ceiling()
-          for long double types.  Thanks to Olivier Langlois <olivier at
-          olivierlanglois dot net> for contributing this.
-
-        * ace/Time_Value.{h,cpp}: Added support for operator<< and to
-          handle long double values better.  Thanks to Olivier Langlois
-          <olivier at olivierlanglois dot net> for contributing this.
-          This fixes bugid 3818 and 2434.
-
-Sun Feb 21 16:28:47 UTC 2010  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * tests/Recursive_Condition_Test.cpp: Revised this test so that it
-          actually uses the ACE_Condition<> template, like it says in the
-          comments..
-
-Sun Feb 21 16:20:35 UTC 2010  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/Condition_T.cpp (ACE_Condition<MUTEX>::wait): Changed the
-          call to mutex_.lock_ to mutex_.mutex() since lock_ is protected.
-          Thanks to Nick Meyer <nick dot meyer at sensis dot com> for
-          reporting this.
-
-Sun Feb 21 09:24:38 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ChangeLogs/*:
-          Use full year
-
-Sat Feb 20 20:26:47 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/global.features:
-          Also set dds4ccm_splie to 0 by default
-
-Fri Feb 19 19:34:47 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/MakeProjectCreator/config/global.features:
-          Set dds4ccm_opendds and dds4ccm_ndds to 0 by default. When
-          generating project files for dds4ccm we now have to enable
-          which dds implementation we want to use
-
-Wed Feb 17 10:02:47 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * html/Stats/index.shtml:
-          Added link for MPC440 Xampler results
-
-Tue Feb 16 09:51:47 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * include/makeinclude/platform_freebsd.GNU:
-        * include/makeinclude/platform_linux_common.GNU:
-          Set fox flags
-
-        * include/makeinclude/platform_gnuwin32_common.GNU:
-          enabled no_hidden_visibility
-
-Mon Feb 15 19:28:47 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * rpmbuild/ace-tao.spec:
-          Package nslist and catior readme files
-
-Mon Feb 15 12:10:47 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * debianbuild/rules:
-          Removed some not needed steps
-
-Mon Feb 15 09:56:47 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * configure.ac:
-          Fixed problem with latest autoconf tools
-
-        * patches/97-fix-empty-elseif.dpatch:
-          Removed, not needed anymore
-
-Mon Feb 15 09:44:47 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * debianbuild/patches/02-fltk-no-gl.dpatch
-        * debianbuild/patches/12-fix-fox-include.dpatch
-        * debianbuild/patches/13-fix-fox-errors.dpatch
-        * debianbuild/patches/14-autoconf-tao.dpatch
-        * debianbuild/patches/26-autoupdate.diff
-        * debianbuild/patches/35-autoconf-fix-else-fi.dpatch
-        * debianbuild/patches/36-autoconf-fix-fidone.dpatch
-        * debianbuild/patches/93-hack-to-fix-libtoolize.dpatch
-        * debianbuild/patches/98-ignore-win32-acdefun-error.diff
-        * debianbuild/patches/98-ignore-win32-acdefun-error.dpatch
-          Removed, not needed anymore, merged changes to trunk
-
-Mon Feb 15 09:40:30 UTC 2010  Martin Corino  <mcorino@remedy.nl>
-
-        * include/makeinclude/platform_linux.GNU:
-
-          Added support for modelcpu (-mcpu=) and modeltune (-mtune=) flags.
-
-Mon Feb 15 09:38:47 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * m4/ace.m4:
-          No need to link ftlk with gl
-
-Mon Feb 15 09:35:47 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/FoxReactor/FoxReactor.h:
-          User has to specify the full fox path now, some distributions now ship fox-1.6 and
-          fox-1.4 as directory names
-
-Mon Feb 15 09:20:30 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * m4/ace_defines.m4:
-          Fixed fixes with latest releases of tools
-
-        * m4/tao.m4:
-          Added here from TAO to get the distribution to work with the latest
-          versions of autoconf tools
-
-Mon Feb 15 06:49:30 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * configure.ac:
-          Fixed fixes with latest releases of tools
-
-Sun Feb 14 19:46:30 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * configure.ac:
-        * m4/ace.m4:
-          Integrated patches from below, created by Pau Garcia i Quiles
-          <pgquiles at elpauer dot org>
-
-        * debianbuild/patches/19-gcc43.dpatch:
-          Removed, not needed anymore
-
-        * debianbuild/patches/94-build-crosscompile.dpatch:
-        * debianbuild/patches/96-build-athena3d.dpatch:
-          Removed, integrated into trunk
-
-Sun Feb 14 07:22:30 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * debianbuild/*:
-          Imported last version from Pau Garcia i Quiles
-
-Sat Feb 13 15:59:26 UTC 2010  James H. Hill  <hillj at cs dot iupui dot edu>
-
-        * ace/Unbounded_Set_Ex.h:
-
-          Added STL iterator type traits support to the ACE_Unbounded_Set*
-          and its corresponding iterators.
-
-Fri Feb 12 19:19:30 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Atomic_Op.h:
-        * ace/Containers_T.h:
-          Doxygen changes
-
-Fri Feb 12 17:39:30 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/run_test.lst:
-          2610 is working now
-
-Fri Feb 12 14:05:21 UTC 2010  Steve Huston  <shuston@riverace.com>
-
-        * ace/Dev_Poll_Reactor.cpp: Fix unused variable warning.
-
-Fri Feb 12 10:36:30 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/config-g++-common.h:
-          Expanded autodetected support for GCC builtin __sync_XXX
-          atomic op functions to the IA64 platform
-
-Thu Feb 11 22:23:08 UTC 2010  Abdul Sowayan  <sowayan@gmail.com>
-
-        * THANKS:
-
-          Added Trent Nadeau <Trent dot Nadeau at ngc dot com> to the
-          hall of fame.
-
-Thu Feb 11 20:29:06 UTC 2010  Steven Stallion  <stallions@ociweb.com>
-
-        * bin/MakeProjectCreator/config/global.features:
-
-          Disabled wireshark feature by default.
-
-Thu Feb 11 19:52:30 UTC 2010  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/config-g++-common.h:
-
-          Expanded autodetected support for GCC builtin __sync_XXX
-          atomic op functions to all powerpc platforms.
-
-Thu Feb 11 12:18:24 UTC 2010  Vladimir Zykov  <vladimir.zykov@prismtech.com>
-
-        * ace/Connector.cpp:
-          Added a call to remove_reference() for a svc handler owned by
-          non-blocking connection handler during connector's close().
-
-        * ace/Svc_Handler.cpp:
-          Removed the code that removes a reference to itself. Svc_Handler
-          doesn't own that reference and thus shouldn't remove it.
-
-        * tests/Bug_2609_Regression_Test.cpp:
-        * tests/NonBlocking_Conn_Test.h:
-        * tests/Bug_2610_Regression_Test.cpp:
-        * tests/NonBlocking_Conn_Test.cpp:
-          Fixed the tests that implicitly assumed ownership of a reference
-          to a svc handler and didn't free it at the end of the test.
-
-        * tests/Process_Strategy_Test.cpp:
-          Fixed the test that was broken by my change on
-          'Mon Feb  8 16:21:06 UTC 2010'. The test incorrectly assumed
-          that close_handle() will not be called for svc handlers in
-          a parent process.
-
-Wed Feb 10 18:39:30 UTC 2010  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/config-g++-common.h:
-
-          Added logic to detect (usable) support for GCC builtin __sync_XXX
-          atomic op functions.
-
-        * ace/Atomic_Op.h:
-        * ace/Atomic_Op.inl:
-
-          Changed autodetection for GCC builtin atomic ops so it will
-          only be used when really wanted.
-          Removed include for stdatomic.h because that has nothing to do with
-          the __sync_XXX builtins but rather with a *proposed* atomic op
-          implementation for the C++1x standard. The __sync_XXX builtins are
-          truly intrinsic, i.e. no header files involved.
-
-Wed Feb 10 15:38:30 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ACE-INSTALL.html:
-          Updated C++ builder support
-
-Wed Feb 10 10:53:30 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/run_test.lst:
-          Marked 2610 as not fixed
-
-        * tests/Process_Strategy_Test.cpp:
-          Use prefix increment
-
-Wed Feb 10 10:45:00 UTC 2010  Simon Massey  <sma at prismtech dot com>
-
-        * tests/NonBlocking_Conn_Test.h:
-        * tests/NonBlocking_Conn_Test.cpp:
-          Fixed a VC9 compilation error (IGNORE is a vc9 #define).
-
-Tue Feb  9 15:03:35 UTC 2010  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * tests/NonBlocking_Conn_Test.cpp (hosts): Updated the list of hosts to
-          check to include news.bbc.co.uk.
-
-Tue Feb  9 09:14:48 UTC 2010  Vladimir Zykov  <vladimir.zykov@prismtech.com>
-
-        * tests/NonBlocking_Conn_Test.h:
-          Fixed a compilation error.
-
-Mon Feb  8 18:53:30 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/run_test.lst:
-          Enabled 2609 and 2610 again, let us see how they run with the recent
-          changes from Vladimir
-
-Mon Feb  8 16:21:06 UTC 2010  Vladimir Zykov  <vladimir.zykov@prismtech.com>
-
-        * ace/Strategies_T.cpp:
-          Changed the code so that close() is called in case of failure
-          instead of destroy().
-
-        * ace/Connector.cpp:
-          Changed a bit the code added by me on 'Wed Sep  2 14:45:27 UTC 2009'
-          as a fix for bug#3731. After some more thinking it turned out that
-          the original code could result in a crash when reference counting is
-          not enabled and thus svc_handler could be destroyed at the time
-          when there was an attempt to do remove_reference().
-
-        * ace/Svc_Handler.cpp:
-          Moved the code added by me on 'Thu Feb  4 11:15:57 UTC 2010'
-          from destroy() to handle_close().
-
-        * tests/NonBlocking_Conn_Test.h:
-        * tests/NonBlocking_Conn_Test.cpp:
-          Extended the test for using Svc_Handler with and without
-          reference counting.
-
-Mon Feb  8 11:35:30 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/ACETAOCIAO.style:
-          Updated with version 1.17 of Profactor Sylemanager
-
-Mon Feb  8 10:33:30 UTC 2010  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/ETCL/ETCL_l.cpp:
-          Fixed new GCC 4.4.x warning about ignoring return values of
-          function marked by the new warn_unused_result attribute.
-
-Sat Feb  6 18:58:30 UTC 2010  Martin Corino  <mcorino@remedy.nl>
-
-        * include/makeinclude/wrapper_macros.GNU:
-          Fixed missing definitions for Icecream support.
-
-Sat Feb  6 15:03:30 UTC 2010  Martin Corino  <mcorino@remedy.nl>
-
-        * include/makeinclude/wrapper_macros.GNU:
-          Added support for Icecream distributed compile system.
-
-Sat Feb  6 12:58:30 UTC 2010  Martin Corino  <mcorino@remedy.nl>
-
-        * tests/Reactor_Performance_Test.cpp:
-        * tests/Reactor_Fairness_Test.cpp:
-        * ASNMP/asnmp/address.cpp:
-        * examples/Reactor/Misc/pingpong.cpp:
-          More fixes for strict-aliasing warnings.
-
-Sat Feb  6 11:28:30 UTC 2010  Martin Corino  <mcorino@remedy.nl>
-
-        * ace/LSOCK.cpp:
-          Fixes for strict-aliasing warnings.
-
-Thu Feb  4 20:29:52 UTC 2010  Steve Huston  <shuston@riverace.com>
-
-        * tests/Reactor_Fairness_Test.cpp: Don't try ACE_Dev_Poll_Reactor on
-          platforms without that capability; also added ACE_WFMO_Reactor to
-          the test (which triggered a crash shutting down WFMO_Reactor... I'm
-          looking into it).
-
-Thu Feb  4 15:32:24 UTC 2010  Steve Huston  <shuston@riverace.com>
-
-        * tests/Reactor_Fairness_Test.cpp:
-        * tests/Reactor_Fairness_Test.h:
-        * tests/Makefile.am:
-        * tests/tests.mpc:
-        * tests/run_test.lst: New test to verify reactor fairness across a
-          set of registered I/O sockets. Tests Select, TP, Dev_Poll now.
-          TP fails fairness tests per Bugzilla 1031. Since the TP fairness
-          failure is a known issue, the new test is marked !FIXED_BUGS_ONLY.
-
-        * ace/Dev_Poll_Reactor.cpp:
-        * ace/Dev_Poll_Reactor.h: Two performance improvements to resolve
-          Bugzilla #3714:
-            1. The notify handler is no longer suspended/resumed around
-               notify processing. This removes the biggest source of CPU
-               consumption introduced at ACE 5.7 - simply acquiring/releasing
-               the token to handle notifies, each of which triggered another
-               token acquire/notify cycle.
-            2. As I/O handlers are suspended before callback, they are not
-               immediately resumed on callback return. Instead, they are added
-               to a "to be resumed" list that is examined just prior to the
-               next epoll_wait() call; any to-be-resumed handles are added
-               back to the epoll set just before waiting. This removes another
-               need to acquire the token just to resume a handler.
-
-Thu Feb  4 11:15:57 UTC 2010  Vladimir Zykov  <vladimir.zykov@prismtech.com>
-
-        * ace/Svc_Handler.cpp:
-          Fixed an unconditional delete of Svc_Handler in destroy(). If
-          reference counting is enabled then it has to do remove_reference().
-          This completes the fix for bug#3731.
-
-        * tests/NonBlocking_Conn_Test.cpp:
-          Changed www.pakarmy.gov.pk to www.pakistanarmy.gov.pk. The first
-          URL seems to be dead.
-
-Thu Feb  4 10:53:30 UTC 2010  Martin Corino  <mcorino@remedy.nl>
-
-        * bin/PerlACE/Process_Unix.pm:
-
-          Fixed problems concerning correct retrievel of process list.
-
-Thu Feb  3 09:57:30 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Atomic_Op.inl:
-          Added support for the GCC Atomic Builtins, if you want to
-          use these, add ACE_HAS_GCC_ATOMIC_BUILTINS defined as 1 in
-          your config file
-
-        * ace/Reactor.cpp:
-        * ace/Select_Reactor_Base.cpp:
-          Layout changes
-
-        * ace/Reactor.h:
-          Doxygen change
-
-Tue Feb  2 19:57:30 UTC 2010  Martin Corino  <mcorino@remedy.nl>
-
-        * bin/PerlACE/TestTarget_WinCE.pm:
-        * bin/PerlACE/Process_Unix.pm:
-        * bin/PerlACE/ProcessLVRT.pm:
-        * bin/PerlACE/TestTarget.pm:
-        * bin/PerlACE/TestTarget_VxWorks.pm:
-        * bin/PerlACE/ProcessVX.pm:
-        * bin/PerlACE/TestTarget_LVRT.pm:
-        * bin/PerlACE/Process_Win32.pm:
-        * bin/PerlACE/Process_VMS.pm:
-
-          Added killall methods to the Process and Target frameworks.
-          Currently only full implementation on Win32 and *nix platforms
-          (empty on others).
-
-Tue Feb  2 19:52:30 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * html/Stats/index.shtml:
-          Updated link to Cell results
-
-Mon Feb  1 23:16:24  2010  Steve Huston  <shuston@riverace.com>
-
-        * ace/Acceptor.h: Fixed up doxygen for ACE_Oneshot_Acceptor.
-
-Tue Jan 26 03:56:45 UTC 2010  Douglas C. Schmidt  <schmidt@dre.vanderbilt.edu>
-
-        * ace/Init_ACE.h: Updated the documentation of ACE::init() and
-          ACE::fini() so it reflects what ACE actually does.  Thanks to
-          Steve Huston, Andrew Kaplan <alexande dot kaplan at tafcorp dot
-          com>, and Alexander Mintz <alexande dot mintz at tafcorp dot
-          com> for motivating this update.
-
-Mon Feb  1 17:35:08 UTC 2010  Chris Cleeland  <cleeland_c@local>
-
-        * ace/Obstack_T.h:
-        * ace/Obstack_T.inl:
-        * ace/Obstack_T.cpp:
-        * ace/SStringfwd.h:
-        * ace/String_Base.h:
-        * ace/String_Base.inl:
-        * ace/String_Base.cpp:
-        * ace/Tokenizer_T.h:
-        * ace/Tokenizer_T.cpp:
-
-          Integrated changes originally done in OCITAO 1.4a by Steve Totten
-          to fulfill [RT 13868].
-
-          Wed Feb  1 10:40:35 2006  Steve Totten  <totten_s@ociweb.com>
-
-          Changed the use of "CHAR" as a template parameter to "ACE_CHAR_T" to
-          avoid possible clash with "CHAR" used as a preprocessor macro.
-          Thanks to Jennifer Kahng <jennifer dot kahng at lmco dot com> for
-          reporting the problem.  This change resolves [RT 8287].
-
-Mon Feb  1 11:21:30 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ace/Connector.cpp:
-          Const change
-
-        * bin/diff-builds-and-group-fixed-tests-only.sh:
-        * etc/index.html:
-        * docs/Download.html:
-          Updated because of recent release
-
-        * tests/NonBlocking_Conn_Test.cpp:
-          Improved this test so that it really tests the connections
-
-        * tests/tests.mpc:
-          Bug_3709_Regression itselfs checks now for vc71
-
-        * ace/Reactor.h:
-          Doxygen fixes
-
 Sun Jan 31 01:04:43 CST 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * ACE version 5.7.6 released.
+	* ACE version 5.7.6 released.
 
 Fri Jan 29 14:24:30 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
 
diff --git a/ACE/ChangeLogs/ChangeLog-2000a b/ACE/ChangeLogs/ChangeLog-00a
index 29d983c12cd..29d983c12cd 100644
--- a/ACE/ChangeLogs/ChangeLog-2000a
+++ b/ACE/ChangeLogs/ChangeLog-00a
diff --git a/ACE/ChangeLogs/ChangeLog-2000b b/ACE/ChangeLogs/ChangeLog-00b
index 333c85f7a1e..333c85f7a1e 100644
--- a/ACE/ChangeLogs/ChangeLog-2000b
+++ b/ACE/ChangeLogs/ChangeLog-00b
diff --git a/ACE/ChangeLogs/ChangeLog-2001a b/ACE/ChangeLogs/ChangeLog-01a
index 2c80dd6896a..2c80dd6896a 100644
--- a/ACE/ChangeLogs/ChangeLog-2001a
+++ b/ACE/ChangeLogs/ChangeLog-01a
diff --git a/ACE/ChangeLogs/ChangeLog-2001b b/ACE/ChangeLogs/ChangeLog-01b
index 504c875d72b..504c875d72b 100644
--- a/ACE/ChangeLogs/ChangeLog-2001b
+++ b/ACE/ChangeLogs/ChangeLog-01b
diff --git a/ACE/ChangeLogs/ChangeLog-2002a b/ACE/ChangeLogs/ChangeLog-02a
index 870ec350d6e..870ec350d6e 100644
--- a/ACE/ChangeLogs/ChangeLog-2002a
+++ b/ACE/ChangeLogs/ChangeLog-02a
diff --git a/ACE/ChangeLogs/ChangeLog-2002b b/ACE/ChangeLogs/ChangeLog-02b
index c13db37e19f..c13db37e19f 100644
--- a/ACE/ChangeLogs/ChangeLog-2002b
+++ b/ACE/ChangeLogs/ChangeLog-02b
diff --git a/ACE/ChangeLogs/ChangeLog-2003a b/ACE/ChangeLogs/ChangeLog-03a
index 930128362db..930128362db 100644
--- a/ACE/ChangeLogs/ChangeLog-2003a
+++ b/ACE/ChangeLogs/ChangeLog-03a
diff --git a/ACE/ChangeLogs/ChangeLog-2003b b/ACE/ChangeLogs/ChangeLog-03b
index 311de7bdba4..311de7bdba4 100644
--- a/ACE/ChangeLogs/ChangeLog-2003b
+++ b/ACE/ChangeLogs/ChangeLog-03b
diff --git a/ACE/ChangeLogs/ChangeLog-2003c b/ACE/ChangeLogs/ChangeLog-03c
index bbd6f2714d6..bbd6f2714d6 100644
--- a/ACE/ChangeLogs/ChangeLog-2003c
+++ b/ACE/ChangeLogs/ChangeLog-03c
diff --git a/ACE/ChangeLogs/ChangeLog-2004a b/ACE/ChangeLogs/ChangeLog-04a
index 0c4668dfbb2..0c4668dfbb2 100644
--- a/ACE/ChangeLogs/ChangeLog-2004a
+++ b/ACE/ChangeLogs/ChangeLog-04a
diff --git a/ACE/ChangeLogs/ChangeLog-2004b b/ACE/ChangeLogs/ChangeLog-04b
index fe54044d243..fe54044d243 100644
--- a/ACE/ChangeLogs/ChangeLog-2004b
+++ b/ACE/ChangeLogs/ChangeLog-04b
diff --git a/ACE/ChangeLogs/ChangeLog-2005a b/ACE/ChangeLogs/ChangeLog-05a
index c6a64f51119..c6a64f51119 100644
--- a/ACE/ChangeLogs/ChangeLog-2005a
+++ b/ACE/ChangeLogs/ChangeLog-05a
diff --git a/ACE/ChangeLogs/ChangeLog-2005b b/ACE/ChangeLogs/ChangeLog-05b
index 15f3ed61bea..15f3ed61bea 100644
--- a/ACE/ChangeLogs/ChangeLog-2005b
+++ b/ACE/ChangeLogs/ChangeLog-05b
diff --git a/ACE/ChangeLogs/ChangeLog-2005c b/ACE/ChangeLogs/ChangeLog-05c
index 3dfeb0ad918..3dfeb0ad918 100644
--- a/ACE/ChangeLogs/ChangeLog-2005c
+++ b/ACE/ChangeLogs/ChangeLog-05c
diff --git a/ACE/ChangeLogs/ChangeLog-2006a b/ACE/ChangeLogs/ChangeLog-06a
index f5ab9e868ab..f5ab9e868ab 100644
--- a/ACE/ChangeLogs/ChangeLog-2006a
+++ b/ACE/ChangeLogs/ChangeLog-06a
diff --git a/ACE/ChangeLogs/ChangeLog-2006b b/ACE/ChangeLogs/ChangeLog-06b
index 2212ce3f6f0..2212ce3f6f0 100644
--- a/ACE/ChangeLogs/ChangeLog-2006b
+++ b/ACE/ChangeLogs/ChangeLog-06b
diff --git a/ACE/ChangeLogs/ChangeLog-2007a b/ACE/ChangeLogs/ChangeLog-07a
index b70a051d787..b70a051d787 100644
--- a/ACE/ChangeLogs/ChangeLog-2007a
+++ b/ACE/ChangeLogs/ChangeLog-07a
diff --git a/ACE/ChangeLogs/ChangeLog-2007b b/ACE/ChangeLogs/ChangeLog-07b
index 2e96e779dc8..2e96e779dc8 100644
--- a/ACE/ChangeLogs/ChangeLog-2007b
+++ b/ACE/ChangeLogs/ChangeLog-07b
diff --git a/ACE/ChangeLogs/ChangeLog-2008a b/ACE/ChangeLogs/ChangeLog-08a
index 7a48c1babf4..7a48c1babf4 100644
--- a/ACE/ChangeLogs/ChangeLog-2008a
+++ b/ACE/ChangeLogs/ChangeLog-08a
diff --git a/ACE/ChangeLogs/ChangeLog-2009a b/ACE/ChangeLogs/ChangeLog-09a
index f02039d5f51..f02039d5f51 100644
--- a/ACE/ChangeLogs/ChangeLog-2009a
+++ b/ACE/ChangeLogs/ChangeLog-09a
diff --git a/ACE/ChangeLogs/ChangeLog-2009b b/ACE/ChangeLogs/ChangeLog-09b
index 5e3344157c2..5e3344157c2 100644
--- a/ACE/ChangeLogs/ChangeLog-2009b
+++ b/ACE/ChangeLogs/ChangeLog-09b
diff --git a/ACE/ChangeLogs/ChangeLog-1993 b/ACE/ChangeLogs/ChangeLog-93
index 0beb8e6321f..0beb8e6321f 100644
--- a/ACE/ChangeLogs/ChangeLog-1993
+++ b/ACE/ChangeLogs/ChangeLog-93
diff --git a/ACE/ChangeLogs/ChangeLog-1994 b/ACE/ChangeLogs/ChangeLog-94
index 09465ce823f..09465ce823f 100644
--- a/ACE/ChangeLogs/ChangeLog-1994
+++ b/ACE/ChangeLogs/ChangeLog-94
diff --git a/ACE/ChangeLogs/ChangeLog-1995 b/ACE/ChangeLogs/ChangeLog-95
index 429e5681fdc..429e5681fdc 100644
--- a/ACE/ChangeLogs/ChangeLog-1995
+++ b/ACE/ChangeLogs/ChangeLog-95
diff --git a/ACE/ChangeLogs/ChangeLog-1996a b/ACE/ChangeLogs/ChangeLog-96a
index 5aa3c9b69fc..5aa3c9b69fc 100644
--- a/ACE/ChangeLogs/ChangeLog-1996a
+++ b/ACE/ChangeLogs/ChangeLog-96a
diff --git a/ACE/ChangeLogs/ChangeLog-1996b b/ACE/ChangeLogs/ChangeLog-96b
index 5dd7b809a42..5dd7b809a42 100644
--- a/ACE/ChangeLogs/ChangeLog-1996b
+++ b/ACE/ChangeLogs/ChangeLog-96b
diff --git a/ACE/ChangeLogs/ChangeLog-1997a b/ACE/ChangeLogs/ChangeLog-97a
index 161d4746d2d..161d4746d2d 100644
--- a/ACE/ChangeLogs/ChangeLog-1997a
+++ b/ACE/ChangeLogs/ChangeLog-97a
diff --git a/ACE/ChangeLogs/ChangeLog-1997b b/ACE/ChangeLogs/ChangeLog-97b
index da7e8bf2f84..da7e8bf2f84 100644
--- a/ACE/ChangeLogs/ChangeLog-1997b
+++ b/ACE/ChangeLogs/ChangeLog-97b
diff --git a/ACE/ChangeLogs/ChangeLog-1998a b/ACE/ChangeLogs/ChangeLog-98a
index c5daa4d7ee1..c5daa4d7ee1 100644
--- a/ACE/ChangeLogs/ChangeLog-1998a
+++ b/ACE/ChangeLogs/ChangeLog-98a
diff --git a/ACE/ChangeLogs/ChangeLog-1998b b/ACE/ChangeLogs/ChangeLog-98b
index d9de5949d12..d9de5949d12 100644
--- a/ACE/ChangeLogs/ChangeLog-1998b
+++ b/ACE/ChangeLogs/ChangeLog-98b
diff --git a/ACE/ChangeLogs/ChangeLog-1999a b/ACE/ChangeLogs/ChangeLog-99a
index 5399b215825..5399b215825 100644
--- a/ACE/ChangeLogs/ChangeLog-1999a
+++ b/ACE/ChangeLogs/ChangeLog-99a
diff --git a/ACE/ChangeLogs/ChangeLog-1999b b/ACE/ChangeLogs/ChangeLog-99b
index 2bdeb97ccd3..2bdeb97ccd3 100644
--- a/ACE/ChangeLogs/ChangeLog-1999b
+++ b/ACE/ChangeLogs/ChangeLog-99b
diff --git a/ACE/THANKS b/ACE/THANKS
index 73c124ca67d..de780ea4701 100644
--- a/ACE/THANKS
+++ b/ACE/THANKS
@@ -776,6 +776,7 @@ Philipp Slusallek <slusallek at graphics dot stanford dot edu>
 Matthew Davis <matthew dot davis at solers dot com>
 Janusz Stopa <jstopa at bear dot com>
 Rusty Conover <rconover at zootweb dot com>
+Alex Mintz <amintz at bear dot com>
 Phillippe Merle <Philippe dot Merle at lifl dot fr>
 Mark Winrock <mwinrock at nortelnetworks dot com>
 Boris Kaminer <boris_kaminer at mail dot ru>
@@ -2313,12 +2314,6 @@ Sail Zeng <sailzeng at tencent dot com>
 Dirk Bonekaemper <dirk dot bonekaemper at dfs dot de>
 Sreejith <sreejithsmadhavan at gmail dot com>
 Guillaume Lahaye <Guillaume dot Lahaye at nuance dot com>
-Andrew Kaplan <alexande dot kaplan at tafcorp dot com>
-Alexander Mintz <alexande dot mintz at tafcorp dot com>
-Jennifer Kahng <jennifer dot kahng at lmco dot com>
-Trent Nadeau <Trent dot Nadeau at ngc dot com>
-Nick Meyer <nick dot meyer at sensis dot com>
-Olivier Langlois <olivier at olivierlanglois dot net>
 
 I would particularly like to thank Paul Stephenson, who worked with me
 at Ericsson in the early 1990's.  Paul devised the recursive Makefile
diff --git a/ACE/ace/Acceptor.h b/ACE/ace/Acceptor.h
index 9ff18245638..499bfc38277 100644
--- a/ACE/ace/Acceptor.h
+++ b/ACE/ace/Acceptor.h
@@ -503,30 +503,21 @@ protected:
  * @class ACE_Oneshot_Acceptor
  *
  * @brief Generic factory for passively connecting clients and creating
- * exactly one service handler of the type SVC_HANDLER specified in the
- * template.
+ * exactly one service handler (SVC_HANDLER).
  *
- * This class works similarly to the regular ACE_Acceptor, but
+ * This class works similarly to the regular {ACE_Acceptor},
  * with the following differences:
- *  -# ACE_Oneshot_Acceptor doesn't automatically register itself with the
- *     ACE_Reactor; the caller is expected to call the accept() method
- *     directly. Since a later call to accept() may require a reactor,
- *     the constructor and open() methods both accept an ACE_Reactor pointer
- *     which is saved in case it's needed in accept().
- *  -# ACE_Oneshot_Acceptor doesn't need an ACE_Creation_Strategy (because
- *     the user supplies the SVC_HANDLER) or an ACE_Accept_Strategy (because
- *     this class only accepts one connection and then removes all traces of
- *     itself from the ACE_Reactor if it was registered for asynchronous
- *     accepts).
- *
- * The usage model for ACE_Oneshot_Acceptor is:
- *  - Instantiate an object and establish its local address to listen at.
- *    This can be accomplished using either the address-accepting constructor
- *    (but there's no error indication) or the default constructor followed
- *    by a call to open().
- *  - Call the accept() method. This will attempt to accept a connection
- *    immediately. If there is no immediately available connection to accept,
- *    behavior is governed by the ACE_Synch_Options argument passed to open().
+ * 1. This class doesn't automagically register {this} with the
+ * {ACE_Reactor} since it expects to have its {accept} method
+ * called directly.  However, it stashes the {ACE_Reactor}
+ * pointer away in case it's needed later to finish accepting
+ * a connection asynchronously.
+ * 2. The class doesn't need an {ACE_Creation_Strategy} (since
+ * the user supplies the SVC_HANDLER) or an
+ * {ACE_Accept_Strategy} (since this class only accepts one
+ * connection and then removes all traces of itself from the
+ * {ACE_Reactor} if it was registered for asynchronous
+ * accepts).
  */
 template <class SVC_HANDLER, ACE_PEER_ACCEPTOR_1>
 class ACE_Oneshot_Acceptor : public ACE_Service_Object
@@ -544,10 +535,10 @@ public:
 
   /**
    * Initialize the appropriate strategies for concurrency and then
-   * open the acceptor at the designated @a local_addr.  Note
-   * that unlike ACE_Acceptor and ACE_Strategy_Acceptor, this
-   * method does NOT register this acceptor with the @a reactor at
-   * this point -- the @a reactor parameter is saved in case it's
+   * open the {peer_acceptor} at the designated {local_addr}.  Note
+   * that unlike the {ACE_Acceptor} and {ACE_Strategy_Acceptor}, this
+   * method does NOT register {this} acceptor with the {reactor} at
+   * this point -- it just stashes the {reactor} away in case it's
    * needed later.
    */
   ACE_Oneshot_Acceptor (const ACE_PEER_ACCEPTOR_ADDR &local_addr,
@@ -556,10 +547,10 @@ public:
 
   /**
    * Initialize the appropriate strategies for concurrency and then
-   * open the acceptor at the designated @a local_addr.  Note
-   * that unlike ACE_Acceptor and ACE_Strategy_Acceptor, this
-   * method does NOT register this acceptor with the @a reactor at
-   * this point -- the @a reactor parameter is saved in case it's
+   * open the {peer_acceptor} at the designated {local_addr}.  Note
+   * that unlike the {ACE_Acceptor} and {ACE_Strategy_Acceptor}, this
+   * method does NOT register {this} acceptor with the {reactor} at
+   * this point -- it just stashes the {reactor} away in case it's
    * needed later.
    */
   int open (const ACE_PEER_ACCEPTOR_ADDR &,
diff --git a/ACE/ace/Atomic_Op.h b/ACE/ace/Atomic_Op.h
index f74bb66e285..d7cbdc37c67 100644
--- a/ACE/ace/Atomic_Op.h
+++ b/ACE/ace/Atomic_Op.h
@@ -45,9 +45,6 @@
 #  define ACE_HAS_BUILTIN_ATOMIC_OP
 # elif defined (ACE_HAS_VXATOMICLIB)
 #  define ACE_HAS_BUILTIN_ATOMIC_OP
-# elif defined (ACE_HAS_GCC_ATOMIC_BUILTINS) && (ACE_HAS_GCC_ATOMIC_BUILTINS == 1)
-#  define ACE_HAS_BUILTIN_ATOMIC_OP
-#  define ACE_USES_GCC_ATOMIC_BUILTINS 1
 # endif /* WIN32 */
 #endif /* ACE_HAS_THREADS */
 
@@ -232,9 +229,9 @@ public:
 
 private:
 
-  /// This function cannot be supported by this template specialization.
-  /// If you need access to an underlying lock, use the ACE_Atomic_Op_Ex
-  /// template instead.
+  // This function cannot be supported by this template specialization.
+  // If you need access to an underlying lock, use the ACE_Atomic_Op_Ex
+  // template instead.
   ACE_Thread_Mutex &mutex (void);
 
 private:
diff --git a/ACE/ace/Atomic_Op.inl b/ACE/ace/Atomic_Op.inl
index 88853d65497..a79cc9e230e 100644
--- a/ACE/ace/Atomic_Op.inl
+++ b/ACE/ace/Atomic_Op.inl
@@ -44,8 +44,6 @@ ACE_Atomic_Op<ACE_Thread_Mutex, long>::operator++ (void)
   return ::InterlockedIncrement (const_cast<long *> (&this->value_));
 #elif defined (ACE_HAS_VXATOMICLIB)
   return ::vxAtomicInc (reinterpret_cast <atomic_t*>(const_cast<long *> (&this->value_))) + 1;
-#elif defined (ACE_USES_GCC_ATOMIC_BUILTINS) && (ACE_USES_GCC_ATOMIC_BUILTINS == 1)
-  return __sync_add_and_fetch (&this->value_, 1);
 #else /* WIN32 */
   return (*increment_fn_) (&this->value_);
 #endif /* WIN32 */
@@ -66,8 +64,6 @@ ACE_Atomic_Op<ACE_Thread_Mutex, long>::operator-- (void)
   return ::InterlockedDecrement (const_cast<long *> (&this->value_));
 #elif defined (ACE_HAS_VXATOMICLIB)
   return ::vxAtomicDec (reinterpret_cast <atomic_t*>(const_cast<long *> (&this->value_))) - 1;
-#elif defined (ACE_USES_GCC_ATOMIC_BUILTINS) && (ACE_USES_GCC_ATOMIC_BUILTINS == 1)
-  return __sync_sub_and_fetch (&this->value_, 1);
 #else /* WIN32 */
   return (*decrement_fn_) (&this->value_);
 #endif /* WIN32 */
@@ -90,8 +86,6 @@ ACE_Atomic_Op<ACE_Thread_Mutex, long>::operator+= (long rhs)
                                    rhs) + rhs;
 #elif defined (ACE_HAS_VXATOMICLIB)
   return ::vxAtomicAdd (reinterpret_cast <atomic_t*>(const_cast<long *> (&this->value_)), rhs) + rhs;
-#elif defined (ACE_USES_GCC_ATOMIC_BUILTINS) && (ACE_USES_GCC_ATOMIC_BUILTINS == 1)
-  return __sync_add_and_fetch (&this->value_, rhs);
 #else /* WIN32 && ACE_HAS_INTERLOCKED_EXCHANGEADD */
   return (*exchange_add_fn_) (&this->value_, rhs) + rhs;
 #endif /* WIN32 && ACE_HAS_INTERLOCKED_EXCHANGEADD */
@@ -108,8 +102,6 @@ ACE_Atomic_Op<ACE_Thread_Mutex, long>::operator-= (long rhs)
                                    -rhs) - rhs;
 #elif defined (ACE_HAS_VXATOMICLIB)
   return ::vxAtomicSub (reinterpret_cast <atomic_t*>(const_cast<long *> (&this->value_)), rhs) - rhs;
-#elif defined (ACE_USES_GCC_ATOMIC_BUILTINS) && (ACE_USES_GCC_ATOMIC_BUILTINS == 1)
-  return __sync_sub_and_fetch (&this->value_, rhs);
 #else /* WIN32 && ACE_HAS_INTERLOCKED_EXCHANGEADD */
   return (*exchange_add_fn_) (&this->value_, -rhs) - rhs;
 #endif /* WIN32 && ACE_HAS_INTERLOCKED_EXCHANGEADD */
@@ -160,8 +152,6 @@ ACE_Atomic_Op<ACE_Thread_Mutex, long>::operator= (long rhs)
   ::InterlockedExchange (const_cast<long *> (&this->value_), rhs);
 #elif defined (ACE_HAS_VXATOMICLIB)
   ::vxAtomicSet (reinterpret_cast <atomic_t*>(const_cast<long *> (&this->value_)), rhs);
-#elif defined (ACE_USES_GCC_ATOMIC_BUILTINS) && (ACE_USES_GCC_ATOMIC_BUILTINS == 1)
-  __sync_lock_test_and_set (&this->value_, rhs);
 #else /* WIN32 */
   (*exchange_fn_) (&this->value_, rhs);
 #endif /* WIN32 */
@@ -178,8 +168,6 @@ ACE_Atomic_Op<ACE_Thread_Mutex, long>::operator= (
   ::InterlockedExchange (const_cast<long *> (&this->value_), rhs.value_);
 #elif defined (ACE_HAS_VXATOMICLIB)
   ::vxAtomicSet (reinterpret_cast <atomic_t*>(const_cast<long *> (&this->value_)), rhs.value_);
-#elif defined (ACE_USES_GCC_ATOMIC_BUILTINS) && (ACE_USES_GCC_ATOMIC_BUILTINS == 1)
-  __sync_lock_test_and_set (&this->value_, rhs.value_);
 #else /* WIN32 */
   (*exchange_fn_) (&this->value_, rhs.value_);
 #endif /* WIN32 */
@@ -227,8 +215,6 @@ ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::operator++ (void)
   return static_cast<unsigned long> (::InterlockedIncrement (const_cast<long *> (reinterpret_cast<volatile long *>(&this->value_))));
 #elif defined (ACE_HAS_VXATOMICLIB)
   return static_cast<unsigned long> (::vxAtomicInc (reinterpret_cast <atomic_t*>(const_cast<long *> (reinterpret_cast<volatile long *>(&this->value_))))) + 1;
-#elif defined (ACE_USES_GCC_ATOMIC_BUILTINS) && (ACE_USES_GCC_ATOMIC_BUILTINS == 1)
-  return __sync_add_and_fetch (&this->value_, 1);
 #else /* WIN32 */
   return static_cast<unsigned long> ((*increment_fn_) (reinterpret_cast<volatile long *> (&this->value_)));
 #endif /* WIN32 */
@@ -249,8 +235,6 @@ ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::operator-- (void)
   return static_cast<unsigned long> (::InterlockedDecrement (const_cast<long *> (reinterpret_cast<volatile long *>(&this->value_))));
 #elif defined (ACE_HAS_VXATOMICLIB)
   return static_cast<unsigned long> (::vxAtomicDec (reinterpret_cast <atomic_t*>(const_cast<long *> (reinterpret_cast<volatile long *>(&this->value_))))) - 1;
-#elif defined (ACE_USES_GCC_ATOMIC_BUILTINS) && (ACE_USES_GCC_ATOMIC_BUILTINS == 1)
-  return __sync_sub_and_fetch (&this->value_, 1);
 #else /* WIN32 */
   return static_cast<unsigned long> ((*decrement_fn_) (reinterpret_cast<volatile long *> (&this->value_)));
 #endif /* WIN32 */
@@ -273,8 +257,6 @@ ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::operator+= (unsigned long rhs)
                                    rhs)) + rhs;
 #elif defined (ACE_HAS_VXATOMICLIB)
   return static_cast<unsigned long> (::vxAtomicAdd (reinterpret_cast <atomic_t*>(const_cast<long *> (reinterpret_cast<volatile long *>(&this->value_))), rhs)) + rhs;
-#elif defined (ACE_USES_GCC_ATOMIC_BUILTINS) && (ACE_USES_GCC_ATOMIC_BUILTINS == 1)
-  return __sync_add_and_fetch (&this->value_, rhs);
 #else /* WIN32 && ACE_HAS_INTERLOCKED_EXCHANGEADD */
   return static_cast<unsigned long> ((*exchange_add_fn_) (reinterpret_cast<volatile long *> (&this->value_), rhs)) + rhs;
 #endif /* WIN32 && ACE_HAS_INTERLOCKED_EXCHANGEADD */
@@ -291,8 +273,6 @@ ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::operator-= (unsigned long rhs)
                                    -static_cast<long>(rhs))) - rhs;
 #elif defined (ACE_HAS_VXATOMICLIB)
   return static_cast<unsigned long> (::vxAtomicSub (reinterpret_cast <atomic_t*>(const_cast<long *> (reinterpret_cast<volatile long *>(&this->value_))), rhs)) - rhs;
-#elif defined (ACE_USES_GCC_ATOMIC_BUILTINS) && (ACE_USES_GCC_ATOMIC_BUILTINS == 1)
-  return __sync_sub_and_fetch (&this->value_, rhs);
 #else /* WIN32 && ACE_HAS_INTERLOCKED_EXCHANGEADD */
   long l_rhs = static_cast<long> (rhs);
   return static_cast<unsigned long> ((*exchange_add_fn_) (reinterpret_cast<volatile long *> (&this->value_), -l_rhs)) - rhs;
@@ -344,8 +324,6 @@ ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::operator= (unsigned long rhs)
   ::InterlockedExchange (const_cast<long *> (reinterpret_cast<volatile long*> (&this->value_)), rhs);
 #elif defined (ACE_HAS_VXATOMICLIB)
   ::vxAtomicSet (reinterpret_cast <atomic_t*>(const_cast<long *> (reinterpret_cast<volatile long*> (&this->value_))), rhs);
-#elif defined (ACE_USES_GCC_ATOMIC_BUILTINS) && (ACE_USES_GCC_ATOMIC_BUILTINS == 1)
-  __sync_lock_test_and_set (&this->value_, rhs);
 #else /* WIN32 */
   (*exchange_fn_) (reinterpret_cast<volatile long *> (&this->value_), rhs);
 #endif /* WIN32 */
@@ -362,8 +340,6 @@ ACE_Atomic_Op<ACE_Thread_Mutex, unsigned long>::operator= (
   ::InterlockedExchange (const_cast<long *> (reinterpret_cast<volatile long*> (&this->value_)), rhs.value_);
 #elif defined (ACE_HAS_VXATOMICLIB)
   ::vxAtomicSet (reinterpret_cast <atomic_t*>(const_cast<long *> (reinterpret_cast<volatile long*> (&this->value_))), rhs.value_);
-#elif defined (ACE_USES_GCC_ATOMIC_BUILTINS) && (ACE_USES_GCC_ATOMIC_BUILTINS == 1)
-  __sync_lock_test_and_set (&this->value_, rhs.value_);
 #else /* WIN32 */
   (*exchange_fn_) (reinterpret_cast<volatile long *> (&this->value_), rhs.value_);
 #endif /* WIN32 */
diff --git a/ACE/ace/Condition_Recursive_Thread_Mutex.cpp b/ACE/ace/Condition_Recursive_Thread_Mutex.cpp
index 01607d8c52c..f95fdaf0939 100644
--- a/ACE/ace/Condition_Recursive_Thread_Mutex.cpp
+++ b/ACE/ace/Condition_Recursive_Thread_Mutex.cpp
@@ -63,7 +63,7 @@ ACE_Condition<ACE_Recursive_Thread_Mutex>::wait (ACE_Recursive_Thread_Mutex &mut
                                                  const ACE_Time_Value *abstime)
 {
   ACE_recursive_mutex_state mutex_state_holder;
-  ACE_recursive_thread_mutex_t &recursive_mutex = mutex.lock ();
+  ACE_recursive_thread_mutex_t &recursive_mutex = mutex.mutex ();
 
   if (ACE_OS::recursive_mutex_cond_unlock (&recursive_mutex,
                                            mutex_state_holder) == -1)
diff --git a/ACE/ace/Condition_T.cpp b/ACE/ace/Condition_T.cpp
index 0e2c465f75f..bc63d7411f2 100644
--- a/ACE/ace/Condition_T.cpp
+++ b/ACE/ace/Condition_T.cpp
@@ -87,7 +87,7 @@ ACE_Condition<MUTEX>::wait (void)
 {
   // ACE_TRACE ("ACE_Condition<MUTEX>::wait");
   return ACE_OS::cond_wait (&this->cond_,
-                            &this->mutex_.lock ());
+                            &this->mutex_.lock_);
 }
 
 template <class MUTEX> int
@@ -96,15 +96,13 @@ ACE_Condition<MUTEX>::wait (MUTEX &mutex,
 {
 // ACE_TRACE ("ACE_Condition<MUTEX>::wait");
   if (abstime == 0)
-    {
       return ACE_OS::cond_wait (&this->cond_,
-                                &mutex.lock ());
-    }
+                                &mutex.lock_);
   else
     {
       ACE_Time_Value tv = *abstime;
       return ACE_OS::cond_timedwait (&this->cond_,
-                                     &mutex.lock (),
+                                     &mutex.lock_,
                                      &tv);
     }
 }
diff --git a/ACE/ace/Connector.cpp b/ACE/ace/Connector.cpp
index 0934ac62750..d3298942196 100644
--- a/ACE/ace/Connector.cpp
+++ b/ACE/ace/Connector.cpp
@@ -32,10 +32,7 @@ ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::ACE_NonBlocking_Connect_Handler
     (ACE_Event_Handler::Reference_Counting_Policy::ENABLED);
 
   if (this->svc_handler_ != 0)
-    {
-      // If reference counting is not enabled then this does nothing.
-      this->svc_handler_->add_reference ();
-    }
+    this->svc_handler_->add_reference ();
 }
 
 template <class SVC_HANDLER> SVC_HANDLER *
@@ -125,29 +122,18 @@ ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::handle_timeout
   ACE_TRACE ("ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::handle_timeout");
 
   SVC_HANDLER *svc_handler = 0;
-  int const retval = this->close (svc_handler) ? 0 : -1;
-
-  if (svc_handler != 0)
-    {
-      ACE_Event_Handler_var ref_count_guard;
+  int retval = this->close (svc_handler) ? 0 : -1;
 
-      // We have to remove reference only when reference counting is enabled.
-      // Otherwise doing remove_reference() can be unsafe as svc_handler can
-      // be destroyed just before the point where we need to remove reference.
-      if (svc_handler->reference_counting_policy ().value () ==
-          ACE_Event_Handler::Reference_Counting_Policy::ENABLED)
-        {
-          ref_count_guard.reset (svc_handler);
-        }
+  // Forward to the SVC_HANDLER the <arg> that was passed in as a
+  // magic cookie during ACE_Connector::connect().  This gives the
+  // SVC_HANDLER an opportunity to take corrective action (e.g., wait
+  // a few milliseconds and try to reconnect again.
+  if (svc_handler != 0 && svc_handler->handle_timeout (tv, arg) == -1)
+    svc_handler->handle_close (svc_handler->get_handle (),
+                               ACE_Event_Handler::TIMER_MASK);
 
-      // Forward to the SVC_HANDLER the <arg> that was passed in as a
-      // magic cookie during ACE_Connector::connect().  This gives the
-      // SVC_HANDLER an opportunity to take corrective action (e.g., wait
-      // a few milliseconds and try to reconnect again.
-      if (svc_handler->handle_timeout (tv, arg) == -1)
-        svc_handler->handle_close (svc_handler->get_handle (),
-                                   ACE_Event_Handler::TIMER_MASK);
-    }
+  if (svc_handler != 0)
+    svc_handler->remove_reference ();
 
   return retval;
 }
@@ -166,18 +152,9 @@ ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::handle_input (ACE_HANDLE)
   // Close Svc_Handler.
   if (svc_handler != 0)
     {
-      ACE_Event_Handler_var ref_count_guard;
-
-      // We have to remove reference only when reference counting is enabled.
-      // Otherwise doing remove_reference() can be unsafe as svc_handler can
-      // be destroyed just before the point where we need to remove reference.
-      if (svc_handler->reference_counting_policy ().value () ==
-          ACE_Event_Handler::Reference_Counting_Policy::ENABLED)
-        {
-          ref_count_guard.reset (svc_handler);
-        }
-
       svc_handler->close (NORMAL_CLOSE_OPERATION);
+
+      svc_handler->remove_reference ();
     }
 
   return retval;
@@ -196,18 +173,9 @@ ACE_NonBlocking_Connect_Handler<SVC_HANDLER>::handle_output (ACE_HANDLE handle)
 
   if (svc_handler != 0)
     {
-      ACE_Event_Handler_var ref_count_guard;
-
-      // We have to remove reference only when reference counting is enabled.
-      // Otherwise doing remove_reference() can be unsafe as svc_handler can
-      // be destroyed just before the point where we need to remove reference.
-      if (svc_handler->reference_counting_policy ().value () ==
-          ACE_Event_Handler::Reference_Counting_Policy::ENABLED)
-        {
-          ref_count_guard.reset (svc_handler);
-        }
-
       connector.initialize_svc_handler (handle, svc_handler);
+
+      svc_handler->remove_reference ();
     }
 
   return retval;
@@ -736,15 +704,6 @@ ACE_Connector<SVC_HANDLER, ACE_PEER_CONNECTOR_2>::close (void)
         }
       SVC_HANDLER *svc_handler = nbch->svc_handler ();
 
-      // Since nbch holds a reference to svc_handler we have to
-      // free it here as there will be no other chance to do it.
-      ACE_Event_Handler_var ref_count_guard;
-      if (svc_handler->reference_counting_policy ().value () ==
-          ACE_Event_Handler::Reference_Counting_Policy::ENABLED)
-        {
-          ref_count_guard.reset (svc_handler);
-        }
-
       // Cancel the non-blocking connection.
       this->cancel (svc_handler);
 
diff --git a/ACE/ace/Containers_T.h b/ACE/ace/Containers_T.h
index e14357c352d..25a46450abd 100644
--- a/ACE/ace/Containers_T.h
+++ b/ACE/ace/Containers_T.h
@@ -1993,8 +1993,13 @@ class ACE_Array : public ACE_Array_Base<T>
 public:
   // Define a "trait"
   typedef T TYPE;
+
   typedef ACE_Array_Iterator<T> ITERATOR;
-  
+
+  // = Exceptions.
+
+  // = Initialization and termination methods.
+
   /// Dynamically create an uninitialized array.
   /**
    * Initialize an empty array of the specified size using the provided
diff --git a/ACE/ace/Dev_Poll_Reactor.cpp b/ACE/ace/Dev_Poll_Reactor.cpp
index 66a0a1ef19c..78dcc03672b 100644
--- a/ACE/ace/Dev_Poll_Reactor.cpp
+++ b/ACE/ace/Dev_Poll_Reactor.cpp
@@ -609,9 +609,6 @@ ACE_Dev_Poll_Reactor::ACE_Dev_Poll_Reactor (ACE_Sig_Handler *sh,
   , poll_fd_ (ACE_INVALID_HANDLE)
   , size_ (0)
   // , ready_set_ ()
-#if defined (ACE_HAS_EVENT_POLL)
-  , epoll_wait_in_progress_ (false)
-#endif /* ACE_HAS_EVENT_POLL */
 #if defined (ACE_HAS_DEV_POLL)
   , dp_fds_ (0)
   , start_pfds_ (0)
@@ -968,33 +965,11 @@ ACE_Dev_Poll_Reactor::work_pending_i (ACE_Time_Value * max_wait_time)
 
 #if defined (ACE_HAS_EVENT_POLL)
 
-  // See if there are handlers that have to be resumed before waiting.
-  {
-    ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, grd, this->to_be_resumed_lock_, -1);
-    this->epoll_wait_in_progress_ = true;
-    for (Resume_Map::iterator i = this->to_be_resumed_.begin ();
-         i != this->to_be_resumed_.end ();
-         ++i)
-      {
-        // Make sure that 1) the handle is still registered,
-        // 2) the registered handler is the one we're waiting to resume.
-        Event_Tuple *info = this->handler_rep_.find (i->first);
-        if (info != 0 && info->event_handler == i->second)
-          {
-            this->resume_handler_i (i->first);
-          }
-      }
-    this->to_be_resumed_.clear ();
-  }
-
-  // Wait for an event.
-  int const nfds = ::epoll_wait (this->poll_fd_,
-                                 &this->event_,
-                                 1,
-                                 static_cast<int> (timeout));
-  // Count on this being an atomic update; at worst, we may get an
-  // extraneous notify() from dispatch_io_event.
-  this->epoll_wait_in_progress_ = false;
+   // Wait for an event.
+   int const nfds = ::epoll_wait (this->poll_fd_,
+                                  &this->event_,
+                                  1,
+                                  static_cast<int> (timeout));
 
 #else
 
@@ -1306,21 +1281,13 @@ ACE_Dev_Poll_Reactor::dispatch_io_event (Token_Guard &guard)
       // With epoll, events are registered with oneshot, so the handle is
       // effectively suspended; future calls to epoll_wait() will select
       // the next event, so they're not managed here.
-      // The hitch to this is that the notify handler is always registered
-      // WITHOUT oneshot and is never suspended/resumed. This avoids endless
-      // notify loops caused by the notify handler requiring a resumption
-      // which requires the token, which requires a notify, etc. described
-      // in Bugzilla 3714. So, never suspend the notify handler.
-
-      bool reactor_resumes_eh = false;
-      if (eh != this->notify_handler_)
-        {
-          info->suspended = true;
-
-          reactor_resumes_eh =
-            eh->resume_handler () ==
-            ACE_Event_Handler::ACE_REACTOR_RESUMES_HANDLER;
-        }
+      // The hitch to this is that the notify handler must always be resumed
+      // immediately, before letting go of the guard. Else it's possible to
+      // get into a state where all handles, including the notify pipe, are
+      // suspended and that means the wait thread can't be interrupted.
+      info->suspended = true;
+      if (eh == this->notify_handler_)
+        this->resume_handler_i (handle);
 #endif /* ACE_HAS_DEV_POLL */
 
       int status = 0;   // gets callback status, below.
@@ -1339,39 +1306,6 @@ ACE_Dev_Poll_Reactor::dispatch_io_event (Token_Guard &guard)
         // if callback returns > 0. We come back with either 0 or < 0.
         status = this->upcall (eh, callback, handle);
 
-        if (eh == this->notify_handler_)
-          return status == 0 ? 1 : -1;
-
-        // If the callback returned 0, epoll-based needs to resume the
-        // suspended handler but dev/poll doesn't.
-        // The epoll case is optimized to not acquire the token in order
-        // to resume the handler; the handler is added to a list of those
-        // that need to be resumed and is handled by the next leader
-        // that does an epoll_wait().
-        // In both epoll and dev/poll cases, if the callback returns <0,
-        // the token needs to be acquired and the handler checked and
-        // removed if it hasn't already been.
-        if (status == 0)
-          {
-#ifdef ACE_HAS_EVENT_POLL
-            // epoll-based effectively suspends handlers around the upcall.
-            // If the handler must be resumed, add it to the list.
-            if (reactor_resumes_eh)
-              {
-                ACE_GUARD_RETURN (ACE_SYNCH_MUTEX,
-                                  grd,
-                                  this->to_be_resumed_lock_,
-                                  -1);
-                bool map_was_empty = this->to_be_resumed_.empty();
-                this->to_be_resumed_.insert
-                  (Resume_Map::value_type (handle, eh));
-                if (this->epoll_wait_in_progress_ && map_was_empty)
-                  this->notify();
-              }
-#endif /* ACE_HAS_EVENT_POLL */
-            return 1;
-          }
-
         // All state in the handler repository may have changed during the
         // upcall while other threads had the token. Thus, reacquire the
         // token and evaluate what's needed. If the upcalled handler is still
@@ -1383,6 +1317,15 @@ ACE_Dev_Poll_Reactor::dispatch_io_event (Token_Guard &guard)
           {
             if (status < 0)
               this->remove_handler_i (handle, disp_mask);
+
+#ifdef ACE_HAS_EVENT_POLL
+            // epoll-based effectively suspends handlers around the upcall.
+            // If the handler must be resumed here, do it now.
+            if (info->suspended &&
+                (eh->resume_handler () ==
+                 ACE_Event_Handler::ACE_REACTOR_RESUMES_HANDLER))
+              this->resume_handler_i (handle);
+#endif /* ACE_HAS_EVENT_POLL */
           }
       }
       // Scope close handles eh ref count decrement, if needed.
@@ -1485,13 +1428,8 @@ ACE_Dev_Poll_Reactor::register_handler_i (ACE_HANDLE handle,
      ACE_OS::memset (&epev, 0, sizeof (epev));
      static const int op = EPOLL_CTL_ADD;
 
+     epev.events  = this->reactor_mask_to_poll_event (mask) | EPOLLONESHOT;
      epev.data.fd = handle;
-     epev.events  = this->reactor_mask_to_poll_event (mask);
-     // All but the notify handler get registered with oneshot to facilitate
-     // auto suspend before the upcall. See dispatch_io_event for more
-     // information.
-     if (event_handler != this->notify_handler_)
-       epev.events |= EPOLLONESHOT;
 
      if (::epoll_ctl (this->poll_fd_, op, handle, &epev) == -1)
        {
diff --git a/ACE/ace/Dev_Poll_Reactor.h b/ACE/ace/Dev_Poll_Reactor.h
index 53b8befb7cb..02f5f7fd457 100644
--- a/ACE/ace/Dev_Poll_Reactor.h
+++ b/ACE/ace/Dev_Poll_Reactor.h
@@ -43,7 +43,6 @@
 #if defined (ACE_HAS_DEV_POLL)
 struct pollfd;
 #elif defined (ACE_HAS_EVENT_POLL)
-#  include "ace/Array_Map.h"
 #  include /**/ <sys/epoll.h>
 #endif
 
@@ -1056,17 +1055,6 @@ protected:
   /// epoll_wait() but not yet processed.
   struct epoll_event event_;
 
-  /// Event handlers that are suspended/resumed around upcalls are not
-  /// immediately resumed; they're added to this list for resumption at
-  /// the next epoll_wait() call. This avoids always needing to acquire the
-  /// token just to resume a handler. Of course, if there are no other
-  /// handlers in the to-be-resumed list and an epoll_wait is already in
-  /// progress, the reactor needs to be notified to force another run around
-  /// the epoll_wait() call.
-  typedef ACE_Array_Map<ACE_HANDLE, ACE_Event_Handler *> Resume_Map;
-  Resume_Map to_be_resumed_;
-  volatile bool epoll_wait_in_progress_;
-  ACE_SYNCH_MUTEX to_be_resumed_lock_;
 #else
   /// The pollfd array that `/dev/poll' will feed its results to.
   struct pollfd *dp_fds_;
diff --git a/ACE/ace/ETCL/ETCL_l.cpp b/ACE/ace/ETCL/ETCL_l.cpp
index bb343092dfc..37ca3d8d26d 100644
--- a/ACE/ace/ETCL/ETCL_l.cpp
+++ b/ACE/ace/ETCL/ETCL_l.cpp
@@ -563,7 +563,7 @@ YY_MALLOC_DECL
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
-#define ETCL_ECHO { size_t __dum_ret = fwrite( yytext, yyleng, 1, yyout ); (void) __dum_ret; }
+#define ETCL_ECHO (void) fwrite( yytext, yyleng, 1, yyout )
 #endif
  //FUZZ: enable check_for_lack_ACE_OS
 
diff --git a/ACE/ace/FoxReactor/FoxReactor.h b/ACE/ace/FoxReactor/FoxReactor.h
index 5033c8f61ac..94ffd92508b 100644
--- a/ACE/ace/FoxReactor/FoxReactor.h
+++ b/ACE/ace/FoxReactor/FoxReactor.h
@@ -28,7 +28,7 @@
 #include "ace/Select_Reactor.h"
 #include "ace/FoxReactor/ACE_FoxReactor_export.h"
 
-#include <fx.h>
+#include <fox/fx.h>
 
 /**
  * @class ACE_FoxReactor
diff --git a/ACE/ace/Init_ACE.h b/ACE/ace/Init_ACE.h
index 596e2b5f591..164f61e1d70 100644
--- a/ACE/ace/Init_ACE.h
+++ b/ACE/ace/Init_ACE.h
@@ -6,11 +6,8 @@
  *
  *  $Id$
  *
- *  Initialize and finalize the ACE library services.  You can
- *  generally execute the @a ACE::init() and @a ACE::fini() sequence
- *  multiple times, but be aware that nothing that ACE controls (e.g.,
- *  singletons, thread-specific services, loaded services, etc.)  will
- *  survive the @a ACE::fini().
+ *  Initialize ACE library services.  Can be called only once per
+ *  program invocation.
  */
 //=============================================================================
 
@@ -31,22 +28,17 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace ACE
 {
   /**
-   * This method initializes the ACE library services and initializes
-   * ACE's internal resources.  Applications should not instantiate
-   * ACE classes or call methods on objects of these classes until @a
-   * ACE::init() returns successfully.
-
-   * @return Returns 0 on success, -1 on failure, and 1 if it had
-   * already been called.
+   * This class implements the functions for the initialization and
+   * shutting down ACE.  These functions are called only once per ACE
+   * invokation.
+   * @return Returns 0 on success, -1 on failure, and 1 if it had already been
+   * called.
    */
   extern ACE_Export int init (void);
 
   /**
-   * Finalize the ACE library services and releases ACE's internal
-   * resources.  In general, do not instantiate ACE classes or call
-   * methods on objects of these classes after @a ACE::fini() has been
-   * called.
-   *
+   * Shut down ACE library services.  Can be called only once per
+   * program invocation.
    * @return Returns 0 on success, -1 on failure, and 1 if it had already been
    * called.
    */
diff --git a/ACE/ace/LSOCK.cpp b/ACE/ace/LSOCK.cpp
index 3b3c46885bf..71f93fdde9c 100644
--- a/ACE/ace/LSOCK.cpp
+++ b/ACE/ace/LSOCK.cpp
@@ -59,8 +59,7 @@ ACE_LSOCK::send_handle (const ACE_HANDLE handle) const
   cmsgptr->cmsg_len = sizeof cmsgbuf;
   send_msg.msg_control = cmsgbuf;
   send_msg.msg_controllen = sizeof cmsgbuf;
-  ACE_HANDLE *ph = (ACE_HANDLE *) CMSG_DATA (cmsgptr);
-  *ph = handle;
+  *(ACE_HANDLE *) CMSG_DATA (cmsgptr) = handle;
   send_msg.msg_flags = 0;
 #else
   send_msg.msg_accrights = (char *) &handle;
@@ -144,9 +143,7 @@ ACE_LSOCK::recv_handle (ACE_HANDLE &handle, char *pbuf, ssize_t *len) const
         {
 #if defined (ACE_HAS_4_4BSD_SENDMSG_RECVMSG)
           // Close down the socket that was returned by the MSG_PEEK.
-          cmsghdr  *cmsgptr = (cmsghdr *) cmsgbuf;
-          ACE_HANDLE * ph = (ACE_HANDLE *) CMSG_DATA (cmsgptr);
-          ACE_OS::closesocket (*ph);
+          ACE_OS::closesocket (*(ACE_HANDLE *) CMSG_DATA ((cmsghdr *) cmsgbuf));
           recv_msg.msg_control = cmsgbuf;
           recv_msg.msg_controllen = sizeof cmsgbuf;
 #else
@@ -161,8 +158,7 @@ ACE_LSOCK::recv_handle (ACE_HANDLE &handle, char *pbuf, ssize_t *len) const
             {
 #if defined (ACE_HAS_4_4BSD_SENDMSG_RECVMSG)
               cmsghdr *cmsgptr = (cmsghdr *) cmsgbuf;
-              ACE_HANDLE * ph = (ACE_HANDLE *) CMSG_DATA (cmsgptr);
-              handle = *ph;
+              handle = *(ACE_HANDLE *) CMSG_DATA (cmsgptr);
 #endif /* ACE_HAS_4_4BSD_SENDMSG_RECVMSG */
               return 1;
             }
diff --git a/ACE/ace/OS_NS_math.h b/ACE/ace/OS_NS_math.h
index ac02cd3070f..49143738a79 100644
--- a/ACE/ace/OS_NS_math.h
+++ b/ACE/ace/OS_NS_math.h
@@ -91,17 +91,9 @@ namespace ACE_OS
   ACE_NAMESPACE_INLINE_FUNCTION
   double floor (double x);
 
-  /// This method computes the largest integral value not greater than x.
-  ACE_NAMESPACE_INLINE_FUNCTION
-  long double floor (long double x);
-  
   /// This method computes the smallest integral value not less than x.
   ACE_NAMESPACE_INLINE_FUNCTION
   double ceil (double x);
-  
-  /// This method computes the smallest integral value not less than x.
-  ACE_NAMESPACE_INLINE_FUNCTION
-  long double ceil (long double x);
 
   /// This method computes the base-2 logarithm of x.
   ACE_NAMESPACE_INLINE_FUNCTION
diff --git a/ACE/ace/OS_NS_math.inl b/ACE/ace/OS_NS_math.inl
index a07cc081299..ff368b53c0d 100644
--- a/ACE/ace/OS_NS_math.inl
+++ b/ACE/ace/OS_NS_math.inl
@@ -22,22 +22,6 @@ namespace ACE_OS {
 #endif
   }
 
-  ACE_INLINE long double
-  floor (long double x)
-  {
-#if defined (ACE_LACKS_FLOORL)
-    // This method computes the largest integral value not greater than x.
-    if(x > 0)
-      return static_cast<long> (x);
-    else if ((static_cast<long> (x) < x) || (static_cast<long> (x) > x) )
-      return static_cast<long>(x) - 1;
-    else
-      return x;
-#else
-    return ::floorl (x);
-#endif
-  }
-
   ACE_INLINE double
   ceil (double x)
   {
@@ -54,22 +38,6 @@ namespace ACE_OS {
 #endif
   }
 
-  ACE_INLINE long double
-  ceil (long double x)
-  {
-#if defined (ACE_LACKS_CEILL)
-    // This method computes the smallest integral value not less than x.
-    if (x < 0)
-      return static_cast<long> (x);
-    else if ((static_cast<long> (x) < x) || (static_cast<long> (x) > x))
-      return static_cast<long> (x) + 1;
-    else
-      return x;
-#else
-    return ::ceill (x);
-#endif
-  }
-
   ACE_INLINE double
   log2 (double x)
   {
diff --git a/ACE/ace/Obstack_T.cpp b/ACE/ace/Obstack_T.cpp
index dc1d0acfc6c..ecce0636b2d 100644
--- a/ACE/ace/Obstack_T.cpp
+++ b/ACE/ace/Obstack_T.cpp
@@ -19,11 +19,11 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Obstack_T)
 
-template <class ACE_CHAR_T> void
-ACE_Obstack_T<ACE_CHAR_T>::dump (void) const
+template <class CHAR> void
+ACE_Obstack_T<CHAR>::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
-  ACE_TRACE ("ACE_Obstack_T<ACE_CHAR_T>::dump");
+  ACE_TRACE ("ACE_Obstack_T<CHAR>::dump");
 
   ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
   ACE_DEBUG ((LM_DEBUG,  ACE_TEXT ("size_ = %d\n"), this->size_));
@@ -33,13 +33,13 @@ ACE_Obstack_T<ACE_CHAR_T>::dump (void) const
 #endif /* ACE_HAS_DUMP */
 }
 
-template <class ACE_CHAR_T> int
-ACE_Obstack_T<ACE_CHAR_T>::request (size_t len)
+template <class CHAR> int
+ACE_Obstack_T<CHAR>::request (size_t len)
 {
-  ACE_TRACE ("ACE_Obstack_T<ACE_CHAR_T>::request");
+  ACE_TRACE ("ACE_Obstack_T<CHAR>::request");
 
   // normalize the length.
-  len *= sizeof (ACE_CHAR_T);
+  len *= sizeof (CHAR);
 
   // Check to see if there's room for the requested length, including
   // any part of an existing string, if any.
@@ -89,15 +89,15 @@ ACE_Obstack_T<ACE_CHAR_T>::request (size_t len)
   return 0;
 }
 
-template <class ACE_CHAR_T> ACE_CHAR_T *
-ACE_Obstack_T<ACE_CHAR_T>::grow (ACE_CHAR_T c)
+template <class CHAR> CHAR *
+ACE_Obstack_T<CHAR>::grow (CHAR c)
 {
-  ACE_TRACE ("ACE_Obstack_T<ACE_CHAR_T>::grow");
+  ACE_TRACE ("ACE_Obstack_T<CHAR>::grow");
 
   if (this->request (1) == 0)
     {
-      ACE_CHAR_T *retv = reinterpret_cast<ACE_CHAR_T *> (this->curr_->cur_);
-      this->curr_->cur_ += sizeof (ACE_CHAR_T);
+      CHAR *retv = reinterpret_cast<CHAR *> (this->curr_->cur_);
+      this->curr_->cur_ += sizeof (CHAR);
       *retv = c;
       return retv;
     }
@@ -105,10 +105,10 @@ ACE_Obstack_T<ACE_CHAR_T>::grow (ACE_CHAR_T c)
     return 0;
 }
 
-template <class ACE_CHAR_T> ACE_Obchunk *
-ACE_Obstack_T<ACE_CHAR_T>::new_chunk (void)
+template <class CHAR> ACE_Obchunk *
+ACE_Obstack_T<CHAR>::new_chunk (void)
 {
-  ACE_TRACE ("ACE_Obstack_T<ACE_CHAR_T>::new_chunk");
+  ACE_TRACE ("ACE_Obstack_T<CHAR>::new_chunk");
 
   ACE_Obchunk *temp = 0;
 
@@ -120,15 +120,15 @@ ACE_Obstack_T<ACE_CHAR_T>::new_chunk (void)
   return temp;
 }
 
-template <class ACE_CHAR_T>
-ACE_Obstack_T<ACE_CHAR_T>::ACE_Obstack_T (size_t size,
+template <class CHAR>
+ACE_Obstack_T<CHAR>::ACE_Obstack_T (size_t size,
                                     ACE_Allocator *allocator_strategy)
   : allocator_strategy_ (allocator_strategy),
     size_ (size),
     head_ (0),
     curr_ (0)
 {
-  ACE_TRACE ("ACE_Obstack_T<ACE_CHAR_T>::ACE_Obstack");
+  ACE_TRACE ("ACE_Obstack_T<CHAR>::ACE_Obstack");
 
   if (this->allocator_strategy_ == 0)
     ACE_ALLOCATOR (this->allocator_strategy_,
@@ -138,10 +138,10 @@ ACE_Obstack_T<ACE_CHAR_T>::ACE_Obstack_T (size_t size,
   this->curr_ = this->head_;
 }
 
-template <class ACE_CHAR_T>
-ACE_Obstack_T<ACE_CHAR_T>::~ACE_Obstack_T (void)
+template <class CHAR>
+ACE_Obstack_T<CHAR>::~ACE_Obstack_T (void)
 {
-  ACE_TRACE ("ACE_Obstack_T<ACE_CHAR_T>::~ACE_Obstack_T");
+  ACE_TRACE ("ACE_Obstack_T<CHAR>::~ACE_Obstack_T");
 
   ACE_Obchunk *temp = this->head_;
 
@@ -154,23 +154,23 @@ ACE_Obstack_T<ACE_CHAR_T>::~ACE_Obstack_T (void)
     }
 }
 
-template <class ACE_CHAR_T> ACE_CHAR_T *
-ACE_Obstack_T<ACE_CHAR_T>::copy (const ACE_CHAR_T *s,
+template <class CHAR> CHAR *
+ACE_Obstack_T<CHAR>::copy (const CHAR *s,
                            size_t len)
 {
-  ACE_TRACE ("ACE_Obstack_T<ACE_CHAR_T>::copy");
+  ACE_TRACE ("ACE_Obstack_T<CHAR>::copy");
 
   if (this->request (len) != 0)
     return 0;
 
-  size_t tsize = len * sizeof (ACE_CHAR_T);
+  size_t tsize = len * sizeof (CHAR);
   ACE_OS::memcpy (this->curr_->cur_, s, tsize);
   this->curr_->cur_ += tsize ;
   return this->freeze ();
 }
 
-template <class ACE_CHAR_T> void
-ACE_Obstack_T<ACE_CHAR_T>::unwind (void* obj)
+template <class CHAR> void
+ACE_Obstack_T<CHAR>::unwind (void* obj)
 {
   if (obj >= this->curr_->contents_ && obj < this->curr_->end_)
     this->curr_->block_ = this->curr_->cur_ = reinterpret_cast<char*> (obj);
@@ -178,8 +178,8 @@ ACE_Obstack_T<ACE_CHAR_T>::unwind (void* obj)
     this->unwind_i (obj);
 }
 
-template <class ACE_CHAR_T> void
-ACE_Obstack_T<ACE_CHAR_T>::unwind_i (void* obj)
+template <class CHAR> void
+ACE_Obstack_T<CHAR>::unwind_i (void* obj)
 {
   ACE_Obchunk* curr = this->head_;
   while (curr != 0 && (curr->contents_ > obj || curr->end_ < obj))
@@ -194,29 +194,29 @@ ACE_Obstack_T<ACE_CHAR_T>::unwind_i (void* obj)
                 ACE_TEXT ("Deletion of non-existent object.\n%a")));
 }
 
-template <class ACE_CHAR_T> void
-ACE_Obstack_T<ACE_CHAR_T>::release (void)
+template <class CHAR> void
+ACE_Obstack_T<CHAR>::release (void)
 {
-  ACE_TRACE ("ACE_Obstack_T<ACE_CHAR_T>::release");
+  ACE_TRACE ("ACE_Obstack_T<CHAR>::release");
 
   this->curr_ = this->head_;
   this->curr_->block_ = this->curr_->cur_ = this->curr_->contents_;
 }
 
-template <class ACE_CHAR_T> void
-ACE_Obstack_T<ACE_CHAR_T>::grow_fast (ACE_CHAR_T c)
+template <class CHAR> void
+ACE_Obstack_T<CHAR>::grow_fast (CHAR c)
 {
-  * (reinterpret_cast<ACE_CHAR_T *> (this->curr_->cur_)) = c;
-  this->curr_->cur_ += sizeof (ACE_CHAR_T);
+  * (reinterpret_cast<CHAR *> (this->curr_->cur_)) = c;
+  this->curr_->cur_ += sizeof (CHAR);
 }
 
-template <class ACE_CHAR_T> ACE_CHAR_T *
-ACE_Obstack_T<ACE_CHAR_T>::freeze (void)
+template <class CHAR> CHAR *
+ACE_Obstack_T<CHAR>::freeze (void)
 {
-  ACE_CHAR_T *retv = reinterpret_cast<ACE_CHAR_T *> (this->curr_->block_);
-  * (reinterpret_cast<ACE_CHAR_T *> (this->curr_->cur_)) = 0;
+  CHAR *retv = reinterpret_cast<CHAR *> (this->curr_->block_);
+  * (reinterpret_cast<CHAR *> (this->curr_->cur_)) = 0;
 
-  this->curr_->cur_ += sizeof (ACE_CHAR_T);
+  this->curr_->cur_ += sizeof (CHAR);
   this->curr_->block_ = this->curr_->cur_;
   return retv;
 }
diff --git a/ACE/ace/Obstack_T.h b/ACE/ace/Obstack_T.h
index ed1d1d20259..3e24ab31925 100644
--- a/ACE/ace/Obstack_T.h
+++ b/ACE/ace/Obstack_T.h
@@ -34,12 +34,12 @@ class ACE_Allocator;
  * The implementation is similar to the GNU obstack utility,
  * which is used extensively in the GCC compiler.
  */
-template <class ACE_CHAR_T>
+template <class CHAR>
 class ACE_Obstack_T
 {
 public:
   // = Initialization and termination methods.
-  ACE_Obstack_T (size_t size = (4096 * sizeof (ACE_CHAR_T)) - sizeof (ACE_Obchunk),
+  ACE_Obstack_T (size_t size = (4096 * sizeof (CHAR)) - sizeof (ACE_Obchunk),
                  ACE_Allocator *allocator_strategy = 0);
   ~ACE_Obstack_T (void);
 
@@ -47,32 +47,32 @@ public:
   /// a new string.  Return -1 if fail, 0 if success.
   int request (size_t len);
 
-  /// Inserting a new ACE_CHAR_T \a c into the current building
+  /// Inserting a new CHAR \a c into the current building
   /// block without freezing (null terminating) the block.
   /// This function will create new chunk by checking the
   /// boundary of current Obchunk.  Return
   /// the location \a c gets inserted to, or 0 if error.
-  ACE_CHAR_T *grow (ACE_CHAR_T c);
+  CHAR *grow (CHAR c);
 
-  /// Inserting a new ACE_CHAR_T \a c into the current building
+  /// Inserting a new CHAR \a c into the current building
   /// block without freezing (null terminating) the block and without
   /// checking for out-of-bound error.
-  void grow_fast (ACE_CHAR_T c);
+  void grow_fast (CHAR c);
 
   /// Freeze the current building block by null terminating it.
   /// Return the starting address of the current building block, 0
   /// if error occurs.
-  ACE_CHAR_T *freeze (void);
+  CHAR *freeze (void);
 
   /// Copy the data into the current Obchunk and freeze the current
   /// block.  Return the starting address of the current building
   /// block, 0 if error occurs.  @a len specify the string length,
   /// not the actually data size.
-  ACE_CHAR_T *copy (const ACE_CHAR_T *data,
+  CHAR *copy (const CHAR *data,
               size_t len);
 
   /// Return the maximum @a length or @a size of a string that can be put
-  /// into this Obstack. @a size = @a length * sizeof (ACE_CHAR_T).
+  /// into this Obstack. @a size = @a length * sizeof (CHAR).
   ///
   /// @deprecated No need to use this function as you can put objects of
   /// arbitrary lengths into the obstack now.
diff --git a/ACE/ace/Obstack_T.inl b/ACE/ace/Obstack_T.inl
index 411b6aea1e0..1eddbdcf4e6 100644
--- a/ACE/ace/Obstack_T.inl
+++ b/ACE/ace/Obstack_T.inl
@@ -4,14 +4,14 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-template <class ACE_CHAR_T> ACE_INLINE size_t
-ACE_Obstack_T<ACE_CHAR_T>::length () const
+template <class CHAR> ACE_INLINE size_t
+ACE_Obstack_T<CHAR>::length () const
 {
-  return this->size_ / sizeof (ACE_CHAR_T);
+  return this->size_ / sizeof (CHAR);
 }
 
-template <class ACE_CHAR_T> ACE_INLINE size_t
-ACE_Obstack_T<ACE_CHAR_T>::size () const
+template <class CHAR> ACE_INLINE size_t
+ACE_Obstack_T<CHAR>::size () const
 {
   return this->size_;
 }
diff --git a/ACE/ace/Reactor.cpp b/ACE/ace/Reactor.cpp
index 8b8be61d4df..ed9d70be269 100644
--- a/ACE/ace/Reactor.cpp
+++ b/ACE/ace/Reactor.cpp
@@ -477,9 +477,7 @@ ACE_Reactor::notify (ACE_Event_Handler *event_handler,
   // First, try to remember this reactor in the event handler, in case
   // the event handler goes away before the notification is delivered.
   if (event_handler != 0 && event_handler->reactor () == 0)
-    {
-      event_handler->reactor (this);
-    }
+    event_handler->reactor (this);
   return this->implementation ()->notify (event_handler, mask, tv);
 }
 
diff --git a/ACE/ace/Reactor.h b/ACE/ace/Reactor.h
index 1e20c358bf7..a791a65227d 100644
--- a/ACE/ace/Reactor.h
+++ b/ACE/ace/Reactor.h
@@ -281,8 +281,8 @@ public:
    * that were dispatched, 0 if the @a max_wait_time elapsed without
    * dispatching any handlers, or -1 if an error occurs.
    *
-   * The only difference between alertable_handle_events() and
-   * handle_events() is that in the alertable case, the eventloop will
+   * The only difference between <alertable_handle_events> and
+   * <handle_events> is that in the alertable case, the eventloop will
    * return when the system queues an I/O completion routine or an
    * Asynchronous Procedure Call.
    */
@@ -294,8 +294,8 @@ public:
    * @a max_wait_time value is a reference and can therefore never be
    * NULL.
    *
-   * The only difference between alertable_handle_events() and
-   * handle_events() is that in the alertable case, the eventloop will
+   * The only difference between <alertable_handle_events> and
+   * <handle_events> is that in the alertable case, the eventloop will
    * return when the system queues an I/O completion routine or an
    * Asynchronous Procedure Call.
    */
@@ -703,7 +703,7 @@ public:
    * Set the maximum number of times that ACE_Reactor will
    * iterate and dispatch the ACE_Event_Handlers that are passed in
    * via the notify queue before breaking out of its
-   * ACE_Message_Queue::dequeue() loop.  By default, this is set to
+   * <ACE_Message_Queue::dequeue> loop.  By default, this is set to
    * -1, which means "iterate until the queue is empty."  Setting this
    * to a value like "1 or 2" will increase "fairness" (and thus
    * prevent starvation) at the expense of slightly higher dispatching
@@ -715,7 +715,7 @@ public:
    * Get the maximum number of times that the ACE_Reactor will
    * iterate and dispatch the ACE_Event_Handler's that are passed in
    * via the notify queue before breaking out of its
-   * ACE_Message_Queue::dequeue() loop.
+   * <ACE_Message_Queue::dequeue> loop.
    */
   int max_notify_iterations (void);
 
diff --git a/ACE/ace/Recursive_Thread_Mutex.h b/ACE/ace/Recursive_Thread_Mutex.h
index 65807b64b47..38effc66afb 100644
--- a/ACE/ace/Recursive_Thread_Mutex.h
+++ b/ACE/ace/Recursive_Thread_Mutex.h
@@ -151,9 +151,6 @@ public:
   int get_nesting_level (void);
 
   /// Returns a reference to the recursive mutex;
-  ACE_recursive_thread_mutex_t &lock (void);
-
-  /// @deprecated Returns a reference to the recursive mutex;
   ACE_recursive_thread_mutex_t &mutex (void);
 
   /// Returns a reference to the recursive mutex's internal mutex;
diff --git a/ACE/ace/Recursive_Thread_Mutex.inl b/ACE/ace/Recursive_Thread_Mutex.inl
index 6a7b55dc6a2..0269de24d6b 100644
--- a/ACE/ace/Recursive_Thread_Mutex.inl
+++ b/ACE/ace/Recursive_Thread_Mutex.inl
@@ -5,7 +5,7 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE ACE_recursive_thread_mutex_t &
-ACE_Recursive_Thread_Mutex::lock (void)
+ACE_Recursive_Thread_Mutex::mutex (void)
 {
   return lock_;
 }
diff --git a/ACE/ace/SStringfwd.h b/ACE/ace/SStringfwd.h
index cab3ecfe8ec..fb28ee8a469 100644
--- a/ACE/ace/SStringfwd.h
+++ b/ACE/ace/SStringfwd.h
@@ -33,7 +33,7 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-template <class ACE_CHAR_T> class ACE_String_Base;  // Forward declaration.
+template <class CHAR> class ACE_String_Base;  // Forward declaration.
 
 typedef ACE_WCHAR_T ACE_WSTRING_TYPE;
 
diff --git a/ACE/ace/Select_Reactor_Base.cpp b/ACE/ace/Select_Reactor_Base.cpp
index d6d90752655..2c45a7ce0ff 100644
--- a/ACE/ace/Select_Reactor_Base.cpp
+++ b/ACE/ace/Select_Reactor_Base.cpp
@@ -691,9 +691,7 @@ ACE_Select_Reactor_Notify::notify (ACE_Event_Handler *event_handler,
   ACE_Event_Handler_var safe_handler (event_handler);
 
   if (event_handler)
-    {
-      event_handler->add_reference ();
-    }
+    event_handler->add_reference ();
 
   ACE_Notification_Buffer buffer (event_handler, mask);
 
@@ -720,9 +718,7 @@ ACE_Select_Reactor_Notify::notify (ACE_Event_Handler *event_handler,
                                sizeof buffer,
                                timeout);
   if (n == -1)
-    {
-      return -1;
-    }
+    return -1;
 
   // No failures.
   safe_handler.release ();
diff --git a/ACE/ace/Strategies_T.cpp b/ACE/ace/Strategies_T.cpp
index 4addb7d3774..6aaef5eb2cc 100644
--- a/ACE/ace/Strategies_T.cpp
+++ b/ACE/ace/Strategies_T.cpp
@@ -439,7 +439,7 @@ ACE_Process_Strategy<SVC_HANDLER>::activate_svc_handler (SVC_HANDLER *svc_handle
     case -1:
       {
         ACE_Errno_Guard error (errno);
-        svc_handler->close ();
+        svc_handler->destroy ();
       }
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("%p\n"),
@@ -462,7 +462,7 @@ ACE_Process_Strategy<SVC_HANDLER>::activate_svc_handler (SVC_HANDLER *svc_handle
     default: // In parent process.
       // We need to close down the <SVC_HANDLER> here because it's
       // running in the child.
-      svc_handler->close ();
+      svc_handler->destroy ();
       return 0;
     }
 }
diff --git a/ACE/ace/String_Base.cpp b/ACE/ace/String_Base.cpp
index b674c659859..75e958335b5 100644
--- a/ACE/ace/String_Base.cpp
+++ b/ACE/ace/String_Base.cpp
@@ -19,26 +19,26 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_ALLOC_HOOK_DEFINE(ACE_String_Base)
 
-template <class ACE_CHAR_T>
-ACE_CHAR_T ACE_String_Base<ACE_CHAR_T>::NULL_String_ = 0;
+template <class CHAR>
+CHAR ACE_String_Base<CHAR>::NULL_String_ = 0;
 
 // Default constructor.
 
-template <class ACE_CHAR_T>
-ACE_String_Base<ACE_CHAR_T>::ACE_String_Base (ACE_Allocator *the_allocator)
+template <class CHAR>
+ACE_String_Base<CHAR>::ACE_String_Base (ACE_Allocator *the_allocator)
   : allocator_ (the_allocator ? the_allocator : ACE_Allocator::instance ()),
     len_ (0),
     buf_len_ (0),
-    rep_ (&ACE_String_Base<ACE_CHAR_T>::NULL_String_),
+    rep_ (&ACE_String_Base<CHAR>::NULL_String_),
     release_ (false)
 {
-  ACE_TRACE ("ACE_String_Base<ACE_CHAR_T>::ACE_String_Base");
+  ACE_TRACE ("ACE_String_Base<CHAR>::ACE_String_Base");
 }
 
 // Constructor that actually copies memory.
 
-template <class ACE_CHAR_T>
-ACE_String_Base<ACE_CHAR_T>::ACE_String_Base (const ACE_CHAR_T *s,
+template <class CHAR>
+ACE_String_Base<CHAR>::ACE_String_Base (const CHAR *s,
                                         ACE_Allocator *the_allocator,
                                         bool release)
   : allocator_ (the_allocator ? the_allocator : ACE_Allocator::instance ()),
@@ -47,12 +47,12 @@ ACE_String_Base<ACE_CHAR_T>::ACE_String_Base (const ACE_CHAR_T *s,
     rep_ (0),
     release_ (false)
 {
-  ACE_TRACE ("ACE_String_Base<ACE_CHAR_T>::ACE_String_Base");
+  ACE_TRACE ("ACE_String_Base<CHAR>::ACE_String_Base");
   this->set (s, release);
 }
 
-template <class ACE_CHAR_T>
-ACE_String_Base<ACE_CHAR_T>::ACE_String_Base (ACE_CHAR_T c,
+template <class CHAR>
+ACE_String_Base<CHAR>::ACE_String_Base (CHAR c,
                                         ACE_Allocator *the_allocator)
   : allocator_ (the_allocator ? the_allocator : ACE_Allocator::instance ()),
     len_ (0),
@@ -60,17 +60,17 @@ ACE_String_Base<ACE_CHAR_T>::ACE_String_Base (ACE_CHAR_T c,
     rep_ (0),
     release_ (false)
 {
-  ACE_TRACE ("ACE_String_Base<ACE_CHAR_T>::ACE_String_Base");
+  ACE_TRACE ("ACE_String_Base<CHAR>::ACE_String_Base");
 
   this->set (&c, 1, true);
 }
 
 // Constructor that actually copies memory.
 
-template <class ACE_CHAR_T>
-ACE_String_Base<ACE_CHAR_T>::ACE_String_Base (
-  const ACE_CHAR_T *s,
-  typename ACE_String_Base<ACE_CHAR_T>::size_type  len,
+template <class CHAR>
+ACE_String_Base<CHAR>::ACE_String_Base (
+  const CHAR *s,
+  typename ACE_String_Base<CHAR>::size_type  len,
   ACE_Allocator *the_allocator,
   bool release)
   : allocator_ (the_allocator ? the_allocator : ACE_Allocator::instance ()),
@@ -79,30 +79,30 @@ ACE_String_Base<ACE_CHAR_T>::ACE_String_Base (
     rep_ (0),
     release_ (false)
 {
-  ACE_TRACE ("ACE_String_Base<ACE_CHAR_T>::ACE_String_Base");
+  ACE_TRACE ("ACE_String_Base<CHAR>::ACE_String_Base");
 
   this->set (s, len, release);
 }
 
 // Copy constructor.
 
-template <class ACE_CHAR_T>
-ACE_String_Base<ACE_CHAR_T>::ACE_String_Base (const ACE_String_Base<ACE_CHAR_T> &s)
+template <class CHAR>
+ACE_String_Base<CHAR>::ACE_String_Base (const ACE_String_Base<CHAR> &s)
   : allocator_ (s.allocator_ ? s.allocator_ : ACE_Allocator::instance ()),
     len_ (0),
     buf_len_ (0),
     rep_ (0),
     release_ (false)
 {
-  ACE_TRACE ("ACE_String_Base<ACE_CHAR_T>::ACE_String_Base");
+  ACE_TRACE ("ACE_String_Base<CHAR>::ACE_String_Base");
 
   this->set (s.rep_, s.len_, true);
 }
 
-template <class ACE_CHAR_T>
-ACE_String_Base<ACE_CHAR_T>::ACE_String_Base (
-  typename ACE_String_Base<ACE_CHAR_T>::size_type len,
-  ACE_CHAR_T c,
+template <class CHAR>
+ACE_String_Base<CHAR>::ACE_String_Base (
+  typename ACE_String_Base<CHAR>::size_type len,
+  CHAR c,
   ACE_Allocator *the_allocator)
   : allocator_ (the_allocator ? the_allocator : ACE_Allocator::instance ()),
     len_ (0),
@@ -110,33 +110,33 @@ ACE_String_Base<ACE_CHAR_T>::ACE_String_Base (
     rep_ (0),
     release_ (false)
 {
-  ACE_TRACE ("ACE_String_Base<ACE_CHAR_T>::ACE_String_Base");
+  ACE_TRACE ("ACE_String_Base<CHAR>::ACE_String_Base");
 
   this->resize (len, c);
 }
 
-template <class ACE_CHAR_T>
-ACE_String_Base<ACE_CHAR_T>::~ACE_String_Base (void)
+template <class CHAR>
+ACE_String_Base<CHAR>::~ACE_String_Base (void)
 {
-  ACE_TRACE ("ACE_String_Base<ACE_CHAR_T>::~ACE_String_Base");
+  ACE_TRACE ("ACE_String_Base<CHAR>::~ACE_String_Base");
 
   if (this->buf_len_ != 0 && this->release_)
       this->allocator_->free (this->rep_);
 }
 
 // this method might benefit from a little restructuring.
-template <class ACE_CHAR_T> void
-ACE_String_Base<ACE_CHAR_T>::set (const ACE_CHAR_T *s,
-                            typename ACE_String_Base<ACE_CHAR_T>::size_type len,
+template <class CHAR> void
+ACE_String_Base<CHAR>::set (const CHAR *s,
+                            typename ACE_String_Base<CHAR>::size_type len,
                             bool release)
 {
   // Case 1. Going from memory to more memory
   size_type new_buf_len = len + 1;
   if (s != 0 && len != 0 && release && this->buf_len_ < new_buf_len)
     {
-      ACE_CHAR_T *temp = 0;
+      CHAR *temp = 0;
       ACE_ALLOCATOR (temp,
-                     (ACE_CHAR_T *) this->allocator_->malloc (new_buf_len * sizeof (ACE_CHAR_T)));
+                     (CHAR *) this->allocator_->malloc (new_buf_len * sizeof (CHAR)));
 
       if (this->buf_len_ != 0 && this->release_)
         this->allocator_->free (this->rep_);
@@ -145,7 +145,7 @@ ACE_String_Base<ACE_CHAR_T>::set (const ACE_CHAR_T *s,
       this->buf_len_ = new_buf_len;
       this->release_ = true;
       this->len_ = len;
-      ACE_OS::memcpy (this->rep_, s, len * sizeof (ACE_CHAR_T));
+      ACE_OS::memcpy (this->rep_, s, len * sizeof (CHAR));
       this->rep_[len] = 0;
     }
   else // Case 2. No memory allocation is necessary.
@@ -164,19 +164,19 @@ ACE_String_Base<ACE_CHAR_T>::set (const ACE_CHAR_T *s,
         {
           this->buf_len_ = 0;
           this->len_ = 0;
-          this->rep_ = &ACE_String_Base<ACE_CHAR_T>::NULL_String_;
+          this->rep_ = &ACE_String_Base<CHAR>::NULL_String_;
           this->release_ = false;
         }
       else if (!release) // Note: No guarantee that rep_ is null terminated.
         {
           this->buf_len_ = len;
           this->len_ = len;
-          this->rep_ = const_cast <ACE_CHAR_T *> (s);
+          this->rep_ = const_cast <CHAR *> (s);
           this->release_ = false;
         }
       else
         {
-          ACE_OS::memcpy (this->rep_, s, len * sizeof (ACE_CHAR_T));
+          ACE_OS::memcpy (this->rep_, s, len * sizeof (CHAR));
           this->rep_[len] = 0;
           this->len_ = len;
         }
@@ -184,12 +184,12 @@ ACE_String_Base<ACE_CHAR_T>::set (const ACE_CHAR_T *s,
 }
 
 // Return substring.
-template <class ACE_CHAR_T> ACE_String_Base<ACE_CHAR_T>
-ACE_String_Base<ACE_CHAR_T>::substring (
-  typename ACE_String_Base<ACE_CHAR_T>::size_type offset,
-  typename ACE_String_Base<ACE_CHAR_T>::size_type length) const
+template <class CHAR> ACE_String_Base<CHAR>
+ACE_String_Base<CHAR>::substring (
+  typename ACE_String_Base<CHAR>::size_type offset,
+  typename ACE_String_Base<CHAR>::size_type length) const
 {
-  ACE_String_Base<ACE_CHAR_T> nill;
+  ACE_String_Base<CHAR> nill;
   size_type count = length;
 
   // case 1. empty string
@@ -206,36 +206,36 @@ ACE_String_Base<ACE_CHAR_T>::substring (
   else if (length == npos || count > (this->len_ - offset))
     count = this->len_ - offset;
 
-  return ACE_String_Base<ACE_CHAR_T> (&this->rep_[offset], count, this->allocator_);
+  return ACE_String_Base<CHAR> (&this->rep_[offset], count, this->allocator_);
 }
 
-template <class ACE_CHAR_T> ACE_String_Base<ACE_CHAR_T> &
-ACE_String_Base<ACE_CHAR_T>::append (const ACE_CHAR_T* s,
-                               typename ACE_String_Base<ACE_CHAR_T>::size_type slen)
+template <class CHAR> ACE_String_Base<CHAR> &
+ACE_String_Base<CHAR>::append (const CHAR* s,
+                               typename ACE_String_Base<CHAR>::size_type slen)
 {
-  ACE_TRACE ("ACE_String_Base<ACE_CHAR_T>::append(const ACE_CHAR_T*, size_type)");
+  ACE_TRACE ("ACE_String_Base<CHAR>::append(const CHAR*, size_type)");
   if (slen > 0 && slen != npos)
   {
     // case 1. No memory allocation needed.
     if (this->buf_len_ >= this->len_ + slen + 1)
     {
       // Copy in data from new string.
-      ACE_OS::memcpy (this->rep_ + this->len_, s, slen * sizeof (ACE_CHAR_T));
+      ACE_OS::memcpy (this->rep_ + this->len_, s, slen * sizeof (CHAR));
     }
     else // case 2. Memory reallocation is needed
     {
       const size_type new_buf_len =
         ace_max(this->len_ + slen + 1, this->buf_len_ + this->buf_len_ / 2);
 
-      ACE_CHAR_T *t = 0;
+      CHAR *t = 0;
 
       ACE_ALLOCATOR_RETURN (t,
-        (ACE_CHAR_T *) this->allocator_->malloc (new_buf_len * sizeof (ACE_CHAR_T)), *this);
+        (CHAR *) this->allocator_->malloc (new_buf_len * sizeof (CHAR)), *this);
 
       // Copy memory from old string into new string.
-      ACE_OS::memcpy (t, this->rep_, this->len_ * sizeof (ACE_CHAR_T));
+      ACE_OS::memcpy (t, this->rep_, this->len_ * sizeof (CHAR));
 
-      ACE_OS::memcpy (t + this->len_, s, slen * sizeof (ACE_CHAR_T));
+      ACE_OS::memcpy (t + this->len_, s, slen * sizeof (CHAR));
 
       if (this->buf_len_ != 0 && this->release_)
         this->allocator_->free (this->rep_);
@@ -252,29 +252,29 @@ ACE_String_Base<ACE_CHAR_T>::append (const ACE_CHAR_T* s,
   return *this;
 }
 
-template <class ACE_CHAR_T> u_long
-ACE_String_Base<ACE_CHAR_T>::hash (void) const
+template <class CHAR> u_long
+ACE_String_Base<CHAR>::hash (void) const
 {
   return
     ACE::hash_pjw (reinterpret_cast<char *> (
-                      const_cast<ACE_CHAR_T *> (this->rep_)),
-                   this->len_ * sizeof (ACE_CHAR_T));
+                      const_cast<CHAR *> (this->rep_)),
+                   this->len_ * sizeof (CHAR));
 }
 
-template <class ACE_CHAR_T> void
-ACE_String_Base<ACE_CHAR_T>::resize (typename ACE_String_Base<ACE_CHAR_T>::size_type len,
-                               ACE_CHAR_T c)
+template <class CHAR> void
+ACE_String_Base<CHAR>::resize (typename ACE_String_Base<CHAR>::size_type len,
+                               CHAR c)
 {
-  ACE_TRACE ("ACE_String_Base<ACE_CHAR_T>::resize");
+  ACE_TRACE ("ACE_String_Base<CHAR>::resize");
 
   fast_resize(len);
-  ACE_OS::memset (this->rep_, c, this->buf_len_ * sizeof (ACE_CHAR_T));
+  ACE_OS::memset (this->rep_, c, this->buf_len_ * sizeof (CHAR));
 }
 
-template <class ACE_CHAR_T> void
-ACE_String_Base<ACE_CHAR_T>::fast_resize (size_t len)
+template <class CHAR> void
+ACE_String_Base<CHAR>::fast_resize (size_t len)
 {
-  ACE_TRACE ("ACE_String_Base<ACE_CHAR_T>::fast_resize");
+  ACE_TRACE ("ACE_String_Base<CHAR>::fast_resize");
 
   // Only reallocate if we don't have enough space...
   if (this->buf_len_ <= len)
@@ -282,8 +282,8 @@ ACE_String_Base<ACE_CHAR_T>::fast_resize (size_t len)
       if (this->buf_len_ != 0 && this->release_)
         this->allocator_->free (this->rep_);
 
-      this->rep_ = static_cast<ACE_CHAR_T*>
-                     (this->allocator_->malloc ((len + 1) * sizeof (ACE_CHAR_T)));
+      this->rep_ = static_cast<CHAR*>
+                     (this->allocator_->malloc ((len + 1) * sizeof (CHAR)));
       this->buf_len_ = len + 1;
       this->release_ = true;
     }
@@ -292,8 +292,8 @@ ACE_String_Base<ACE_CHAR_T>::fast_resize (size_t len)
     this->rep_[0] = 0;
 }
 
-template <class ACE_CHAR_T> void
-ACE_String_Base<ACE_CHAR_T>::clear (bool release)
+template <class CHAR> void
+ACE_String_Base<CHAR>::clear (bool release)
 {
   // This can't use set(), because that would free memory if release=false
   if (release)
@@ -301,7 +301,7 @@ ACE_String_Base<ACE_CHAR_T>::clear (bool release)
     if (this->buf_len_ != 0 && this->release_)
       this->allocator_->free (this->rep_);
 
-    this->rep_ = &ACE_String_Base<ACE_CHAR_T>::NULL_String_;
+    this->rep_ = &ACE_String_Base<CHAR>::NULL_String_;
     this->len_ = 0;
     this->buf_len_ = 0;
     this->release_ = false;
@@ -313,20 +313,20 @@ ACE_String_Base<ACE_CHAR_T>::clear (bool release)
 }
 
 // Assignment operator (does copy memory).
-template <class ACE_CHAR_T> ACE_String_Base<ACE_CHAR_T> &
-ACE_String_Base<ACE_CHAR_T>::operator= (const ACE_CHAR_T *s)
+template <class CHAR> ACE_String_Base<CHAR> &
+ACE_String_Base<CHAR>::operator= (const CHAR *s)
 {
-  ACE_TRACE ("ACE_String_Base<ACE_CHAR_T>::operator=");
+  ACE_TRACE ("ACE_String_Base<CHAR>::operator=");
   if (s != 0)
     this->set (s, true);
   return *this;
 }
 
 // Assignment operator (does copy memory).
-template <class ACE_CHAR_T> ACE_String_Base<ACE_CHAR_T> &
-ACE_String_Base<ACE_CHAR_T>::operator= (const ACE_String_Base<ACE_CHAR_T> &s)
+template <class CHAR> ACE_String_Base<CHAR> &
+ACE_String_Base<CHAR>::operator= (const ACE_String_Base<CHAR> &s)
 {
-  ACE_TRACE ("ACE_String_Base<ACE_CHAR_T>::operator=");
+  ACE_TRACE ("ACE_String_Base<CHAR>::operator=");
 
   // Check for self-assignment.
   if (this != &s)
@@ -337,8 +337,8 @@ ACE_String_Base<ACE_CHAR_T>::operator= (const ACE_String_Base<ACE_CHAR_T> &s)
   return *this;
 }
 
-template <class ACE_CHAR_T> void
-ACE_String_Base<ACE_CHAR_T>::set (const ACE_CHAR_T *s, bool release)
+template <class CHAR> void
+ACE_String_Base<CHAR>::set (const CHAR *s, bool release)
 {
   size_t length = 0;
   if (s != 0)
@@ -347,42 +347,42 @@ ACE_String_Base<ACE_CHAR_T>::set (const ACE_CHAR_T *s, bool release)
   this->set (s, length, release);
 }
 
-template <class ACE_CHAR_T> void
-ACE_String_Base<ACE_CHAR_T>::fast_clear (void)
+template <class CHAR> void
+ACE_String_Base<CHAR>::fast_clear (void)
 {
   this->len_ = 0;
   if (this->release_)
     {
       // String retains the original buffer.
-      if (this->rep_ != &ACE_String_Base<ACE_CHAR_T>::NULL_String_)
+      if (this->rep_ != &ACE_String_Base<CHAR>::NULL_String_)
         this->rep_[0] = 0;
     }
   else
     {
       // External buffer: string relinquishes control of it.
       this->buf_len_ = 0;
-      this->rep_ = &ACE_String_Base<ACE_CHAR_T>::NULL_String_;
+      this->rep_ = &ACE_String_Base<CHAR>::NULL_String_;
     }
 }
 
 // Get a copy of the underlying representation.
 
-template <class ACE_CHAR_T> ACE_CHAR_T *
-ACE_String_Base<ACE_CHAR_T>::rep (void) const
+template <class CHAR> CHAR *
+ACE_String_Base<CHAR>::rep (void) const
 {
-  ACE_TRACE ("ACE_String_Base<ACE_CHAR_T>::rep");
+  ACE_TRACE ("ACE_String_Base<CHAR>::rep");
 
-  ACE_CHAR_T *new_string;
-  ACE_NEW_RETURN (new_string, ACE_CHAR_T[this->len_ + 1], 0);
+  CHAR *new_string;
+  ACE_NEW_RETURN (new_string, CHAR[this->len_ + 1], 0);
   ACE_OS::strsncpy (new_string, this->rep_, this->len_+1);
 
   return new_string;
 }
 
-template <class ACE_CHAR_T> int
-ACE_String_Base<ACE_CHAR_T>::compare (const ACE_String_Base<ACE_CHAR_T> &s) const
+template <class CHAR> int
+ACE_String_Base<CHAR>::compare (const ACE_String_Base<CHAR> &s) const
 {
-  ACE_TRACE ("ACE_String_Base<ACE_CHAR_T>::compare");
+  ACE_TRACE ("ACE_String_Base<CHAR>::compare");
 
   if (this->rep_ == s.rep_)
     return 0;
@@ -392,7 +392,7 @@ ACE_String_Base<ACE_CHAR_T>::compare (const ACE_String_Base<ACE_CHAR_T> &s) cons
 
   int result = ACE_OS::memcmp (this->rep_,
                                s.rep_,
-                               smaller_length * sizeof (ACE_CHAR_T));
+                               smaller_length * sizeof (CHAR));
 
   if (result == 0 && this->len_ != s.len_)
     result = this->len_ > s.len_ ? 1 : -1;
@@ -401,56 +401,56 @@ ACE_String_Base<ACE_CHAR_T>::compare (const ACE_String_Base<ACE_CHAR_T> &s) cons
 
 // Comparison operator.
 
-template <class ACE_CHAR_T> bool
-ACE_String_Base<ACE_CHAR_T>::operator== (const ACE_String_Base<ACE_CHAR_T> &s) const
+template <class CHAR> bool
+ACE_String_Base<CHAR>::operator== (const ACE_String_Base<CHAR> &s) const
 {
   return this->len_ == s.len_ &&
          ACE_OS::memcmp (this->rep_,
                          s.rep_,
-                         this->len_ * sizeof (ACE_CHAR_T)) == 0;
+                         this->len_ * sizeof (CHAR)) == 0;
 }
 
-template <class ACE_CHAR_T> bool
-ACE_String_Base<ACE_CHAR_T>::operator== (const ACE_CHAR_T *s) const
+template <class CHAR> bool
+ACE_String_Base<CHAR>::operator== (const CHAR *s) const
 {
   size_t len = ACE_OS::strlen (s);
   return this->len_ == len &&
          ACE_OS::memcmp (this->rep_,
                          s,
-                         len * sizeof (ACE_CHAR_T)) == 0;
+                         len * sizeof (CHAR)) == 0;
 }
 
-template <class ACE_CHAR_T> typename ACE_String_Base<ACE_CHAR_T>::size_type
-ACE_String_Base<ACE_CHAR_T>::find (
-  const ACE_CHAR_T *s,
-  typename ACE_String_Base<ACE_CHAR_T>::size_type pos) const
+template <class CHAR> typename ACE_String_Base<CHAR>::size_type
+ACE_String_Base<CHAR>::find (
+  const CHAR *s,
+  typename ACE_String_Base<CHAR>::size_type pos) const
 {
-  ACE_CHAR_T *substr = this->rep_ + pos;
+  CHAR *substr = this->rep_ + pos;
   size_t len = ACE_OS::strlen (s);
-  ACE_CHAR_T *pointer = ACE_OS::strnstr (substr, s, len);
+  CHAR *pointer = ACE_OS::strnstr (substr, s, len);
   if (pointer == 0)
-    return ACE_String_Base<ACE_CHAR_T>::npos;
+    return ACE_String_Base<CHAR>::npos;
   else
     return pointer - this->rep_;
 }
 
-template <class ACE_CHAR_T> typename ACE_String_Base<ACE_CHAR_T>::size_type
-ACE_String_Base<ACE_CHAR_T>::find (
-  ACE_CHAR_T c,
-  typename ACE_String_Base<ACE_CHAR_T>::size_type pos) const
+template <class CHAR> typename ACE_String_Base<CHAR>::size_type
+ACE_String_Base<CHAR>::find (
+  CHAR c,
+  typename ACE_String_Base<CHAR>::size_type pos) const
 {
-  ACE_CHAR_T *substr = this->rep_ + pos;
-  ACE_CHAR_T *pointer = ACE_OS::strnchr (substr, c, this->len_ - pos);
+  CHAR *substr = this->rep_ + pos;
+  CHAR *pointer = ACE_OS::strnchr (substr, c, this->len_ - pos);
   if (pointer == 0)
-    return ACE_String_Base<ACE_CHAR_T>::npos;
+    return ACE_String_Base<CHAR>::npos;
   else
     return pointer - this->rep_;
 }
 
-template <class ACE_CHAR_T> typename ACE_String_Base<ACE_CHAR_T>::size_type
-ACE_String_Base<ACE_CHAR_T>::rfind (
-  ACE_CHAR_T c,
-  typename ACE_String_Base<ACE_CHAR_T>::size_type pos) const
+template <class CHAR> typename ACE_String_Base<CHAR>::size_type
+ACE_String_Base<CHAR>::rfind (
+  CHAR c,
+  typename ACE_String_Base<CHAR>::size_type pos) const
 {
   if (pos == npos || pos > this->len_)
     pos = this->len_;
@@ -461,11 +461,11 @@ ACE_String_Base<ACE_CHAR_T>::rfind (
     if (this->rep_[i] == c)
       return i;
 
-  return ACE_String_Base<ACE_CHAR_T>::npos;
+  return ACE_String_Base<CHAR>::npos;
 }
 
-template <class ACE_CHAR_T> void
-ACE_String_Base<ACE_CHAR_T>::swap (ACE_String_Base<ACE_CHAR_T> & str)
+template <class CHAR> void
+ACE_String_Base<CHAR>::swap (ACE_String_Base<CHAR> & str)
 {
   std::swap (this->allocator_ , str.allocator_);
   std::swap (this->len_       , str.len_);
@@ -476,10 +476,10 @@ ACE_String_Base<ACE_CHAR_T>::swap (ACE_String_Base<ACE_CHAR_T> & str)
 
 // ----------------------------------------------
 
-template <class ACE_CHAR_T>
-int ACE_String_Base_Iterator <ACE_CHAR_T>::next (ACE_CHAR_T * & ch) const
+template <class CHAR>
+int ACE_String_Base_Iterator <CHAR>::next (CHAR * & ch) const
 {
-  ACE_TRACE ("ACE_String_Base_Iterator<ACE_CHAR_T>::next");
+  ACE_TRACE ("ACE_String_Base_Iterator<CHAR>::next");
 
   if (0 == this->done ())
   {
@@ -493,10 +493,10 @@ int ACE_String_Base_Iterator <ACE_CHAR_T>::next (ACE_CHAR_T * & ch) const
   }
 }
 
-template <class ACE_CHAR_T>
-int ACE_String_Base_Iterator <ACE_CHAR_T>::advance (void)
+template <class CHAR>
+int ACE_String_Base_Iterator <CHAR>::advance (void)
 {
-  ACE_TRACE ("ACE_String_Base_Iterator<ACE_CHAR_T>::advance");
+  ACE_TRACE ("ACE_String_Base_Iterator<CHAR>::advance");
 
   if (this->index_ < this->str_->length ())
   {
@@ -509,12 +509,12 @@ int ACE_String_Base_Iterator <ACE_CHAR_T>::advance (void)
   }
 }
 
-template <class ACE_CHAR_T>
-const ACE_String_Base_Iterator <ACE_CHAR_T> &
-ACE_String_Base_Iterator <ACE_CHAR_T>::
-operator = (const ACE_String_Base_Iterator <ACE_CHAR_T> & rhs)
+template <class CHAR>
+const ACE_String_Base_Iterator <CHAR> &
+ACE_String_Base_Iterator <CHAR>::
+operator = (const ACE_String_Base_Iterator <CHAR> & rhs)
 {
-  ACE_TRACE ("ACE_String_Base_Iterator<ACE_CHAR_T>::operator =");
+  ACE_TRACE ("ACE_String_Base_Iterator<CHAR>::operator =");
 
   if (this == &rhs)
     return *this;
@@ -526,10 +526,10 @@ operator = (const ACE_String_Base_Iterator <ACE_CHAR_T> & rhs)
 
 // ----------------------------------------------
 
-template <class ACE_CHAR_T>
-int ACE_String_Base_Const_Iterator <ACE_CHAR_T>::next (const ACE_CHAR_T * & ch) const
+template <class CHAR>
+int ACE_String_Base_Const_Iterator <CHAR>::next (const CHAR * & ch) const
 {
-  ACE_TRACE ("ACE_String_Base_Const_Iterator<ACE_CHAR_T>::next");
+  ACE_TRACE ("ACE_String_Base_Const_Iterator<CHAR>::next");
 
   if (0 == this->done ())
   {
@@ -543,10 +543,10 @@ int ACE_String_Base_Const_Iterator <ACE_CHAR_T>::next (const ACE_CHAR_T * & ch)
   }
 }
 
-template <class ACE_CHAR_T>
-int ACE_String_Base_Const_Iterator <ACE_CHAR_T>::advance (void)
+template <class CHAR>
+int ACE_String_Base_Const_Iterator <CHAR>::advance (void)
 {
-  ACE_TRACE ("ACE_String_Base_Const_Iterator<ACE_CHAR_T>::advance");
+  ACE_TRACE ("ACE_String_Base_Const_Iterator<CHAR>::advance");
 
   if (this->index_ < this->str_->length ())
   {
@@ -559,12 +559,12 @@ int ACE_String_Base_Const_Iterator <ACE_CHAR_T>::advance (void)
   }
 }
 
-template <class ACE_CHAR_T>
-const ACE_String_Base_Const_Iterator <ACE_CHAR_T> &
-ACE_String_Base_Const_Iterator <ACE_CHAR_T>::
-operator = (const ACE_String_Base_Const_Iterator <ACE_CHAR_T> & rhs)
+template <class CHAR>
+const ACE_String_Base_Const_Iterator <CHAR> &
+ACE_String_Base_Const_Iterator <CHAR>::
+operator = (const ACE_String_Base_Const_Iterator <CHAR> & rhs)
 {
-  ACE_TRACE ("ACE_String_Base_Const_Iterator<ACE_CHAR_T>::operator =");
+  ACE_TRACE ("ACE_String_Base_Const_Iterator<CHAR>::operator =");
 
   if (this == &rhs)
     return *this;
@@ -576,64 +576,64 @@ operator = (const ACE_String_Base_Const_Iterator <ACE_CHAR_T> & rhs)
 
 // ----------------------------------------------
 
-template <class ACE_CHAR_T> ACE_String_Base<ACE_CHAR_T>
-operator+ (const ACE_String_Base<ACE_CHAR_T> &s, const ACE_String_Base<ACE_CHAR_T> &t)
+template <class CHAR> ACE_String_Base<CHAR>
+operator+ (const ACE_String_Base<CHAR> &s, const ACE_String_Base<CHAR> &t)
 {
-  ACE_String_Base<ACE_CHAR_T> temp (s.length () + t.length ());
+  ACE_String_Base<CHAR> temp (s.length () + t.length ());
   temp += s;
   temp += t;
   return temp;
 }
 
-template <class ACE_CHAR_T> ACE_String_Base<ACE_CHAR_T>
-operator+ (const ACE_CHAR_T *s, const ACE_String_Base<ACE_CHAR_T> &t)
+template <class CHAR> ACE_String_Base<CHAR>
+operator+ (const CHAR *s, const ACE_String_Base<CHAR> &t)
 {
   size_t slen = 0;
   if (s != 0)
     slen = ACE_OS::strlen (s);
-  ACE_String_Base<ACE_CHAR_T> temp (slen + t.length ());
+  ACE_String_Base<CHAR> temp (slen + t.length ());
   if (slen > 0)
     temp.append (s, slen);
   temp += t;
   return temp;
 }
 
-template <class ACE_CHAR_T> ACE_String_Base<ACE_CHAR_T>
-operator+ (const ACE_String_Base<ACE_CHAR_T> &s, const ACE_CHAR_T *t)
+template <class CHAR> ACE_String_Base<CHAR>
+operator+ (const ACE_String_Base<CHAR> &s, const CHAR *t)
 {
   size_t tlen = 0;
   if (t != 0)
     tlen = ACE_OS::strlen (t);
-  ACE_String_Base<ACE_CHAR_T> temp (s.length () + tlen);
+  ACE_String_Base<CHAR> temp (s.length () + tlen);
   temp += s;
   if (tlen > 0)
     temp.append (t, tlen);
   return temp;
 }
 
-template <class ACE_CHAR_T> ACE_String_Base<ACE_CHAR_T>
-operator + (const ACE_String_Base<ACE_CHAR_T> &t,
-            const ACE_CHAR_T c)
+template <class CHAR> ACE_String_Base<CHAR>
+operator + (const ACE_String_Base<CHAR> &t,
+            const CHAR c)
 {
-  ACE_String_Base<ACE_CHAR_T> temp (t.length () + 1);
+  ACE_String_Base<CHAR> temp (t.length () + 1);
   temp += t;
   temp += c;
   return temp;
 }
 
-template <class ACE_CHAR_T> ACE_String_Base<ACE_CHAR_T>
-operator + (const ACE_CHAR_T c,
-            const ACE_String_Base<ACE_CHAR_T> &t)
+template <class CHAR> ACE_String_Base<CHAR>
+operator + (const CHAR c,
+            const ACE_String_Base<CHAR> &t)
 {
-  ACE_String_Base<ACE_CHAR_T> temp (t.length () + 1);
+  ACE_String_Base<CHAR> temp (t.length () + 1);
   temp += c;
   temp += t;
   return temp;
 }
 
-template <class ACE_CHAR_T>
-ACE_String_Base<ACE_CHAR_T> &
-ACE_String_Base<ACE_CHAR_T>::operator+= (const ACE_CHAR_T* s)
+template <class CHAR>
+ACE_String_Base<CHAR> &
+ACE_String_Base<CHAR>::operator+= (const CHAR* s)
 {
   size_t slen = 0;
   if (s != 0)
@@ -641,19 +641,19 @@ ACE_String_Base<ACE_CHAR_T>::operator+= (const ACE_CHAR_T* s)
   return this->append (s, slen);
 }
 
-template <class ACE_CHAR_T>
-ACE_String_Base<ACE_CHAR_T> &
-ACE_String_Base<ACE_CHAR_T>::operator+= (const ACE_String_Base<ACE_CHAR_T> &s)
+template <class CHAR>
+ACE_String_Base<CHAR> &
+ACE_String_Base<CHAR>::operator+= (const ACE_String_Base<CHAR> &s)
 {
-  ACE_TRACE ("ACE_String_Base<ACE_CHAR_T>::operator+=(const ACE_String_Base<ACE_CHAR_T> &)");
+  ACE_TRACE ("ACE_String_Base<CHAR>::operator+=(const ACE_String_Base<CHAR> &)");
   return this->append (s.rep_, s.len_);
 }
 
-template <class ACE_CHAR_T>
-ACE_String_Base<ACE_CHAR_T> &
-ACE_String_Base<ACE_CHAR_T>::operator+= (const ACE_CHAR_T c)
+template <class CHAR>
+ACE_String_Base<CHAR> &
+ACE_String_Base<CHAR>::operator+= (const CHAR c)
 {
-  ACE_TRACE ("ACE_String_Base<ACE_CHAR_T>::operator+=(const ACE_CHAR_T)");
+  ACE_TRACE ("ACE_String_Base<CHAR>::operator+=(const CHAR)");
   const size_type slen = 1;
   return this->append (&c, slen);
 }
diff --git a/ACE/ace/String_Base.h b/ACE/ace/String_Base.h
index ae775c35dc3..55c2eb3f9a4 100644
--- a/ACE/ace/String_Base.h
+++ b/ACE/ace/String_Base.h
@@ -28,11 +28,11 @@
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Forward decl.
-template <class ACE_CHAR_T>
+template <class CHAR>
 class ACE_String_Base_Iterator;
 
 // Forward decl.
-template <class ACE_CHAR_T>
+template <class CHAR>
 class ACE_String_Base_Const_Iterator;
 
 /**
@@ -63,22 +63,22 @@ class ACE_String_Base_Const_Iterator;
  *     many STL class templates.  If you find yourself casting you're
  *     probably doing something wrong.
  */
-template <class ACE_CHAR_T>
+template <class CHAR>
 class ACE_String_Base : public ACE_String_Base_Const
 {
 public:
   using ACE_String_Base_Const::size_type;
 
-  friend class ACE_String_Base_Iterator <ACE_CHAR_T>;
-  friend class ACE_String_Base_Const_Iterator <ACE_CHAR_T>;
+  friend class ACE_String_Base_Iterator <CHAR>;
+  friend class ACE_String_Base_Const_Iterator <CHAR>;
 
   // ACE-style iterators
-  typedef ACE_String_Base_Iterator <ACE_CHAR_T> ITERATOR;
-  typedef ACE_String_Base_Const_Iterator <ACE_CHAR_T> CONST_ITERATOR;
+  typedef ACE_String_Base_Iterator <CHAR> ITERATOR;
+  typedef ACE_String_Base_Const_Iterator <CHAR> CONST_ITERATOR;
 
   // STL-style iterators
-  typedef ACE_String_Base_Iterator <ACE_CHAR_T> iterator;
-  typedef ACE_String_Base_Const_Iterator <ACE_CHAR_T> const_iterator;
+  typedef ACE_String_Base_Iterator <CHAR> iterator;
+  typedef ACE_String_Base_Const_Iterator <CHAR> const_iterator;
 
    /**
     *  Default constructor.
@@ -101,9 +101,9 @@ public:
    * @param the_allocator ACE_Allocator associated with string
    * @param release Allocator responsible(true)/not reponsible(false) for
    *    freeing memory.
-   * @return ACE_String_Base containing const ACE_CHAR_T *s
+   * @return ACE_String_Base containing const CHAR *s
    */
-  ACE_String_Base (const ACE_CHAR_T *s,
+  ACE_String_Base (const CHAR *s,
                    ACE_Allocator *the_allocator = 0,
                    bool release = true);
 
@@ -122,9 +122,9 @@ public:
    * @param the_allocator ACE_Allocator associated with string
    * @param release Allocator responsible(true)/not reponsible(false) for
    *    freeing memory.
-   * @return ACE_String_Base containing const ACE_CHAR_T *s
+   * @return ACE_String_Base containing const CHAR *s
    */
-  ACE_String_Base (const ACE_CHAR_T *s,
+  ACE_String_Base (const CHAR *s,
                    size_type len,
                    ACE_Allocator *the_allocator = 0,
                    bool release = true);
@@ -135,16 +135,16 @@ public:
    *  @param s Input ACE_String_Base string to copy
    *  @return Copy of input string @a s
    */
-  ACE_String_Base (const ACE_String_Base < ACE_CHAR_T > &s);
+  ACE_String_Base (const ACE_String_Base < CHAR > &s);
 
   /**
    *  Constructor that copies @a c into dynamically allocated memory.
    *
    *  @param c Single input character.
    *  @param the_allocator ACE_Allocator associated with string
-   *  @return ACE_String_Base containing ACE_CHAR_T 'c'
+   *  @return ACE_String_Base containing CHAR 'c'
    */
-  ACE_String_Base (ACE_CHAR_T c, ACE_Allocator *the_allocator = 0);
+  ACE_String_Base (CHAR c, ACE_Allocator *the_allocator = 0);
 
   /**
    *  Constructor that allocates a len long string.
@@ -160,7 +160,7 @@ public:
    *  @return Empty ACE_String_Base with room for len CHARs
    */
   ACE_String_Base (size_type len,
-                   ACE_CHAR_T c = 0,
+                   CHAR c = 0,
                    ACE_Allocator *the_allocator = 0);
 
   /**
@@ -175,7 +175,7 @@ public:
    * @param slot Index of the desired character
    * @return The character at index @a slot
    */
-  const ACE_CHAR_T & operator[] (size_type slot) const;
+  const CHAR & operator[] (size_type slot) const;
 
   /**
    * Return the <slot'th> character by reference in the string
@@ -184,15 +184,15 @@ public:
    * @param slot Index of the desired character
    * @return The character at index @a slot
    */
-  ACE_CHAR_T & operator[] (size_type slot);
+  CHAR & operator[] (size_type slot);
 
   /**
    *  Assignment operator (does copy memory).
    *
-   *  @param s Input null-terminated ACE_CHAR_T string to assign to this object.
+   *  @param s Input null-terminated CHAR string to assign to this object.
    *  @return Return a copy of the this string.
    */
-  ACE_String_Base < ACE_CHAR_T > &operator = (const ACE_CHAR_T * s);
+  ACE_String_Base < CHAR > &operator = (const CHAR * s);
 
   /**
    *  Assignment operator (does copy memory).
@@ -200,7 +200,7 @@ public:
    *  @param s Input ACE_String_Base string to assign to this object.
    *  @return Return a copy of the this string.
    */
-  ACE_String_Base < ACE_CHAR_T > &operator = (const ACE_String_Base < ACE_CHAR_T > &s);
+  ACE_String_Base < CHAR > &operator = (const ACE_String_Base < CHAR > &s);
 
   /**
    *  Assignment alternative method (does not copy memory).
@@ -208,7 +208,7 @@ public:
    *  @param s Input ACE_String_Base string to assign to this object.
    *  @return Return this string.
    */
-  ACE_String_Base < ACE_CHAR_T > &assign_nocopy (const ACE_String_Base < ACE_CHAR_T > &s);
+  ACE_String_Base < CHAR > &assign_nocopy (const ACE_String_Base < CHAR > &s);
 
   /**
    * Copy @a s into this @a ACE_String_Base.
@@ -227,7 +227,7 @@ public:
    * @param release Allocator responsible(true)/not reponsible(false) for
    *    freeing memory.
    */
-  void set (const ACE_CHAR_T * s, bool release = true);
+  void set (const CHAR * s, bool release = true);
 
   /**
    *  Copy @a len bytes of @a s (will zero terminate the result).
@@ -247,7 +247,7 @@ public:
    *  @param release Allocator responsible(true)/not reponsible(false) for
    *    freeing memory.
    */
-  void set (const ACE_CHAR_T * s, size_type len, bool release);
+  void set (const CHAR * s, size_type len, bool release);
 
   /**
    * Clear this string. Memory is _not_ freed if @a release is false.
@@ -291,7 +291,7 @@ public:
    * @param length How many characters to return starting at the offset.
    * @return The string containing the desired substring
    */
-  ACE_String_Base < ACE_CHAR_T > substring (size_type offset,
+  ACE_String_Base < CHAR > substring (size_type offset,
                                       size_type length = npos) const;
 
   /**
@@ -301,7 +301,7 @@ public:
    * @param length How many characters to return starting at the offset.
    * @return The string containing the desired substring
    */
-  ACE_String_Base < ACE_CHAR_T > substr (size_type offset,
+  ACE_String_Base < CHAR > substr (size_type offset,
                                    size_type length = npos) const;
 
   /**
@@ -311,7 +311,7 @@ public:
    *  @return The combined string (input append to the end of the old). New
    *    string is zero terminated.
    */
-  ACE_String_Base < ACE_CHAR_T > &operator += (const ACE_String_Base < ACE_CHAR_T > &s);
+  ACE_String_Base < CHAR > &operator += (const ACE_String_Base < CHAR > &s);
 
   /**
    *  Concat operator (copies memory).
@@ -320,26 +320,26 @@ public:
    *  @return The combined string (input append to the end of the old). New
    *    string is zero terminated.
    */
-  ACE_String_Base < ACE_CHAR_T >& operator += (const ACE_CHAR_T* s);
+  ACE_String_Base < CHAR >& operator += (const CHAR* s);
 
   /**
    *  Concat operator (copies memory).
    *
-   *  @param c Input ACE_CHAR_T to concatenate to this string.
+   *  @param c Input CHAR to concatenate to this string.
    *  @return The combined string (input append to the end of the old). New
    *    string is zero terminated.
    */
-  ACE_String_Base < ACE_CHAR_T >& operator += (const ACE_CHAR_T c);
+  ACE_String_Base < CHAR >& operator += (const CHAR c);
 
   /**
    *  Append function (copies memory).
    *
-   *  @param s Input ACE_CHAR_T array to concatenate to this string.
+   *  @param s Input CHAR array to concatenate to this string.
    *  @param slen The length of the array.
    *  @return The combined string (input append to the end of the old). New
    *    string is zero terminated.
    */
-  ACE_String_Base < ACE_CHAR_T >& append (const ACE_CHAR_T* s, size_type slen);
+  ACE_String_Base < CHAR >& append (const CHAR* s, size_type slen);
 
   /**
    *  Returns a hash value for this string.
@@ -359,7 +359,7 @@ public:
    *  Return the number of allocated CHARs in the string object.
    *  This may be greater than the current length of the string.
    *
-   *  @return Maximum number of ACE_CHAR_T units that can be stored, including
+   *  @return Maximum number of CHAR units that can be stored, including
    *          any terminating nul that may be needed.
    */
   size_t capacity (void) const;
@@ -386,7 +386,7 @@ public:
    * @return Pointer reference to the string data. Returned string is
    *    zero terminated.
    */
-  ACE_CHAR_T *rep (void) const;
+  CHAR *rep (void) const;
 
   /**
    * Get at the underlying representation directly!
@@ -397,12 +397,12 @@ public:
    *    that the string is zero terminated.
    *
    */
-  const ACE_CHAR_T *fast_rep (void) const;
+  const CHAR *fast_rep (void) const;
 
   /**
    *  Same as STL String's <c_str> and <fast_rep>.
    */
-  const ACE_CHAR_T *c_str (void) const;
+  const CHAR *c_str (void) const;
 
   /**
    *  Comparison operator that will match substrings.  Returns the
@@ -412,7 +412,7 @@ public:
    *  @return Integer index value of the first location of string @a s or
    *          @c npos (not found).
    */
-  size_type strstr (const ACE_String_Base<ACE_CHAR_T> &s) const;
+  size_type strstr (const ACE_String_Base<CHAR> &s) const;
 
   /**
    *  Find <str> starting at pos.  Returns the slot of the first
@@ -423,7 +423,7 @@ public:
    *  @return Index value of the first location of string @a str else
    *          @c npos.
    */
-  size_type find (const ACE_String_Base<ACE_CHAR_T> &str, size_type pos = 0) const;
+  size_type find (const ACE_String_Base<CHAR> &str, size_type pos = 0) const;
 
   /**
    *  Find @a s starting at pos.  Returns the slot of the first
@@ -434,7 +434,7 @@ public:
    *  @return Index value of the first location of string @a str else
    *          @c npos.
    */
-  size_type find (const ACE_CHAR_T *s, size_type pos = 0) const;
+  size_type find (const CHAR *s, size_type pos = 0) const;
 
   /**
    *  Find @a c starting at pos.  Returns the slot of the first
@@ -445,7 +445,7 @@ public:
    *  @return Index value of the first location of string @a str else
    *          @c npos.
    */
-  size_type find (ACE_CHAR_T c, size_type pos = 0) const;
+  size_type find (CHAR c, size_type pos = 0) const;
 
   /**
    *  Find @a c starting at pos (counting from the end).  Returns the
@@ -456,7 +456,7 @@ public:
    *  @return Index value of the first location of string @a str else
    *          @c npos.
    */
-  size_type rfind (ACE_CHAR_T c, size_type pos = npos) const;
+  size_type rfind (CHAR c, size_type pos = npos) const;
 
   /**
    *  Equality comparison operator (must match entire string).
@@ -464,7 +464,7 @@ public:
    * @param s Input ACE_String_Base string to compare against stored string.
    * @return @c true if equal, @c false otherwise.
    */
-  bool operator == (const ACE_String_Base<ACE_CHAR_T> &s) const;
+  bool operator == (const ACE_String_Base<CHAR> &s) const;
 
   /**
    *  Equality comparison operator (must match entire string).
@@ -472,7 +472,7 @@ public:
    * @param s Null terminated string to compare against stored string.
    * @return @c true if equal, @c false otherwise.
    */
-  bool operator == (const ACE_CHAR_T *s) const;
+  bool operator == (const CHAR *s) const;
 
   /**
    *  Less than comparison operator.
@@ -480,7 +480,7 @@ public:
    *  @param s Input ACE_String_Base string to compare against stored string.
    *  @return @c true if less than, @c false otherwise.
    */
-  bool operator < (const ACE_String_Base<ACE_CHAR_T> &s) const;
+  bool operator < (const ACE_String_Base<CHAR> &s) const;
 
   /**
    *  Greater than comparison operator.
@@ -488,7 +488,7 @@ public:
    *  @param s Input ACE_String_Base string to compare against stored string.
    *  @return @c true if greater than, @c false otherwise.
    */
-  bool operator > (const ACE_String_Base<ACE_CHAR_T> &s) const;
+  bool operator > (const ACE_String_Base<CHAR> &s) const;
 
   /**
    *  Inequality comparison operator.
@@ -496,7 +496,7 @@ public:
    *  @param s String to compare against stored string.
    *  @return @c true if not equal, @c false otherwise.
    */
-  bool operator != (const ACE_String_Base<ACE_CHAR_T> &s) const;
+  bool operator != (const ACE_String_Base<CHAR> &s) const;
 
   /**
    *  Inequality comparison operator.
@@ -504,7 +504,7 @@ public:
    *  @param s Null terminated string to compare against stored string.
    *  @return @c true if not equal, @c false otherwise.
    */
-  bool operator != (const ACE_CHAR_T *s) const;
+  bool operator != (const CHAR *s) const;
 
   /**
    *  Performs a strncmp comparison.
@@ -513,7 +513,7 @@ public:
    *  @return Integer value of result (less than 0, 0, greater than 0)
    *    depending on how input string @a s is to the stored string.
    */
-  int compare (const ACE_String_Base<ACE_CHAR_T> &s) const;
+  int compare (const ACE_String_Base<CHAR> &s) const;
 
   /**
    *  Dump the state of an object.
@@ -537,16 +537,16 @@ public:
    * it doesn't fill the buffer, so is much faster.
    *
    * @param len The number of CHARs to reserve
-   * @param c The ACE_CHAR_T to use when filling the string.
+   * @param c The CHAR to use when filling the string.
    */
-  void resize (size_type len, ACE_CHAR_T c = 0);
+  void resize (size_type len, CHAR c = 0);
   void fast_resize (size_t len);
 
   /// Swap the contents of this @c ACE_String_Base with @a str.
   /**
    * @note This is non-throwing operation.
    */
-  void swap (ACE_String_Base<ACE_CHAR_T> & str);
+  void swap (ACE_String_Base<CHAR> & str);
 
   iterator begin (void);
   const_iterator begin (void) const;
@@ -579,7 +579,7 @@ protected:
   /**
    *  Pointer to data.
    */
-  ACE_CHAR_T *rep_;
+  CHAR *rep_;
 
   /**
    *  Flag that indicates if we own the memory
@@ -589,7 +589,7 @@ protected:
   /**
    *  Represents the "NULL" string to simplify the internal logic.
    */
-  static ACE_CHAR_T NULL_String_;
+  static CHAR NULL_String_;
 };
 
 /**
@@ -603,15 +603,15 @@ protected:
  * category. Future versions of the class will support the operations
  * of std::random_access_iterator_tag.
  */
-template <class ACE_CHAR_T>
+template <class CHAR>
 class ACE_String_Base_Iterator
 {
 public:
   // = std::iterator_traits typedefs/traits.
   typedef std::bidirectional_iterator_tag iterator_category;
-  typedef ACE_CHAR_T                            value_type;
-  typedef ACE_CHAR_T &                          reference;
-  typedef ACE_CHAR_T *                          pointer;
+  typedef CHAR                            value_type;
+  typedef CHAR &                          reference;
+  typedef CHAR *                          pointer;
   typedef ptrdiff_t                       difference_type;
 
   /**
@@ -619,14 +619,14 @@ public:
    *
    * @param[in]       str         Target string for iterator.
    */
-  ACE_String_Base_Iterator (ACE_String_Base <ACE_CHAR_T> & str, int end = 0);
+  ACE_String_Base_Iterator (ACE_String_Base <CHAR> & str, int end = 0);
 
   /**
    * Copy constructor
    *
    * @param[in]       iter        Iterator to copy.
    */
-  ACE_String_Base_Iterator (const ACE_String_Base_Iterator <ACE_CHAR_T> & iter);
+  ACE_String_Base_Iterator (const ACE_String_Base_Iterator <CHAR> & iter);
 
   /// Destructor.
   ~ACE_String_Base_Iterator (void);
@@ -646,7 +646,7 @@ public:
    * @retval         0          All characters have been seen.
    * @retval         1          Items still remain to be seen.
    */
-  int next (ACE_CHAR_T * & ch) const;
+  int next (CHAR * & ch) const;
 
   /**
    * Move to the next character in the string.
@@ -662,58 +662,58 @@ public:
    * @param[in]       iter      Right-hand side of operator.
    * @return          Reference to self.
    */
-  const ACE_String_Base_Iterator <ACE_CHAR_T> & operator = (const ACE_String_Base_Iterator <ACE_CHAR_T> & iter);
+  const ACE_String_Base_Iterator <CHAR> & operator = (const ACE_String_Base_Iterator <CHAR> & iter);
 
   /**
    * Dereference operator
    *
    * @return          Reference to current character seen by iterator.
    */
-  ACE_CHAR_T & operator * (void);
+  CHAR & operator * (void);
 
   /**
    * Prefix operator
    */
-  ACE_String_Base_Iterator <ACE_CHAR_T> & operator ++ (void);
+  ACE_String_Base_Iterator <CHAR> & operator ++ (void);
 
   /**
    * Postfix operator
    */
-  ACE_String_Base_Iterator <ACE_CHAR_T> operator ++ (int);
+  ACE_String_Base_Iterator <CHAR> operator ++ (int);
 
   /**
    * Prefix operator
    */
-  ACE_String_Base_Iterator <ACE_CHAR_T> & operator -- (void);
+  ACE_String_Base_Iterator <CHAR> & operator -- (void);
 
   /**
    * Postfix operator
    */
-  ACE_String_Base_Iterator <ACE_CHAR_T> operator -- (int);
+  ACE_String_Base_Iterator <CHAR> operator -- (int);
 
   /**
    * Eqaulity comparison operator
    *
    * @param[in]       rhs       Right-hand side of operator.
    */
-  bool operator == (const ACE_String_Base_Iterator <ACE_CHAR_T> & rhs) const;
+  bool operator == (const ACE_String_Base_Iterator <CHAR> & rhs) const;
 
   /**
    * Ineqaulity comparison operator
    *
    * @param[in]       rhs       Right-hand side of operator.
    */
-  bool operator != (const ACE_String_Base_Iterator <ACE_CHAR_T> & rhs) const;
+  bool operator != (const ACE_String_Base_Iterator <CHAR> & rhs) const;
 
-  bool operator < (const ACE_String_Base_Iterator <ACE_CHAR_T> & rhs) const;
-  bool operator > (const ACE_String_Base_Iterator <ACE_CHAR_T> & rhs) const;
+  bool operator < (const ACE_String_Base_Iterator <CHAR> & rhs) const;
+  bool operator > (const ACE_String_Base_Iterator <CHAR> & rhs) const;
 
-  bool operator <= (const ACE_String_Base_Iterator <ACE_CHAR_T> & rhs) const;
-  bool operator >= (const ACE_String_Base_Iterator <ACE_CHAR_T> & rhs) const;
+  bool operator <= (const ACE_String_Base_Iterator <CHAR> & rhs) const;
+  bool operator >= (const ACE_String_Base_Iterator <CHAR> & rhs) const;
 
 private:
   /// Target string to iterate over.
-  ACE_String_Base <ACE_CHAR_T> * str_;
+  ACE_String_Base <CHAR> * str_;
 
   /// Current location in the string.
   size_t index_;
@@ -730,15 +730,15 @@ private:
  * category. Future versions of the class will support the operations
  * of std::random_access_iterator_tag.
  */
-template <class ACE_CHAR_T>
+template <class CHAR>
 class ACE_String_Base_Const_Iterator
 {
 public:
   // = std::iterator_traits typedefs/traits.
   typedef std::bidirectional_iterator_tag iterator_category;
-  typedef const ACE_CHAR_T                      value_type;
-  typedef const ACE_CHAR_T &                    reference;
-  typedef const ACE_CHAR_T *                    pointer;
+  typedef const CHAR                      value_type;
+  typedef const CHAR &                    reference;
+  typedef const CHAR *                    pointer;
   typedef ptrdiff_t                       difference_type;
 
   /**
@@ -746,14 +746,14 @@ public:
    *
    * @param[in]       str         Target string for iterator.
    */
-  ACE_String_Base_Const_Iterator (const ACE_String_Base <ACE_CHAR_T> & str, int end = 0);
+  ACE_String_Base_Const_Iterator (const ACE_String_Base <CHAR> & str, int end = 0);
 
   /**
    * Copy constructor
    *
    * @param[in]       iter        Iterator to copy.
    */
-  ACE_String_Base_Const_Iterator (const ACE_String_Base_Const_Iterator <ACE_CHAR_T> & iter);
+  ACE_String_Base_Const_Iterator (const ACE_String_Base_Const_Iterator <CHAR> & iter);
 
   /// Destructor.
   ~ACE_String_Base_Const_Iterator (void);
@@ -773,7 +773,7 @@ public:
    * @retval         0          All characters have been seen.
    * @retval         1          Items still remain to be seen.
    */
-  int next (const ACE_CHAR_T * & ch) const;
+  int next (const CHAR * & ch) const;
 
   /**
    * Move to the next character in the string.
@@ -789,88 +789,88 @@ public:
    * @param[in]       iter      Right-hand side of operator.
    * @return          Reference to self.
    */
-  const ACE_String_Base_Const_Iterator <ACE_CHAR_T> & operator = (const ACE_String_Base_Const_Iterator <ACE_CHAR_T> & iter);
+  const ACE_String_Base_Const_Iterator <CHAR> & operator = (const ACE_String_Base_Const_Iterator <CHAR> & iter);
 
   /**
    * Dereference operator
    *
    * @return          Reference to current character seen by iterator.
    */
-  const ACE_CHAR_T & operator * (void);
+  const CHAR & operator * (void);
 
   /**
    * Prefix operator
    */
-  ACE_String_Base_Const_Iterator <ACE_CHAR_T> & operator ++ (void);
+  ACE_String_Base_Const_Iterator <CHAR> & operator ++ (void);
 
   /**
    * Postfix operator
    */
-  ACE_String_Base_Const_Iterator <ACE_CHAR_T> operator ++ (int);
+  ACE_String_Base_Const_Iterator <CHAR> operator ++ (int);
 
   /**
    * Prefix operator
    */
-  ACE_String_Base_Const_Iterator <ACE_CHAR_T> & operator -- (void);
+  ACE_String_Base_Const_Iterator <CHAR> & operator -- (void);
 
   /**
    * Postfix operator
    */
-  ACE_String_Base_Const_Iterator <ACE_CHAR_T> operator -- (int);
+  ACE_String_Base_Const_Iterator <CHAR> operator -- (int);
 
   /**
    * Eqaulity comparison operator
    *
    * @param[in]       rhs       Right-hand side of operator.
    */
-  bool operator == (const ACE_String_Base_Const_Iterator <ACE_CHAR_T> & rhs) const;
+  bool operator == (const ACE_String_Base_Const_Iterator <CHAR> & rhs) const;
 
   /**
    * Ineqaulity comparison operator
    *
    * @param[in]       rhs       Right-hand side of operator.
    */
-  bool operator != (const ACE_String_Base_Const_Iterator <ACE_CHAR_T> & rhs) const;
+  bool operator != (const ACE_String_Base_Const_Iterator <CHAR> & rhs) const;
 
-  bool operator < (const ACE_String_Base_Const_Iterator <ACE_CHAR_T> & rhs) const;
-  bool operator > (const ACE_String_Base_Const_Iterator <ACE_CHAR_T> & rhs) const;
+  bool operator < (const ACE_String_Base_Const_Iterator <CHAR> & rhs) const;
+  bool operator > (const ACE_String_Base_Const_Iterator <CHAR> & rhs) const;
 
-  bool operator <= (const ACE_String_Base_Const_Iterator <ACE_CHAR_T> & rhs) const;
-  bool operator >= (const ACE_String_Base_Const_Iterator <ACE_CHAR_T> & rhs) const;
+  bool operator <= (const ACE_String_Base_Const_Iterator <CHAR> & rhs) const;
+  bool operator >= (const ACE_String_Base_Const_Iterator <CHAR> & rhs) const;
 
 private:
   /// Target string to iterate over.
-  const ACE_String_Base <ACE_CHAR_T> * str_;
+  const ACE_String_Base <CHAR> * str_;
 
   /// Current location in the string.
   size_t index_;
 };
 
-template < class ACE_CHAR_T >
-  ACE_String_Base < ACE_CHAR_T > operator + (const ACE_String_Base < ACE_CHAR_T > &,
-                                       const ACE_String_Base < ACE_CHAR_T > &);
-template < class ACE_CHAR_T >
-  ACE_String_Base < ACE_CHAR_T > operator + (const ACE_String_Base < ACE_CHAR_T > &,
-                                       const ACE_CHAR_T *);
-template < class ACE_CHAR_T >
-  ACE_String_Base < ACE_CHAR_T > operator + (const ACE_CHAR_T *,
-                                       const ACE_String_Base < ACE_CHAR_T > &);
-
-template < class ACE_CHAR_T >
-  ACE_String_Base < ACE_CHAR_T > operator + (const ACE_String_Base < ACE_CHAR_T > &t,
-                                       const ACE_CHAR_T c);
-
-template < class ACE_CHAR_T >
-  ACE_String_Base < ACE_CHAR_T > operator + (const ACE_CHAR_T c,
-                                       const ACE_String_Base < ACE_CHAR_T > &t);
-
-template <class ACE_CHAR_T>
-  bool operator == (const ACE_CHAR_T *s,
-                    const ACE_String_Base<ACE_CHAR_T> &t);
-
-template <class ACE_CHAR_T>
-  bool operator != (const ACE_CHAR_T *s,
-                    const ACE_String_Base<ACE_CHAR_T> &t);
+template < class CHAR >
+  ACE_String_Base < CHAR > operator + (const ACE_String_Base < CHAR > &,
+                                       const ACE_String_Base < CHAR > &);
+template < class CHAR >
+  ACE_String_Base < CHAR > operator + (const ACE_String_Base < CHAR > &,
+                                       const CHAR *);
+template < class CHAR >
+  ACE_String_Base < CHAR > operator + (const CHAR *,
+                                       const ACE_String_Base < CHAR > &);
+
+template < class CHAR >
+  ACE_String_Base < CHAR > operator + (const ACE_String_Base < CHAR > &t,
+                                       const CHAR c);
+
+template < class CHAR >
+  ACE_String_Base < CHAR > operator + (const CHAR c,
+                                       const ACE_String_Base < CHAR > &t);
+
+template <class CHAR>
+  bool operator == (const CHAR *s,
+                    const ACE_String_Base<CHAR> &t);
+
+template <class CHAR>
+  bool operator != (const CHAR *s,
+                    const ACE_String_Base<CHAR> &t);
 
 ACE_END_VERSIONED_NAMESPACE_DECL
 
diff --git a/ACE/ace/String_Base.inl b/ACE/ace/String_Base.inl
index 29c262e2b56..17643cbe089 100644
--- a/ACE/ace/String_Base.inl
+++ b/ACE/ace/String_Base.inl
@@ -9,214 +9,214 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-template <class ACE_CHAR_T> ACE_INLINE void
-ACE_String_Base<ACE_CHAR_T>::dump (void) const
+template <class CHAR> ACE_INLINE void
+ACE_String_Base<CHAR>::dump (void) const
 {
 #if defined (ACE_HAS_DUMP)
-  ACE_TRACE ("ACE_String_Base<ACE_CHAR_T>::dump");
+  ACE_TRACE ("ACE_String_Base<CHAR>::dump");
 #endif /* ACE_HAS_DUMP */
 }
 
 // Assignment method (does not copy memory)
-template <class ACE_CHAR_T> ACE_INLINE ACE_String_Base<ACE_CHAR_T> &
-ACE_String_Base<ACE_CHAR_T>::assign_nocopy (const ACE_String_Base<ACE_CHAR_T> &s)
+template <class CHAR> ACE_INLINE ACE_String_Base<CHAR> &
+ACE_String_Base<CHAR>::assign_nocopy (const ACE_String_Base<CHAR> &s)
 {
-  ACE_TRACE ("ACE_String_Base<ACE_CHAR_T>::assign_nocopy");
+  ACE_TRACE ("ACE_String_Base<CHAR>::assign_nocopy");
   this->set (s.rep_, s.len_, false);
   return *this;
 }
 
-template <class ACE_CHAR_T> ACE_INLINE typename ACE_String_Base<ACE_CHAR_T>::size_type
-ACE_String_Base<ACE_CHAR_T>::length (void) const
+template <class CHAR> ACE_INLINE typename ACE_String_Base<CHAR>::size_type
+ACE_String_Base<CHAR>::length (void) const
 {
-  ACE_TRACE ("ACE_String_Base<ACE_CHAR_T>::length");
+  ACE_TRACE ("ACE_String_Base<CHAR>::length");
   return this->len_;
 }
 
-template <class ACE_CHAR_T> ACE_INLINE size_t
-ACE_String_Base<ACE_CHAR_T>::capacity (void) const
+template <class CHAR> ACE_INLINE size_t
+ACE_String_Base<CHAR>::capacity (void) const
 {
-  ACE_TRACE ("ACE_String_Base<ACE_CHAR_T>::capacity");
+  ACE_TRACE ("ACE_String_Base<CHAR>::capacity");
   return this->buf_len_;
 }
 
-template <class ACE_CHAR_T> ACE_INLINE bool
-ACE_String_Base<ACE_CHAR_T>::is_empty (void) const
+template <class CHAR> ACE_INLINE bool
+ACE_String_Base<CHAR>::is_empty (void) const
 {
   return this->len_ == 0;
 }
 
-template <class ACE_CHAR_T> ACE_INLINE bool
-ACE_String_Base<ACE_CHAR_T>::empty (void) const
+template <class CHAR> ACE_INLINE bool
+ACE_String_Base<CHAR>::empty (void) const
 {
   return this->is_empty ();
 }
 
-template <class ACE_CHAR_T> ACE_INLINE ACE_String_Base<ACE_CHAR_T>
-ACE_String_Base<ACE_CHAR_T>::substr (
-  typename ACE_String_Base<ACE_CHAR_T>::size_type offset,
-  typename ACE_String_Base<ACE_CHAR_T>::size_type length) const
+template <class CHAR> ACE_INLINE ACE_String_Base<CHAR>
+ACE_String_Base<CHAR>::substr (
+  typename ACE_String_Base<CHAR>::size_type offset,
+  typename ACE_String_Base<CHAR>::size_type length) const
 {
-  ACE_TRACE ("ACE_String_Base<ACE_CHAR_T>::substr");
+  ACE_TRACE ("ACE_String_Base<CHAR>::substr");
   return this->substring (offset, length);
 }
 
 // Return the <slot'th> character in the string.
 
-template <class ACE_CHAR_T> ACE_INLINE const ACE_CHAR_T &
-ACE_String_Base<ACE_CHAR_T>::operator[] (
-  typename ACE_String_Base<ACE_CHAR_T>::size_type slot) const
+template <class CHAR> ACE_INLINE const CHAR &
+ACE_String_Base<CHAR>::operator[] (
+  typename ACE_String_Base<CHAR>::size_type slot) const
 {
-  ACE_TRACE ("ACE_String_Base<ACE_CHAR_T>::operator[]");
+  ACE_TRACE ("ACE_String_Base<CHAR>::operator[]");
   return this->rep_[slot];
 }
 
 // Return the <slot'th> character in the string by reference.
 
-template <class ACE_CHAR_T> ACE_INLINE ACE_CHAR_T &
-ACE_String_Base<ACE_CHAR_T>::operator[] (
-  typename ACE_String_Base<ACE_CHAR_T>::size_type slot)
+template <class CHAR> ACE_INLINE CHAR &
+ACE_String_Base<CHAR>::operator[] (
+  typename ACE_String_Base<CHAR>::size_type slot)
 {
-  ACE_TRACE ("ACE_String_Base<ACE_CHAR_T>::operator[]");
+  ACE_TRACE ("ACE_String_Base<CHAR>::operator[]");
   return this->rep_[slot];
 }
 
-template <class ACE_CHAR_T> ACE_INLINE const ACE_CHAR_T *
-ACE_String_Base<ACE_CHAR_T>::fast_rep (void) const
+template <class CHAR> ACE_INLINE const CHAR *
+ACE_String_Base<CHAR>::fast_rep (void) const
 {
   return this->rep_;
 }
 
-template <class ACE_CHAR_T> ACE_INLINE const ACE_CHAR_T *
-ACE_String_Base<ACE_CHAR_T>::c_str (void) const
+template <class CHAR> ACE_INLINE const CHAR *
+ACE_String_Base<CHAR>::c_str (void) const
 {
   return this->rep_;
 }
 
 // Less than comparison operator.
 
-template <class ACE_CHAR_T> ACE_INLINE bool
-ACE_String_Base<ACE_CHAR_T>::operator < (const ACE_String_Base<ACE_CHAR_T> &s) const
+template <class CHAR> ACE_INLINE bool
+ACE_String_Base<CHAR>::operator < (const ACE_String_Base<CHAR> &s) const
 {
-  ACE_TRACE ("ACE_String_Base<ACE_CHAR_T>::operator <");
+  ACE_TRACE ("ACE_String_Base<CHAR>::operator <");
   return compare (s) < 0;
 }
 
 // Greater than comparison operator.
 
-template <class ACE_CHAR_T> ACE_INLINE bool
-ACE_String_Base<ACE_CHAR_T>::operator > (const ACE_String_Base &s) const
+template <class CHAR> ACE_INLINE bool
+ACE_String_Base<CHAR>::operator > (const ACE_String_Base &s) const
 {
-  ACE_TRACE ("ACE_String_Base<ACE_CHAR_T>::operator >");
+  ACE_TRACE ("ACE_String_Base<CHAR>::operator >");
   return compare (s) > 0;
 }
 
 
 // Comparison operator.
 
-template <class ACE_CHAR_T> ACE_INLINE bool
-ACE_String_Base<ACE_CHAR_T>::operator!= (const ACE_String_Base<ACE_CHAR_T> &s) const
+template <class CHAR> ACE_INLINE bool
+ACE_String_Base<CHAR>::operator!= (const ACE_String_Base<CHAR> &s) const
 {
-  ACE_TRACE ("ACE_String_Base<ACE_CHAR_T>::operator!=");
+  ACE_TRACE ("ACE_String_Base<CHAR>::operator!=");
   return !(*this == s);
 }
 
-template <class ACE_CHAR_T> ACE_INLINE bool
-ACE_String_Base<ACE_CHAR_T>::operator!= (const ACE_CHAR_T *s) const
+template <class CHAR> ACE_INLINE bool
+ACE_String_Base<CHAR>::operator!= (const CHAR *s) const
 {
   return !(*this == s);
 }
 
-template <class ACE_CHAR_T> ACE_INLINE typename ACE_String_Base<ACE_CHAR_T>::size_type
-ACE_String_Base<ACE_CHAR_T>::find (const ACE_String_Base<ACE_CHAR_T>&str,
-                             typename ACE_String_Base<ACE_CHAR_T>::size_type pos) const
+template <class CHAR> ACE_INLINE typename ACE_String_Base<CHAR>::size_type
+ACE_String_Base<CHAR>::find (const ACE_String_Base<CHAR>&str,
+                             typename ACE_String_Base<CHAR>::size_type pos) const
 {
-  ACE_TRACE ("ACE_String_Base<ACE_CHAR_T>::find");
+  ACE_TRACE ("ACE_String_Base<CHAR>::find");
   return this->find (str.rep_, pos);
 }
 
-template <class ACE_CHAR_T> ACE_INLINE typename ACE_String_Base<ACE_CHAR_T>::size_type
-ACE_String_Base<ACE_CHAR_T>::strstr (const ACE_String_Base<ACE_CHAR_T> &s) const
+template <class CHAR> ACE_INLINE typename ACE_String_Base<CHAR>::size_type
+ACE_String_Base<CHAR>::strstr (const ACE_String_Base<CHAR> &s) const
 {
-  ACE_TRACE ("ACE_String_Base<ACE_CHAR_T>::strstr");
+  ACE_TRACE ("ACE_String_Base<CHAR>::strstr");
   return this->find (s.rep_);
 }
 
-template <class ACE_CHAR_T> ACE_INLINE typename ACE_String_Base<ACE_CHAR_T>::iterator
-ACE_String_Base<ACE_CHAR_T>::begin (void)
+template <class CHAR> ACE_INLINE typename ACE_String_Base<CHAR>::iterator
+ACE_String_Base<CHAR>::begin (void)
 {
-  ACE_TRACE ("ACE_String_Base<ACE_CHAR_T>::begin");
+  ACE_TRACE ("ACE_String_Base<CHAR>::begin");
   return iterator (*this);
 }
 
-template <class ACE_CHAR_T> ACE_INLINE typename ACE_String_Base<ACE_CHAR_T>::const_iterator
-ACE_String_Base<ACE_CHAR_T>::begin (void) const
+template <class CHAR> ACE_INLINE typename ACE_String_Base<CHAR>::const_iterator
+ACE_String_Base<CHAR>::begin (void) const
 {
-  ACE_TRACE ("ACE_String_Base<ACE_CHAR_T>::begin");
+  ACE_TRACE ("ACE_String_Base<CHAR>::begin");
   return const_iterator (*this);
 }
 
-template <class ACE_CHAR_T> ACE_INLINE typename ACE_String_Base<ACE_CHAR_T>::iterator
-ACE_String_Base<ACE_CHAR_T>::end (void)
+template <class CHAR> ACE_INLINE typename ACE_String_Base<CHAR>::iterator
+ACE_String_Base<CHAR>::end (void)
 {
-  ACE_TRACE ("ACE_String_Base<ACE_CHAR_T>::end");
+  ACE_TRACE ("ACE_String_Base<CHAR>::end");
   return iterator (*this, 1);
 }
 
-template <class ACE_CHAR_T> ACE_INLINE typename ACE_String_Base<ACE_CHAR_T>::const_iterator
-ACE_String_Base<ACE_CHAR_T>::end (void) const
+template <class CHAR> ACE_INLINE typename ACE_String_Base<CHAR>::const_iterator
+ACE_String_Base<CHAR>::end (void) const
 {
-  ACE_TRACE ("ACE_String_Base<ACE_CHAR_T>::end");
+  ACE_TRACE ("ACE_String_Base<CHAR>::end");
   return const_iterator (*this, 1);
 }
 
 // ----------------------------------------------
 
-template <class ACE_CHAR_T> ACE_INLINE
-ACE_String_Base_Iterator <ACE_CHAR_T>::
-ACE_String_Base_Iterator (ACE_String_Base <ACE_CHAR_T> & str, int end)
+template <class CHAR> ACE_INLINE
+ACE_String_Base_Iterator <CHAR>::
+ACE_String_Base_Iterator (ACE_String_Base <CHAR> & str, int end)
 : str_ (&str),
   index_ (0 == end ? 0 : str.length ())
 {
-  ACE_TRACE ("ACE_String_Base_Iterator<ACE_CHAR_T>::ACE_String_Base_Iterator");
+  ACE_TRACE ("ACE_String_Base_Iterator<CHAR>::ACE_String_Base_Iterator");
 }
 
-template <class ACE_CHAR_T> ACE_INLINE
-ACE_String_Base_Iterator <ACE_CHAR_T>::
-ACE_String_Base_Iterator (const ACE_String_Base_Iterator <ACE_CHAR_T> & iter)
+template <class CHAR> ACE_INLINE
+ACE_String_Base_Iterator <CHAR>::
+ACE_String_Base_Iterator (const ACE_String_Base_Iterator <CHAR> & iter)
 : str_ (iter.str_),
   index_ (iter.index_)
 {
-  ACE_TRACE ("ACE_String_Base_Iterator<ACE_CHAR_T>::ACE_String_Base_Iterator");
+  ACE_TRACE ("ACE_String_Base_Iterator<CHAR>::ACE_String_Base_Iterator");
 }
 
-template <class ACE_CHAR_T> ACE_INLINE
-ACE_String_Base_Iterator <ACE_CHAR_T>::~ACE_String_Base_Iterator (void)
+template <class CHAR> ACE_INLINE
+ACE_String_Base_Iterator <CHAR>::~ACE_String_Base_Iterator (void)
 {
-  ACE_TRACE ("ACE_String_Base_Iterator<ACE_CHAR_T>::~ACE_String_Base_Iterator");
+  ACE_TRACE ("ACE_String_Base_Iterator<CHAR>::~ACE_String_Base_Iterator");
 }
 
-template <class ACE_CHAR_T> ACE_INLINE
-int ACE_String_Base_Iterator <ACE_CHAR_T>::done (void) const
+template <class CHAR> ACE_INLINE
+int ACE_String_Base_Iterator <CHAR>::done (void) const
 {
-  ACE_TRACE ("ACE_String_Base_Iterator<ACE_CHAR_T>::done");
+  ACE_TRACE ("ACE_String_Base_Iterator<CHAR>::done");
 
   return this->index_ >= this->str_->length () ? 1 : 0;
 }
 
-template <class ACE_CHAR_T> ACE_INLINE
-ACE_CHAR_T & ACE_String_Base_Iterator <ACE_CHAR_T>::operator * (void)
+template <class CHAR> ACE_INLINE
+CHAR & ACE_String_Base_Iterator <CHAR>::operator * (void)
 {
-  ACE_TRACE ("ACE_String_Base_Iterator<ACE_CHAR_T>::operator *");
+  ACE_TRACE ("ACE_String_Base_Iterator<CHAR>::operator *");
 
   return this->str_->rep_[this->index_];
 }
 
-template <class ACE_CHAR_T> ACE_INLINE
-ACE_String_Base_Iterator <ACE_CHAR_T> &
-ACE_String_Base_Iterator <ACE_CHAR_T>::operator ++ (void)
+template <class CHAR> ACE_INLINE
+ACE_String_Base_Iterator <CHAR> &
+ACE_String_Base_Iterator <CHAR>::operator ++ (void)
 {
-  ACE_TRACE ("ACE_String_Base_Iterator<ACE_CHAR_T>::operator ++");
+  ACE_TRACE ("ACE_String_Base_Iterator<CHAR>::operator ++");
 
   if (0 == this->done ())
     ++ this->index_;
@@ -224,13 +224,13 @@ ACE_String_Base_Iterator <ACE_CHAR_T>::operator ++ (void)
   return *this;
 }
 
-template <class ACE_CHAR_T> ACE_INLINE
-ACE_String_Base_Iterator <ACE_CHAR_T>
-ACE_String_Base_Iterator <ACE_CHAR_T>::operator ++ (int)
+template <class CHAR> ACE_INLINE
+ACE_String_Base_Iterator <CHAR>
+ACE_String_Base_Iterator <CHAR>::operator ++ (int)
 {
-  ACE_TRACE ("ACE_String_Base_Iterator<ACE_CHAR_T>::operator ++ (int)");
+  ACE_TRACE ("ACE_String_Base_Iterator<CHAR>::operator ++ (int)");
 
-  ACE_String_Base_Iterator <ACE_CHAR_T> temp (*this);
+  ACE_String_Base_Iterator <CHAR> temp (*this);
 
   if (0 == this->done ())
     ++ this->index_;
@@ -238,11 +238,11 @@ ACE_String_Base_Iterator <ACE_CHAR_T>::operator ++ (int)
   return temp;
 }
 
-template <class ACE_CHAR_T> ACE_INLINE
-ACE_String_Base_Iterator <ACE_CHAR_T> &
-ACE_String_Base_Iterator <ACE_CHAR_T>::operator -- (void)
+template <class CHAR> ACE_INLINE
+ACE_String_Base_Iterator <CHAR> &
+ACE_String_Base_Iterator <CHAR>::operator -- (void)
 {
-  ACE_TRACE ("ACE_String_Base_Iterator<ACE_CHAR_T>::operator --");
+  ACE_TRACE ("ACE_String_Base_Iterator<CHAR>::operator --");
 
   if (0 < this->index_)
     -- this->index_;
@@ -250,13 +250,13 @@ ACE_String_Base_Iterator <ACE_CHAR_T>::operator -- (void)
   return *this;
 }
 
-template <class ACE_CHAR_T> ACE_INLINE
-ACE_String_Base_Iterator <ACE_CHAR_T>
-ACE_String_Base_Iterator <ACE_CHAR_T>::operator -- (int)
+template <class CHAR> ACE_INLINE
+ACE_String_Base_Iterator <CHAR>
+ACE_String_Base_Iterator <CHAR>::operator -- (int)
 {
-  ACE_TRACE ("ACE_String_Base_Iterator<ACE_CHAR_T>::operator -- (int)");
+  ACE_TRACE ("ACE_String_Base_Iterator<CHAR>::operator -- (int)");
 
-  ACE_String_Base_Iterator <ACE_CHAR_T> temp (*this);
+  ACE_String_Base_Iterator <CHAR> temp (*this);
 
   if (0 < this->index_)
     -- this->index_;
@@ -264,95 +264,95 @@ ACE_String_Base_Iterator <ACE_CHAR_T>::operator -- (int)
   return temp;
 }
 
-template <class ACE_CHAR_T> ACE_INLINE bool
-ACE_String_Base_Iterator <ACE_CHAR_T>::
-operator == (const ACE_String_Base_Iterator <ACE_CHAR_T> & rhs) const
+template <class CHAR> ACE_INLINE bool
+ACE_String_Base_Iterator <CHAR>::
+operator == (const ACE_String_Base_Iterator <CHAR> & rhs) const
 {
   return this->index_ == rhs.index_;
 }
 
-template <class ACE_CHAR_T> ACE_INLINE bool
-ACE_String_Base_Iterator <ACE_CHAR_T>::
-operator != (const ACE_String_Base_Iterator <ACE_CHAR_T> & rhs) const
+template <class CHAR> ACE_INLINE bool
+ACE_String_Base_Iterator <CHAR>::
+operator != (const ACE_String_Base_Iterator <CHAR> & rhs) const
 {
   return this->index_ != rhs.index_;
 }
 
-template <class ACE_CHAR_T> ACE_INLINE bool
-ACE_String_Base_Iterator <ACE_CHAR_T>::
-operator < (const ACE_String_Base_Iterator <ACE_CHAR_T> & rhs) const
+template <class CHAR> ACE_INLINE bool
+ACE_String_Base_Iterator <CHAR>::
+operator < (const ACE_String_Base_Iterator <CHAR> & rhs) const
 {
   return this->index_ < rhs.index_;
 }
 
-template <class ACE_CHAR_T> ACE_INLINE bool
-ACE_String_Base_Iterator <ACE_CHAR_T>::
-operator > (const ACE_String_Base_Iterator <ACE_CHAR_T> & rhs) const
+template <class CHAR> ACE_INLINE bool
+ACE_String_Base_Iterator <CHAR>::
+operator > (const ACE_String_Base_Iterator <CHAR> & rhs) const
 {
   return this->index_ > rhs.index_;
 }
 
-template <class ACE_CHAR_T> ACE_INLINE bool
-ACE_String_Base_Iterator <ACE_CHAR_T>::
-operator >= (const ACE_String_Base_Iterator <ACE_CHAR_T> & rhs) const
+template <class CHAR> ACE_INLINE bool
+ACE_String_Base_Iterator <CHAR>::
+operator >= (const ACE_String_Base_Iterator <CHAR> & rhs) const
 {
   return this->index_ >= rhs.index_;
 }
 
-template <class ACE_CHAR_T> ACE_INLINE bool
-ACE_String_Base_Iterator <ACE_CHAR_T>::
-operator <= (const ACE_String_Base_Iterator <ACE_CHAR_T> & rhs) const
+template <class CHAR> ACE_INLINE bool
+ACE_String_Base_Iterator <CHAR>::
+operator <= (const ACE_String_Base_Iterator <CHAR> & rhs) const
 {
   return this->index_ <= rhs.index_;
 }
 
 // ----------------------------------------------
 
-template <class ACE_CHAR_T> ACE_INLINE
-ACE_String_Base_Const_Iterator <ACE_CHAR_T>::
-ACE_String_Base_Const_Iterator (const ACE_String_Base <ACE_CHAR_T> & str, int end)
+template <class CHAR> ACE_INLINE
+ACE_String_Base_Const_Iterator <CHAR>::
+ACE_String_Base_Const_Iterator (const ACE_String_Base <CHAR> & str, int end)
 : str_ (&str),
   index_ (0 == end ? 0 : str.length ())
 {
-  ACE_TRACE ("ACE_String_Base_Const_Iterator<ACE_CHAR_T>::ACE_String_Base_Const_Iterator");
+  ACE_TRACE ("ACE_String_Base_Const_Iterator<CHAR>::ACE_String_Base_Const_Iterator");
 }
 
-template <class ACE_CHAR_T> ACE_INLINE
-ACE_String_Base_Const_Iterator <ACE_CHAR_T>::
-ACE_String_Base_Const_Iterator (const ACE_String_Base_Const_Iterator <ACE_CHAR_T> & iter)
+template <class CHAR> ACE_INLINE
+ACE_String_Base_Const_Iterator <CHAR>::
+ACE_String_Base_Const_Iterator (const ACE_String_Base_Const_Iterator <CHAR> & iter)
 : str_ (iter.str_),
   index_ (iter.index_)
 {
-  ACE_TRACE ("ACE_String_Base_Const_Iterator<ACE_CHAR_T>::ACE_String_Base_Const_Iterator");
+  ACE_TRACE ("ACE_String_Base_Const_Iterator<CHAR>::ACE_String_Base_Const_Iterator");
 }
 
-template <class ACE_CHAR_T> ACE_INLINE
-ACE_String_Base_Const_Iterator <ACE_CHAR_T>::~ACE_String_Base_Const_Iterator (void)
+template <class CHAR> ACE_INLINE
+ACE_String_Base_Const_Iterator <CHAR>::~ACE_String_Base_Const_Iterator (void)
 {
-  ACE_TRACE ("ACE_String_Base_Const_Iterator<ACE_CHAR_T>::~ACE_String_Base_Const_Iterator");
+  ACE_TRACE ("ACE_String_Base_Const_Iterator<CHAR>::~ACE_String_Base_Const_Iterator");
 }
 
-template <class ACE_CHAR_T> ACE_INLINE
-int ACE_String_Base_Const_Iterator <ACE_CHAR_T>::done (void) const
+template <class CHAR> ACE_INLINE
+int ACE_String_Base_Const_Iterator <CHAR>::done (void) const
 {
-  ACE_TRACE ("ACE_String_Base_Const_Iterator<ACE_CHAR_T>::done");
+  ACE_TRACE ("ACE_String_Base_Const_Iterator<CHAR>::done");
 
   return this->index_ >= this->str_->length () ? 1 : 0;
 }
 
-template <class ACE_CHAR_T> ACE_INLINE
-const ACE_CHAR_T & ACE_String_Base_Const_Iterator <ACE_CHAR_T>::operator * (void)
+template <class CHAR> ACE_INLINE
+const CHAR & ACE_String_Base_Const_Iterator <CHAR>::operator * (void)
 {
-  ACE_TRACE ("ACE_String_Base_Const_Iterator<ACE_CHAR_T>::operator *");
+  ACE_TRACE ("ACE_String_Base_Const_Iterator<CHAR>::operator *");
 
   return this->str_->rep_[this->index_];
 }
 
-template <class ACE_CHAR_T> ACE_INLINE
-ACE_String_Base_Const_Iterator <ACE_CHAR_T> &
-ACE_String_Base_Const_Iterator <ACE_CHAR_T>::operator ++ (void)
+template <class CHAR> ACE_INLINE
+ACE_String_Base_Const_Iterator <CHAR> &
+ACE_String_Base_Const_Iterator <CHAR>::operator ++ (void)
 {
-  ACE_TRACE ("ACE_String_Base_Const_Iterator<ACE_CHAR_T>::operator ++");
+  ACE_TRACE ("ACE_String_Base_Const_Iterator<CHAR>::operator ++");
 
   if (0 == this->done ())
     ++ this->index_;
@@ -360,13 +360,13 @@ ACE_String_Base_Const_Iterator <ACE_CHAR_T>::operator ++ (void)
   return *this;
 }
 
-template <class ACE_CHAR_T> ACE_INLINE
-ACE_String_Base_Const_Iterator <ACE_CHAR_T>
-ACE_String_Base_Const_Iterator <ACE_CHAR_T>::operator ++ (int)
+template <class CHAR> ACE_INLINE
+ACE_String_Base_Const_Iterator <CHAR>
+ACE_String_Base_Const_Iterator <CHAR>::operator ++ (int)
 {
-  ACE_TRACE ("ACE_String_Base_Const_Iterator<ACE_CHAR_T>::operator ++ (int)");
+  ACE_TRACE ("ACE_String_Base_Const_Iterator<CHAR>::operator ++ (int)");
 
-  ACE_String_Base_Const_Iterator <ACE_CHAR_T> temp (*this);
+  ACE_String_Base_Const_Iterator <CHAR> temp (*this);
 
   if (0 == this->done ())
     ++ this->index_;
@@ -374,11 +374,11 @@ ACE_String_Base_Const_Iterator <ACE_CHAR_T>::operator ++ (int)
   return temp;
 }
 
-template <class ACE_CHAR_T> ACE_INLINE
-ACE_String_Base_Const_Iterator <ACE_CHAR_T> &
-ACE_String_Base_Const_Iterator <ACE_CHAR_T>::operator -- (void)
+template <class CHAR> ACE_INLINE
+ACE_String_Base_Const_Iterator <CHAR> &
+ACE_String_Base_Const_Iterator <CHAR>::operator -- (void)
 {
-  ACE_TRACE ("ACE_String_Base_Const_Iterator<ACE_CHAR_T>::operator --");
+  ACE_TRACE ("ACE_String_Base_Const_Iterator<CHAR>::operator --");
 
   if (0 < this->index_)
     -- this->index_;
@@ -386,13 +386,13 @@ ACE_String_Base_Const_Iterator <ACE_CHAR_T>::operator -- (void)
   return *this;
 }
 
-template <class ACE_CHAR_T> ACE_INLINE
-ACE_String_Base_Const_Iterator <ACE_CHAR_T>
-ACE_String_Base_Const_Iterator <ACE_CHAR_T>::operator -- (int)
+template <class CHAR> ACE_INLINE
+ACE_String_Base_Const_Iterator <CHAR>
+ACE_String_Base_Const_Iterator <CHAR>::operator -- (int)
 {
-  ACE_TRACE ("ACE_String_Base_Const_Iterator<ACE_CHAR_T>::operator -- (int)");
+  ACE_TRACE ("ACE_String_Base_Const_Iterator<CHAR>::operator -- (int)");
 
-  ACE_String_Base_Const_Iterator <ACE_CHAR_T> temp (*this);
+  ACE_String_Base_Const_Iterator <CHAR> temp (*this);
 
   if (0 < this->index_)
     -- this->index_;
@@ -400,60 +400,60 @@ ACE_String_Base_Const_Iterator <ACE_CHAR_T>::operator -- (int)
   return temp;
 }
 
-template <class ACE_CHAR_T> ACE_INLINE bool
-ACE_String_Base_Const_Iterator <ACE_CHAR_T>::
-operator == (const ACE_String_Base_Const_Iterator <ACE_CHAR_T> & rhs) const
+template <class CHAR> ACE_INLINE bool
+ACE_String_Base_Const_Iterator <CHAR>::
+operator == (const ACE_String_Base_Const_Iterator <CHAR> & rhs) const
 {
   return this->index_ == rhs.index_;
 }
 
-template <class ACE_CHAR_T> ACE_INLINE bool
-ACE_String_Base_Const_Iterator <ACE_CHAR_T>::
-operator != (const ACE_String_Base_Const_Iterator <ACE_CHAR_T> & rhs) const
+template <class CHAR> ACE_INLINE bool
+ACE_String_Base_Const_Iterator <CHAR>::
+operator != (const ACE_String_Base_Const_Iterator <CHAR> & rhs) const
 {
   return this->index_ != rhs.index_;
 }
 
-template <class ACE_CHAR_T> ACE_INLINE bool
-ACE_String_Base_Const_Iterator <ACE_CHAR_T>::
-operator < (const ACE_String_Base_Const_Iterator <ACE_CHAR_T> & rhs) const
+template <class CHAR> ACE_INLINE bool
+ACE_String_Base_Const_Iterator <CHAR>::
+operator < (const ACE_String_Base_Const_Iterator <CHAR> & rhs) const
 {
   return this->index_ < rhs.index_;
 }
 
-template <class ACE_CHAR_T> ACE_INLINE bool
-ACE_String_Base_Const_Iterator <ACE_CHAR_T>::
-operator > (const ACE_String_Base_Const_Iterator <ACE_CHAR_T> & rhs) const
+template <class CHAR> ACE_INLINE bool
+ACE_String_Base_Const_Iterator <CHAR>::
+operator > (const ACE_String_Base_Const_Iterator <CHAR> & rhs) const
 {
   return this->index_ > rhs.index_;
 }
 
-template <class ACE_CHAR_T> ACE_INLINE bool
-ACE_String_Base_Const_Iterator <ACE_CHAR_T>::
-operator >= (const ACE_String_Base_Const_Iterator <ACE_CHAR_T> & rhs) const
+template <class CHAR> ACE_INLINE bool
+ACE_String_Base_Const_Iterator <CHAR>::
+operator >= (const ACE_String_Base_Const_Iterator <CHAR> & rhs) const
 {
   return this->index_ >= rhs.index_;
 }
 
-template <class ACE_CHAR_T> ACE_INLINE bool
-ACE_String_Base_Const_Iterator <ACE_CHAR_T>::
-operator <= (const ACE_String_Base_Const_Iterator <ACE_CHAR_T> & rhs) const
+template <class CHAR> ACE_INLINE bool
+ACE_String_Base_Const_Iterator <CHAR>::
+operator <= (const ACE_String_Base_Const_Iterator <CHAR> & rhs) const
 {
   return this->index_ <= rhs.index_;
 }
 
 // ----------------------------------------------
 
-template <class ACE_CHAR_T> ACE_INLINE bool
-operator== (const ACE_CHAR_T *s,
-            const ACE_String_Base<ACE_CHAR_T> &t)
+template <class CHAR> ACE_INLINE bool
+operator== (const CHAR *s,
+            const ACE_String_Base<CHAR> &t)
 {
   return t == s;
 }
 
-template <class ACE_CHAR_T> ACE_INLINE bool
-operator!= (const ACE_CHAR_T *s,
-            const ACE_String_Base<ACE_CHAR_T> &t)
+template <class CHAR> ACE_INLINE bool
+operator!= (const CHAR *s,
+            const ACE_String_Base<CHAR> &t)
 {
   return !(t == s);
 }
diff --git a/ACE/ace/Svc_Handler.cpp b/ACE/ace/Svc_Handler.cpp
index af57b7fb16d..7941c34238c 100644
--- a/ACE/ace/Svc_Handler.cpp
+++ b/ACE/ace/Svc_Handler.cpp
@@ -111,13 +111,11 @@ ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::destroy (void)
   // Only delete ourselves if we're not owned by a module and have
   // been allocated dynamically.
   if (this->mod_ == 0 && this->dynamic_ && this->closing_ == false)
-    {
-      // Will call the destructor, which automatically calls <shutdown>.
-      // Note that if we are *not* allocated dynamically then the
-      // destructor will call <shutdown> automatically when it gets run
-      // during cleanup.
-      delete this;
-    }
+    // Will call the destructor, which automatically calls <shutdown>.
+    // Note that if we are *not* allocated dynamically then the
+    // destructor will call <shutdown> automatically when it gets run
+    // during cleanup.
+    delete this;
 }
 
 template <PR_ST_1, ACE_SYNCH_DECL> void
@@ -304,11 +302,7 @@ ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::handle_close (ACE_HANDLE,
 {
   ACE_TRACE ("ACE_Svc_Handler<PR_ST_2, ACE_SYNCH_USE>::handle_close");
 
-  if (this->reference_counting_policy ().value () ==
-      ACE_Event_Handler::Reference_Counting_Policy::DISABLED)
-    {
-      this->destroy ();
-    }
+  this->destroy ();
 
   return 0;
 }
diff --git a/ACE/ace/Thread_Mutex.h b/ACE/ace/Thread_Mutex.h
index 2c5d7bfca88..d8f5369b01a 100644
--- a/ACE/ace/Thread_Mutex.h
+++ b/ACE/ace/Thread_Mutex.h
@@ -130,16 +130,15 @@ public:
   int tryacquire_write (void);
 
   /**
-   * This is only here to make the ACE_Thread_Mutex interface
-   * consistent with the other synchronization APIs.  Assumes the
-   * caller has already acquired the mutex using one of the above
-   * calls, and returns 0 (success) always.
+   * This is only here to make the ACE_Thread_Mutex
+   * interface consistent with the other synchronization APIs.
+   * Assumes the caller has already acquired the mutex using one of
+   * the above calls, and returns 0 (success) always.
    */
   int tryacquire_write_upgrade (void);
 
   /// Return the underlying mutex.
   const ACE_thread_mutex_t &lock (void) const;
-  ACE_thread_mutex_t &lock (void);
 
   /// Dump the state of an object.
   void dump (void) const;
@@ -147,7 +146,7 @@ public:
   /// Declare the dynamic allocation hooks.
   ACE_ALLOC_HOOK_DECLARE;
 
-protected:
+  // protected:
   /// Mutex type that supports single-process locking efficiently.
   ACE_thread_mutex_t lock_;
 
diff --git a/ACE/ace/Thread_Mutex.inl b/ACE/ace/Thread_Mutex.inl
index 0a9abbd3b9e..dbef586fbc3 100644
--- a/ACE/ace/Thread_Mutex.inl
+++ b/ACE/ace/Thread_Mutex.inl
@@ -11,13 +11,6 @@ ACE_Thread_Mutex::lock (void) const
   return this->lock_;
 }
 
-ACE_INLINE ACE_thread_mutex_t &
-ACE_Thread_Mutex::lock (void) 
-{
-// ACE_TRACE ("ACE_Thread_Mutex::lock");
-  return this->lock_;
-}
-
 ACE_INLINE int
 ACE_Thread_Mutex::acquire_read (void)
 {
diff --git a/ACE/ace/Time_Value.cpp b/ACE/ace/Time_Value.cpp
index e40f98af10e..4f6953be055 100644
--- a/ACE/ace/Time_Value.cpp
+++ b/ACE/ace/Time_Value.cpp
@@ -10,12 +10,6 @@ ACE_RCSID (ace,
 
 #include "ace/Numeric_Limits.h"
 #include "ace/If_Then_Else.h"
-#include "ace/OS_NS_math.h"
-
-#ifdef ACE_HAS_CPP98_IOSTREAMS
-#include <ostream>
-#include <iomanip>
-#endif /* ACE_HAS_CPP98_IOSTREAMS */
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
@@ -168,7 +162,7 @@ ACE_Time_Value::dump (void) const
 }
 
 void
-ACE_Time_Value::normalize (bool saturate)
+ACE_Time_Value::normalize (void)
 {
   // // ACE_OS_TRACE ("ACE_Time_Value::normalize");
   // From Hans Rohnert...
@@ -177,45 +171,23 @@ ACE_Time_Value::normalize (bool saturate)
     {
       /*! \todo This loop needs some optimization.
        */
-      if (!saturate) // keep the conditionnal expression outside the while loop to minimize performance cost
-        do
-          {
-            ++this->tv_.tv_sec;
-            this->tv_.tv_usec -= ACE_ONE_SECOND_IN_USECS;
-          }
-        while (this->tv_.tv_usec >= ACE_ONE_SECOND_IN_USECS);
-      else
-        do
-          if (this->tv_.tv_sec < ACE_Numeric_Limits<time_t>::max())
-            {
-              ++this->tv_.tv_sec;
-              this->tv_.tv_usec -= ACE_ONE_SECOND_IN_USECS;
-            }
-          else
-            this->tv_.tv_usec = ACE_ONE_SECOND_IN_USECS - 1;
-        while (this->tv_.tv_usec >= ACE_ONE_SECOND_IN_USECS);
+      do
+        {
+          ++this->tv_.tv_sec;
+          this->tv_.tv_usec -= ACE_ONE_SECOND_IN_USECS;
+        }
+      while (this->tv_.tv_usec >= ACE_ONE_SECOND_IN_USECS);
     }
   else if (this->tv_.tv_usec <= -ACE_ONE_SECOND_IN_USECS)
     {
       /*! \todo This loop needs some optimization.
        */
-      if (!saturate)
-        do
-          {
-            --this->tv_.tv_sec;
-            this->tv_.tv_usec += ACE_ONE_SECOND_IN_USECS;
-          }
-        while (this->tv_.tv_usec <= -ACE_ONE_SECOND_IN_USECS);
-      else
-        do
-          if (this->tv_.tv_sec > ACE_Numeric_Limits<time_t>::min())
-            {
-              --this->tv_.tv_sec;
-              this->tv_.tv_usec += ACE_ONE_SECOND_IN_USECS;
-            }
-          else
-            this->tv_.tv_usec = -ACE_ONE_SECOND_IN_USECS + 1;
-        while (this->tv_.tv_usec <= -ACE_ONE_SECOND_IN_USECS);
+      do
+        {
+          --this->tv_.tv_sec;
+          this->tv_.tv_usec += ACE_ONE_SECOND_IN_USECS;
+        }
+      while (this->tv_.tv_usec <= -ACE_ONE_SECOND_IN_USECS);
     }
 
   if (this->tv_.tv_sec >= 1 && this->tv_.tv_usec < 0)
@@ -223,7 +195,7 @@ ACE_Time_Value::normalize (bool saturate)
       --this->tv_.tv_sec;
       this->tv_.tv_usec += ACE_ONE_SECOND_IN_USECS;
     }
-  // tv_sec in qnxnto is unsigned
+// tv_sec in qnxnto is unsigned
 #if !defined ( __QNXNTO__)
   else if (this->tv_.tv_sec < 0 && this->tv_.tv_usec > 0)
     {
@@ -237,107 +209,51 @@ ACE_Time_Value::normalize (bool saturate)
 ACE_Time_Value &
 ACE_Time_Value::operator *= (double d)
 {
-  // To work around the lack of precision of a long double to contain
-  // a 64-bits time_t + 6 digits after the decimal point for the usec part,
-  // we perform the multiplication of the 2 timeval parts separately.
+  // The floating type to be used in the computations.  It should be
+  // large enough to hold a time_t.  We actually want a floating type
+  // with enough digits in its mantissa to hold a time_t without
+  // losing precision.  For example, if FLT_RADIX is 2 and
+  // LDBL_MANT_DIG is 64, a long double has a 64 bit wide mantissa,
+  // which would be sufficient to hold a 64 bit time_t value without
+  // losing precision.
   //
-  // This extra precision step is adding a cost when transfering the
-  // seconds resulting from the usec multiplication.  This operation
-  // correspond to the normalization process performed in normalize()
-  // but we must absolutly do it here because the usec multiplication
-  // result value could exceed what can be stored in a suseconds_t
-  // type variable.
-  //
-  // Since this is a costly operation, we try to detect as soon as
-  // possible if we are having a saturation in order to abort the rest
-  // of the computation.
+  // For now we'll simply go with long double if it is larger than
+  // time_t.  We're hosed if long double isn't large enough.
   typedef ACE::If_Then_Else<(sizeof (double) > sizeof (time_t)),
-    double,
-    long double>::result_type float_type;
+                            double,
+                            long double>::result_type float_type;
 
-  float_type sec_total = static_cast<float_type> (this->sec());
-  sec_total *= d;
+  float_type time_total =
+    (this->sec ()
+     + static_cast<float_type> (this->usec ()) / ACE_ONE_SECOND_IN_USECS) * d;
 
   // shall we saturate the result?
   static const float_type max_int =
-    ACE_Numeric_Limits<time_t>::max() + 0.999999;
+    ACE_Numeric_Limits<time_t>::max () + 0.999999;
   static const float_type min_int =
-    ACE_Numeric_Limits<time_t>::min() - 0.999999;
+    ACE_Numeric_Limits<time_t>::min () - 0.999999;
 
-  if (sec_total > max_int)
-    this->set(ACE_Numeric_Limits<time_t>::max(), ACE_ONE_SECOND_IN_USECS-1);
-  else if (sec_total < min_int)
-    this->set(ACE_Numeric_Limits<time_t>::min(), -ACE_ONE_SECOND_IN_USECS+1);
-  else
-    {
-      time_t time_sec = static_cast<time_t> (sec_total);
-
-      float_type usec_total = this->usec();
-      usec_total *= d;
-
-      // adding usec resulting from tv_sec mult
-      usec_total += (sec_total-time_sec) * ACE_ONE_SECOND_IN_USECS;
-
-      // extract seconds component of the usec mult
-      sec_total = usec_total / ACE_ONE_SECOND_IN_USECS;
-      // keep remaining usec
-      if (sec_total > 0)
-        usec_total = (sec_total - ACE_OS::floor(sec_total));
-      else
-        usec_total = (sec_total - ACE_OS::ceil(sec_total));
-
-      sec_total -= usec_total;
-      usec_total *= ACE_ONE_SECOND_IN_USECS;
-
-      // add the seconds component of the usec mult with the tv_sec mult prod.
-      sec_total += time_sec;
-
-      // recheck for saturation
-      if (sec_total > max_int)
-        this->set (ACE_Numeric_Limits<time_t>::max(), ACE_ONE_SECOND_IN_USECS - 1);
-      else if (sec_total < min_int)
-        this->set (ACE_Numeric_Limits<time_t>::min(), -ACE_ONE_SECOND_IN_USECS + 1);
-      else
-        {
-          time_sec = static_cast<time_t> (sec_total);
-          suseconds_t time_usec = static_cast<suseconds_t> (usec_total);
+  if (time_total > max_int)
+    time_total = max_int;
+  if (time_total < min_int)
+    time_total = min_int;
 
-          // round up the result to save the last usec
-          if (time_usec > 0 && (usec_total - time_usec) >= 0.5)
-            ++time_usec;
-          else if (time_usec < 0 && (usec_total - time_usec) <= -0.5)
-            --time_usec;
+  const time_t time_sec = static_cast<time_t> (time_total);
 
-          this->set (time_sec, time_usec);
-        }
-    }
-  return *this;
-}
+  time_total -= time_sec;
+  time_total *= ACE_ONE_SECOND_IN_USECS;
 
-#ifdef ACE_HAS_CPP98_IOSTREAMS
-ostream &operator<<(ostream &o, const ACE_Time_Value &v)
-{
-  char oldFiller = o.fill ();
-  o.fill ('0');
-  const timeval *tv = v;
-  if (tv->tv_sec)
-    {
-      o << tv->tv_sec;
-      if (tv->tv_usec)
-        o << '.' << std::setw (6) << abs (tv->tv_usec);
-    }
-  else if (tv->tv_usec < 0)
-    o << "-0." << std::setw (6) << -tv->tv_usec;
-  else
-    {
-      o << '0';
-      if (tv->tv_usec > 0)
-        o << '.'<< std::setw (6) << tv->tv_usec;
-    }
+  suseconds_t time_usec = static_cast<suseconds_t> (time_total);
+
+  // round up the result to save the last usec
+  if (time_usec > 0 && (time_total - time_usec) >= 0.5)
+    ++time_usec;
+  else if (time_usec < 0 && (time_total - time_usec) <= -0.5)
+    --time_usec;
 
-  o.fill (oldFiller);
-  return o;
+  this->set (time_sec, time_usec);
+
+  return *this;
 }
-#endif /* ACE_HAS_CPP98_IOSTREAMS */
 
 ACE_END_VERSIONED_NAMESPACE_DECL
diff --git a/ACE/ace/Time_Value.h b/ACE/ace/Time_Value.h
index 5943094ef75..eb8bf13492d 100644
--- a/ACE/ace/Time_Value.h
+++ b/ACE/ace/Time_Value.h
@@ -32,9 +32,6 @@ suseconds_t const ACE_ONE_SECOND_IN_USECS = 1000000;
 // needed for ACE_UINT64
 #include "ace/Basic_Types.h"
 
-// needed to determine if iostreams are present
-#include "ace/iosfwd.h"
-
 // This forward declaration is needed by the set() and FILETIME() functions
 #if defined (ACE_LACKS_LONGLONG_T)
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -327,7 +324,7 @@ public:
 
 private:
   /// Put the timevalue into a canonical form.
-  void normalize (bool saturate = false);
+  void normalize (void);
 
   /// Store the values as a timeval.
 #if defined (ACE_HAS_TIME_T_LONG_MISMATCH)
@@ -349,10 +346,6 @@ private:
 #endif /* ACE_HAS_TIME_T_LONG_MISMATCH */
 };
 
-#ifdef ACE_HAS_CPP98_IOSTREAMS
-extern ACE_Export ostream &operator<<( ostream &o, const ACE_Time_Value &v );
-#endif
-
 ACE_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
diff --git a/ACE/ace/Tokenizer_T.cpp b/ACE/ace/Tokenizer_T.cpp
index d913a92049b..a0af46e9ec0 100644
--- a/ACE/ace/Tokenizer_T.cpp
+++ b/ACE/ace/Tokenizer_T.cpp
@@ -11,8 +11,8 @@
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
-template <class ACE_CHAR_T>
-ACE_Tokenizer_T<ACE_CHAR_T>::ACE_Tokenizer_T (ACE_CHAR_T *buffer)
+template <class CHAR>
+ACE_Tokenizer_T<CHAR>::ACE_Tokenizer_T (CHAR *buffer)
   : buffer_ (buffer),
     index_ (0),
     preserves_index_ (0),
@@ -20,9 +20,9 @@ ACE_Tokenizer_T<ACE_CHAR_T>::ACE_Tokenizer_T (ACE_CHAR_T *buffer)
 {
 }
 
-template <class ACE_CHAR_T>
+template <class CHAR>
 int
-ACE_Tokenizer_T<ACE_CHAR_T>::delimiter (ACE_CHAR_T d)
+ACE_Tokenizer_T<CHAR>::delimiter (CHAR d)
 {
   if (delimiter_index_ == MAX_DELIMITERS)
     return -1;
@@ -33,10 +33,10 @@ ACE_Tokenizer_T<ACE_CHAR_T>::delimiter (ACE_CHAR_T d)
   return 0;
 }
 
-template <class ACE_CHAR_T>
+template <class CHAR>
 int
-ACE_Tokenizer_T<ACE_CHAR_T>::delimiter_replace (ACE_CHAR_T d,
-                                  ACE_CHAR_T replacement)
+ACE_Tokenizer_T<CHAR>::delimiter_replace (CHAR d,
+                                  CHAR replacement)
 {
   // Make it possible to replace delimiters on-the-fly, e.g., parse
   // string until certain token count and then copy rest of the
@@ -59,10 +59,10 @@ ACE_Tokenizer_T<ACE_CHAR_T>::delimiter_replace (ACE_CHAR_T d,
   return 0;
 }
 
-template <class ACE_CHAR_T>
+template <class CHAR>
 int
-ACE_Tokenizer_T<ACE_CHAR_T>::preserve_designators (ACE_CHAR_T start,
-                                     ACE_CHAR_T stop,
+ACE_Tokenizer_T<CHAR>::preserve_designators (CHAR start,
+                                     CHAR stop,
                                      int strip)
 {
   if (preserves_index_ == MAX_PRESERVES)
@@ -75,11 +75,11 @@ ACE_Tokenizer_T<ACE_CHAR_T>::preserve_designators (ACE_CHAR_T start,
   return 0;
 }
 
-template <class ACE_CHAR_T>
+template <class CHAR>
 int
-ACE_Tokenizer_T<ACE_CHAR_T>::is_delimiter (ACE_CHAR_T d,
+ACE_Tokenizer_T<CHAR>::is_delimiter (CHAR d,
                              int &replace,
-                             ACE_CHAR_T &r)
+                             CHAR &r)
 {
   replace = 0;
 
@@ -97,10 +97,10 @@ ACE_Tokenizer_T<ACE_CHAR_T>::is_delimiter (ACE_CHAR_T d,
   return 0;
 }
 
-template <class ACE_CHAR_T>
+template <class CHAR>
 int
-ACE_Tokenizer_T<ACE_CHAR_T>::is_preserve_designator (ACE_CHAR_T start,
-                                       ACE_CHAR_T &stop,
+ACE_Tokenizer_T<CHAR>::is_preserve_designator (CHAR start,
+                                       CHAR &stop,
                                        int &strip)
 {
   for (int x = 0; x < preserves_index_; x++)
@@ -114,9 +114,9 @@ ACE_Tokenizer_T<ACE_CHAR_T>::is_preserve_designator (ACE_CHAR_T start,
   return 0;
 }
 
-template <class ACE_CHAR_T>
-ACE_CHAR_T *
-ACE_Tokenizer_T<ACE_CHAR_T>::next (void)
+template <class CHAR>
+CHAR *
+ACE_Tokenizer_T<CHAR>::next (void)
 {
   // Check if the previous pass was the last one in the buffer.
   if (index_ == -1)
@@ -124,16 +124,16 @@ ACE_Tokenizer_T<ACE_CHAR_T>::next (void)
       index_ = 0;
       return 0;
     }
- 
+    
   // Check if a buffer has been passed
   if (!buffer_)
     {
       return 0;
     }
 
-  ACE_CHAR_T replacement = 0;
+  CHAR replacement = 0;
   int replace;
-  ACE_CHAR_T *next_token = 0;
+  CHAR *next_token = 0;
 
   // Skip all leading delimiters.
   for (;;)
@@ -159,7 +159,7 @@ ACE_Tokenizer_T<ACE_CHAR_T>::next (void)
   next_token = buffer_ + index_;
 
   // A preserved region is it's own token.
-  ACE_CHAR_T stop;
+  CHAR stop;
   int strip;
   if (this->is_preserve_designator (buffer_[index_],
                                     stop,
diff --git a/ACE/ace/Tokenizer_T.h b/ACE/ace/Tokenizer_T.h
index 097f9cc3965..0d5455d14c4 100644
--- a/ACE/ace/Tokenizer_T.h
+++ b/ACE/ace/Tokenizer_T.h
@@ -33,7 +33,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
  * preserve designators.  Does not allow special characters, yet
  * (e.g., printf ("\"like a quoted string\"")).
  */
-template <class ACE_CHAR_T>
+template <class CHAR>
 class ACE_Tokenizer_T
 {
 public:
@@ -47,7 +47,7 @@ public:
    * \sa preserve_designators
    * \sa preserve_designators
    */
-  ACE_Tokenizer_T (ACE_CHAR_T *buffer);
+  ACE_Tokenizer_T (CHAR *buffer);
 
   /**
    * \a d is a delimiter.
@@ -70,7 +70,7 @@ public:
       Joseph/Hagins
       Hagins \endverbatim
    */
-  int delimiter (ACE_CHAR_T d);
+  int delimiter (CHAR d);
 
   /**
    * \a d is a delimiter and, when found, will be replaced by
@@ -94,7 +94,7 @@ public:
        Joseph
        Hagins \endverbatim
  */
-  int delimiter_replace (ACE_CHAR_T d, ACE_CHAR_T replacement);
+  int delimiter_replace (CHAR d, CHAR replacement);
 
   /**
    * Extract string between a pair of designator characters.
@@ -139,10 +139,10 @@ public:
       Joseph
       Hagins \endverbatim
    */
-  int preserve_designators (ACE_CHAR_T start, ACE_CHAR_T stop, int strip=1);
+  int preserve_designators (CHAR start, CHAR stop, int strip=1);
 
   /// Returns the next token.
-  ACE_CHAR_T *next (void);
+  CHAR *next (void);
 
   enum {
     MAX_DELIMITERS=16,
@@ -152,16 +152,16 @@ public:
 protected:
   /// Returns 1 if @a d is a delimiter, 0 otherwise.  If @a d should be
   /// replaced with @a r, @a replace is set to 1, otherwise 0.
-  int is_delimiter (ACE_CHAR_T d, int &replace, ACE_CHAR_T &r);
+  int is_delimiter (CHAR d, int &replace, CHAR &r);
 
   /**
    * If @a start is a start preserve designator, returns 1 and sets
    * @a stop to the stop designator.  Returns 0 if @a start is not a
    * preserve designator.
    */
-  int is_preserve_designator (ACE_CHAR_T start, ACE_CHAR_T &stop, int &strip);
+  int is_preserve_designator (CHAR start, CHAR &stop, int &strip);
 
-  ACE_CHAR_T *buffer_;
+  CHAR *buffer_;
   int index_;
 
   /**
@@ -184,8 +184,8 @@ protected:
      * E.g., ")".
      * Whether the designators should be removed from the token.
      */
-    ACE_CHAR_T start_;
-    ACE_CHAR_T stop_;
+    CHAR start_;
+    CHAR stop_;
     int strip_;
   };
 
@@ -212,8 +212,8 @@ protected:
      * with a technique that sets replacement_ = delimiter by
      * default.  I'll do that next iteration.
      */
-    ACE_CHAR_T delimiter_;
-    ACE_CHAR_T replacement_;
+    CHAR delimiter_;
+    CHAR replacement_;
     int replace_;
   };
 
diff --git a/ACE/ace/Unbounded_Set_Ex.h b/ACE/ace/Unbounded_Set_Ex.h
index acf54ebd426..31f92e3009d 100644
--- a/ACE/ace/Unbounded_Set_Ex.h
+++ b/ACE/ace/Unbounded_Set_Ex.h
@@ -16,7 +16,6 @@
 
 #include "ace/Node.h"
 #include "ace/os_include/os_stddef.h"
-#include <iterator>
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -44,16 +43,6 @@ template <class T, class C>
 class ACE_Unbounded_Set_Ex_Iterator
 {
 public:
-  /// Type definition of the container type.
-  typedef ACE_Unbounded_Set_Ex<T, C> container_type;
-
-  // = std::iterator_traits typedefs/traits.
-  typedef std::forward_iterator_tag                iterator_category;
-  typedef typename container_type::value_type      value_type;
-  typedef typename container_type::reference       reference;
-  typedef typename container_type::pointer         pointer;
-  typedef typename container_type::difference_type difference_type;
-
   // = Initialization method.
   ACE_Unbounded_Set_Ex_Iterator (ACE_Unbounded_Set_Ex<T, C> &s, bool end = false);
 
@@ -113,15 +102,6 @@ template <class T, class C>
 class ACE_Unbounded_Set_Ex_Const_Iterator
 {
 public:
-  typedef ACE_Unbounded_Set_Ex<T, C> container_type;
-
-  // = std::iterator_traits typedefs/traits.
-  typedef std::forward_iterator_tag                 iterator_category;
-  typedef typename container_type::const_value_type value_type;
-  typedef typename container_type::const_reference  reference;
-  typedef typename container_type::const_pointer    pointer;
-  typedef typename container_type::difference_type  difference_type;
-
   // = Initialization method.
   ACE_Unbounded_Set_Ex_Const_Iterator (const ACE_Unbounded_Set_Ex<T, C> &s,
                                        bool end = false);
@@ -226,15 +206,6 @@ public:
   typedef C COMP;
   typedef ACE_Node<T, C> NODE;
 
-  // = STL typedefs/traits.
-  typedef T                   value_type;
-  typedef T const             const_value_type;
-  typedef value_type &        reference;
-  typedef const_value_type &  const_reference;
-  typedef value_type *        pointer;
-  typedef const_value_type *  const_pointer;
-  typedef ptrdiff_t           difference_type;
-
   // = Initialization and termination methods.
   /// Constructor.  Use user specified allocation strategy
   /// if specified.
diff --git a/ACE/ace/config-g++-common.h b/ACE/ace/config-g++-common.h
index c49752b72db..86ee5673c84 100644
--- a/ACE/ace/config-g++-common.h
+++ b/ACE/ace/config-g++-common.h
@@ -149,19 +149,6 @@
 # endif  /* ACE_HAS_CUSTOM_EXPORT_MACROS == 0 */
 #endif  /* __GNU__ >= 4 */
 
-// GCC >= 4.1 provides __sync_XXXX builtins for use in atomic operations
-// although the builtins are provided globally they are not supported on all platforms
-#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 1))
-# if defined (__powerpc__)
-//  the builtins seem to be provided for all powerpc platforms
-#   define ACE_HAS_GCC_ATOMIC_BUILTINS 1
-# endif
-# if defined (__ia64)
-//  the builtins seem to be provided for the IA64 platforms
-#   define ACE_HAS_GCC_ATOMIC_BUILTINS 1
-# endif
-#endif
-
 #if defined (ACE_HAS_GNU_REPO)
   // -frepo causes unresolved symbols of basic_string left- and
   // right-shift operators with ACE_HAS_STRING_CLASS.
diff --git a/ACE/ace/config-hpux-11.00.h b/ACE/ace/config-hpux-11.00.h
index 6093b4f98bc..8be52fe880a 100644
--- a/ACE/ace/config-hpux-11.00.h
+++ b/ACE/ace/config-hpux-11.00.h
@@ -343,11 +343,6 @@
 #define ACE_LACKS_SETENV
 #define ACE_LACKS_UNSETENV
 
-#if !defined (__ia64)
-# define ACE_LACKS_CEILL
-# define ACE_LACKS_FLOORL
-#endif
-
 // Shared library name/path components
 #if defined (__ia64)
 #  define ACE_DLL_SUFFIX  ACE_TEXT (".so")
diff --git a/ACE/ace/config-lynxos.h b/ACE/ace/config-lynxos.h
index 2e2f481d9e9..e05a8f2f496 100644
--- a/ACE/ace/config-lynxos.h
+++ b/ACE/ace/config-lynxos.h
@@ -99,9 +99,7 @@
 #define ACE_HAS_TIMEZONE_GETTIMEOFDAY
 
 #define ACE_LACKS_ALPHASORT_PROTOTYPE
-#define ACE_LACKS_CEILL
 #define ACE_LACKS_CONST_TIMESPEC_PTR
-#define ACE_LACKS_FLOORL
 #define ACE_LACKS_GETPGID
 #define ACE_LACKS_ISCTYPE
 #define ACE_LACKS_MADVISE
diff --git a/ACE/ace/config-sunos5.5.h b/ACE/ace/config-sunos5.5.h
index 4b24d32047e..592567c8803 100644
--- a/ACE/ace/config-sunos5.5.h
+++ b/ACE/ace/config-sunos5.5.h
@@ -130,8 +130,6 @@
   // config-g++-common.h undef's ACE_HAS_STRING_CLASS with -frepo, so
   // this must appear before its #include.
 # define ACE_HAS_STRING_CLASS
-# define ACE_LACKS_CEILL
-# define ACE_LACKS_FLOORL 
 
 # include "ace/config-g++-common.h"
 
diff --git a/ACE/ace/config-vxworks6.4.h b/ACE/ace/config-vxworks6.4.h
index 1758eb61066..dae90277785 100644
--- a/ACE/ace/config-vxworks6.4.h
+++ b/ACE/ace/config-vxworks6.4.h
@@ -116,9 +116,7 @@
 #define ACE_HAS_THREADS
 #define ACE_HAS_SYSCTL
 #define ACE_LACKS_ALPHASORT
-#define ACE_LACKS_CEILL
 #define ACE_LACKS_EXEC
-#define ACE_LACKS_FLOORL
 #define ACE_LACKS_RLIMIT
 #define ACE_LACKS_FILELOCKS
 #define ACE_LACKS_FORK
diff --git a/ACE/ace/iosfwd.h b/ACE/ace/iosfwd.h
index fa959f6c021..d255a75241c 100644
--- a/ACE/ace/iosfwd.h
+++ b/ACE/ace/iosfwd.h
@@ -44,7 +44,6 @@
 
 # if !defined (ACE_USES_OLD_IOSTREAMS)
 #   include /**/ <iosfwd>
-#define ACE_HAS_CPP98_IOSTREAMS 1
 # else
   // @note If these forward declarations don't work (e.g. aren't
   //       portable), we may have to include "ace/streams.h" as a last
diff --git a/ACE/bin/ACETAOCIAO.style b/ACE/bin/ACETAOCIAO.style
index 3e20fc492d3..ca0619acaf3 100644
--- a/ACE/bin/ACETAOCIAO.style
+++ b/ACE/bin/ACETAOCIAO.style
@@ -100,12 +100,6 @@
 <rule name="expressions-binary-spacing">
 <presetreference>Expressions_Binary Operators_Spaced</presetreference>
 </rule>
-<rule name="expressions-conditional-spacing">
-<presetreference>Expressions_Conditional Operators_Spaced</presetreference>
-</rule>
-<rule name="expressions-conditional-spacing" override="true">
-<presetreference>Expressions_Conditional Operators_Disabled</presetreference>
-</rule>
 <rule name="expressions-functioncall-spacing">
 <presetreference>Functions_Calls_Spaced</presetreference>
 </rule>
@@ -115,9 +109,6 @@
 <rule name="expressions-pointer-spacing">
 <presetreference>Expressions_Pointer Operators_Not Spaced</presetreference>
 </rule>
-<rule name="expressions-pointer-wrapping">
-<presetreference>Expressions_Pointer Operator Wrapping_After</presetreference>
-</rule>
 <rule name="expressions-unary-spacing">
 <presetreference>Expressions_Logical and Bitwise Unary Operators_Not Spaced</presetreference>
 </rule>
@@ -160,11 +151,8 @@
 <rule name="function-parameter-alignment">
 <presetreference>Functions_Parameter Alignment_Bracket</presetreference>
 </rule>
-<rule name="function-parameter-brackets" override="true">
-<presetreference>Functions_Parameter Brackets_Disabled</presetreference>
-</rule>
 <rule name="function-parameter-lines">
-<presetreference>Functions_Parameter Lines_True</presetreference>
+<presetreference>Functions_Parameter Lines_False</presetreference>
 </rule>
 <rule name="function-parameter-spacing">
 <presetreference>Functions_Parameter Spacing_AfterComma</presetreference>
@@ -182,7 +170,7 @@
 <presetreference>Global_Alignment ensures at least one space_False</presetreference>
 </rule>
 <rule name="global-bracing-style">
-<presetreference>Global_Default Block Brace Position_Indented</presetreference>
+<presetreference>Global_Default Block Brace Position_Aligned</presetreference>
 </rule>
 <rule name="global-bracket-alignment">
 <presetreference>Expressions_Bracket Alignment_AlignAtBracket</presetreference>
@@ -265,6 +253,9 @@
 <rule name="multiple-inheritance">
 <presetreference>Classes and Structs_Multiple Inheritance_OnePerLine</presetreference>
 </rule>
+<rule name="multiple-inheritance" override="true">
+<presetreference>Classes and Structs_Multiple Inheritance_Disabled</presetreference>
+</rule>
 <rule name="namespace-bracing-style">
 <presetreference>Namespaces_Brace Position_Aligned</presetreference>
 </rule>
diff --git a/ACE/bin/MakeProjectCreator/config/global.features b/ACE/bin/MakeProjectCreator/config/global.features
index 72bab059672..f25df8b9d79 100644
--- a/ACE/bin/MakeProjectCreator/config/global.features
+++ b/ACE/bin/MakeProjectCreator/config/global.features
@@ -59,11 +59,6 @@ xerces3       = 0
 ofccm         = 0
 ndds          = 0
 mcpp          = 0
-wireshark     = 0
-
-dds4ccm_opendds = 0
-dds4ccm_ndds = 0
-dds4ccm_splice = 0
 
 // Features for various GUI libraries
 
diff --git a/ACE/bin/PerlACE/ProcessLVRT.pm b/ACE/bin/PerlACE/ProcessLVRT.pm
index 44cd400ad2d..2079346f33c 100644
--- a/ACE/bin/PerlACE/ProcessLVRT.pm
+++ b/ACE/bin/PerlACE/ProcessLVRT.pm
@@ -345,12 +345,4 @@ CHECK:
     return -1;
 }
 
-###
-
-sub kill_all ($)
-{
-  my $procmask = shift;
-  ## NOT IMPLEMENTED YET
-}
-
 1;
diff --git a/ACE/bin/PerlACE/ProcessVX.pm b/ACE/bin/PerlACE/ProcessVX.pm
index 842a35f70fa..e273e6f8ed7 100644
--- a/ACE/bin/PerlACE/ProcessVX.pm
+++ b/ACE/bin/PerlACE/ProcessVX.pm
@@ -436,26 +436,18 @@ for(my $i = 0; $i <= $#ARGV; ++$i) {
 $PerlACE::ProcessVX::WAIT_DELAY_FACTOR = $ENV{"ACE_RUNTEST_DELAY"};
 
 if (defined $ENV{'ACE_TEST_WINCE'}) {
-  if ($OSNAME eq "MSWin32") {
-      require PerlACE::ProcessWinCE;
-  } else {
-      require PerlACE::ProcessWinCE_Unix;
-  }
+if ($OSNAME eq "MSWin32") {
+    require PerlACE::ProcessWinCE;
 } else {
-  if ($OSNAME eq "MSWin32") {
-      require PerlACE::ProcessVX_Win32;
-  }
-  else {
-      require PerlACE::ProcessVX_Unix;
-  }
+    require PerlACE::ProcessWinCE_Unix;
+}
+} else {
+if ($OSNAME eq "MSWin32") {
+    require PerlACE::ProcessVX_Win32;
+}
+else {
+    require PerlACE::ProcessVX_Unix;
 }
-
-###
-
-sub kill_all ($)
-{
-  my $procmask = shift;
-  ## NOT IMPLEMENTED YET
 }
 
 1;
diff --git a/ACE/bin/PerlACE/Process_Unix.pm b/ACE/bin/PerlACE/Process_Unix.pm
index e1ddb7f8fde..d08da933761 100644
--- a/ACE/bin/PerlACE/Process_Unix.pm
+++ b/ACE/bin/PerlACE/Process_Unix.pm
@@ -533,42 +533,4 @@ sub TimedWait ($)
     return -1;
 }
 
-###
-
-sub kill_all ($)
-{
-  my $procmask = shift;
-  my $pid = -1;
-  my $first = 1;
-  my $ps_cmd = 'ps xw';
-  my $ps_file = `which ps`;
-  if ((-l $ps_file) and (readlink ($ps_file)) =~ /busybox/) {
-    ## some embedded targets use BusyBox for base tools
-    ## with different arguments
-    $ps_cmd = 'ps w';
-  }
-  if (defined $ENV{'PS_CMD'}) {
-    ## in case a special command is required
-    $ps_cmd = $ENV{'PS_CMD'};
-  }
-  for my $line (`$ps_cmd`) {
-    if ($first) {
-      # skip first line (headers)
-      $first = 0;
-    } else {
-      # find matching process line
-      if ($line =~ /$procmask/) {
-        # find process PID
-        if ($line =~ /^\s*(\d+)\s+/) {
-          $pid = $1;
-          kill ('KILL', $pid); # kill process
-          if (defined $ENV{'ACE_TEST_VERBOSE'}) {
-            print STDERR "INFO: Killed process at [$line]\n";
-          }
-        }
-      }
-    }
-  }
-}
-
 1;
diff --git a/ACE/bin/PerlACE/Process_VMS.pm b/ACE/bin/PerlACE/Process_VMS.pm
index 6ecda65e8cd..30d4cdd271b 100644
--- a/ACE/bin/PerlACE/Process_VMS.pm
+++ b/ACE/bin/PerlACE/Process_VMS.pm
@@ -356,12 +356,4 @@ sub TimedWait ($)
     return -1;
 }
 
-###
-
-sub kill_all ($)
-{
-  my $procmask = shift;
-  ## NOT IMPLEMENTED YET
-}
-
 1;
diff --git a/ACE/bin/PerlACE/Process_Win32.pm b/ACE/bin/PerlACE/Process_Win32.pm
index c65b445bb78..ace30cb05bd 100644
--- a/ACE/bin/PerlACE/Process_Win32.pm
+++ b/ACE/bin/PerlACE/Process_Win32.pm
@@ -416,25 +416,4 @@ sub TimedWait ($)
     return $self->Wait($timeout);
 }
 
-###
-
-sub kill_all ($)
-{
-  my $procmask = shift;
-  my $pid = -1;
-  for my $line (`tasklist /nh /fo csv`) {    
-    # find matching process line
-    if ($line =~ /$procmask/) {
-      # find process PID
-      if ($line =~ /^\"[^\"]+\",\"(\d+)\",/) {
-        $pid = $1;
-        Win32::Process::KillProcess ($pid, 0); # kill process
-        if (defined $ENV{'ACE_TEST_VERBOSE'}) {
-          print STDERR "INFO: Killed process at [$line]\n"
-        }
-      }
-    }
-  }
-}
-
 1;
diff --git a/ACE/bin/PerlACE/TestTarget.pm b/ACE/bin/PerlACE/TestTarget.pm
index fc56dd2faf2..8fa7d9f4f30 100644
--- a/ACE/bin/PerlACE/TestTarget.pm
+++ b/ACE/bin/PerlACE/TestTarget.pm
@@ -339,11 +339,4 @@ sub GetStderrLog ($)
     return;
 }
 
-sub KillAll ($)
-{
-    my $self = shift;
-    my $procmask = shift;
-    PerlACE::Process::kill_all ($procmask);    
-}
-
 1;
diff --git a/ACE/bin/PerlACE/TestTarget_LVRT.pm b/ACE/bin/PerlACE/TestTarget_LVRT.pm
index 0212d4a3dd1..a1c5207cc95 100644
--- a/ACE/bin/PerlACE/TestTarget_LVRT.pm
+++ b/ACE/bin/PerlACE/TestTarget_LVRT.pm
@@ -288,11 +288,4 @@ sub RebootReset ($)
     }
 }
 
-sub KillAll ($)
-{
-    my $self = shift;
-    my $procmask = shift;
-    PerlACE::ProcessLVRT::kill_all ($procmask);    
-}
-
 1;
diff --git a/ACE/bin/PerlACE/TestTarget_VxWorks.pm b/ACE/bin/PerlACE/TestTarget_VxWorks.pm
index 0d97c785691..be5f4600c27 100644
--- a/ACE/bin/PerlACE/TestTarget_VxWorks.pm
+++ b/ACE/bin/PerlACE/TestTarget_VxWorks.pm
@@ -72,11 +72,4 @@ sub WaitForFileTimed ($)
     return PerlACE::waitforfile_timed ($newfile, $timeout);
 }
 
-sub KillAll ($)
-{
-    my $self = shift;
-    my $procmask = shift;
-    PerlACE::ProcessVX::kill_all ($procmask);    
-}
-
 1;
diff --git a/ACE/bin/PerlACE/TestTarget_WinCE.pm b/ACE/bin/PerlACE/TestTarget_WinCE.pm
index cfb2fb220bc..17e736c95da 100644
--- a/ACE/bin/PerlACE/TestTarget_WinCE.pm
+++ b/ACE/bin/PerlACE/TestTarget_WinCE.pm
@@ -170,11 +170,4 @@ sub DeleteFile ($)
     unlink ("$newfile");
 }
 
-sub KillAll ($)
-{
-    my $self = shift;
-    my $procmask = shift;
-    PerlACE::ProcessVX::kill_all ($procmask);    
-}
-
 1;
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 1b3db772360..b8a59fd75ec 100755
--- a/ACE/bin/diff-builds-and-group-fixed-tests-only.sh
+++ b/ACE/bin/diff-builds-and-group-fixed-tests-only.sh
@@ -1,4 +1,4 @@
-if test -z $1; then olddate=2010_01_31; else olddate=$1; fi
+if test -z $1; then olddate=2009_11_29; 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/configure.ac b/ACE/configure.ac
index 561c1d192c6..a2d68b08aa3 100644
--- a/ACE/configure.ac
+++ b/ACE/configure.ac
@@ -135,9 +135,6 @@ AC_LANG([C++])
 dnl If we are cross compiling disable certain things in the Makefiles.
 AM_CONDITIONAL([ACE_CROSS_COMPILED], [test X$cross_compiling = Xyes])
 
-dnl If we are cross compiling disable certain things in the Makefiles.
-AM_CONDITIONAL([BUILD_CROSS_COMPILE], [test X$cross_compiling = Xyes])
-
 dnl Look for the best awk-style program available.
 AC_PROG_AWK
 
@@ -371,6 +368,9 @@ AC_DISABLE_STATIC
 dnl Enable Libtool module support
 AC_LIBTOOL_DLOPEN
 
+dnl Enable support for "clean" DLLs.
+AC_LIBTOOL_WIN32_DLL
+
 dnl
 dnl  ###### Relies on the as of yet unreleased Libtool 1.6 distribuion ###
 dnl
@@ -3288,8 +3288,6 @@ ACE_CHECK_LACKS_FUNCS(strtoul)
 
 ACE_FUNC_STRTOULL
 
-ACE_CHECK_LACKS_FUNCS(floor ceil floorl ceill)
-
 # swab() comes in a number of forms:
 #   swab (const void*, void*, size_t) is POSIX, XPG4, SUS, SUSv2 standard.
 #   swab (const char*, char*, size_t) is SVID third edition.
@@ -4556,11 +4554,11 @@ if test "$ace_user_enable_reentrant_funcs" = yes; then
 #endif
                  ]],
                  [[
-  const char * name = 0;
+  const char * name;
   struct passwd * pwent;
-  char * buffer = 0;
+  char * buffer;
   int buflen;
-  struct passwd * result = 0;
+  struct passwd * result;
 
   int status = getpwnam_r (name, pwent, buffer, buflen, &result);
                  ]])],
@@ -4569,11 +4567,10 @@ if test "$ace_user_enable_reentrant_funcs" = yes; then
                     AC_DEFINE([ACE_HAS_POSIX_GETPWNAM_R])
                   fi
                  ],
-                [
+                 [
                   dnl Nothing to do!
-                  echo
-                ]),
-                ],,
+                 ])
+                ],
                 [AC_DEFINE([ACE_LACKS_PWD_REENTRANT_FUNCTIONS])])
 
   AC_CHECK_FUNC([ctime_r],,)
diff --git a/ACE/debianbuild/control b/ACE/debianbuild/control
index c514799dd6f..040f1169b5c 100644
--- a/ACE/debianbuild/control
+++ b/ACE/debianbuild/control
@@ -2,10 +2,10 @@ Source: ace
 Section: devel
 Priority: optional
 Maintainer: Debian ACE+TAO maintainers <pkg-ace-devel@lists.alioth.debian.org>
-Uploaders: Thomas Girard <thomas.g.girard@free.fr>, Pau Garcia i Quiles <pgquiles@elpauer.org>
-Build-Depends: 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), libfox-1.6-dev, zlib1g-dev, libzzip-dev, docbook-to-man, bzip2, autoconf, automake, libtool, autotools-dev, doxygen, graphviz
+Uploaders: Konstantinos Margaritis <markos@debian.org>, Brian Nelson <pyro@debian.org>, Thomas Girard <thomas.g.girard@free.fr>
+Build-Depends: 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), libfox-1.6-dev, zlib1g-dev, libzzip-dev, docbook-to-man, bzip2, autoconf, automake, libtool, autotools-dev, doxygen
 Build-Conflicts: autoconf2.13, automake1.4
-Standards-Version: 3.8.3
+Standards-Version: 3.8.3.0
 Vcs-Svn: svn://svn.debian.org/svn/pkg-ace/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-ace/trunk
 Homepage: http://www.cs.wustl.edu/~schmidt/ACE.html
diff --git a/ACE/debianbuild/patches/00list b/ACE/debianbuild/patches/00list
index d77c48fbc12..58876f97286 100644
--- a/ACE/debianbuild/patches/00list
+++ b/ACE/debianbuild/patches/00list
@@ -1,6 +1,9 @@
 01-change-tao-sonames
+02-fltk-no-gl
 02-qt4
 04-reduce-opt
+12-fix-fox-include
+15-fix-fltk-include
 34-bts386713
 50-prepatch-dummy-mark
 92-default-ACE_ROOT
diff --git a/ACE/debianbuild/patches/02-fltk-no-gl.dpatch b/ACE/debianbuild/patches/02-fltk-no-gl.dpatch
new file mode 100644
index 00000000000..1828c31e2b0
--- /dev/null
+++ b/ACE/debianbuild/patches/02-fltk-no-gl.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02-fltk-no-gl.dpatch by Thomas Girard <thomas.g.girard@free.fr>
+##
+## DP: do not link against libfltk_gl
+
+@DPATCH@
+--- ACE_wrappers.orig/m4/ace.m4
++++ ACE_wrappers/m4/ace.m4
+@@ -1180,8 +1180,8 @@
+    fi
+  fi
+  if test X"${FLTKCONFIG}" != X; then
+-   ACE_FLTK_CPPFLAGS=`$FLTKCONFIG --use-gl --cxxflags 2>/dev/null`
+-   ACE_FLTK_LIBS=`$FLTKCONFIG --use-gl --ldflags 2>/dev/null`
++   ACE_FLTK_CPPFLAGS=`$FLTKCONFIG --cxxflags 2>/dev/null`
++   ACE_FLTK_LIBS=`$FLTKCONFIG --ldflags 2>/dev/null`
+ 
+    AC_SUBST(ACE_FLTK_CPPFLAGS)
+    AC_SUBST(ACE_FLTK_LIBS)
diff --git a/ACE/debianbuild/patches/02-qt4.dpatch b/ACE/debianbuild/patches/02-qt4.dpatch
index 1677c008477..5a0501f024b 100644
--- a/ACE/debianbuild/patches/02-qt4.dpatch
+++ b/ACE/debianbuild/patches/02-qt4.dpatch
@@ -2,12 +2,12 @@
 ## 02-qt4.dpatch by Thomas Girard <thomas.g.girard@free.fr>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: use Qt4 instead of Qt3
+## DP: detect Qt4 instead of Qt3
 
 @DPATCH@
 --- ACE_wrappers.orig/m4/ace.m4
 +++ ACE_wrappers/m4/ace.m4
-@@ -1195,18 +1195,18 @@
+@@ -1265,18 +1265,18 @@
  AC_DEFUN([ACE_PATH_QT],
  [
   ac_qt_found=no
diff --git a/ACE/debianbuild/patches/03-g++-new-throws.dpatch b/ACE/debianbuild/patches/03-g++-new-throws.dpatch
deleted file mode 100644
index 54f3b631ae9..00000000000
--- a/ACE/debianbuild/patches/03-g++-new-throws.dpatch
+++ /dev/null
@@ -1,68 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03-g++-new-throws.dpatch by Thomas Girard <thomas.g.girard@free.fr>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: don't test if new() throws std::bad_alloc
-
-@DPATCH@
---- orig/configure.ac
-+++ mod/configure.ac
-@@ -5224,57 +5224,7 @@
-   ACE_CACHE_CHECK([if new throws std::bad_alloc exception on failure],
-     [ace_cv_new_throws_bad_alloc_exception],
-     [
--     AC_RUN_IFELSE([AC_LANG_SOURCE([[
--#if defined (ACE_HAS_NEW_NO_H)
--# include <new>
--#elif defined (ACE_HAS_NEW_H)
--# include <new.h>
--#endif
--
--#if defined (ACE_HAS_STDEXCEPT_NO_H)
--# include <stdexcept>
--#elif defined (ACE_HAS_EXCEPTION_H)
--# include <exception.h>
--#endif
--
--/* We already checked for ACE_LACKS_NUMERIC_LIMITS */
--#if !defined ACE_LACKS_NUMERIC_LIMITS
--#include <limits>
--#endif
--
--        int main(int, char *[]) {
--#if defined ACE_LACKS_NUMERIC_LIMITS
--          const size_t ALLOC_SIZE = 2 * 1024 * 1024 * 1024;
--#else
--          const size_t ALLOC_SIZE = std::numeric_limits<size_t>::max () / 2;
--#endif
--          while (1) {
--            try {
--              char *a = new char[ALLOC_SIZE];
--              if (a == 0) {
--                return 1; /* new() does NOT throw exceptions */
--              }
--            }
--
--#ifdef ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB
--            catch (std::bad_alloc)
--#else
--            catch (bad_alloc)
--#endif  /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */
--            {
--             return 0; /* new() does throw exceptions */
--            }
--         };
--
--         return 1;  /* ERROR: We shouldn't get this far! */
--        }
--       ]])],[
--        ace_cv_new_throws_bad_alloc_exception=yes
--       ],[
--        ace_cv_new_throws_bad_alloc_exception=no
--       ],[
--        ace_cv_new_throws_bad_alloc_exception=no
--       ])
-+     ace_cv_new_throws_bad_alloc_exception=yes
-     ], [AC_DEFINE([ACE_NEW_THROWS_EXCEPTIONS])],)
- 
-   if test "$ace_cv_new_throws_bad_alloc_exception" != yes; then
diff --git a/ACE/debianbuild/patches/04-reduce-opt.dpatch b/ACE/debianbuild/patches/04-reduce-opt.dpatch
index 789603cf5ee..7f072829c7e 100644
--- a/ACE/debianbuild/patches/04-reduce-opt.dpatch
+++ b/ACE/debianbuild/patches/04-reduce-opt.dpatch
@@ -2,8 +2,7 @@
 ## 04-reduce-opt.dpatch by Thomas Girard <thomas.g.girard@free.fr>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: drop -O3 default optimization level. Please note that
-## DP: -O2 level is set when using autoconf method.
+## DP: drop -O3 default optimization level
 
 @DPATCH@
 --- ACE_wrappers.orig/m4/compiler.m4
diff --git a/ACE/debianbuild/patches/05-autoconf-fox.dpatch b/ACE/debianbuild/patches/05-autoconf-fox.dpatch
new file mode 100644
index 00000000000..0315ab11eec
--- /dev/null
+++ b/ACE/debianbuild/patches/05-autoconf-fox.dpatch
@@ -0,0 +1,116 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05-autoconf-fox.dpatch by Thomas Girard <thomas.g.girard@free.fr>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: add autoconf support for Fox
+
+@DPATCH@
+--- ACE_wrappers.orig/m4/ace.m4
++++ ACE_wrappers/m4/ace.m4
+@@ -501,6 +501,7 @@
+  ACE_ENABLE_QT_REACTOR
+  ACE_ENABLE_TK_REACTOR
+  ACE_ENABLE_XT_REACTOR
++ ACE_ENABLE_FOX_REACTOR
+ 
+  # placeholder for WxWindows/wxWidgets support
+  AM_CONDITIONAL([BUILD_WXWINDOWS], false)
+@@ -1543,4 +1544,58 @@
+                [test X$ace_user_enable_xt_reactor = Xyes])
+ ])
+ 
++# ACE_PATH_FOX
++#---------------------------------------------------------------------------
++AC_DEFUN([ACE_PATH_FOX],
++[AC_ARG_WITH([fox-config],
++ AS_HELP_STRING([--with-fox-config=PATH],
++                [path to fox-config [[automatic]]]),
++ [ ac_fox_config="${withval}" ])
++ if test X"${ac_fox_config}" = X; then
++   AC_PATH_PROG([FOXCONFIG], [fox-config], [], [])
++ else
++  AC_MSG_CHECKING([whether ${ac_fox_config} exists])
++   if test -f "${ac_fox_config}"; then
++     FOXCONFIG="${ac_fox_config}"
++     AC_MSG_RESULT([yes])
++   else
++     AC_MSG_RESULT([no])
++   fi
++ fi
++ if test X"${FOXCONFIG}" != X; then
++   ACE_FOX_CPPFLAGS=-I/usr/include/fox-1.6
++   ACE_FOX_LIBS=-lFOX-1.6
++   AC_SUBST(ACE_FOX_CPPFLAGS)
++   AC_SUBST(ACE_FOX_LIBS)
++ fi
++])
+ 
++# ACE_ENABLE_FOX_REACTOR
++#---------------------------------------------------------------------------
++AC_DEFUN([ACE_ENABLE_FOX_REACTOR],
++[AC_REQUIRE([ACE_PATH_FOX])
++AC_ARG_ENABLE([fox-reactor],
++               AS_HELP_STRING([--enable-fox-reactor],
++                              [build support for the FoxReactor [[no]]]),
++               [case "${enableval}" in
++                 yes)
++                   AS_IF([test X"${FOXCONFIG}" != X],
++                         [ace_user_enable_fox_reactor=yes],
++                         [AC_MSG_ERROR([ACE_FoxReactor cannot be enabled: fox-config not found.])])
++                   ;;
++                 no)
++                   ace_user_enable_fox_reactor=no
++                   ;;
++                 *)
++                   AC_MSG_ERROR([bad value ${enableval} for --enable-fox-reactor])
++		   ;;
++	       esac],
++               [
++                 ace_user_enable_fox_reactor=no
++               ])
++AM_CONDITIONAL([BUILD_FOX], [test X$ace_user_enable_fox_reactor = Xyes])
++AM_CONDITIONAL([BUILD_ACE_FOXREACTOR],
++               [test X$ace_user_enable_fox_reactor = Xyes])
++AM_CONDITIONAL([BUILD_TAO_FOXRESOURCE],
++               [test X$ace_user_enable_fox_reactor = Xyes])
++])
+--- ACE_wrappers.orig/bin/MakeProjectCreator/config/global.features
++++ ACE_wrappers/bin/MakeProjectCreator/config/global.features
+@@ -90,6 +90,8 @@
+ ace_tkreactor    = 1
+ // Use FlReactor
+ ace_flreactor    = 1
++// Use FoxReactor
++ace_foxreactor   = 1
+ 
+ // Features for TAO support for various GUI libraries
+ // Use QtResources for TAO
+@@ -100,6 +102,8 @@
+ tao_tkresource    = 1
+ // Use FlResources for TAO
+ tao_flresource    = 1
++// Use FoxResources for TAO
++tao_foxresource   = 1
+ 
+ //Use the ZIP_Wrapper feature for when using the ZIP wrapper classes
+ ZIP_Wrapper = 0
+--- ACE_wrappers.orig/ace/ace.mwc
++++ ACE_wrappers/ace/ace.mwc
+@@ -6,6 +6,7 @@
+   ace.mpc
+   ace_for_tao.mpc
+   ace_flreactor.mpc
++  ace_foxreactor.mpc
+   ace_qtreactor.mpc
+   ace_tkreactor.mpc
+   ace_xtreactor.mpc
+--- ACE_wrappers.orig/TAO/configure.ac
++++ ACE_wrappers/TAO/configure.ac
+@@ -183,6 +183,7 @@
+ ACE_ENABLE_QT_REACTOR
+ ACE_ENABLE_TK_REACTOR
+ ACE_ENABLE_XT_REACTOR
++ACE_ENABLE_FOX_REACTOR
+ ACE_PATH_ZZIP
+ ACE_PATH_ZLIB
+ 
diff --git a/ACE/debianbuild/patches/06-fix-kokyu-mpc.dpatch b/ACE/debianbuild/patches/06-fix-kokyu-mpc.dpatch
new file mode 100644
index 00000000000..9d08731ca6f
--- /dev/null
+++ b/ACE/debianbuild/patches/06-fix-kokyu-mpc.dpatch
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 06-revert-mpc-kokyu-change.dpatch by Thomas Girard <thomas.g.girard@free.fr>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: use upstream patch to unbreak Kokyu library search path
+
+@DPATCH@
+--- ACE_wrappers.orig/bin/MakeProjectCreator/modules/AutomakeWorkspaceHelper.pm
++++ ACE_wrappers/bin/MakeProjectCreator/modules/AutomakeWorkspaceHelper.pm
+@@ -135,7 +135,7 @@
+         $reldir = 'Kokyu';
+       }
+     }
+-    $str =~ s!$libname!\$(top_builddir)/$reldir/$libname!;
++    $str =~ s!$libname!\$(ACE_BUILDDIR)/$reldir/$libname!;
+     return $str;
+   }
+   elsif ($libname =~ /^lib(tao|kokyu)/i) {
diff --git a/ACE/debianbuild/patches/07-autoconf-fix-gperf.dpatch b/ACE/debianbuild/patches/07-autoconf-fix-gperf.dpatch
new file mode 100644
index 00000000000..27332fe00b8
--- /dev/null
+++ b/ACE/debianbuild/patches/07-autoconf-fix-gperf.dpatch
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 07-autoconf-fix-gperf.dpatch by Thomas Girard <thomas.g.girard@free.fr>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix an autotools error in GPERF handling.
+
+@DPATCH@
+--- ACE_wrappers.orig/m4/ace.m4
++++ ACE_wrappers/m4/ace.m4
+@@ -535,7 +535,7 @@
+      AC_MSG_WARN([existing gperf may be overwritten during installation])
+     ],[])
+  fi
+- AM_CONDITIONAL([COMPILE_GPERF], [test X$ace_user_enable_gperf = Xyes])
++ AM_CONDITIONAL([BUILD_GPERF], [test X$ace_user_enable_gperf = Xyes])
+ 
+  ACE_ENABLE_QOS
+  ACE_ENABLE_SSL
diff --git a/ACE/debianbuild/patches/12-fix-fox-include.dpatch b/ACE/debianbuild/patches/12-fix-fox-include.dpatch
new file mode 100644
index 00000000000..26ff9767537
--- /dev/null
+++ b/ACE/debianbuild/patches/12-fix-fox-include.dpatch
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 12-fix-fox-include.dpatch by Thomas Girard <thomas.g.girard@free.fr>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: drop fox/ prefix in include, it's correctly set by fox-config
+
+@DPATCH@
+--- ACE_wrappers.orig/ace/FoxReactor/FoxReactor.h
++++ ACE_wrappers/ace/FoxReactor/FoxReactor.h
+@@ -27,7 +27,7 @@
+ 
+ #include "ace/Select_Reactor.h"
+ 
+-#include <fox/fx.h>
++#include <fx.h>
+ 
+ /**
+  * @class ACE_FoxReactor
+--- ACE_wrappers.orig/TAO/tao/FoxResource/FoxResource_Loader.h
++++ ACE_wrappers/TAO/tao/FoxResource/FoxResource_Loader.h
+@@ -24,7 +24,7 @@
+ 
+ #include "tao/Versioned_Namespace.h"
+ 
+-#include <fox/fx.h>
++#include <fx.h>
+ 
+ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ 
diff --git a/ACE/debianbuild/patches/14-autoconf-tao.dpatch b/ACE/debianbuild/patches/14-autoconf-tao.dpatch
new file mode 100644
index 00000000000..f13d0e95d50
--- /dev/null
+++ b/ACE/debianbuild/patches/14-autoconf-tao.dpatch
@@ -0,0 +1,54 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 14-autoconf-tao.dpatch by Thomas Girard <thomas.g.girard@free.fr>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: enhance TAO autoconf support
+
+@DPATCH@
+--- ACE_wrappers.orig/TAO/configure.ac
++++ ACE_wrappers/TAO/configure.ac
+@@ -124,10 +124,6 @@
+ AC_PROG_CXX
+ AC_PROG_CXXCPP
+ 
+-dnl Configure libtool
+-AC_DISABLE_STATIC
+-AC_PROG_LIBTOOL
+-
+ ACE_CHECK_THREADS
+ 
+ dnl Set the test language as C++
+@@ -190,6 +186,33 @@
+ TAO_ENABLE_EXAMPLES
+ TAO_ENABLE_TESTS
+ 
++dnl The user's/default C++ flags are stored in "CXXFLAGS."  We use
++dnl the variable "ACE_CXXFLAGS" to set the C++ flags we want.  At the end
++dnl of the configuration process we combine ACE_CXXFLAGS and CXXFLAGS
++dnl into CXXFLAGS (e.g., CXXFLAGS="$ACE_CXXFLAGS $CXXFLAGS").  CXXFLAGS
++dnl goes after ACE_CXXFLAGS so that the user's C++ flag command line
++dnl choices always override the configure script's choices.
++ACE_CXXFLAGS=""
++ACE_CFLAGS=""
++
++ACE_SET_COMPILER_FLAGS
++
++dnl Disable building of static libraries by default
++AC_DISABLE_STATIC
++
++dnl Enable Libtool module support
++AC_LIBTOOL_DLOPEN
++
++dnl Enable support for "clean" DLLs.
++AC_LIBTOOL_WIN32_DLL
++
++dnl Check for libtool and turn on Automake processing for Libtool
++AC_PROG_LIBTOOL
++
++CXXFLAGS="$ACE_CXXFLAGS $X_CFLAGS $CXXFLAGS"
++CFLAGS="$ACE_CFLAGS $X_CFLAGS $CFLAGS"
++CPPFLAGS="$ACE_CPPFLAGS $CPPFLAGS"
++LDFLAGS="$ACE_LDFLAGS $LDFLAGS"
+ 
+ dnl
+ dnl SECTION 16: AC_CONFIG_FILES([FILE...])
diff --git a/ACE/debianbuild/patches/15-fix-fltk-include.dpatch b/ACE/debianbuild/patches/15-fix-fltk-include.dpatch
new file mode 100644
index 00000000000..54dc8b6c348
--- /dev/null
+++ b/ACE/debianbuild/patches/15-fix-fltk-include.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 15-fix-fltk-include.dpatch by Raphael Bossek <bossekr@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Uses new FLTK header files.
+
+@DPATCH@
+
+--- ACE_wrappers/ace/FlReactor/FlReactor.cpp.orig	2004-10-25 00:08:59.932411424 +0200
++++ ACE_wrappers/ace/FlReactor/FlReactor.cpp	2004-10-25 00:09:08.272143592 +0200
+@@ -6,7 +6,7 @@
+ 
+ #if defined (ACE_HAS_FL)
+ 
+-#include /**/ <FL/Fl.h>
++#include /**/ <FL/Fl.H>
+ 
+ ACE_ALLOC_HOOK_DEFINE (ACE_FlReactor)
+ 
diff --git a/ACE/debianbuild/patches/17-protect-mpc-path.dpatch b/ACE/debianbuild/patches/17-protect-mpc-path.dpatch
new file mode 100644
index 00000000000..fb4ad963bfe
--- /dev/null
+++ b/ACE/debianbuild/patches/17-protect-mpc-path.dpatch
@@ -0,0 +1,17 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 17-protect-mpc-path.dpatch by Thomas Girard <thomas.g.girard@free.fr>
+##
+## DP: disable pattern metacharacters in path
+
+@DPATCH@
+--- ACE_wrappers.orig/MPC/modules/AutomakeWorkspaceCreator.pm
++++ ACE_wrappers/MPC/modules/AutomakeWorkspaceCreator.pm
+@@ -618,7 +618,7 @@
+   my($start) = $self->getstartdir();
+ 
+   ## Take off the starting directory
+-  $value =~ s/$start//;
++  $value =~ s/\Q$start\E//;
+   return $value;
+ }
+ 
diff --git a/ACE/debianbuild/patches/20-fix-iostream-detection.dpatch b/ACE/debianbuild/patches/20-fix-iostream-detection.dpatch
new file mode 100644
index 00000000000..4cd9e8cf059
--- /dev/null
+++ b/ACE/debianbuild/patches/20-fix-iostream-detection.dpatch
@@ -0,0 +1,128 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20-autoconf-fix-iostream.dpatch by Thomas Girard <thomas.g.girard@free.fr>
+##
+## DP: fix autotools iostream detection
+@DPATCH@
+--- ACE_wrappers.orig/configure.ac
++++ ACE_wrappers/configure.ac
+@@ -1013,11 +1013,9 @@
+ dnl Check for availablity of "new style" C++ stream headers
+ AC_CHECK_HEADERS([iomanip ios iostream istream ostream fstream streambuf],
+   ,
+-  [AC_DEFINE([ACE_USES_OLD_IOSTREAMS])])
+-
+-AC_CHECK_HEADER([iostream.h],
+-  [AC_CHECK_HEADER([fstream.h],,[AC_DEFINE([ACE_LACKS_IOSTREAM_TOTALLY])])],
+-  [AC_DEFINE([ACE_LACKS_IOSTREAM_TOTALLY])])
++  [AC_CHECK_HEADERS([iostream.h fstream.h],
++                    [AC_DEFINE([ACE_USES_OLD_IOSTREAMS])],
++                    [AC_DEFINE([ACE_LACKS_IOSTREAM_TOTALLY])])])
+ 
+ dnl Check if platform needs to #include <regexpr.h> for
+ dnl regular expression support
+@@ -2014,14 +2012,18 @@
+   [ace_cv_feature_char_right_shifts],
+   [
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
++#ifdef ACE_USES_OLD_IOSTREAM
+ #include <iostream.h>
++#else
++#include <iostream>
++#endif
+                   ]],[[
+ unsigned char a = 0;
+-cin >> a;
++std::cin >> a;
+ 
+ #ifndef ACE_LACKS_SIGNED_CHAR
+ signed char b = 0;
+-cin >> b;
++std::cin >> b;
+ #endif
+                   ]])],[
+                    ace_cv_feature_char_right_shifts=yes
+@@ -2036,14 +2038,18 @@
+   [ace_cv_feature_char_ptr_right_shifts],
+   [
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
++#ifdef ACE_USES_OLD_IOSTREAMS
+ #include <iostream.h>
++#else
++#include <iostream>
++#endif
+                   ]],[[
+ unsigned char * a = 0;
+-cin >> a;
++std::cin >> a;
+ 
+ #ifndef ACE_LACKS_SIGNED_CHAR
+ signed char * b = 0;
+-cin >> b;
++std::cin >> b;
+ #endif
+                   ]])],[
+                    ace_cv_feature_char_ptr_right_shifts=yes
+@@ -5823,9 +5829,17 @@
+ ACE_CACHE_CHECK([for iostream method ipfx()],
+   [ace_cv_feature_has_iostream_ipfx],[
+     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
++#ifdef ACE_USES_OLD_IOSTREAMS
+ #include <iostream.h>
++#else
++#include <iostream>
++#endif
+       ]], [[
++#ifdef ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB
++       std::cin.ipfx();
++#else
+        cin.ipfx();
++#endif
+       ]])],[
+        ace_cv_feature_has_iostream_ipfx=yes
+       ],[
+@@ -5837,9 +5851,17 @@
+ ACE_CACHE_CHECK([for line-buffered streambufs],
+   [ace_cv_feature_has_linebuffered_streambuf],[
+     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
++#ifdef ACE_USES_OLD_IOSTREAMS
+ #include <iostream.h>
++#else
++#include <iostream>
++#endif
+       ]], [[
++#ifdef ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB
++       std::cin.rdbuf()->linebuffered(1);
++#else
+        cin.rdbuf()->linebuffered(1);
++#endif
+       ]])],[
+        ace_cv_feature_has_linebuffered_streambuf=yes
+       ],[
+@@ -5851,9 +5873,17 @@
+ ACE_CACHE_CHECK([for unbuffered streambufs],
+   [ace_cv_feature_has_unbuffered_streambuf],[
+     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
++#ifdef ACE_USES_OLD_IOSTREAMS
+ #include <iostream.h>
++#else
++#include <iostream>
++#endif
+       ]], [[
++#ifdef ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB
++       std::cin.rdbuf()->unbuffered(1);
++#else
+        cin.rdbuf()->unbuffered(1);
++#endif
+       ]])],[
+        ace_cv_feature_has_unbuffered_streambuf=yes
+       ],[
+--- ACE_wrappers.orig/m4/aio.m4
++++ ACE_wrappers/m4/aio.m4
+@@ -64,7 +64,6 @@
+ #include <string.h>
+ #include <errno.h>
+ #include <stdio.h>
+-#include <iostream.h>
+ 
+ #include <aio.h>
+ 
diff --git a/ACE/debianbuild/patches/24-add-missing-headers.dpatch b/ACE/debianbuild/patches/24-add-missing-headers.dpatch
deleted file mode 100644
index 96dfc8a0ad1..00000000000
--- a/ACE/debianbuild/patches/24-add-missing-headers.dpatch
+++ /dev/null
@@ -1,197 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 24-add-missing-headers.dpatch by Thomas Girard <thomas.g.girard@free.fr>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: adds missing headers
-
-@DPATCH@
---- ACE_wrappers.orig/Kokyu/Kokyu.mpc
-+++ ACE_wrappers/Kokyu/Kokyu.mpc
-@@ -14,8 +14,14 @@
-     Kokyu_defs.cpp
-   }
- 
-+  Header_Files {
-+    kokyu_config.h
-+    kokyu_export.h
-+  }
-+
-   Template_Files {
-     Kokyu_dsrt.cpp
-+    DSRT_CV_Dispatcher_Impl_T.cpp
-     DSRT_Direct_Dispatcher_Impl_T.cpp
-     DSRT_Dispatcher_Impl_T.cpp
-     DSRT_Dispatch_Item_T.cpp
---- ACE_wrappers.orig/TAO/orbsvcs/orbsvcs/RTEvent_Serv.mpc
-+++ ACE_wrappers/TAO/orbsvcs/orbsvcs/RTEvent_Serv.mpc
-@@ -84,6 +84,13 @@
-     Event/EC_Thread_Flags.cpp
-   }
- 
-+  Header_Files {
-+    Event/event_serv_export.h
-+    Event/EC_Defaults.h
-+    Event/ECG_Defaults.h
-+    Event/ECG_Address_Server_Base.h
-+  }
-+
-   Template_Files {
-     Event/EC_Busy_Lock.cpp
-     Event/EC_Lifetime_Utils_T.cpp
---- ACE_wrappers.orig/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc
-+++ ACE_wrappers/TAO/orbsvcs/orbsvcs/RTCORBAEvent.mpc
-@@ -17,6 +17,7 @@
-   }
- 
-   Header_Files {
-+    Event/rtcorba_event_export.h
-   }
- 
-   Inline_Files {
---- ACE_wrappers.orig/TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc
-+++ ACE_wrappers/TAO/orbsvcs/orbsvcs/RTKokyuEvent.mpc
-@@ -19,6 +19,10 @@
-     }
-   }
- 
-+  Header_Files {
-+    Event/rtkokyu_event_export.h
-+  }
-+
-   Template_Files {
-   }
- }
---- ACE_wrappers.orig/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc
-+++ ACE_wrappers/TAO/orbsvcs/orbsvcs/RTSchedEvent.mpc
-@@ -20,6 +20,10 @@
-     }
-   }
- 
-+  Header_Files {
-+    Event/sched_event_export.h
-+  }
-+
-   Template_Files {
-   }
- }
---- ACE_wrappers.orig/TAO/orbsvcs/orbsvcs/RTEvent.mpc
-+++ ACE_wrappers/TAO/orbsvcs/orbsvcs/RTEvent.mpc
-@@ -26,6 +26,7 @@
- 
-   Header_Files {
-     Event_Utilities.h
-+    Event_Service_Constants.h
-     RtecDefaultEventDataC.h
-     RtecEventCommC.h
-     RtecEventChannelAdminC.h
---- ACE_wrappers.orig/TAO/orbsvcs/orbsvcs/FTORB.mpc
-+++ ACE_wrappers/TAO/orbsvcs/orbsvcs/FTORB.mpc
-@@ -22,6 +22,9 @@
- 
-   Header_Files {
-     FaultTolerance/FT_ORB_Utils_export.h
-+    FaultTolerance/FT_ORBInitializer.h
-+    FaultTolerance/ftconf.h
-+    FaultTolerance/FT_Service_Activate.h
-   }
- 
-   Pkgconfig_Files {
-@@ -53,6 +56,10 @@
-     }
-   }
- 
-+  Header_Files {
-+    FaultTolerance/FT_ClientORB_export.h
-+  }
-+
-   Template_Files {
-   }
- 
-@@ -80,6 +87,10 @@
-     }
-   }
- 
-+  Header_Files {
-+    FaultTolerance/FT_ServerORB_export.h
-+  }
-+
-   Template_Files {
-   }
- 
---- ACE_wrappers.orig/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc
-+++ ACE_wrappers/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc
-@@ -32,6 +32,11 @@
-     }
-   }
- 
-+  Header_Files {
-+    FtRtEvent/Utils/ScopeGuard.h
-+    FtRtEvent/Utils/ftrtevent_export.h
-+  }
-+
-   Template_Files {
-   }
- }
-@@ -50,6 +55,10 @@
-     }
-   }
- 
-+  Header_Files {
-+    FtRtEvent/ClientORB/ftrt_clientorb_export.h
-+  }
-+
-   Inline_Files {
-   }
- 
-@@ -79,5 +88,8 @@
- 
-   Header_Files {
-     FtRtEvent/EventChannel/ftrtec_export.h
-+    FtRtEvent/EventChannel/FTEC_Fault_Listener.h
-+    FtRtEvent/EventChannel/FTRTEC_ServiceActivate.h
-+    FtRtEvent/EventChannel/Fault_Listener.h
-   }
- }
---- ACE_wrappers.orig/TAO/orbsvcs/orbsvcs/HTIOP.mpc
-+++ ACE_wrappers/TAO/orbsvcs/orbsvcs/HTIOP.mpc
-@@ -26,4 +26,8 @@
-       HTIOP
-     }
-   }
-+
-+  Header_Files {
-+    HTIOP/HTIOP_Export.h
-+  }
- }
---- ACE_wrappers.orig/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc
-+++ ACE_wrappers/TAO/orbsvcs/orbsvcs/CosLoadBalancing.mpc
-@@ -41,6 +41,16 @@
-     }
-   }
- 
-+  Header_Files {
-+    LoadBalancing/LB_LoadAlertMap.h
-+    LoadBalancing/LB_LoadListMap.h
-+    LoadBalancing/LB_LoadMap.h
-+    LoadBalancing/LB_Location_Index_Map.h
-+    LoadBalancing/LB_MonitorMap.h
-+    LoadBalancing/LB_conf.h
-+    LoadBalancing/LoadBalancing_export.h
-+  }
-+
-   Template_Files {
-   }
- 
---- ACE_wrappers.orig/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc
-+++ ACE_wrappers/TAO/orbsvcs/orbsvcs/CosLifeCycle.mpc
-@@ -23,6 +23,10 @@
-     }
-   }
- 
-+  Header_Files {
-+    LifeCycle/lifecycle_export.h
-+  }
-+
-   Template_Files {
-   }
- 
diff --git a/ACE/debianbuild/patches/34-bts386713.dpatch b/ACE/debianbuild/patches/34-bts386713.dpatch
index e7106d58adf..cdf73439591 100644
--- a/ACE/debianbuild/patches/34-bts386713.dpatch
+++ b/ACE/debianbuild/patches/34-bts386713.dpatch
@@ -1,445 +1,165 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 34-bts386713.dpatch by Pau Garcia i Quiles <pgquiles@elpauer.org>
+## 34-bts386713.dpatch by Thomas Girard <thomas.g.girard@free.fr>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: load libraries with their complete name
+## DP: load libraries with their complete name.
 
 @DPATCH@
-diff -rupd ACE_wrappers.orig/TAO/CIAO/DAnCE/Starter/Starter.cpp ACE_wrappers/TAO/CIAO/DAnCE/Starter/Starter.cpp
---- ACE_wrappers.orig/TAO/CIAO/DAnCE/Starter/Starter.cpp	2009-12-14 00:42:19.502255634 +0100
-+++ ACE_wrappers/TAO/CIAO/DAnCE/Starter/Starter.cpp	2009-12-14 00:59:12.215257079 +0100
-@@ -562,7 +562,7 @@ Starter::initNodeManager (const char * n
-     if (0 == loader)
-       {
-         ACE_Service_Config::process_directive (ACE_DYNAMIC_SERVICE_DIRECTIVE ("NodeManager_Loader",
--                                                                              "DAnCE_NodeManager",
-+                                                                              "libDAnCE_NodeManager-0.7.5.so",
-                                                                               "_make_DAnCE_NodeManager_Module",
-                                                                               ""));
-         loader = ACE_Dynamic_Service<TAO_Object_Loader>::instance ("NodeManager_Loader");
-@@ -592,7 +592,7 @@ Starter::initExecutionManager()
-     DANCE_DEBUG ( (LM_TRACE, "[%M] Starting ExecutionManager...\n"));
-     ACE_Service_Config::process_directive (
-         ACE_DYNAMIC_SERVICE_DIRECTIVE ("ExecutionManager_Loader"
--            , "DAnCE_ExecutionManager"
-+            , "libDAnCE_ExecutionManager-0.7.5.so"
-             , "_make_DAnCE_ExecutionManager_Module"
-             , ""));
-     TAO_Object_Loader * loader = ACE_Dynamic_Service<TAO_Object_Loader>::instance ("ExecutionManager_Loader");
-@@ -623,7 +623,7 @@ Starter::runPlanLauncher()
-         DANCE_DEBUG ( (LM_TRACE, "[%M] Starting PlanLauncher...\n"));
-         ACE_Service_Config::process_directive (
-             ACE_DYNAMIC_SERVICE_DIRECTIVE ("PlanLauncher_Loader"
--                , "DAnCE_Plan_Launcher"
-+                , "libDAnCE_Plan_Launcher-0.7.5.so"
-                 , "_make_DAnCE_Plan_Launcher_Module"
-                 , ""));
-       }
-@@ -632,7 +632,7 @@ Starter::runPlanLauncher()
-         DANCE_DEBUG ( (LM_TRACE, "[%M] Starting PlanLauncherBase...\n"));
-         ACE_Service_Config::process_directive (
-             ACE_DYNAMIC_SERVICE_DIRECTIVE ("PlanLauncher_Loader"
--                , "DAnCE_Plan_Launcher_Base"
-+                , "libDAnCE_Plan_Launcher_Base-0.7.5.so"
-                 , "_make_DAnCE_Plan_Launcher_Base_Module"
-                 , ""));
-       }
-diff -rupd ACE_wrappers.orig/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp ACE_wrappers/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp
---- ACE_wrappers.orig/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp	2009-12-14 00:42:05.534162607 +0100
-+++ ACE_wrappers/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp	2009-12-14 00:59:12.215257079 +0100
-@@ -14,7 +14,7 @@ ACE_RCSID (PortableGroup,
+--- ACE_wrappers.orig/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp	2007-01-25 18:04:11.000000000 +0000
++++ ACE_wrappers/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp	2007-02-13 11:45:38.000000000 +0000
+@@ -14,7 +14,7 @@
  
  static const char pg_poa_factory_name[] = "TAO_GOA";
- static const ACE_TCHAR pg_poa_factory_directive[] = ACE_DYNAMIC_SERVICE_DIRECTIVE(
+ static const char pg_poa_factory_directive[] = ACE_DYNAMIC_SERVICE_DIRECTIVE(
 -  "TAO_GOA", "TAO_PortableGroup", "_make_TAO_PG_Object_Adapter_Factory", "");
-+  "TAO_GOA", "libTAO_PortableGroup-1.7.5.so", "_make_TAO_PG_Object_Adapter_Factory", "");
++  "TAO_GOA", "libTAO_PortableGroup-1.6.6.so", "_make_TAO_PG_Object_Adapter_Factory", "");
  
  TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  
-diff -rupd ACE_wrappers.orig/TAO/orbsvcs/tests/Bug_3486_Regression/server.cpp ACE_wrappers/TAO/orbsvcs/tests/Bug_3486_Regression/server.cpp
---- ACE_wrappers.orig/TAO/orbsvcs/tests/Bug_3486_Regression/server.cpp	2009-12-14 00:42:06.382162746 +0100
-+++ ACE_wrappers/TAO/orbsvcs/tests/Bug_3486_Regression/server.cpp	2009-12-14 00:59:12.215257079 +0100
-@@ -18,7 +18,7 @@ ACE_TCHAR const * const scpc_unloadOrb =
- 
- ACE_TCHAR const * const scpc_loadNamingService = ACE_DYNAMIC_SERVICE_DIRECTIVE(
-   "testNamingService",
--  "TAO_CosNaming_Serv",
-+  "libTAO_CosNaming_Serv-1.7.5.so",
-   "_make_TAO_Naming_Loader",
-   ""
- );
-diff -rupd ACE_wrappers.orig/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp ACE_wrappers/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp
---- ACE_wrappers.orig/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp	2009-12-14 00:42:06.030162565 +0100
-+++ ACE_wrappers/TAO/orbsvcs/tests/Notify/Bug_2926_Regression/server.cpp	2009-12-14 00:59:12.215257079 +0100
-@@ -20,7 +20,7 @@ ACE_TCHAR const * const scpc_unloadOrb =
- 
- ACE_TCHAR const * const scpc_loadNotifyService = ACE_DYNAMIC_SERVICE_DIRECTIVE(
-   "testNotifyService",
--  "TAO_CosNotification_Serv",
-+  "libTAO_CosNotification_Serv-1.7.5.so",
-   "_make_TAO_CosNotify_Service",
-   ""
- );
-diff -rupd ACE_wrappers.orig/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp ACE_wrappers/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp
---- ACE_wrappers.orig/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp	2009-12-14 00:42:06.026162764 +0100
-+++ ACE_wrappers/TAO/orbsvcs/tests/Notify/Bug_3252_Regression/server.cpp	2009-12-14 00:59:12.215257079 +0100
-@@ -24,7 +24,7 @@ ACE_TCHAR const * const scpc_unloadOrb =
- 
- ACE_TCHAR const * const scpc_loadNotifyService = ACE_DYNAMIC_SERVICE_DIRECTIVE(
-   "testNotifyService",
--  "TAO_CosNotification_Serv",
-+  "libTAO_CosNotification_Serv-1.7.5.so",
-   "_make_TAO_CosNotify_Service",
-   "-UseSeparateDispatchingORB 1"
- );
-diff -rupd ACE_wrappers.orig/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/server.cpp ACE_wrappers/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/server.cpp
---- ACE_wrappers.orig/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/server.cpp	2009-12-14 00:42:06.018162604 +0100
-+++ ACE_wrappers/TAO/orbsvcs/tests/Notify/Bug_3646b_Regression/server.cpp	2009-12-14 00:59:12.219164079 +0100
-@@ -20,7 +20,7 @@ ACE_TCHAR const * const scpc_unloadOrb =
- 
- ACE_TCHAR const * const scpc_loadNotifyService = ACE_DYNAMIC_SERVICE_DIRECTIVE(
-   "testNotifyService",
--  "TAO_Notify_Service",
-+  "libTAO_Notify_Service-1.7.5.so",
-   "_make_TAO_Notify_Service_Driver",
-   "-NoNameSvc -RunThreads 0"
- );
-diff -rupd ACE_wrappers.orig/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp ACE_wrappers/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp
---- ACE_wrappers.orig/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp	2009-12-14 00:42:06.046162766 +0100
-+++ ACE_wrappers/TAO/orbsvcs/tests/Notify/Bug_3646c_Regression/server.cpp	2009-12-14 00:59:12.219164079 +0100
-@@ -23,7 +23,7 @@ ACE_TCHAR const * const scpc_unloadOrb =
- 
- ACE_TCHAR scpc_loadNotifyService[max_length] = ACE_DYNAMIC_SERVICE_DIRECTIVE(
-   "testNotifyService",
--  "TAO_Notify_Service",
-+  "libTAO_Notify_Service-1.7.5.so",
-   "_make_TAO_Notify_Service_Driver",
-   "-Channel -ChannelName Channel1 -ChannelName Channel2 -RunThreads 0 -ORBInitRef NameService=iioploc://%s:%s/NameService -IORoutput %s"
- );
-diff -rupd ACE_wrappers.orig/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/server.cpp ACE_wrappers/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/server.cpp
---- ACE_wrappers.orig/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/server.cpp	2009-12-14 00:42:06.074162491 +0100
-+++ ACE_wrappers/TAO/orbsvcs/tests/Notify/Bug_3646d_Regression/server.cpp	2009-12-14 00:59:12.219164079 +0100
-@@ -20,7 +20,7 @@ ACE_TCHAR const * const scpc_unloadOrb =
- 
- ACE_TCHAR const * const scpc_loadNotifyService = ACE_DYNAMIC_SERVICE_DIRECTIVE(
-   "testNotifyService",
--  "TAO_Notify_Service",
-+  "libTAO_Notify_Service-1.7.5.so",
-   "_make_TAO_Notify_Service_Driver",
-   "-Channel -ChannelName Channel1 -ChannelName Channel2 -RunThreads 10 -ORBInitRef NameService=file://naming.ior -IORoutput notify.ior"
- );
-@@ -29,7 +29,7 @@ ACE_TCHAR const * const scpc_unloadNotif
- 
- ACE_TCHAR const * const scpc_loadNameService = ACE_DYNAMIC_SERVICE_DIRECTIVE(
-   "testNamingService",
--  "TAO_CosNaming_Serv",
-+  "libTAO_CosNaming_Serv-1.7.5.so",
-   "_make_TAO_Naming_Loader",
-   "testNameService testNameService -ORBId testDllOrb -m 0 -o naming.ior"
- );
-diff -rupd ACE_wrappers.orig/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/server.cpp ACE_wrappers/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/server.cpp
---- ACE_wrappers.orig/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/server.cpp	2009-12-14 00:42:06.038162926 +0100
-+++ ACE_wrappers/TAO/orbsvcs/tests/Notify/Bug_3663_Regression/server.cpp	2009-12-14 00:59:12.219164079 +0100
-@@ -20,7 +20,7 @@ ACE_TCHAR const * const scpc_unloadOrb =
- 
- ACE_TCHAR const * const scpc_loadNotifyService = ACE_DYNAMIC_SERVICE_DIRECTIVE(
-   "testNotifyService",
--  "TAO_Notify_Service",
-+  "libTAO_Notify_Service-1.7.5.so",
-   "_make_TAO_Notify_Service_Driver_INCORRECT",
-   "-NoNameSvc -RunThreads 0"
- );
-diff -rupd ACE_wrappers.orig/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp ACE_wrappers/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp
---- ACE_wrappers.orig/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp	2009-12-14 00:42:06.062163609 +0100
-+++ ACE_wrappers/TAO/orbsvcs/tests/Notify/Bug_3688b_Regression/server.cpp	2009-12-14 00:59:12.219164079 +0100
-@@ -24,7 +24,7 @@ ACE_TCHAR const * const scpc_unloadOrb =
- 
- ACE_TCHAR const * const scpc_loadNameService = ACE_DYNAMIC_SERVICE_DIRECTIVE(
-   "testNamingService",
--  "TAO_CosNaming_Serv",
-+  "libTAO_CosNaming_Serv-1.7.5.so",
-   "_make_TAO_Naming_Loader",
-   "testNameService testNameService -ORBId testDllOrb -m 0 -o naming.ior"
- );
-@@ -34,7 +34,7 @@ ACE_TCHAR const * const scpc_unloadNameS
- 
- ACE_TCHAR const * const scpc_loadNotifyService = ACE_DYNAMIC_SERVICE_DIRECTIVE(
-   "testNotifyService",
--  "TAO_Notify_Service",
-+  "libTAO_Notify_Service-1.7.5.so",
-   "_make_TAO_Notify_Service_Driver",
-   "-Channel -ChannelName Channel1 -ChannelName Channel2 -RunThreads 1 -ORBInitRef NameService=file://naming.ior -IORoutput notify.ior"
- );
-diff -rupd ACE_wrappers.orig/TAO/tao/Codeset/Codeset_Manager_i.cpp ACE_wrappers/TAO/tao/Codeset/Codeset_Manager_i.cpp
---- ACE_wrappers.orig/TAO/tao/Codeset/Codeset_Manager_i.cpp	2009-12-14 00:42:09.538164079 +0100
-+++ ACE_wrappers/TAO/tao/Codeset/Codeset_Manager_i.cpp	2009-12-14 00:59:12.219164079 +0100
-@@ -358,7 +358,7 @@ TAO_Codeset_Manager_i::open(TAO_ORB_Core
-   if (fact == 0)
-     ACE_Service_Config::process_directive
-       (ACE_DYNAMIC_SERVICE_DIRECTIVE ("UTF8_Latin1_Factory",
--                                      "TAO_Codeset",
-+                                      "libTAO_Codeset-1.7.5.so",
-                                       "_make_TAO_UTF8_Latin1_Factory",
-                                       ""));
-   else
-@@ -375,7 +375,7 @@ TAO_Codeset_Manager_i::open(TAO_ORB_Core
-   if (fact == 0)
-     ACE_Service_Config::process_directive
-       (ACE_DYNAMIC_SERVICE_DIRECTIVE ("UTF16_BOM_Factory",
--                                      "TAO_Codeset",
-+                                      "libTAO_Codeset-1.7.5.so",
-                                       "_make_TAO_UTF16_BOM_Factory",
-                                       ""));
-   else
-diff -rupd ACE_wrappers.orig/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp ACE_wrappers/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp
---- ACE_wrappers.orig/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp	2009-12-14 00:42:09.426163271 +0100
-+++ ACE_wrappers/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp	2009-12-14 00:59:12.219164079 +0100
-@@ -13,7 +13,7 @@ ACE_RCSID (CSD,
- static const ACE_TCHAR csd_poa_factory_directive[] =
-   ACE_DYNAMIC_SERVICE_DIRECTIVE(
-     "TAO_CSD_Object_Adapter_Factory",
--    "TAO_CSD_Framework",
-+    "libTAO_CSD_Framework-1.7.5.so",
-     "_make_TAO_CSD_Object_Adapter_Factory",
-     "");
- 
-diff -rupd ACE_wrappers.orig/TAO/tao/ORB_Core.cpp ACE_wrappers/TAO/tao/ORB_Core.cpp
---- ACE_wrappers.orig/TAO/tao/ORB_Core.cpp	2009-12-14 00:42:09.538164079 +0100
-+++ ACE_wrappers/TAO/tao/ORB_Core.cpp	2009-12-14 00:59:12.219164079 +0100
-@@ -1643,7 +1643,7 @@ TAO_ORB_Core::policy_factory_registry_i 
+--- ACE_wrappers.orig/TAO/tao/ORB_Core.cpp	2007-01-25 19:59:59.000000000 +0000
++++ ACE_wrappers/TAO/tao/ORB_Core.cpp	2007-02-13 12:33:58.000000000 +0000
+@@ -1596,7 +1596,7 @@
      {
        this->configuration ()->process_directive (
          ACE_DYNAMIC_SERVICE_DIRECTIVE("PolicyFactory_Loader",
 -                                      "TAO_PI",
-+                                      "libTAO_PI-1.7.5.so",
++                                      "libTAO_PI-1.6.6.so",
                                        "_make_TAO_PolicyFactory_Loader",
                                        ""));
        loader =
-@@ -1695,7 +1695,7 @@ TAO_ORB_Core::orbinitializer_registry_i 
+@@ -1635,7 +1635,7 @@
      {
-       this->configuration ()->process_directive (
+       config->process_directive (
          ACE_DYNAMIC_SERVICE_DIRECTIVE ("ORBInitializer_Registry",
 -                                       "TAO_PI",
-+                                       "libTAO_PI-1.7.5.so",
++                                       "libTAO_PI-1.6.6.so",
                                         "_make_ORBInitializer_Registry",
                                         ""));
        this->orbinitializer_registry_ =
-@@ -2429,7 +2429,7 @@ TAO_ORB_Core::resolve_typecodefactory_i 
+@@ -2432,7 +2432,7 @@
      {
        this->configuration ()->process_directive
          (ACE_DYNAMIC_SERVICE_DIRECTIVE("TypeCodeFactory",
 -                                       "TAO_TypeCodeFactory",
-+                                       "libTAO_TypeCodeFactory-1.7.5.so",
++                                       "libTAO_TypeCodeFactory-1.6.6.so",
                                         "_make_TAO_TypeCodeFactory_Loader",
                                         ""));
        loader =
-@@ -2462,7 +2462,7 @@ TAO_ORB_Core::resolve_codecfactory_i (vo
+@@ -2465,7 +2465,7 @@
      {
        this->configuration()->process_directive
          (ACE_DYNAMIC_SERVICE_DIRECTIVE("CodecFactory",
 -                                       "TAO_CodecFactory",
-+                                       "libTAO_CodecFactory-1.7.5.so",
++                                       "libTAO_CodecFactory-1.6.6.so",
                                         "_make_TAO_CodecFactory_Loader",
                                         ""));
        loader =
-@@ -2489,7 +2489,7 @@ TAO_ORB_Core::resolve_compression_manage
+@@ -2492,7 +2492,7 @@
      {
        this->configuration()->process_directive
          (ACE_DYNAMIC_SERVICE_DIRECTIVE("Compression",
 -                                       "TAO_Compression",
-+                                       "libTAO_Compression-1.7.5.so",
++                                       "libTAO_Compression-1.6.6.so",
                                         "_make_TAO_Compression_Loader",
                                         ""));
        loader =
-@@ -2515,7 +2515,7 @@ TAO_ORB_Core::resolve_poa_current_i (voi
+@@ -2519,7 +2519,7 @@
      {
        this->configuration()->process_directive
          (ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_POA_Current_Factory",
 -                                       "TAO_PortableServer",
-+                                       "libTAO_PortableServer-1.7.5.so",
++                                       "libTAO_PortableServer-1.6.6.so",
                                         "_make_TAO_POA_Current_Factory",
                                         ""));
        loader =
-@@ -2544,7 +2544,7 @@ TAO_ORB_Core::resolve_picurrent_i (void)
+@@ -2549,7 +2549,7 @@
      {
        this->configuration ()->process_directive
          (ACE_DYNAMIC_SERVICE_DIRECTIVE("PICurrent_Loader",
 -                                       "TAO_PI",
-+                                       "libTAO_PI-1.7.5.so",
++                                       "libTAO_PI-1.6.6.so",
                                         "_make_TAO_PICurrent_Loader",
                                         ""));
        loader =
-@@ -2575,7 +2575,7 @@ TAO_ORB_Core::resolve_dynanyfactory_i (v
+@@ -2581,7 +2581,7 @@
      {
        this->configuration ()->process_directive
          (ACE_DYNAMIC_SERVICE_DIRECTIVE("DynamicAny_Loader",
 -                                       "TAO_DynamicAny",
-+                                       "libTAO_DynamicAny-1.7.5.so",
++                                       "libTAO_DynamicAny-1.6.6.so",
                                         "_make_TAO_DynamicAny_Loader",
                                         ""));
        loader =
-@@ -2602,7 +2602,7 @@ TAO_ORB_Core::resolve_iormanipulation_i 
+@@ -2609,7 +2609,7 @@
      {
        this->configuration()->process_directive
          (ACE_DYNAMIC_SERVICE_DIRECTIVE("IORManip_Loader",
 -                                       "TAO_IORManip",
-+                                       "libTAO_IORManip-1.7.5.so",
++                                       "libTAO_IORManip-1.6.6.so",
                                         "_make_TAO_IORManip_Loader",
                                         ""));
        loader =
-@@ -2628,7 +2628,7 @@ TAO_ORB_Core::resolve_ior_table_i (void)
+@@ -2636,7 +2636,7 @@
      {
        this->configuration ()->process_directive
          (ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_IORTable",
 -                                       "TAO_IORTable",
-+                                       "libTAO_IORTable-1.7.5.so",
++                                       "libTAO_IORTable-1.6.6.so",
                                         "_make_TAO_Table_Adapter_Factory",
                                         ""));
        factory =
-@@ -2663,7 +2663,7 @@ TAO_ORB_Core::resolve_monitor_i (void)
-     {
-       this->configuration ()->process_directive
-         (ACE_DYNAMIC_SERVICE_DIRECTIVE("Monitor_Init",
--                                       "TAO_Monitor",
-+                                       "libTAO_Monitor-1.7.5.so",
-                                        "_make_TAO_Monitor_Init",
-                                        ""));
-       loader =
-diff -rupd ACE_wrappers.orig/TAO/tao/ORBInitializer_Registry.cpp ACE_wrappers/TAO/tao/ORBInitializer_Registry.cpp
---- ACE_wrappers.orig/TAO/tao/ORBInitializer_Registry.cpp	2009-12-14 00:42:09.662163328 +0100
-+++ ACE_wrappers/TAO/tao/ORBInitializer_Registry.cpp	2009-12-14 00:59:12.219164079 +0100
-@@ -53,7 +53,7 @@ namespace PortableInterceptor
+--- ACE_wrappers.orig/TAO/tao/ORBInitializer_Registry.cpp	2007-01-24 16:37:36.000000000 +0000
++++ ACE_wrappers/TAO/tao/ORBInitializer_Registry.cpp	2007-02-13 12:30:53.000000000 +0000
+@@ -57,7 +57,7 @@
        {
          ACE_Service_Config::process_directive (
            ACE_DYNAMIC_SERVICE_DIRECTIVE("ORBInitializer_Registry",
 -                                        "TAO_PI",
-+                                        "libTAO_PI-1.7.5.so",
++                                        "libTAO_PI-1.6.6.so",
                                          "_make_ORBInitializer_Registry",
                                          ""));
          orbinitializer_registry_ =
-diff -rupd ACE_wrappers.orig/TAO/tao/params.cpp ACE_wrappers/TAO/tao/params.cpp
---- ACE_wrappers.orig/TAO/tao/params.cpp	2009-12-14 00:42:09.170163692 +0100
-+++ ACE_wrappers/TAO/tao/params.cpp	2009-12-14 00:59:12.259162724 +0100
-@@ -59,7 +59,7 @@ TAO_ORB_Parameters::TAO_ORB_Parameters (
-   , poa_factory_name_ ("TAO_Object_Adapter_Factory")
-   , poa_factory_directive_
-       (ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_Object_Adapter_Factory",
--                                     "TAO_PortableServer",
-+                                     "libTAO_PortableServer-1.7.5.so",
-                                      "_make_TAO_Object_Adapter_Factory",
-                                      ""))
-   , forward_invocation_on_object_not_exist_ (false)
-diff -rupd ACE_wrappers.orig/TAO/tao/PI/ORBInitInfo.cpp ACE_wrappers/TAO/tao/PI/ORBInitInfo.cpp
---- ACE_wrappers.orig/TAO/tao/PI/ORBInitInfo.cpp	2009-12-14 00:42:09.534163639 +0100
-+++ ACE_wrappers/TAO/tao/PI/ORBInitInfo.cpp	2009-12-14 00:59:12.223163120 +0100
-@@ -121,7 +121,7 @@ TAO_ORBInitInfo::codec_factory (void)
+--- ACE_wrappers.orig/TAO/tao/PI/ORBInitInfo.cpp	2007-01-24 18:43:15.000000000 +0000
++++ ACE_wrappers/TAO/tao/PI/ORBInitInfo.cpp	2007-02-13 12:30:07.000000000 +0000
+@@ -128,7 +128,7 @@
          {
            ACE_Service_Config::process_directive (
              ACE_DYNAMIC_SERVICE_DIRECTIVE("CodecFactory",
 -                                          "TAO_CodecFactory",
-+                                          "libTAO_CodecFactory-1.7.5.so",
++                                          "libTAO_CodecFactory-1.6.6.so",
                                            "_make_TAO_CodecFactory_Loader",
                                            ""));
            loader =
-diff -rupd ACE_wrappers.orig/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp ACE_wrappers/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp
---- ACE_wrappers.orig/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp	2009-12-14 00:42:09.422163150 +0100
-+++ ACE_wrappers/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp	2009-12-14 00:59:12.223163120 +0100
-@@ -83,7 +83,7 @@ namespace TAO
+--- ACE_wrappers.orig/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp	2007-01-24 16:37:36.000000000 +0000
++++ ACE_wrappers/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp	2007-02-13 11:46:59.000000000 +0000
+@@ -85,7 +85,7 @@
              {
                ACE_Service_Config::process_directive (
                  ACE_DYNAMIC_SERVICE_DIRECTIVE(
 -                  "ImR_Client_Adapter", "TAO_ImR_Client",
-+                  "ImR_Client_Adapter", "libTAO_ImR_Client-1.7.5.so",
++                  "ImR_Client_Adapter", "libTAO_ImR_Client-1.6.6.so",
                    "_make_ImR_Client_Adapter_Impl", ""));
  
                adapter =
-diff -rupd ACE_wrappers.orig/TAO/tao/RTCORBA/RT_ORBInitializer.cpp ACE_wrappers/TAO/tao/RTCORBA/RT_ORBInitializer.cpp
---- ACE_wrappers.orig/TAO/tao/RTCORBA/RT_ORBInitializer.cpp	2009-12-14 00:42:09.774162647 +0100
-+++ ACE_wrappers/TAO/tao/RTCORBA/RT_ORBInitializer.cpp	2009-12-14 00:59:12.223163120 +0100
-@@ -41,7 +41,7 @@ static const char rt_poa_factory_name[] 
- static const ACE_TCHAR rt_poa_factory_directive[] =
-   ACE_DYNAMIC_SERVICE_DIRECTIVE(
-     "TAO_RT_Object_Adapter_Factory",
--    "TAO_RTPortableServer",
-+    "libTAO_RTPortableServer-1.7.5.so",
-     "_make_TAO_RT_Object_Adapter_Factory",
-     "");
- 
-diff -rupd ACE_wrappers.orig/TAO/tao/TAO_Internal.cpp ACE_wrappers/TAO/tao/TAO_Internal.cpp
---- ACE_wrappers.orig/TAO/tao/TAO_Internal.cpp	2009-12-14 00:42:10.002163319 +0100
-+++ ACE_wrappers/TAO/tao/TAO_Internal.cpp	2009-12-14 00:59:12.223163120 +0100
-@@ -534,7 +534,7 @@ namespace
+--- ACE_wrappers.orig/TAO/tao/TAO_Internal.cpp	2006-12-28 11:46:39.000000000 +0000
++++ ACE_wrappers/TAO/tao/TAO_Internal.cpp	2007-02-13 11:47:57.000000000 +0000
+@@ -484,7 +484,7 @@
              ACE_Service_Config::process_directive (
                ACE_DYNAMIC_SERVICE_DIRECTIVE (
                  "TAO_Codeset",
 -                "TAO_Codeset",
-+                "libTAO_Codeset-1.7.5.so",
++                "libTAO_Codeset-1.6.6.so",
                  "_make_TAO_Codeset_Manager_Factory",
                  ""));
  
-diff -rupd ACE_wrappers.orig/TAO/tests/DLL_ORB/client.cpp ACE_wrappers/TAO/tests/DLL_ORB/client.cpp
---- ACE_wrappers.orig/TAO/tests/DLL_ORB/client.cpp	2009-12-14 00:42:12.254247172 +0100
-+++ ACE_wrappers/TAO/tests/DLL_ORB/client.cpp	2009-12-14 01:19:12.378162468 +0100
-@@ -30,7 +30,7 @@ ACE_TMAIN(int, ACE_TCHAR *[])
-   if (ACE_Service_Config::process_directive (
-         ACE_DYNAMIC_SERVICE_DIRECTIVE(
-           "Client_Module",
--          "Test_Client_Module",
-+          "libTest_Client_Module-1.7.5.so",
-           "_make_Test_Client_Module",
-           "-k file://test.ior")) != 0)
-     {
-diff -rupd ACE_wrappers.orig/TAO/tests/ORB_Local_Config/Bug_2612/Test.cpp ACE_wrappers/TAO/tests/ORB_Local_Config/Bug_2612/Test.cpp
---- ACE_wrappers.orig/TAO/tests/ORB_Local_Config/Bug_2612/Test.cpp	2009-12-14 00:42:13.546163086 +0100
-+++ ACE_wrappers/TAO/tests/ORB_Local_Config/Bug_2612/Test.cpp	2009-12-14 01:26:03.054181888 +0100
-@@ -13,7 +13,7 @@ ACE_TCHAR const * const scpc_loadOrb = /
-   // each parameter CANNOT be split into multiple quoted strings "line1" "nextline" with the expectation that
-   // they will be join together. Hence the long parameter 4.
-   ACE_DYNAMIC_SERVICE_DIRECTIVE ("testDllOrb",
--                                 "DllOrb",
-+                                 "DllOrb.so",
-                                  "_make_DllOrb",
- "DllOrb -t 1 -ORBGestalt Local -ORBDebugLevel 3 -ORBId testORB -ORBInitRef NameService=file:///tmp/test-ns.ior -ORBDottedDecimalAddresses 1"
-                                  );
-diff -rupd ACE_wrappers.orig/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp ACE_wrappers/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp
---- ACE_wrappers.orig/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp	2009-12-14 00:42:13.650166654 +0100
-+++ ACE_wrappers/TAO/tests/ORB_Local_Config/Service_Dependency/Test.cpp	2009-12-14 00:59:12.259162724 +0100
-@@ -153,7 +153,7 @@ testORBInitializer_Registry (int , ACE_T
-     {
-       one->process_directive (
-         ACE_DYNAMIC_SERVICE_DIRECTIVE("ORBInitializer_Registry",
--                                      "TAO_PI",
-+                                      "libTAO_PI-1.7.5.so",
-                                       "_make_ORBInitializer_Registry",
-                                       ""));
-       oir =
-@@ -252,7 +252,7 @@ testORBInitializer_Registry (int , ACE_T
- 
-   one->process_directive
-     (ACE_DYNAMIC_SERVICE_DIRECTIVE("PolicyFactory_Loader",
--                                   "TAO_PI",
-+                                   "libTAO_PI-1.7.5.so",
-                                    "_make_TAO_PolicyFactory_Loader",
-                                    ""));
- 
-@@ -292,7 +292,7 @@ testServiceDependency (int , ACE_TCHAR *
+--- ACE_wrappers.orig/TAO/tao/RTCORBA/RT_ORBInitializer.cpp	2007-06-28 18:53:33.000000000 +0000
++++ ACE_wrappers/TAO/tao/RTCORBA/RT_ORBInitializer.cpp	2007-06-28 18:55:43.000000000 +0000
+@@ -40,7 +40,7 @@
+ static const ACE_TCHAR rt_poa_factory_directive[] =
+   ACE_DYNAMIC_SERVICE_DIRECTIVE(
+     "TAO_RT_Object_Adapter_Factory",
+-    "TAO_RTPortableServer",
++    "libTAO_RTPortableServer-1.6.6.so",
+     "_make_TAO_RT_Object_Adapter_Factory",
+     "");
  
-     int result = one->process_directive
-       (ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_Codeset",
--                                     "TAO_Codeset",
-+                                     "libTAO_Codeset-1.7.5.so",
-                                      "_make_TAO_Codeset_Manager_Factory",
-                                      ""));
-     if (result != 0)
-diff -rupd ACE_wrappers.orig/TAO/tests/TransportCurrent/Framework/simple.cpp ACE_wrappers/TAO/tests/TransportCurrent/Framework/simple.cpp
---- ACE_wrappers.orig/TAO/tests/TransportCurrent/Framework/simple.cpp	2009-12-14 00:42:10.274245769 +0100
-+++ ACE_wrappers/TAO/tests/TransportCurrent/Framework/simple.cpp	2009-12-14 00:59:12.259162724 +0100
-@@ -59,7 +59,7 @@ testCurrentLoader (int, char *[])
- #if !defined (TAO_AS_STATIC_LIBS)
-           int ret = ACE_Service_Config::process_directive
-             (ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_Transport_Current_Loader",
--                                           "TAO_Transport_Current",
-+                                           "libTAO_Transport_Current-1.7.5.so",
-                                            "_make_TAO_Transport_Current_Loader",
-                                            ""));
-           ACE_ASSERT (ret == 0);
diff --git a/ACE/debianbuild/patches/90-patch-mpc-basedir.dpatch b/ACE/debianbuild/patches/90-patch-mpc-basedir.dpatch
deleted file mode 100644
index 594844a615b..00000000000
--- a/ACE/debianbuild/patches/90-patch-mpc-basedir.dpatch
+++ /dev/null
@@ -1,45 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 90-patch-mpc-basedir.dpatch by  <pgquiles@elpauer.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Set MPC base dir directly, no need to fix the tests performed by ACE 
-## DP: because there is no Debian/VMS (yeat :-)
-
-@DPATCH@
-
-diff -rupd ACE_wrappers.orig/bin/mpc.pl ACE_wrappers/bin/mpc.pl
---- ACE_wrappers.orig/bin/mpc.pl	2009-11-23 01:19:57.000000000 +0100
-+++ ACE_wrappers/bin/mpc.pl	2009-11-24 00:24:27.000000000 +0100
-@@ -20,13 +20,7 @@ use FindBin;
- use File::Spec;
- use File::Basename;
- 
--my($basePath) = $FindBin::RealBin;
--my($baseName) = $FindBin::RealScript;
--if ($^O eq 'VMS') {
--  $basePath = File::Spec->rel2abs(dirname($0)) if ($basePath eq '');
--  $basePath = VMS::Filespec::unixify($basePath);
--}
--$basePath .= '/MakeProjectCreator';
-+my($basePath) = '/usr/share/ace/bin/MakeProjectCreator';
- 
- my($mpcroot) = $ENV{MPC_ROOT};
- my($mpcpath) = (defined $mpcroot ? $mpcroot :
-diff -rupd ACE_wrappers.orig/bin/mwc.pl ACE_wrappers/bin/mwc.pl
---- ACE_wrappers.orig/bin/mwc.pl	2009-11-23 01:19:57.000000000 +0100
-+++ ACE_wrappers/bin/mwc.pl	2009-11-24 00:23:44.000000000 +0100
-@@ -20,13 +20,7 @@ use FindBin;
- use File::Spec;
- use File::Basename;
- 
--my($basePath) = $FindBin::RealBin;
--my($baseName) = $FindBin::RealScript;
--if ($^O eq 'VMS') {
--  $basePath = File::Spec->rel2abs(dirname($0)) if ($basePath eq '');
--  $basePath = VMS::Filespec::unixify($basePath);
--}
--$basePath .= '/MakeProjectCreator';
-+my($basePath) = '/usr/share/ace/bin/MakeProjectCreator';
- 
- my($mpcroot) = $ENV{MPC_ROOT};
- my($mpcpath) = (defined $mpcroot ? $mpcroot :
diff --git a/ACE/debianbuild/patches/91-patch-dg-basedir.dpatch b/ACE/debianbuild/patches/91-patch-dg-basedir.dpatch
deleted file mode 100644
index 0703e3e6a38..00000000000
--- a/ACE/debianbuild/patches/91-patch-dg-basedir.dpatch
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 91-patch-dg-basedir.dpatch by Thomas Girard <thomas.g.girard@free.fr>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix path to DependencyGenerator.
-
-@DPATCH@
---- ACE_wrappers.orig/bin/depgen.pl
-+++ ACE_wrappers/bin/depgen.pl
-@@ -19,12 +19,8 @@
- use File::Spec;
- use File::Basename;
- 
--my($basePath) = $FindBin::RealBin;
--if ($^O eq 'VMS') {
--  $basePath = File::Spec->rel2abs(dirname($0)) if ($basePath eq '');
--  $basePath = VMS::Filespec::unixify($basePath);
--}
--unshift(@INC, $basePath . '/DependencyGenerator');
-+my($basePath) = '/usr/share/ace/bin/DependencyGenerator';
-+unshift(@INC, $basePath);
- 
- require DependencyEditor;
- 
diff --git a/ACE/debianbuild/patches/95-build-ace-for-tao.dpatch b/ACE/debianbuild/patches/95-build-ace-for-tao.dpatch
deleted file mode 100644
index 61c3261dce7..00000000000
--- a/ACE/debianbuild/patches/95-build-ace-for-tao.dpatch
+++ /dev/null
@@ -1,29 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 95-build-ace-for-tao.dpatch by  <pgquiles@elpauer.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Always define nobase_include_HEADERS, regardless of BUILD_ACE_FOR_TAO
-
-@DPATCH@
-
-diff -rupd ACE_wrappers.orig/ace/Makefile.am ACE_wrappers/ace/Makefile.am
---- ACE_wrappers.orig/ace/Makefile.am	2009-11-05 22:47:49.000000000 +0100
-+++ ACE_wrappers/ace/Makefile.am	2009-11-06 00:35:29.000000000 +0100
-@@ -27,7 +27,7 @@ nobase_include_HEADERS =
- 
- ## Makefile.ACE.am
- 
--if !BUILD_ACE_FOR_TAO
-+## if !BUILD_ACE_FOR_TAO
- 
- lib_LTLIBRARIES += libACE.la
- 
-@@ -1261,7 +1261,7 @@ CLEANFILES += \
- ACE.pc: ${top_builddir}/config.status ${srcdir}/ACE.pc.in
- 	${top_builddir}/config.status --file $@:${srcdir}/ACE.pc.in
- 
--endif !BUILD_ACE_FOR_TAO
-+## endif !BUILD_ACE_FOR_TAO
- 
- EXTRA_DIST = \
-   ACE.pc.in \
diff --git a/ACE/debianbuild/rules b/ACE/debianbuild/rules
index 5602c1aed85..a3650fa1d82 100644
--- a/ACE/debianbuild/rules
+++ b/ACE/debianbuild/rules
@@ -52,6 +52,7 @@ export ACE_ROOT := $(shell pwd)/$(ACE_SUBDIR)
 export TAO_ROOT := $(ACE_ROOT)/TAO
 export CIAO_ROOT := $(TAO_ROOT)/CIAO
 export DANCE_ROOT := $(CIAO_ROOT)/DAnCE
+export DDS_ROOT := $(CIAO_ROOT)/connectors/dds4ccm
 export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH):$(ACE_ROOT)/lib
 export QTDIR := /usr/share/qt4
 
@@ -194,6 +195,13 @@ install: build
 	$(MAKE) -C objdir install DESTDIR=$(CURDIR)/$(DT)
 	$(MAKE) -C objdir/TAO install DESTDIR=$(CURDIR)/$(DT)
 
+#	Rename the catior utility, it already exists in another package
+	mv $(DT)/usr/bin/catior $(DT)/usr/bin/tao-catior
+
+#       Multiple README
+	cp $(TAO_ROOT)/utils/catior/README $(TAO_ROOT)/utils/catior/README.catior
+	cp $(TAO_ROOT)/utils/nslist/README $(TAO_ROOT)/utils/nslist/README.nslist
+
 #	We provide scripts replacement for tao_idl and tao_ifr ; they
 #	automatically define ACE_ROOT and TAO_ROOT
 	mv $(DT)/usr/bin/tao_idl $(DT)/usr/bin/tao_idl.real
diff --git a/ACE/docs/Download.html b/ACE/docs/Download.html
index 8c9bd0148df..0dcea8645ed 100644
--- a/ACE/docs/Download.html
+++ b/ACE/docs/Download.html
@@ -84,101 +84,101 @@ 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-5.7.6.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.7.6.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.7.5.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.7.5.tar.gz">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.7.6.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.7.6.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.7.5.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.7.5.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-5.7.6.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.7.6.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.7.5.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.7.5.tar.bz2">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.7.6.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.7.6.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.7.5.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.7.5.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-5.7.6.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.7.6.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.7.5.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-5.7.5.zip">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.7.6.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.7.6.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.7.5.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO+CIAO-src-5.7.5.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-5.7.6.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-5.7.6.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-5.7.5.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-5.7.5.tar.gz">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.7.6.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.7.6.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.7.5.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.7.5.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-5.7.6.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-5.7.6.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-5.7.5.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-5.7.5.tar.bz2">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.7.6.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.7.6.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.7.5.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.7.5.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-5.7.6.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-5.7.6.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-5.7.5.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-5.7.5.zip">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.7.6.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.7.6.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.7.5.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE+TAO-src-5.7.5.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-5.7.6.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-5.7.6.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-5.7.5.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-5.7.5.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-5.7.6.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-5.7.6.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-5.7.5.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-5.7.5.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-5.7.6.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-5.7.6.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-html-5.7.5.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-html-5.7.5.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-5.7.6.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-5.7.6.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-5.7.5.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-5.7.5.tar.gz">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.7.6.tar.gz">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.7.6.tar.gz">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.7.5.tar.gz">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.7.5.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-5.7.6.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-5.7.6.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-5.7.5.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-5.7.5.tar.bz2">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.7.6.tar.bz2">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.7.6.tar.bz2">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.7.5.tar.bz2">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.7.5.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-5.7.6.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-5.7.6.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-5.7.5.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-5.7.5.zip">FTP</A>]
       </TD>
-      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.7.6.zip">HTTP</A>]
-          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.7.6.zip">FTP</A>]
+      <TD>[<A HREF="http://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.7.5.zip">HTTP</A>]
+          [<A HREF="ftp://download.dre.vanderbilt.edu/previous_versions/ACE-src-5.7.5.zip">FTP</A>]
       </TD>
   </TR>
 </TABLE>
diff --git a/ACE/docs/bczar/bczar.html b/ACE/docs/bczar/bczar.html
index 60327564b29..db5c4503060 100644
--- a/ACE/docs/bczar/bczar.html
+++ b/ACE/docs/bczar/bczar.html
@@ -378,6 +378,14 @@
         one build where you run the TAO Hello world test and check if the libraries are having the
         correct version number.</li>
       <li>
+        Mail the approved release announcement out to, at minimum the following: <tt>ciao-users@list.isis.vanderbilt.edu</tt>,
+        <tt>tao-users@list.isis.vanderbilt.edu</tt>, <tt>tao-announce@list.isis.vanderbilt.edu</tt>,
+        <tt>ace-users@list.isis.vanderbilt.edu</tt>, <tt>ace-announce@list.isis.vanderbilt.edu</tt>. 
+        Do this as yourself (not as bugzilla). <b>N.B.</b>
+      You will not be able to post to the users' lists unless you are subscribed to 
+      them. Odds are you will not be able to post to the announce lists at all. Ask 
+      someone else (like Doug or Johnny) to do this step.<br>
+      <li>
         Update in the autobuild archive the file configs/scoreboard/releases.xml with 
         the made release (version number and release date). This is used by the integrated scoreboard on http://scoreboard.theaceorb.nl  Remember to do a changelog entry.</li>
       <li>
@@ -390,14 +398,6 @@
         <li>bin/diff-builds-and-group-fixed-tests-only.sh to give the correct default old_date for this release.</li></ul>
       <li>
         Update the NEWS, TAO/NEWS, and TAO/CIAO/NEWS files to have a new section for the next release.</li>
-      <li>
-        Mail the approved release announcement out to, at minimum the following: <tt>ciao-users@list.isis.vanderbilt.edu</tt>,
-        <tt>tao-users@list.isis.vanderbilt.edu</tt>, <tt>tao-announce@list.isis.vanderbilt.edu</tt>,
-        <tt>ace-users@list.isis.vanderbilt.edu</tt>, <tt>ace-announce@list.isis.vanderbilt.edu</tt>. 
-        Do this as yourself (not as bugzilla). <b>N.B.</b>
-      You will not be able to post to the users' lists unless you are subscribed to 
-      them. Odds are you will not be able to post to the announce lists at all. Ask 
-      someone else (like Doug or Johnny) to do this step.<br>
       </ol>
     </p>
     <hr>
diff --git a/ACE/docs/svn/config b/ACE/docs/svn/config
index 59bf7e5e4a4..8074c5b6cbb 100644
--- a/ACE/docs/svn/config
+++ b/ACE/docs/svn/config
@@ -83,8 +83,6 @@ enable-auto-props = yes
 *.aspx=svn:eol-style=native;svn:keywords=Author Date Id Revision
 *.cpp=svn:eol-style=native;svn:keywords=Author Date Id Revision
 *.cxx=svn:eol-style=native;svn:keywords=Author Date Id Revision
-*.patch=svn:eol-style=native;svn:keywords=Author Date Id Revision
-*.dpatch=svn:eol-style=native;svn:keywords=Author Date Id Revision
 *.cc=svn:eol-style=native;svn:keywords=Author Date Id Revision
 *.C=svn:eol-style=native;svn:keywords=Author Date Id Revision
 *.c=svn:eol-style=native;svn:keywords=Author Date Id Revision
diff --git a/ACE/docs/svn/svn-prefs.reg b/ACE/docs/svn/svn-prefs.reg
index bf019f83256..88cde866921 100644
--- a/ACE/docs/svn/svn-prefs.reg
+++ b/ACE/docs/svn/svn-prefs.reg
@@ -37,8 +37,6 @@ REGEDIT4
 "*.aspx"="svn:eol-style=native;svn:keywords=Author Date Id Revision"
 "*.conf"="svn:eol-style=native;svn:keywords=Author Date Id Revision"
 "*.cpp"="svn:eol-style=native;svn:keywords=Author Date Id Revision"
-"*.patch"="svn:eol-style=native;svn:keywords=Author Date Id Revision"
-"*.dpatch"="svn:eol-style=native;svn:keywords=Author Date Id Revision"
 "*.cxx"="svn:eol-style=native;svn:keywords=Author Date Id Revision"
 "*.cc"="svn:eol-style=native;svn:keywords=Author Date Id Revision"
 "*.C"="svn:eol-style=native;svn:keywords=Author Date Id Revision"
diff --git a/ACE/etc/index.html b/ACE/etc/index.html
index 43e1a119cae..43495c31cc3 100644
--- a/ACE/etc/index.html
+++ b/ACE/etc/index.html
@@ -35,7 +35,6 @@
     <hr>
     We do have the documentation for previous releases
     <ul>
-      <LI><P><A HREF="5.7.6/html">5.7.6</A></P></LI>
       <LI><P><A HREF="5.7.5/html">5.7.5</A></P></LI>
       <LI><P><A HREF="5.7.4/html">5.7.4</A></P></LI>
       <LI><P><A HREF="5.7.3/html">5.7.3</A></P></LI>
diff --git a/ACE/examples/Reactor/Misc/pingpong.cpp b/ACE/examples/Reactor/Misc/pingpong.cpp
index bf36caf99b0..9a7a8566eae 100644
--- a/ACE/examples/Reactor/Misc/pingpong.cpp
+++ b/ACE/examples/Reactor/Misc/pingpong.cpp
@@ -80,10 +80,8 @@ Ping_Pong::Ping_Pong (char b[], ACE_HANDLE f)
     pid_ (ACE_OS::getpid ()),
     handle_ (f)
 {
-  int *pi_buf = (int *) this->buf_;
-  *(pi_buf) = (int) this->pid_;
-  pi_buf = (int *) (this->buf_ + sizeof (int));
-  *(pi_buf) = 0;
+  *((int *) this->buf_) = (int) this->pid_;
+  *((int *) (this->buf_ + sizeof (int))) = 0;
   ACE_OS::strcpy (this->buf_ + (2 * sizeof (int)), b);
   this->buf_[this->buflen_ - 1] = '\n';
   this->buf_[this->buflen_] = '\0';
diff --git a/ACE/html/Stats/index.shtml b/ACE/html/Stats/index.shtml
index 50261c1a2e8..242ff09e777 100644
--- a/ACE/html/Stats/index.shtml
+++ b/ACE/html/Stats/index.shtml
@@ -50,7 +50,7 @@ In addition to the statistics described above, a number of other ACE/TAO/CIAO de
   <a href="http://www.dre.vanderbilt.edu/Scoreboard/">Automated Builds</a>
 </li>
 <li>
-  Xampler Performance benchmarks for <a href="http://www.dre.vanderbilt.edu/~isisbuilds/auto_compile_logs/isislab/emulab/FC6xampler/Template-Display/_Report/">x86</a>, <a href="http://www.dre.vanderbilt.edu/~remedynl/ps3cellbuild_xampler/ps3xampler/_Report/">IBM Cell</a> and <a href="http://www.dre.vanderbilt.edu/~remedynl/mpc440_xampler/mpc440xampler/_Report/">MPC440</a>
+  Xampler Performance benchmarks for <a href="http://www.dre.vanderbilt.edu/~isisbuilds/auto_compile_logs/isislab/emulab/FC6xampler/Template-Display/_Report/">x86</a> and <a href="http://www.dre.vanderbilt.edu/~remedynl/ps3xampler/ps3xampler/_Report/">IBM Cell</a>
 </li>
 <li>
   <a href="http://www.dre.vanderbilt.edu/Stats/CORBAecompact/">Footprint CORBA/e compact</a>
diff --git a/ACE/include/makeinclude/platform_freebsd.GNU b/ACE/include/makeinclude/platform_freebsd.GNU
index f08842ad483..07eb7a4ccd1 100644
--- a/ACE/include/makeinclude/platform_freebsd.GNU
+++ b/ACE/include/makeinclude/platform_freebsd.GNU
@@ -84,9 +84,9 @@ PLATFORM_GTK_CPPFLAGS=$(shell gtk-config --cflags)
 PLATFORM_GTK_LIBS    =$(shell gtk-config --libs)
 PLATFORM_GTK_LDFLAGS =
 
-PLATFORM_FOX_CPPFLAGS ?= -I/usr/include/fox
-PLATFORM_FOX_LIBS ?= -lFOX
-PLATFORM_FOX_LDFLAGS ?=
+PLATFORM_FOX_CPPFLAGS=
+PLATFORM_FOX_LIBS=-lFOX
+PLATFORM_FOX_LDFLAGS=
 
 PLATFORM_TK_CPPFLAGS=$(shell . /usr/local/lib/tk8.*/tkConfig.sh && echo -n $$TK_INCLUDE_SPEC)
 PLATFORM_TK_LIBS=$(shell . /usr/local/lib/tk8.*/tkConfig.sh && echo -n $$TK_LIB_FLAG)
diff --git a/ACE/include/makeinclude/platform_g++_common.GNU b/ACE/include/makeinclude/platform_g++_common.GNU
index aa2b0b0720f..9611d652435 100644
--- a/ACE/include/makeinclude/platform_g++_common.GNU
+++ b/ACE/include/makeinclude/platform_g++_common.GNU
@@ -68,10 +68,6 @@ ifeq ($(GNU_LD),1)
   STATIC_LINK_FLAG ?= -static
 endif # GNU_LD
 
-ifeq ($(no_strict_aliasing), 1)
-  CCFLAGS += -fno-strict-aliasing
-endif
-
 ifeq ($(shared_libs), 1)
   ifneq ($(static_libs_only), 1)
     # Add all symbols to the dynamic symbol table.  Needed to enable
diff --git a/ACE/include/makeinclude/platform_gnuwin32_common.GNU b/ACE/include/makeinclude/platform_gnuwin32_common.GNU
index 28ce90b3c7f..f1c4fbac86e 100644
--- a/ACE/include/makeinclude/platform_gnuwin32_common.GNU
+++ b/ACE/include/makeinclude/platform_gnuwin32_common.GNU
@@ -10,8 +10,6 @@ ifneq ($(mingw32),1)
   endif
 endif
 
-no_hidden_visibility ?= 1
-
 GNUWIN32_CXX_VERSION := $(shell $(CXX) -dumpversion)
 
 winsock2 ?= 1
diff --git a/ACE/include/makeinclude/platform_linux.GNU b/ACE/include/makeinclude/platform_linux.GNU
index a07b3ae4fe1..7e387db7e60 100644
--- a/ACE/include/makeinclude/platform_linux.GNU
+++ b/ACE/include/makeinclude/platform_linux.GNU
@@ -97,16 +97,6 @@ PRELIB  = @true
 #
 include $(ACE_ROOT)/include/makeinclude/platform_g++_common.GNU
 
-ifneq ($(TCPU),)
-  ifeq ($(tunemodelflag),1)
-    FLAGS_C_CC += -mtune=$(TCPU)
-  endif
-  
-  ifeq ($(cpumodelflag),1)
-    FLAGS_C_CC += -mcpu=$(TCPU)
-  endif
-endif
-
 # TAO with GCC 4.0.2 and -O3 seems to result in runtime issues, for example
 # the ForwardRequest PI test will fail. For GCC 4.0.2 we default to -O2
 ifeq ($(CXX_VERSION),4.0.2)
diff --git a/ACE/include/makeinclude/platform_linux_common.GNU b/ACE/include/makeinclude/platform_linux_common.GNU
index 40686268a2a..db17a263ee4 100644
--- a/ACE/include/makeinclude/platform_linux_common.GNU
+++ b/ACE/include/makeinclude/platform_linux_common.GNU
@@ -33,9 +33,9 @@ PLATFORM_GTK_CPPFLAGS=$(shell gtk-config --cflags)
 PLATFORM_GTK_LIBS    =$(shell gtk-config --libs)
 PLATFORM_GTK_LDFLAGS =
 
-PLATFORM_FOX_CPPFLAGS ?= -I/usr/include/fox
-PLATFORM_FOX_LIBS     ?= -lFOX
-PLATFORM_FOX_LDFLAGS  ?=
+PLATFORM_FOX_CPPFLAGS=
+PLATFORM_FOX_LIBS=-lFOX
+PLATFORM_FOX_LDFLAGS=
 
 # NOTE: we only support wxWindows over GTK
 PLATFORM_WX_CPPFLAGS= $(shell wx-config --cxxflags) $(PLATFORM_GTK_CPPFLAGS)
diff --git a/ACE/include/makeinclude/wrapper_macros.GNU b/ACE/include/makeinclude/wrapper_macros.GNU
index 521d7d3592c..c6d62b4f860 100644
--- a/ACE/include/makeinclude/wrapper_macros.GNU
+++ b/ACE/include/makeinclude/wrapper_macros.GNU
@@ -888,38 +888,6 @@ ace_uuid      ?= 1
 ace_filecache ?= 1
 acexml        ?= 1
 
-# Icecream distributed compilation support
-ifeq ($(icecream),1)
-  # check availability of icecc
-  ifneq ($(ICECC_ROOT),)
-    ICECC_PROG := $(ICECC_ROOT)/icecc
-  else
-    ICECC_PROG := $(shell which icecc 2>/dev/null)
-  endif
-  ICECC_VERTEST := $(shell test -x "$(ICECC_PROG)" && $(ICECC_PROG) --version)
-  ifneq (ICECC,$(findstring ICECC,$(ICECC_VERTEST)))
-    # not good, try alternative install location
-    ICECC_PROG := /opt/icecream/bin/icecc
-    ICECC_VERTEST := $(shell test -x "$(ICECC_PROG)" && $(ICECC_PROG) --version)
-    ifneq (ICECC,$(findstring ICECC,$(ICECC_VERTEST)))
-      override icecream := 0
-      $(error Cannot locate valid Icecream compiler.)
-    endif
-  endif
-  ifeq ($(icecream),1)
-    # force LD and DLD to be 'normal' tools
-    override LD := $(LD)
-    override DLD := $(DLD)
-    # define tools that icecc should call for local jobs
-    ICECC_CC := $(CC)
-    ICECC_CXX := $(CXX)
-    export ICECC_CC ICECC_CXX
-    # let all compilation go through icecc
-    CC := $(ICECC_PROG)
-    CXX := $(ICECC_PROG)
-  endif
-endif
-
 #----------------------------------------------------------------------------
 #      Conditional macro definitions
 #----------------------------------------------------------------------------
diff --git a/ACE/m4/ace.m4 b/ACE/m4/ace.m4
index d27fffa0ab7..f6ab11916d6 100644
--- a/ACE/m4/ace.m4
+++ b/ACE/m4/ace.m4
@@ -1250,8 +1250,8 @@ AC_DEFUN([ACE_PATH_FL],
    fi
  fi
  if test X"${FLTKCONFIG}" != X; then
-   ACE_FLTK_CPPFLAGS=`$FLTKCONFIG --cxxflags 2>/dev/null`
-   ACE_FLTK_LIBS=`$FLTKCONFIG --ldflags 2>/dev/null`
+   ACE_FLTK_CPPFLAGS=`$FLTKCONFIG --use-gl --cxxflags 2>/dev/null`
+   ACE_FLTK_LIBS=`$FLTKCONFIG --use-gl --ldflags 2>/dev/null`
 
    AC_SUBST(ACE_FLTK_CPPFLAGS)
    AC_SUBST(ACE_FLTK_LIBS)
@@ -1393,7 +1393,6 @@ if test "$no_x" != yes; then
    AC_SUBST(ACE_XT_LIBS)
 fi
 AM_CONDITIONAL([BUILD_ATHENA], true)
-AM_CONDITIONAL([BUILD_ATHENA3D], true)
 AM_CONDITIONAL([BUILD_MOTIF], false)
 ])
 
diff --git a/ACE/m4/ace_defines.m4 b/ACE/m4/ace_defines.m4
index c8b37af9171..08a16407e05 100644
--- a/ACE/m4/ace_defines.m4
+++ b/ACE/m4/ace_defines.m4
@@ -27,7 +27,7 @@ do
 ACE_CHECK_DEFINE($ace_def,
                  [AC_DEFINE_UNQUOTED(AS_TR_CPP([ACE_HAS_$ace_def])) $2],
                  [$3],
-                 [$4])
+                 [$4])dnl
 done
 ])
 
@@ -43,6 +43,6 @@ do
 ACE_CHECK_DEFINE($ace_def,
                  [$2],
                  [AC_DEFINE_UNQUOTED(AS_TR_CPP([ACE_LACKS_$ace_def])) $3],
-                 [$4])
+                 [$4])dnl
 done
 ])
diff --git a/ACE/rpmbuild/ace-tao.spec b/ACE/rpmbuild/ace-tao.spec
index d7793cfa159..b4c6d0084fc 100644
--- a/ACE/rpmbuild/ace-tao.spec
+++ b/ACE/rpmbuild/ace-tao.spec
@@ -2356,8 +2356,6 @@ fi
 %doc TAO/PROBLEM-REPORT-FORM
 %doc TAO/VERSION
 %doc TAO/README
-%doc TAO/utils/catior/README.catior
-%doc TAO/utils/catior/README.nslist
 
 # ---------------- tao-cosnaming ----------------
 
diff --git a/ACE/tests/Atomic_Op_Test.cpp b/ACE/tests/Atomic_Op_Test.cpp
index 00dfc06c8af..d807b287684 100644
--- a/ACE/tests/Atomic_Op_Test.cpp
+++ b/ACE/tests/Atomic_Op_Test.cpp
@@ -25,8 +25,6 @@ ACE_RCSID(tests, Atomic_Op_Test, "$Id$")
 
 #include "ace/Atomic_Op.h"
 #include "ace/Synch_Traits.h"
-#include "ace/Time_Value.h"
-#include "ace/OS_NS_sys_time.h"
 
 enum { TEST_ITERATIONS = 1000000 };
 
@@ -71,10 +69,7 @@ run_main (int, ACE_TCHAR *[])
   ACE_ASSERT (foo == 7);
   ACE_ASSERT (foo2 == 7);
 
-  ACE_UINT64 usec;
-
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <long> assignment %D\n")));
-  ACE_Time_Value diff = ACE_OS::gettimeofday ();
   int i;
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
@@ -83,12 +78,9 @@ run_main (int, ACE_TCHAR *[])
       foo = 3;
       foo = 4;
     }
-  diff = ACE_OS::gettimeofday () - diff;
-  diff.to_usec (usec);
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <long> assignment %D, took %Q\n"), usec));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <long> assignment %D\n")));
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <long> increment %D\n")));
-  diff = ACE_OS::gettimeofday ();
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
       ++foo;
@@ -96,12 +88,9 @@ run_main (int, ACE_TCHAR *[])
       ++foo;
       ++foo;
     }
-  diff = ACE_OS::gettimeofday () - diff;
-  diff.to_usec (usec);
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <long> increment %D, took %Q\n"), usec));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <long> increment %D\n")));
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <long> decrement %D\n")));
-  diff = ACE_OS::gettimeofday ();
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
       --foo;
@@ -109,12 +98,9 @@ run_main (int, ACE_TCHAR *[])
       --foo;
       --foo;
     }
-  diff = ACE_OS::gettimeofday () - diff;
-  diff.to_usec (usec);
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <long> decrement %D, took %Q\n"), usec));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <long> decrement %D\n")));
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <long> addition %D\n")));
-  diff = ACE_OS::gettimeofday ();
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
       foo += 5;
@@ -122,12 +108,9 @@ run_main (int, ACE_TCHAR *[])
       foo += 5;
       foo += 5;
     }
-  diff = ACE_OS::gettimeofday () - diff;
-  diff.to_usec (usec);
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <long> addition %D, took %Q\n"), usec));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <long> addition %D\n")));
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <long> subtraction %D\n")));
-  diff = ACE_OS::gettimeofday ();
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
       foo -= 5;
@@ -135,9 +118,7 @@ run_main (int, ACE_TCHAR *[])
       foo -= 5;
       foo -= 5;
     }
-  diff = ACE_OS::gettimeofday () - diff;
-  diff.to_usec (usec);
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <long> subtraction %D, took %Q\n"), usec));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <long> subtraction %D\n")));
 
   ACE_Atomic_Op <ACE_SYNCH_MUTEX, unsigned long> foo_unsigned (5);
 
@@ -176,7 +157,6 @@ run_main (int, ACE_TCHAR *[])
   ACE_ASSERT (foo_unsigned2 == 7);
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <unsigned long> assignment %D\n")));
-  diff = ACE_OS::gettimeofday ();
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
       foo_unsigned = 1;
@@ -184,12 +164,9 @@ run_main (int, ACE_TCHAR *[])
       foo_unsigned = 3;
       foo_unsigned = 4;
     }
-  diff = ACE_OS::gettimeofday () - diff;
-  diff.to_usec (usec);
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned long> assignment %D, took %Q\n"), usec));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned long> assignment %D\n")));
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <unsigned long> increment %D\n")));
-  diff = ACE_OS::gettimeofday ();
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
       ++foo_unsigned;
@@ -197,12 +174,9 @@ run_main (int, ACE_TCHAR *[])
       ++foo_unsigned;
       ++foo_unsigned;
     }
-  diff = ACE_OS::gettimeofday () - diff;
-  diff.to_usec (usec);
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned long> increment %D, took %Q\n"), usec));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned long> increment %D\n")));
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <unsigned long> decrement %D\n")));
-  diff = ACE_OS::gettimeofday ();
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
       --foo_unsigned;
@@ -210,12 +184,9 @@ run_main (int, ACE_TCHAR *[])
       --foo_unsigned;
       --foo_unsigned;
     }
-  diff = ACE_OS::gettimeofday () - diff;
-  diff.to_usec (usec);
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned long> decrement %D, took %Q\n"), usec));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned long> decrement %D\n")));
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <unsigned long> addition %D\n")));
-  diff = ACE_OS::gettimeofday ();
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
       foo_unsigned += 5;
@@ -223,12 +194,9 @@ run_main (int, ACE_TCHAR *[])
       foo_unsigned += 5;
       foo_unsigned += 5;
     }
-  diff = ACE_OS::gettimeofday () - diff;
-  diff.to_usec (usec);
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned long> addition %D, took %Q\n"), usec));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned long> addition %D\n")));
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <unsigned long> subtraction %D\n")));
-  diff = ACE_OS::gettimeofday ();
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
       foo_unsigned -= 5;
@@ -236,9 +204,7 @@ run_main (int, ACE_TCHAR *[])
       foo_unsigned -= 5;
       foo_unsigned -= 5;
     }
-  diff = ACE_OS::gettimeofday () - diff;
-  diff.to_usec (usec);
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned long> subtraction %D, took %Q\n"), usec));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned long> subtraction %D\n")));
 
   ACE_Atomic_Op <ACE_SYNCH_MUTEX, int> bar (5);
 
@@ -277,7 +243,6 @@ run_main (int, ACE_TCHAR *[])
   ACE_ASSERT (bar2 == 7);
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <int> assignment %D\n")));
-  diff = ACE_OS::gettimeofday ();
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
       bar = 1;
@@ -285,12 +250,9 @@ run_main (int, ACE_TCHAR *[])
       bar = 3;
       bar = 4;
     }
-  diff = ACE_OS::gettimeofday () - diff;
-  diff.to_usec (usec);
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <int> assignment %D, took %Q\n"), usec));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <int> assignment %D\n")));
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <int> increment %D\n")));
-  diff = ACE_OS::gettimeofday ();
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
       ++bar;
@@ -298,12 +260,9 @@ run_main (int, ACE_TCHAR *[])
       ++bar;
       ++bar;
     }
-  diff = ACE_OS::gettimeofday () - diff;
-  diff.to_usec (usec);
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <int> increment %D, took %Q\n"), usec));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <int> increment %D\n")));
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <int> decrement %D\n")));
-  diff = ACE_OS::gettimeofday ();
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
       --bar;
@@ -311,12 +270,9 @@ run_main (int, ACE_TCHAR *[])
       --bar;
       --bar;
     }
-  diff = ACE_OS::gettimeofday () - diff;
-  diff.to_usec (usec);
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <int> decrement %D, took %Q\n"), usec));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <int> decrement %D\n")));
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <int> addition %D\n")));
-  diff = ACE_OS::gettimeofday ();
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
       bar += 5;
@@ -324,12 +280,9 @@ run_main (int, ACE_TCHAR *[])
       bar += 5;
       bar += 5;
     }
-  diff = ACE_OS::gettimeofday () - diff;
-  diff.to_usec (usec);
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <int> addition %D, took %Q\n"), usec));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <int> addition %D\n")));
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <int> subtraction %D\n")));
-  diff = ACE_OS::gettimeofday ();
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
       bar -= 5;
@@ -337,9 +290,7 @@ run_main (int, ACE_TCHAR *[])
       bar -= 5;
       bar -= 5;
     }
-  diff = ACE_OS::gettimeofday () - diff;
-  diff.to_usec (usec);
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <int> subtraction %D, took %Q\n"), usec));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <int> subtraction %D\n")));
 
   ACE_Atomic_Op <ACE_SYNCH_MUTEX, unsigned int> unsigned_bar (5);
 
@@ -378,7 +329,6 @@ run_main (int, ACE_TCHAR *[])
   ACE_ASSERT (unsigned_bar2 == 7);
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <unsigned int> assignment %D\n")));
-  diff = ACE_OS::gettimeofday ();
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
       unsigned_bar = 1;
@@ -386,12 +336,9 @@ run_main (int, ACE_TCHAR *[])
       unsigned_bar = 3;
       unsigned_bar = 4;
     }
-  diff = ACE_OS::gettimeofday () - diff;
-  diff.to_usec (usec);
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned int> assignment %D, took %Q\n"), usec));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned int> assignment %D\n")));
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <unsigned int> increment %D\n")));
-  diff = ACE_OS::gettimeofday ();
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
       ++unsigned_bar;
@@ -399,12 +346,9 @@ run_main (int, ACE_TCHAR *[])
       ++unsigned_bar;
       ++unsigned_bar;
     }
-  diff = ACE_OS::gettimeofday () - diff;
-  diff.to_usec (usec);
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned int> increment %D, took %Q\n"), usec));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned int> increment %D\n")));
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <unsigned int> decrement %D\n")));
-  diff = ACE_OS::gettimeofday ();
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
       --unsigned_bar;
@@ -412,12 +356,9 @@ run_main (int, ACE_TCHAR *[])
       --unsigned_bar;
       --unsigned_bar;
     }
-  diff = ACE_OS::gettimeofday () - diff;
-  diff.to_usec (usec);
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned int> decrement %D, took %Q\n"), usec));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned int> decrement %D\n")));
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <unsigned int> addition %D\n")));
-  diff = ACE_OS::gettimeofday ();
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
       unsigned_bar += 5;
@@ -425,12 +366,9 @@ run_main (int, ACE_TCHAR *[])
       unsigned_bar += 5;
       unsigned_bar += 5;
     }
-  diff = ACE_OS::gettimeofday () - diff;
-  diff.to_usec (usec);
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned int> addition %D, took %Q\n"), usec));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned int> addition %D\n")));
 
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting <unsigned int> subtraction %D\n")));
-  diff = ACE_OS::gettimeofday ();
   for (i = 0; i < TEST_ITERATIONS; ++i)
     {
       unsigned_bar -= 5;
@@ -438,9 +376,8 @@ run_main (int, ACE_TCHAR *[])
       unsigned_bar -= 5;
       unsigned_bar -= 5;
     }
-  diff = ACE_OS::gettimeofday () - diff;
-  diff.to_usec (usec);
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned int> subtraction %D, took %Q\n"), usec));
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Ending <unsigned int> subtraction %D\n")));
+
 
   ACE_END_TEST;
   return 0;
diff --git a/ACE/tests/Bug_2609_Regression_Test.cpp b/ACE/tests/Bug_2609_Regression_Test.cpp
index 2c94b30cd44..734ba205acd 100644
--- a/ACE/tests/Bug_2609_Regression_Test.cpp
+++ b/ACE/tests/Bug_2609_Regression_Test.cpp
@@ -64,8 +64,6 @@ public:
   {
     TEST_TRACE ("handle_close");
     super::handle_close (fd, mask);
-    // Remove own reference which we own since creation.
-    this->remove_reference ();
     if (g_handler_deleted)
     {
       ACE_ERROR ((LM_ERROR,
diff --git a/ACE/tests/Bug_2610_Regression_Test.cpp b/ACE/tests/Bug_2610_Regression_Test.cpp
index 50b3e502936..648e90bf2d2 100644
--- a/ACE/tests/Bug_2610_Regression_Test.cpp
+++ b/ACE/tests/Bug_2610_Regression_Test.cpp
@@ -55,8 +55,6 @@ public:
   int handle_close (ACE_HANDLE /*fd*/, ACE_Reactor_Mask /*mask*/)
   {
     TEST_TRACE ("handle_close");
-    // Remove own reference which we own since creation.
-    this->remove_reference ();
     g_semaphore.release();
     return 0;
   }
@@ -77,18 +75,14 @@ protected:
     int rv = super::accept_svc_handler(svc_handler);
     if (g_acceptor_accept_fails)
       {
-        // Remove own reference which we own since creation.
-        svc_handler->remove_reference ();
         g_semaphore.release();
         return -1;
       }
     return rv;
   }
-  int activate_svc_handler (My_Svc_Handler *svc_handler)
+  int activate_svc_handler (My_Svc_Handler* /*svc_handler*/)
   {
     TEST_TRACE ("My_Acceptor::activate_svc_handler");
-    // Remove own reference which we own since creation.
-    svc_handler->remove_reference ();
     g_semaphore.release();
     return -1;
   }
diff --git a/ACE/tests/Makefile.am b/ACE/tests/Makefile.am
index d7e41648e32..b9a4933d4a6 100644
--- a/ACE/tests/Makefile.am
+++ b/ACE/tests/Makefile.am
@@ -2480,20 +2480,6 @@ Reactor_Exceptions_Test_LDADD = \
   libTest_Output.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-noinst_PROGRAMS += Reactor_Fairness_Test
-
-Reactor_Fairness_Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR)
-
-Reactor_Fairness_Test_SOURCES = \
-  $(ACE_ROOT)/tests/Main.cpp \
-  Reactor_Fairness_Test.cpp
-
-Reactor_Fairness_Test_LDADD = \
-  libTest_Output.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
 ## Makefile.Reactor_Notification_Queue_Test.am
 
 noinst_PROGRAMS += Reactor_Notification_Queue_Test
diff --git a/ACE/tests/NonBlocking_Conn_Test.cpp b/ACE/tests/NonBlocking_Conn_Test.cpp
index 4eba44f07b0..80e25c63cfb 100644
--- a/ACE/tests/NonBlocking_Conn_Test.cpp
+++ b/ACE/tests/NonBlocking_Conn_Test.cpp
@@ -30,22 +30,14 @@
 #include "ace/WFMO_Reactor.h"
 #include "ace/Get_Opt.h"
 
-static bool test_select_reactor = true;
-static bool test_tp_reactor = true;
-static bool test_wfmo_reactor = true;
-static int result = 0;
+static int test_select_reactor = 1;
+static int test_tp_reactor = 1;
+static int test_wfmo_reactor = 1;
 
-Svc_Handler::Svc_Handler (bool is_ref_counted)
+Svc_Handler::Svc_Handler (void)
   : status_ (0),
-    completion_counter_ (0),
-    is_ref_counted_ (is_ref_counted)
+    completion_counter_ (0)
 {
-  if (this->is_ref_counted_)
-    {
-      // Enable reference counting on the event handler.
-      this->reference_counting_policy ().value (
-        ACE_Event_Handler::Reference_Counting_Policy::ENABLED);
-    }
 }
 
 void
@@ -59,40 +51,30 @@ Svc_Handler::connection_status (Connection_Status &status,
 int
 Svc_Handler::open (void *)
 {
-  *this->status_ = Svc_Handler::Conn_SUCCEEDED;
+  *this->status_ = SUCCEEDED;
   (*this->completion_counter_)++;
 
   return 0;
 }
 
 int
-Svc_Handler::handle_close (ACE_HANDLE handle, ACE_Reactor_Mask mask)
+Svc_Handler::handle_close (ACE_HANDLE handle,
+                           ACE_Reactor_Mask mask)
 {
-  *this->status_ = Svc_Handler::Conn_FAILED;
+  *this->status_ = FAILED;
   (*this->completion_counter_)++;
 
-  typedef ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH> super;
-
-  bool const is_ref_counted = this->is_ref_counted_;
-
-  int const res = super::handle_close (handle,
-                                       mask);
-
-  if (is_ref_counted)
-    {
-      // If we use reference counting then remove reference
-      // which we own since Svc_Handler creation.
-      this->remove_reference ();
-    }
-
-  return res;
+  return ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>::handle_close (handle,
+                                                                         mask);
 }
 
-typedef ACE_Connector<Svc_Handler, ACE_SOCK_CONNECTOR> CONNECTOR;
+typedef ACE_Connector<Svc_Handler,
+                      ACE_SOCK_CONNECTOR>
+        CONNECTOR;
 
 static const char* hosts[] = {
   "www.russiantvguide.com:80",
-  "news.bbc.co.uk:80",
+  "www.pakarmy.gov.pk:80",
   "www.cnn.com:80",
   "www.waca.com.au:80",
   "www.uganda.co.ug:80",
@@ -100,17 +82,15 @@ static const char* hosts[] = {
   "www.dre.vanderbilt.edu:80",
   "www.dhm.gov.np:80",
   "www.msn.com:80",
-  "www.presidencymaldives.gov.mv:80"
-};
+  "www.presidencymaldives.gov.mv:80" };
 
 static int number_of_connections = 0;
-static bool with_ref_counting = false;
 
 void
 test_connect (ACE_Reactor &reactor,
               ACE_INET_Addr *addresses,
               ACE_Synch_Options &synch_options,
-              Svc_Handler::Completion_Status complete_nonblocking_connections)
+              int complete_nonblocking_connections)
 {
   CONNECTOR connector (&reactor);
 
@@ -126,7 +106,7 @@ test_connect (ACE_Reactor &reactor,
   for (i = 0; i < number_of_connections; ++i)
     {
       svc_handlers[i] =
-        new Svc_Handler (with_ref_counting);
+        new Svc_Handler;
 
       svc_handlers[i]->connection_status (connection_status[i],
                                           completion_counter);
@@ -141,7 +121,7 @@ test_connect (ACE_Reactor &reactor,
   if (!synch_options[ACE_Synch_Options::USE_REACTOR])
     ACE_ASSERT (completion_counter == number_of_connections);
 
-  if (complete_nonblocking_connections != Svc_Handler::Comp_NO)
+  if (complete_nonblocking_connections)
     {
       while (completion_counter != number_of_connections)
         {
@@ -159,12 +139,12 @@ test_connect (ACE_Reactor &reactor,
                                    1);
 
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("Connection to %s %s\n"),
+                  "Connection to %s %s\n",
                   buffer,
-                  connection_status[i] == Svc_Handler::Conn_SUCCEEDED ?
-                  ACE_TEXT("succeeded") : ACE_TEXT("failed")));
+                  connection_status[i] == Svc_Handler::SUCCEEDED ?
+                  "succeeded" : "failed"));
 
-      if (connection_status[i] == Svc_Handler::Conn_SUCCEEDED)
+      if (connection_status[i] == Svc_Handler::SUCCEEDED)
         {
           svc_handlers[i]->close ();
         }
@@ -177,11 +157,11 @@ test_connect (ACE_Reactor &reactor,
 void
 test (ACE_Reactor_Impl *impl)
 {
-  size_t const nr_names = sizeof hosts / sizeof (char *);
-  ACE_INET_Addr *addresses = new ACE_INET_Addr[nr_names];
-  number_of_connections = 0;
+  size_t nr_names = sizeof hosts / sizeof (char *);
+  ACE_INET_Addr *addresses =
+    new ACE_INET_Addr[nr_names];
 
-  for (size_t i = 0; i < nr_names; ++i)
+  for (size_t i = 0, number_of_connections = 0; i < nr_names; ++i)
     {
       if (addresses[number_of_connections].set (hosts[i]) == 0)
         ++number_of_connections;
@@ -191,60 +171,65 @@ test (ACE_Reactor_Impl *impl)
                     ACE_TEXT_CHAR_TO_TCHAR (hosts[i])));
     }
 
-  ACE_Reactor reactor (impl, 1);
+  ACE_Reactor reactor (impl,
+                       1);
+
+  int complete_nonblocking_connections = 1;
+  int dont_wait_for_nonblocking_connections = 0;
+  int ignored = 99;
 
   ACE_Synch_Options blocking_connect =
     ACE_Synch_Options::defaults;
 
   ACE_DEBUG ((LM_DEBUG,
-              "Blocking connections...\n"));
+              "\nBlocking connections...\n\n"));
 
   test_connect (reactor,
                 addresses,
                 blocking_connect,
-                Svc_Handler::Comp_IGNORE);
+                ignored);
 
   blocking_connect.set (ACE_Synch_Options::USE_TIMEOUT,
                         ACE_Time_Value (0, 50 * 1000));
 
   ACE_DEBUG ((LM_DEBUG,
-              "Blocking connections (with timeouts)...\n"));
+              "\nBlocking connections (with timeouts)...\n\n"));
 
   test_connect (reactor,
                 addresses,
                 blocking_connect,
-                Svc_Handler::Comp_IGNORE);
+                ignored);
 
   ACE_Synch_Options nonblocking_connect
     (ACE_Synch_Options::USE_REACTOR);
 
   ACE_DEBUG ((LM_DEBUG,
-              "Non-blocking connections...\n"));
+              "\nNon-blocking connections...\n\n"));
 
   test_connect (reactor,
                 addresses,
                 nonblocking_connect,
-                Svc_Handler::Comp_YES);
+                complete_nonblocking_connections);
 
   ACE_DEBUG ((LM_DEBUG,
-              "Non-blocking connections (without waiting for completions)...\n"));
+              "\nNon-blocking connections (without waiting for completions)...\n\n"));
 
   test_connect (reactor,
                 addresses,
                 nonblocking_connect,
-                Svc_Handler::Comp_NO);
+                dont_wait_for_nonblocking_connections);
 
   nonblocking_connect.set (ACE_Synch_Options::USE_REACTOR |
                            ACE_Synch_Options::USE_TIMEOUT,
                            ACE_Time_Value (0, 500 * 1000));
 
   ACE_DEBUG ((LM_DEBUG,
-              "Non-blocking connections (with timeouts)...\n"));
+              "\nNon-blocking connections (with timeouts)...\n\n"));
 
   test_connect (reactor,
                 addresses,
                 nonblocking_connect,
-                Svc_Handler::Comp_YES);
+                complete_nonblocking_connections);
 
   delete[] addresses;
 }
@@ -294,37 +279,24 @@ run_main (int argc, ACE_TCHAR *argv[])
   ACE_START_TEST (ACE_TEXT ("NonBlocking_Conn_Test"));
 
   // Validate options.
-  result = parse_args (argc, argv);
+  int result =
+    parse_args (argc, argv);
   if (result != 0)
     return result;
 
   if (test_select_reactor)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "Testing Select Reactor....\n"));
+                  "\n\nTesting Select Reactor....\n\n"));
 
-      with_ref_counting = false;
-      test (new ACE_Select_Reactor);
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "Testing Select Reactor (ref counted)....\n"));
-
-      with_ref_counting = true;
       test (new ACE_Select_Reactor);
     }
 
   if (test_tp_reactor)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "Testing TP Reactor....\n"));
-
-      with_ref_counting = false;
-      test (new ACE_TP_Reactor);
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "Testing TP Reactor (ref counted)....\n"));
+                  "\n\nTesting TP Reactor....\n\n"));
 
-      with_ref_counting = true;
       test (new ACE_TP_Reactor);
     }
 
@@ -333,15 +305,8 @@ run_main (int argc, ACE_TCHAR *argv[])
   if (test_wfmo_reactor)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "Testing WFMO Reactor....\n"));
+                  "\n\nTesting WFMO Reactor....\n\n"));
 
-      with_ref_counting = false;
-      test (new ACE_WFMO_Reactor);
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "Testing WFMO Reactor (ref counted)....\n"));
-
-      with_ref_counting = true;
       test (new ACE_WFMO_Reactor);
     }
 
@@ -349,5 +314,6 @@ run_main (int argc, ACE_TCHAR *argv[])
 
   ACE_END_TEST;
 
-  return result;
+  return 0;
 }
+
diff --git a/ACE/tests/NonBlocking_Conn_Test.h b/ACE/tests/NonBlocking_Conn_Test.h
index dc52f3fe694..77746238226 100644
--- a/ACE/tests/NonBlocking_Conn_Test.h
+++ b/ACE/tests/NonBlocking_Conn_Test.h
@@ -33,18 +33,11 @@ public:
 
   enum Connection_Status
     {
-      Conn_SUCCEEDED,
-      Conn_FAILED
+      SUCCEEDED,
+      FAILED
     };
 
-  enum Completion_Status
-    {
-      Comp_YES,
-      Comp_NO,
-      Comp_IGNORE
-    };
-
-  Svc_Handler (bool is_ref_counted = false);
+  Svc_Handler (void);
 
   void connection_status (Connection_Status &status,
                           int &completion_counter);
@@ -56,7 +49,6 @@ public:
 
   Connection_Status *status_;
   int *completion_counter_;
-  bool is_ref_counted_;
 };
 
 #endif /* NONBLOCKING_CONN_TEST_H */
diff --git a/ACE/tests/OS_Test.cpp b/ACE/tests/OS_Test.cpp
index ae914515716..6144e102ceb 100644
--- a/ACE/tests/OS_Test.cpp
+++ b/ACE/tests/OS_Test.cpp
@@ -1153,11 +1153,7 @@ ceil_test (void)
       result = ACE_OS::ceil (values [i]);
       if (!is_equal(result, results[i]))
         {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("ceil error: input %.1F, output %1F, expected %1F\n"),
-                      values [i],
-                      result,
-                      results [i]));
+          ACE_ERROR ((LM_ERROR, ACE_TEXT ("ceil error: input %.1F, output %1F, expected %1F\n"), values [i], result, results [i]));
           error_count++;
         }
     }
@@ -1181,65 +1177,7 @@ floor_test (void)
       result = ACE_OS::floor (values [i]);
       if (!is_equal(result, results[i]))
         {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("floor error: input %.1F, output %1F, expected %1F\n"),
-                      values [i],
-                      result,
-                      results [i]));
-          error_count++;
-        }
-    }
-
-  return error_count;
-}
-
-int
-ceill_test (void)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("Testing ceill method\n")));
-
-  long double values[]  = {-2.5, -1.5, 1.5, 2.5};
-  long double results[] = {-2.0, -1.0, 2.0, 3.0};
-  long double result = 0.0;
-  int error_count = 0;
-
-  for (size_t i = 0 ; i < sizeof (values) / sizeof (long double) ; i++)
-    {
-      result = ACE_OS::ceil (values [i]);
-      if (!is_equal(result, results[i]))
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("ceil error: input %.1F, output %1F, expected %1F\n"),
-                      values [i],
-                      result,
-                      results [i]));
-          error_count++;
-        }
-    }
-
-  return error_count;
-}
-
-int
-floorl_test (void)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("Testing floorl method\n")));
-
-  long double values[]  = {-2.5, -1.5, 1.5, 2.5};
-  long double results[] = {-3.0, -2.0, 1.0, 2.0};
-  long double result = 0.0;
-  int error_count = 0;
-
-  for (size_t i = 0 ; i < sizeof (values) / sizeof (long double) ; i++)
-    {
-      result = ACE_OS::floor (values [i]);
-      if (!is_equal(result, results[i]))
-        {
-          ACE_ERROR ((LM_ERROR, 
-                      ACE_TEXT ("floor error: input %.1F, output %1F, expected %1F\n"), 
-                      values [i], result, results [i]));
+          ACE_ERROR ((LM_ERROR, ACE_TEXT ("floor error: input %.1F, output %1F, expected %1F\n"), values [i], result, results [i]));
           error_count++;
         }
     }
@@ -1314,12 +1252,6 @@ run_main (int, ACE_TCHAR *[])
   if ((result = floor_test ()) != 0)
       status = result;
 
-  if ((result = ceill_test ()) != 0)
-      status = result;
-
-  if ((result = floorl_test ()) != 0)
-      status = result;
-
   if ((result = log2_test ()) != 0)
       status = result;
 
diff --git a/ACE/tests/Process_Strategy_Test.cpp b/ACE/tests/Process_Strategy_Test.cpp
index 74cbf0bfe12..92a22214c74 100644
--- a/ACE/tests/Process_Strategy_Test.cpp
+++ b/ACE/tests/Process_Strategy_Test.cpp
@@ -85,7 +85,7 @@ static void
 connection_completed (void)
 {
   // Increment connection counter.
-  ++connections;
+  connections++;
 
   // If all connections have been serviced.
   if (connections == ACE_MAX_ITERATIONS + 1)
@@ -441,18 +441,8 @@ int
 Counting_Service::handle_close (ACE_HANDLE,
                                 ACE_Reactor_Mask)
 {
-  // Count completed connections here only when the test is not in
-  // "process-per-connection" mode. In general, this should not be
-  // done here. Proper place for this is activate_svc_handler() but
-  // since only "process-per-connection" hooks into that function in
-  // other modes it's done here. The later creates a problem in
-  // "process-per-connection" mode since it calculates the same
-  // connection twice and as a result it cannot finalize gracefully.
-  if (OPTIONS::instance ()->concurrency_type () != Options::PROCESS)
-    {
-      // Done with another connection.
-      connection_completed ();
-    }
+  // Done with another connection.
+  connection_completed ();
 
   // Call down to base class
   return ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>::handle_close ();
diff --git a/ACE/tests/Reactor_Fairness_Test.cpp b/ACE/tests/Reactor_Fairness_Test.cpp
deleted file mode 100644
index c9f3e746bb9..00000000000
--- a/ACE/tests/Reactor_Fairness_Test.cpp
+++ /dev/null
@@ -1,409 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-//
-// = FILENAME
-//    Reactor_Performance_Test.cpp
-//
-// = DESCRIPTION
-//    This test is used to time the dispatching mechanisms of the
-//    <ACE_Reactor>s. Both the <ACE_WFMO_Reactor> and
-//    <ACE_Select_Reactor> can be tested.
-//
-// = AUTHOR
-//    Irfan Pyarali <irfan@cs.wustl.edu>
-//
-// ============================================================================
-
-#include "test_config.h"
-#include "Reactor_Fairness_Test.h"
-#include "ace/Get_Opt.h"
-#include "ace/SOCK_Connector.h"
-#include "ace/SOCK_Acceptor.h"
-#include "ace/Acceptor.h"
-#include "ace/Reactor.h"
-#include "ace/Dev_Poll_Reactor.h"
-#include "ace/WFMO_Reactor.h"
-#include "ace/Select_Reactor.h"
-#include "ace/TP_Reactor.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/Numeric_Limits.h"
-#include "ace/Signal.h"
-#include "ace/Atomic_Op.h"
-#include "ace/Thread_Mutex.h"
-
-ACE_RCSID(tests, Reactor_Fairness_Test, "$Id$")
-
-#if defined (ACE_HAS_THREADS)
-
-namespace {
-
-  const char ACE_ALPHABET[] = "abcdefghijklmnopqrstuvwxyz";
-
-  // Number of connections to run
-  int opt_nconnections = 5;
-
-  // How many seconds to run the test on each reactor
-  int opt_secs = 30;
-
-  // How many thread to run in the reactor loop
-  int opt_reactor_threads = 3;
-
-  // Extra debug messages
-  int opt_debug = 0;
-
-  ACE_Atomic_Op<ACE_Thread_Mutex, int> reactor_thread_nr = 0;
-
-  // Class to collect and report on data handling for each test pass.
-  struct Result_Set {
-    int nr_conns;
-    typedef ACE_Array_Map<ACE_HANDLE, unsigned int> report_map;
-    report_map reports;
-
-    void reset (int n_connections)   // Reset for next run
-    {
-      reports.clear ();
-      nr_conns = n_connections;
-    }
-
-    void report (ACE_HANDLE h, unsigned int chunks)
-    {
-      std::pair<ACE_HANDLE, unsigned int> newval (h, chunks);
-      reports.insert (newval);
-    }
-
-    // Return 1 if this looks like a failure wrt fairness.
-    int analyze_reports (void)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("Results (%d entries):\n"),
-                  reports.size()));
-      unsigned int max_chunks = 0;
-      unsigned int min_chunks = ACE_Numeric_Limits<unsigned int>::max();
-      for (report_map::iterator iter = reports.begin();
-           iter != reports.end ();
-           ++iter)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("   handle %d: %u\n"),
-                      (*iter).first, (*iter).second));
-          if ((*iter).second > max_chunks)
-            max_chunks = (*iter).second;
-          if ((*iter).second < min_chunks)
-            min_chunks = (*iter).second;
-        }
-      if ((max_chunks - min_chunks) > max_chunks / 10)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("Too much unfairness (max %u, min %u)\n"),
-                           max_chunks,
-                           min_chunks),
-                          1);
-      return 0;
-    }
-  };
-  Result_Set results;
-}
-
-// Handle incoming data
-int
-Read_Handler::handle_input (ACE_HANDLE h)
-{
-  char buf[BUFSIZ];
-  ssize_t result = this->peer ().recv (buf, ACE_OS::strlen(ACE_ALPHABET));
-  if (opt_debug)
-    ACE_DEBUG((LM_DEBUG,
-               ACE_TEXT ("(%t) Read_Handler::handle_input h %d, result %b\n"),
-               h, result));
-  if (result > 0)
-    {
-      if (opt_debug)
-        {
-          buf[result] = 0;
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("(%t) Read_Handler::handle_input: h %d: %C\n"),
-                      h,
-                      buf));
-        }
-      ++this->chunks_in;
-    }
-  else if (result < 0)
-    {
-      if (errno == EWOULDBLOCK)
-        return 0;
-      else
-        {
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("handle_input: h %d: %p (errno: %d)\n"),
-                      h, ACE_TEXT ("recv"), ACE_ERRNO_GET));
-
-          // This will cause handle_close to get called.
-          return -1;
-        }
-    }
-  else // result == 0
-    {
-      if (opt_debug)
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Handle %d closing\n"), h));
-      // This will cause handle_close to get called.
-      return -1;
-    }
-
-  return 0;
-}
-
-// Handle connection shutdown.
-
-int
-Read_Handler::handle_close (ACE_HANDLE handle,
-                            ACE_Reactor_Mask /*close_mask*/)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("(%t) Read_Handler handle %d close; %u chunks\n"),
-              handle, chunks_in));
-  results.report (handle, this->chunks_in);
-
-  // Shutdown
-  this->destroy ();
-  return 0;
-}
-
-// Pump data as fast as possible to all the sockets.
-ACE_THR_FUNC_RETURN
-sender (void *arg)
-{
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("(%t) running sender\n")));
-
-  // Ensure an error, not a signal, on broken pipe.
-  ACE_Sig_Action no_sigpipe ((ACE_SignalHandler) SIG_IGN);
-  ACE_Sig_Action original_action;
-  no_sigpipe.register_action (SIGPIPE, &original_action);
-
-  ACE_INET_Addr *connection_addr =
-    reinterpret_cast<ACE_INET_Addr *> (arg);
-
-  int i;
-
-  // Automagic memory cleanup.
-  ACE_SOCK_Stream *temp_socks = 0;
-  ACE_NEW_RETURN (temp_socks,
-                  ACE_SOCK_Stream [opt_nconnections],
-                  0);
-  ACE_Auto_Basic_Array_Ptr <ACE_SOCK_Stream> socks (temp_socks);
-
-  // Connection all <opt_nconnections> connections before sending data.
-  ACE_SOCK_Connector c;
-  for (i = 0; i < opt_nconnections; i++)
-    {
-      if (c.connect (socks[i], *connection_addr) == -1)
-        {
-          if (errno != ECONNREFUSED || i == 0)
-            {
-              ACE_ERROR ((LM_ERROR,
-                          ACE_TEXT ("(%t) conn %d %p\n"),
-                          ACE_TEXT ("connect")));
-              while (--i >= 0)
-                socks[i].close ();
-              break;
-            }
-        }
-      socks[i].enable (ACE_NONBLOCK);
-    }
-  if (i < opt_nconnections)
-    return 0;
-
-  // Keep blasting data on all possible connections until this thread
-  // is canceled. If we manage to overrun the receiver on all sockets,
-  // sleep a bit for the receivers to catch up.
-  ACE_thread_t me = ACE_Thread::self ();
-  ACE_Thread_Manager *tm = ACE_Thread_Manager::instance ();
-  size_t send_cnt = ACE_OS::strlen (ACE_ALPHABET);
-  bool fail = false;
-  while (!tm->testcancel (me) && !fail)
-    {
-      bool sent_something = false;
-      for (i = 0; i < opt_nconnections; i++)
-        {
-          ssize_t cnt = socks[i].send (ACE_ALPHABET, send_cnt);
-          if (opt_debug)
-            ACE_DEBUG ((LM_DEBUG,
-                        ACE_TEXT ("(%t) h %d sent %b\n"),
-                        socks[i].get_handle(),
-                        cnt));
-          if (cnt > 0)
-            {
-              sent_something = true;
-              continue;
-            }
-          if (errno == EWOULDBLOCK)
-            continue;
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("(%t) %p; giving up\n"),
-                      ACE_TEXT ("sender")));
-          fail = true;
-          break;
-        }
-      if (!fail && !sent_something)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("(%t) Full sockets... pausing...\n")));
-          ACE_OS::sleep (1);
-          ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Resuming sending.\n")));
-        }
-    }
-
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Done sending.\n")));
-  for (i = 0; i < opt_nconnections; i++)
-    socks[i].close ();
-  return 0;
-}
-
-ACE_THR_FUNC_RETURN
-reactor_loop (void *p)
-{
-  ACE_Reactor *r = reinterpret_cast<ACE_Reactor *> (p);
-  int me = reactor_thread_nr++;
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) Reactor loop %d starting...\n"), me));
-  if (me == 0)
-    r->owner (ACE_Thread::self ());
-  if (r->run_reactor_event_loop () == -1)
-    ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%t) %p\n"), ACE_TEXT ("reactor")));
-  else
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) reactor thread %d ending\n"), me));
-  return 0;
-}
-
-void
-run (ACE_Reactor_Impl &ri, const ACE_TCHAR *what, bool tp = true)
-{
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Starting test with %s\n"), what));
-
-  ACE_Reactor r (&ri);
-  ACE_Thread_Manager *tm = ACE_Thread_Manager::instance ();
-  ACE_Acceptor<Read_Handler, ACE_SOCK_ACCEPTOR> acceptor;
-
-  // Bind acceptor to any port and then find out what the port was.
-  ACE_INET_Addr server_addr;
-  ACE_INET_Addr local_addr (ACE_sap_any_cast (const ACE_INET_Addr &));
-  if (acceptor.open (local_addr, &r) == -1
-      || acceptor.acceptor ().get_local_addr (server_addr) == -1)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("(%t) %p\n"),
-                  ACE_TEXT ("acceptor open")));
-      return;
-    }
-
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("(%t) starting server at port %d\n"),
-              server_addr.get_port_number ()));
-
-  reactor_thread_nr = 0;   // Reset for new set
-  if (-1 == tm->spawn_n (tp ? opt_reactor_threads : 1, reactor_loop, &r))
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("%p\n"),
-                  ACE_TEXT ("reactor thread spawn")));
-      acceptor.close();
-      return;
-    }
-
-  ACE_INET_Addr connection_addr (server_addr.get_port_number (),
-                                 ACE_DEFAULT_SERVER_HOST);
-
-  int sender_grp = tm->spawn (sender, &connection_addr);
-  if (-1 == sender_grp)
-    {
-      ACE_ERROR ((LM_ERROR, ACE_TEXT ("%p\n"), ACE_TEXT ("sender spawn")));
-    }
-  else
-    {
-      ACE_OS::sleep (opt_secs);
-      tm->cancel_grp (sender_grp);
-    }
-  r.end_reactor_event_loop ();
-
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("(%t) waiting for the test threads...\n")));
-  tm->wait ();
-}
-
-int
-run_main (int argc, ACE_TCHAR *argv[])
-{
-  ACE_START_TEST (ACE_TEXT ("Reactor_Fairness_Test"));
-
-  //FUZZ: disable check_for_lack_ACE_OS
-  ACE_Get_Opt getopt (argc, argv, ACE_TEXT ("c:s:t:d"), 1);
-  for (int c; (c = getopt ()) != -1; )
-  //FUZZ: enble check_for_lack_ACE_OS
-    switch (c)
-      {
-      case 'c':
-        opt_nconnections = ACE_OS::atoi (getopt.opt_arg ());
-        break;
-      case 's':
-        opt_secs = ACE_OS::atoi (getopt.opt_arg ());
-        break;
-      case 't':
-        opt_reactor_threads = ACE_OS::atoi (getopt.opt_arg ());
-        break;
-      case 'd':
-        opt_debug = 1;
-        break;
-      }
-
-  // Run the test once for each reactor type available.
-  int fails = 0;
-  results.reset (opt_nconnections);
-  {
-    ACE_Select_Reactor r;
-    run (r, ACE_TEXT ("Select Reactor"), false);  // No thread pool
-  }
-  fails += results.analyze_reports ();
- 
-  results.reset (opt_nconnections);
-  {
-    ACE_TP_Reactor r;
-    run (r, ACE_TEXT ("TP Reactor"));
-  }
-  fails += results.analyze_reports ();
-
-#if defined (ACE_HAS_EVENT_POLL) || defined (ACE_HAS_DEV_POLL)
-  results.reset (opt_nconnections);
-  {
-    ACE_Dev_Poll_Reactor r;
-    run (r, ACE_TEXT ("Dev_Poll Reactor"));
-  }
-  fails += results.analyze_reports ();
-#endif /* ACE_HAS_EVENT_POLL || ACE_HAS_DEV_POLL */
-
-#if defined (ACE_WIN32)
-  results.reset (opt_nconnections);
-  {
-    ACE_WFMO_Reactor r;
-    run (r, ACE_TEXT ("WFMO Reactor"));
-  }
-  fails += results.analyze_reports ();
-#endif /* ACE_WIN32 */
-
-  ACE_END_TEST;
-  return fails;
-}
-
-#else
-int
-run_main (int, ACE_TCHAR *[])
-{
-  ACE_START_TEST (ACE_TEXT ("Reactor_Performance_Test"));
-
-  ACE_ERROR ((LM_INFO,
-              ACE_TEXT ("threads not supported on this platform\n")));
-
-  ACE_END_TEST;
-  return 0;
-}
-#endif /* ACE_HAS_THREADS */
diff --git a/ACE/tests/Reactor_Fairness_Test.h b/ACE/tests/Reactor_Fairness_Test.h
deleted file mode 100644
index 6b8815ace11..00000000000
--- a/ACE/tests/Reactor_Fairness_Test.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    tests
-//
-// = FILENAME
-//    Reactor_Fairness_Test.h
-//
-// = DESCRIPTION
-//    This file includes template class definitions for the
-//    Reactor_Fairness_Test.cpp program.  This class gets its own
-//    header file to work around AIX C++ compiler "features" related
-//    to template instantiation...
-//
-// = AUTHOR
-//    Steve Huston <shuston@riverace.com>
-//
-// ============================================================================
-
-#ifndef ACE_TESTS_REACTOR_FAIRNESS_TEST_H
-#define ACE_TESTS_REACTOR_FAIRNESS_TEST_H
-
-#include "ace/SOCK_Stream.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Svc_Handler.h"
-
-class Read_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-{
-  // = TITLE
-  //   Simple class for reading in the data
-public:
-  Read_Handler () : chunks_in (0) {}
-
-  virtual int handle_input (ACE_HANDLE h);
-  virtual int handle_close (ACE_HANDLE handle,
-                            ACE_Reactor_Mask close_mask);
-  // The Svc_Handler callbacks.
-
-private:
-  unsigned int chunks_in;
-};
-
-#endif /* ACE_TESTS_REACTOR_FAIRNESS_TEST_H */
diff --git a/ACE/tests/Reactor_Performance_Test.cpp b/ACE/tests/Reactor_Performance_Test.cpp
index 975c8c34678..bdb4e51cbac 100644
--- a/ACE/tests/Reactor_Performance_Test.cpp
+++ b/ACE/tests/Reactor_Performance_Test.cpp
@@ -360,8 +360,7 @@ run_main (int argc, ACE_TCHAR *argv[])
   ACE_INET_Addr server_addr;
 
   // Bind acceptor to any port and then find out what the port was.
-  ACE_INET_Addr local_addr (ACE_sap_any_cast (const ACE_INET_Addr &));
-  if (acceptor.open (local_addr) == -1
+  if (acceptor.open (ACE_sap_any_cast (const ACE_INET_Addr &)) == -1
       || acceptor.acceptor ().get_local_addr (server_addr) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("(%t) %p\n"),
diff --git a/ACE/tests/Recursive_Condition_Test.cpp b/ACE/tests/Recursive_Condition_Test.cpp
index 63360905348..6786b478681 100644
--- a/ACE/tests/Recursive_Condition_Test.cpp
+++ b/ACE/tests/Recursive_Condition_Test.cpp
@@ -11,7 +11,8 @@
 // = DESCRIPTION
 //      This test program validates the functionality of the
 //      ACE_Condition<ACE_Recursive_Thread_Mutex> template
-//      specialization.
+//      specialization when combined with the
+//      ACE_Thread_Timer_Queue_Adapter on Win32 and Posix pthreads.
 //
 // = AUTHOR
 //    Stephen Howard <stephen.e.howard@lmco.com> and
@@ -67,9 +68,8 @@ private:
 
 // These are for the basic functionality tests.
 ACE_SYNCH_RECURSIVE_MUTEX mutex_;
-ACE_Condition<ACE_SYNCH_RECURSIVE_MUTEX> condition_ (mutex_);
-// Test driver sets this to non-zero before spawning and to zero for
-// waiter.
+ACE_SYNCH_RECURSIVE_CONDITION condition_(mutex_);
+// Test driver sets this to non-zero before spawning and to zero for waiter.
 int protected_int = 0;
 
 static ACE_THR_FUNC_RETURN
@@ -247,6 +247,7 @@ run_main (int, ACE_TCHAR *[])
   ACE_START_TEST (ACE_TEXT ("Recursive_Condition_Test"));
 
 #if defined (ACE_HAS_THREADS)
+
   int status = 0;
 
   /* Test 1 - Simple test */
diff --git a/ACE/tests/Time_Value_Test.cpp b/ACE/tests/Time_Value_Test.cpp
index 1f136ead1bc..42f6c50b1e5 100644
--- a/ACE/tests/Time_Value_Test.cpp
+++ b/ACE/tests/Time_Value_Test.cpp
@@ -30,10 +30,6 @@ ACE_RCSID(tests, Time_Value_Test, "$Id$")
 
 #include "ace/Numeric_Limits.h"
 
-#ifdef ACE_HAS_CPP98_IOSTREAMS
-#include <sstream>
-#endif
-
 int
 run_main (int, ACE_TCHAR *[])
 {
@@ -98,32 +94,6 @@ run_main (int, ACE_TCHAR *[])
   tv1 *= -10.0;
   ACE_ASSERT (tv1 == tv2);
 
-  const time_t max_time_t = ACE_Numeric_Limits<time_t>::max ();
-  const time_t min_time_t = ACE_Numeric_Limits<time_t>::min ();
-
-  // test protection against overflows
-  // ACE_ASSERT( ACE_Time_Value(max_time_t,ACE_ONE_SECOND_IN_USECS) != ACE_Time_Value(ACE_Numeric_Limits<time_t>::min()) );
-  
-  // test saturated result
-  tv1.set (max_time_t - 1, 499999);
-  tv2.set (max_time_t, 999999);  // ACE_Time_Value::max_time
-  tv1 *= 10.0;
-  ACE_ASSERT (tv1 == tv2);
-  tv1.set (max_time_t - 1, 499999);
-  tv2.set (min_time_t, -999999);
-  tv1 *= -10.0;
-  ACE_ASSERT (tv1 == tv2);
-  
-  // test results near limits
-  tv1.set ((max_time_t >> 1), 499999);
-  tv2.set ((-(max_time_t >> 1) << 1), -999998);
-  tv1 *= -2.0;
-  ACE_ASSERT (tv1 == tv2);
-  tv1.set (max_time_t >> 1, 499999);
-  tv2.set (((max_time_t >> 1) << 1), 999998);
-  tv1 *= 2.0;
-  ACE_ASSERT (tv1 == tv2);
-
   // Test correct msec() convert; also checks for compile error reported in
   // Bugzilla 3336.
   ACE_Time_Value msec_test (42, 555000);
@@ -141,27 +111,6 @@ run_main (int, ACE_TCHAR *[])
                 ACE_TEXT ("msec const test failed: %Q should be 42555\n"),
                 ms));
 
-#ifdef ACE_HAS_CPP98_IOSTREAMS
-  std::ostringstream ost;
-  ost << ACE_Time_Value(1);
-  ACE_ASSERT( ost.str() == "1" );
-  ost.str("");
-  ost << ACE_Time_Value(1,1);
-  ACE_ASSERT( ost.str() == "1.000001" );
-  ost.str("");
-  ost << ACE_Time_Value(-1,-1);
-  ACE_ASSERT( ost.str() == "-1.000001" );
-  ost.str(""); 
-  ost << ACE_Time_Value(0,1);
-  ACE_ASSERT( ost.str() == "0.000001" );
-  ost.str("");
-  ost << ACE_Time_Value(0,-1);
-  ACE_ASSERT( ost.str() == "-0.000001" );
-  ost.str("");
-  ost << ACE_Time_Value();
-  ACE_ASSERT( ost.str() == "0" );
-#endif
-                
   ACE_END_TEST;
 
   return ret;
diff --git a/ACE/tests/run_test.lst b/ACE/tests/run_test.lst
index 6570ca8da25..4797eb20206 100644
--- a/ACE/tests/run_test.lst
+++ b/ACE/tests/run_test.lst
@@ -33,11 +33,11 @@ Buffer_Stream_Test
 Bug_1576_Regression_Test
 Bug_1890_Regression_Test
 Bug_2368_Regression_Test: ALL !DISABLED
-Bug_2434_Regression_Test
+Bug_2434_Regression_Test: !FIXED_BUGS_ONLY
 Bug_2497_Regression_Test
 Bug_2540_Regression_Test
-Bug_2609_Regression_Test: !ST !ACE_FOR_TAO
-Bug_2610_Regression_Test: !ST !ACE_FOR_TAO
+#Bug_2609_Regression_Test: !ST !ACE_FOR_TAO
+#Bug_2610_Regression_Test: !ST !ACE_FOR_TAO
 Bug_2659_Regression_Test: !ST !VxWorks64 !VxWorks65
 Bug_2653_Regression_Test: !ST
 Bug_2740_Regression_Test: !ST
@@ -161,7 +161,6 @@ Bug_3332_Regression_Test
 Reactor_Dispatch_Order_Test
 Reactor_Dispatch_Order_Test_Dev_Poll:
 Reactor_Exceptions_Test
-Reactor_Fairness_Test: !FIXED_BUGS_ONLY
 Reactor_Notify_Test: !ST !ACE_FOR_TAO
 Reactor_Notification_Queue_Test
 Reactor_Performance_Test: !ACE_FOR_TAO
diff --git a/ACE/tests/tests.mpc b/ACE/tests/tests.mpc
index 8ee44a1a028..80b98926e03 100644
--- a/ACE/tests/tests.mpc
+++ b/ACE/tests/tests.mpc
@@ -376,6 +376,9 @@ project(Bug_3673_Regression_Test) : acetest {
 
 project(Bug_3709_Regression_Test) : acetest {
   exename = Bug_3709_Regression_Test
+  specific (vc71) {
+    requires += dummy_label
+  }
   Source_Files {
     Bug_3709_Regression_Test.cpp
   }
@@ -1146,13 +1149,6 @@ project(Reactor_Dispatch_Order_Test_Dev_Poll) : acetest {
   }
 }
 
-project(Reactor Fairness Test) : acetest {
-  exename = Reactor_Fairness_Test
-  Source_Files {
-    Reactor_Fairness_Test.cpp
-  }
-}
-
 project(Reactor Performance Test) : acetest {
   avoids += ace_for_tao
   exename = Reactor_Performance_Test
diff --git a/ADBC/ChangeLog b/ADBC/ChangeLog
index 21043c44616..b04428a6c5e 100644
--- a/ADBC/ChangeLog
+++ b/ADBC/ChangeLog
@@ -1,9 +1,3 @@
-Thu Feb 18 05:44:41 UTC 2010  James H. Hill  <hillj at cs dot iupui dot edu>
-
-        * MPC/config/adbc_odbc.mpb:
-
-          Missing base project file.
-
 Mon Jan  4 16:51:31 UTC 2010  James H. Hill  <hillj at cs dot iupui dot edu>
 
         * .:
diff --git a/ADBC/MPC/config/adbc_odbc.mpb b/ADBC/MPC/config/adbc_odbc.mpb
deleted file mode 100644
index 7750ed3107b..00000000000
--- a/ADBC/MPC/config/adbc_odbc.mpb
+++ /dev/null
@@ -1,6 +0,0 @@
-// $Id$
-
-project : odbc, adbc_defaults {
-  libs  += ADBC_ODBC
-  after += ADBC_ODBC
-}
diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 43b3a051c30..cbfa8dab7a9 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3400 +1,6 @@
-Wed Feb 24 15:23:40 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.cpp:
-        * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp:
-        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp:
-        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp:
-          Resolved compiler errors.
-
-Wed Feb 24 15:01:17 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/BuiltinTopicKey_t.h:
-        * connectors/dds4ccm/impl/ndds/DataReader.h:
-        * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.h:
-        * connectors/dds4ccm/impl/ndds/DataReaderListener.h:
-        * connectors/dds4ccm/impl/ndds/DataReaderQos.h:
-        * connectors/dds4ccm/impl/ndds/DataWriter.h:
-        * connectors/dds4ccm/impl/ndds/DataWriterListener.h:
-        * connectors/dds4ccm/impl/ndds/DataWriterQos.h:
-        * connectors/dds4ccm/impl/ndds/DeadlineQosPolicy.h:
-        * connectors/dds4ccm/impl/ndds/DestinationOrderQosPolicy.h:
-        * connectors/dds4ccm/impl/ndds/DomainParticipantFactoryQos.h:
-        * connectors/dds4ccm/impl/ndds/DomainParticipantListener.h:
-        * connectors/dds4ccm/impl/ndds/DomainParticipantQos.h:
-        * connectors/dds4ccm/impl/ndds/DurabilityQosPolicy.h:
-        * connectors/dds4ccm/impl/ndds/DurabilityServiceQosPolicy.h:
-        * connectors/dds4ccm/impl/ndds/Duration_t.h:
-        * connectors/dds4ccm/impl/ndds/EntityFactoryQosPolicy.h:
-        * connectors/dds4ccm/impl/ndds/GroupDataQosPolicy.h:
-        * connectors/dds4ccm/impl/ndds/HistoryQosPolicy.h:
-        * connectors/dds4ccm/impl/ndds/InconsistentTopicStatus.h:
-        * connectors/dds4ccm/impl/ndds/InstanceHandleSeq.h:
-        * connectors/dds4ccm/impl/ndds/InstanceHandle_t.h:
-        * connectors/dds4ccm/impl/ndds/LatencyBudgetQosPolicy.h:
-        * connectors/dds4ccm/impl/ndds/LifespanQosPolicy.h:
-        * connectors/dds4ccm/impl/ndds/LivelinessChangedStatus.h:
-        * connectors/dds4ccm/impl/ndds/LivelinessLostStatus.h:
-        * connectors/dds4ccm/impl/ndds/LivelinessQosPolicy.h:
-        * connectors/dds4ccm/impl/ndds/OfferedDeadlineMissedStatus.h:
-        * connectors/dds4ccm/impl/ndds/OfferedIncompatibleQosStatus.h:
-        * connectors/dds4ccm/impl/ndds/OwnershipQosPolicy.h:
-        * connectors/dds4ccm/impl/ndds/OwnershipStrengthQosPolicy.h:
-        * connectors/dds4ccm/impl/ndds/PartitionQosPolicy.h:
-        * connectors/dds4ccm/impl/ndds/PresentationQosPolicy.h:
-        * connectors/dds4ccm/impl/ndds/PublicationBuiltinTopicData.h:
-        * connectors/dds4ccm/impl/ndds/PublicationMatchedStatus.h:
-        * connectors/dds4ccm/impl/ndds/Publisher.h:
-        * connectors/dds4ccm/impl/ndds/PublisherListener.h:
-        * connectors/dds4ccm/impl/ndds/PublisherQos.h:
-        * connectors/dds4ccm/impl/ndds/QosPolicyCountSeq.h:
-        * connectors/dds4ccm/impl/ndds/QueryCondition.h:
-        * connectors/dds4ccm/impl/ndds/ReadCondition.h:
-        * connectors/dds4ccm/impl/ndds/ReaderDataLifecycleQosPolicy.h:
-        * connectors/dds4ccm/impl/ndds/ReliabilityQosPolicy.h:
-        * connectors/dds4ccm/impl/ndds/RequestedDeadlineMissedStatus.h:
-        * connectors/dds4ccm/impl/ndds/RequestedIncompatibleQosStatus.h:
-        * connectors/dds4ccm/impl/ndds/ResourceLimitsQosPolicy.h:
-        * connectors/dds4ccm/impl/ndds/SampleLostStatus.h:
-        * connectors/dds4ccm/impl/ndds/SampleRejectedStatus.h:
-        * connectors/dds4ccm/impl/ndds/StatusCondition.h:
-        * connectors/dds4ccm/impl/ndds/StringSeq.h:
-        * connectors/dds4ccm/impl/ndds/Subscriber.h:
-        * connectors/dds4ccm/impl/ndds/SubscriberListener.h:
-        * connectors/dds4ccm/impl/ndds/SubscriberQos.h:
-        * connectors/dds4ccm/impl/ndds/SubscriptionMatchedStatus.h:
-        * connectors/dds4ccm/impl/ndds/TimeBasedFilterQosPolicy.h:
-        * connectors/dds4ccm/impl/ndds/Time_t.h:
-        * connectors/dds4ccm/impl/ndds/TopicDataQosPolicy.h:
-        * connectors/dds4ccm/impl/ndds/TopicListener.h:
-        * connectors/dds4ccm/impl/ndds/TopicQos.h:
-        * connectors/dds4ccm/impl/ndds/TransportPriorityQosPolicy.h:
-        * connectors/dds4ccm/impl/ndds/UserDataQosPolicy.h:
-        * connectors/dds4ccm/impl/ndds/WriterDataLifecycleQosPolicy.h:
-          Implemented Qos operators and renamed header defines.
-
-Wed Feb 24 14:36:37 UTC 2010  William R. Otte <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/tools/Split_Plan/Split_Plan_impl.h:
-
-          Fuzz fix.
-
-Wed Feb 24 13:21:52 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/idl/dds_rtf2_dcps.idl:
-          Removed all lem interfaces
-
-        * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp:
-        * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp:
-          Fixed compile errors
-
-        * connectors/dds4ccm/impl/ndds/DataWriterListener_T.cpp:
-        * connectors/dds4ccm/impl/ndds/DataWriterListener_T.h:
-          Some callbacks are ndds specific
-
-Wed Feb 24 11:43:52 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * MPC/config/dds4ccm_ts_default.mpb:
-          ndds needs no-strict-aliasing
-
-Wed Feb 24 11:39:52 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/DataWriter.cpp
-        * connectors/dds4ccm/impl/ndds/DataWriter.h
-        * connectors/dds4ccm/impl/ndds/DataWriterListener.cpp
-        * connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp
-        * connectors/dds4ccm/impl/ndds/DDS_Write_T.h
-        * connectors/dds4ccm/impl/ndds/Publisher.cpp
-        * connectors/dds4ccm/impl/ndds/PublisherListener.cpp
-        * connectors/dds4ccm/impl/ndds/TopicDescription.h
-          More cleanup
-
-Wed Feb 24 11:26:52 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.cpp
-        * connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.h
-        * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp
-        * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.h
-        * connectors/dds4ccm/impl/ndds/DataReader.cpp
-        * connectors/dds4ccm/impl/ndds/DataReader.h
-        * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp
-        * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.h
-        * connectors/dds4ccm/impl/ndds/DataReaderListener.cpp
-        * connectors/dds4ccm/impl/ndds/DataReaderListener.h
-        * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp
-        * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h
-        * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp
-        * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h
-        * connectors/dds4ccm/impl/ndds/DataWriter.cpp
-        * connectors/dds4ccm/impl/ndds/DataWriter.h
-        * connectors/dds4ccm/impl/ndds/DataWriterListener.cpp
-        * connectors/dds4ccm/impl/ndds/DataWriterListener.h
-        * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp
-        * connectors/dds4ccm/impl/ndds/DDS_Get_T.h
-        * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp
-        * connectors/dds4ccm/impl/ndds/DDS_Listen_T.h
-        * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp
-        * connectors/dds4ccm/impl/ndds/DDS_Read_T.h
-        * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp
-        * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.h
-        * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp
-        * connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp
-        * connectors/dds4ccm/impl/ndds/DDS_Update_T.h
-        * connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp
-        * connectors/dds4ccm/impl/ndds/DDS_Write_T.h
-        * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp
-        * connectors/dds4ccm/impl/ndds/DomainParticipant.h
-        * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp
-        * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h
-        * connectors/dds4ccm/impl/ndds/DomainParticipantListener.cpp
-        * connectors/dds4ccm/impl/ndds/DomainParticipantListener.h
-        * connectors/dds4ccm/impl/ndds/Getter_T.cpp
-        * connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.cpp
-        * connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.h
-        * connectors/dds4ccm/impl/ndds/Publisher.cpp
-        * connectors/dds4ccm/impl/ndds/Publisher.h
-        * connectors/dds4ccm/impl/ndds/PublisherListener.cpp
-        * connectors/dds4ccm/impl/ndds/PublisherListener.h
-        * connectors/dds4ccm/impl/ndds/QueryCondition.cpp
-        * connectors/dds4ccm/impl/ndds/QueryCondition.h
-        * connectors/dds4ccm/impl/ndds/ReadCondition.cpp
-        * connectors/dds4ccm/impl/ndds/ReadCondition.h
-        * connectors/dds4ccm/impl/ndds/Reader_T.cpp
-        * connectors/dds4ccm/impl/ndds/Subscriber.cpp
-        * connectors/dds4ccm/impl/ndds/Subscriber.h
-        * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp
-        * connectors/dds4ccm/impl/ndds/SubscriberListener.h
-        * connectors/dds4ccm/impl/ndds/Topic.cpp
-        * connectors/dds4ccm/impl/ndds/TopicDescription.cpp
-        * connectors/dds4ccm/impl/ndds/Updater_T.cpp
-        * connectors/dds4ccm/impl/ndds/Updater_T.h
-        * connectors/dds4ccm/impl/ndds/Writer_T.cpp
-        * connectors/dds4ccm/impl/ndds/Writer_T.h
-          Cleaning up the implementation
-
-Wed Feb 24 10:45:52 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp
-        * connectors/dds4ccm/impl/ndds/DataReader.cpp
-        * connectors/dds4ccm/impl/ndds/DataWriter.cpp
-        * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp
-        * connectors/dds4ccm/impl/ndds/Publisher.cpp
-        * connectors/dds4ccm/impl/ndds/Reader_T.h
-        * connectors/dds4ccm/impl/ndds/StatusCondition.cpp
-        * connectors/dds4ccm/impl/ndds/StatusCondition.h
-        * connectors/dds4ccm/impl/ndds/Subscriber.cpp
-        * connectors/dds4ccm/impl/ndds/Topic.cpp
-        * connectors/dds4ccm/impl/ndds/Topic.h
-        * connectors/dds4ccm/impl/ndds/TopicDescription.cpp
-        * connectors/dds4ccm/impl/ndds/TopicDescription.h
-        * connectors/dds4ccm/impl/ndds/TopicListener.cpp
-        * connectors/dds4ccm/impl/ndds/TopicListener.h
-          Cleaning up the implementation
-
-Wed Feb 24 08:09:43 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp:
-        * connectors/dds4ccm/impl/ndds/Publisher.cpp:
-          Resolved compiler warnings on Linux.
-
-Wed Feb 24 08:06:47 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp:
-        * connectors/dds4ccm/impl/ndds/DataReader.cpp:
-        * connectors/dds4ccm/impl/ndds/DataReaderListener.cpp:
-        * connectors/dds4ccm/impl/ndds/DataWriter.cpp:
-        * connectors/dds4ccm/impl/ndds/DataWriterListener.cpp:
-        * connectors/dds4ccm/impl/ndds/DomainParticipant.h:
-        * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp:
-        * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp:
-        * connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.h:
-        * connectors/dds4ccm/impl/ndds/PublisherListener.cpp:
-        * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp:
-        * connectors/dds4ccm/impl/ndds/QueryCondition.cpp:
-        * connectors/dds4ccm/impl/ndds/Subscriber.h:
-        * connectors/dds4ccm/impl/ndds/Subscriber.cpp:
-        * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp:
-        * connectors/dds4ccm/impl/ndds/Topic.cpp:
-        * connectors/dds4ccm/impl/ndds/Utils.h:
-          Resolved compiler warnings. Also removed unnecessary
-          space characters.
-
-Wed Feb 24 07:28:52 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/idl/dds_rtf2_dcps.idl
-        * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp
-        * connectors/dds4ccm/impl/ndds/DataReader.cpp
-        * connectors/dds4ccm/impl/ndds/DataReader.h
-        * connectors/dds4ccm/impl/ndds/DataReaderListener.cpp
-        * connectors/dds4ccm/impl/ndds/DataReaderQos.h
-        * connectors/dds4ccm/impl/ndds/DataWriter.cpp
-        * connectors/dds4ccm/impl/ndds/DataWriter.h
-        * connectors/dds4ccm/impl/ndds/DataWriterListener.cpp
-        * connectors/dds4ccm/impl/ndds/DataWriterListener.h
-        * connectors/dds4ccm/impl/ndds/DataWriterQos.h
-        * connectors/dds4ccm/impl/ndds/DeadlineQosPolicy.h
-        * connectors/dds4ccm/impl/ndds/DestinationOrderQosPolicy.h
-        * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp
-        * connectors/dds4ccm/impl/ndds/DomainParticipant.h
-        * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp
-        * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h
-        * connectors/dds4ccm/impl/ndds/DomainParticipantFactoryQos.h
-        * connectors/dds4ccm/impl/ndds/DomainParticipantListener.h
-        * connectors/dds4ccm/impl/ndds/DomainParticipantQos.h
-        * connectors/dds4ccm/impl/ndds/DurabilityQosPolicy.h
-        * connectors/dds4ccm/impl/ndds/DurabilityServiceQosPolicy.h
-        * connectors/dds4ccm/impl/ndds/Duration_t.h
-        * connectors/dds4ccm/impl/ndds/EntityFactoryQosPolicy.h
-        * connectors/dds4ccm/impl/ndds/GroupDataQosPolicy.h
-        * connectors/dds4ccm/impl/ndds/HistoryQosPolicy.h
-        * connectors/dds4ccm/impl/ndds/InconsistentTopicStatus.h
-        * connectors/dds4ccm/impl/ndds/InstanceHandle_t.h
-        * connectors/dds4ccm/impl/ndds/InstanceHandleSeq.h
-        * connectors/dds4ccm/impl/ndds/LatencyBudgetQosPolicy.h
-        * connectors/dds4ccm/impl/ndds/LifespanQosPolicy.h
-        * connectors/dds4ccm/impl/ndds/LivelinessChangedStatus.h
-        * connectors/dds4ccm/impl/ndds/LivelinessLostStatus.h
-        * connectors/dds4ccm/impl/ndds/LivelinessQosPolicy.h
-        * connectors/dds4ccm/impl/ndds/OfferedDeadlineMissedStatus.h
-        * connectors/dds4ccm/impl/ndds/OfferedIncompatibleQosStatus.h
-        * connectors/dds4ccm/impl/ndds/OwnershipQosPolicy.h
-        * connectors/dds4ccm/impl/ndds/OwnershipStrengthQosPolicy.h
-        * connectors/dds4ccm/impl/ndds/PartitionQosPolicy.h
-        * connectors/dds4ccm/impl/ndds/PresentationQosPolicy.h
-        * connectors/dds4ccm/impl/ndds/PublicationMatchedStatus.h
-        * connectors/dds4ccm/impl/ndds/Publisher.cpp
-        * connectors/dds4ccm/impl/ndds/PublisherListener.cpp
-        * connectors/dds4ccm/impl/ndds/PublisherListener.h
-        * connectors/dds4ccm/impl/ndds/PublisherQos.h
-        * connectors/dds4ccm/impl/ndds/QosPolicyCountSeq.h
-        * connectors/dds4ccm/impl/ndds/QueryCondition.cpp
-        * connectors/dds4ccm/impl/ndds/ReaderDataLifecycleQosPolicy.h
-        * connectors/dds4ccm/impl/ndds/ReliabilityQosPolicy.h
-        * connectors/dds4ccm/impl/ndds/RequestedDeadlineMissedStatus.h
-        * connectors/dds4ccm/impl/ndds/RequestedIncompatibleQosStatus.h
-        * connectors/dds4ccm/impl/ndds/ResourceLimitsQosPolicy.h
-        * connectors/dds4ccm/impl/ndds/SampleInfo.h
-        * connectors/dds4ccm/impl/ndds/SampleLostStatus.h
-        * connectors/dds4ccm/impl/ndds/SampleRejectedStatus.h
-        * connectors/dds4ccm/impl/ndds/StringSeq.h
-        * connectors/dds4ccm/impl/ndds/Subscriber.cpp
-        * connectors/dds4ccm/impl/ndds/Subscriber.h
-        * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp
-        * connectors/dds4ccm/impl/ndds/SubscriberListener.h
-        * connectors/dds4ccm/impl/ndds/SubscriberQos.h
-        * connectors/dds4ccm/impl/ndds/SubscriptionMatchedStatus.h
-        * connectors/dds4ccm/impl/ndds/Time_t.h
-        * connectors/dds4ccm/impl/ndds/TimeBasedFilterQosPolicy.h
-        * connectors/dds4ccm/impl/ndds/TimeUtilities.h
-        * connectors/dds4ccm/impl/ndds/Topic.cpp
-        * connectors/dds4ccm/impl/ndds/TopicDataQosPolicy.h
-        * connectors/dds4ccm/impl/ndds/TopicDescription.h
-        * connectors/dds4ccm/impl/ndds/TopicListener.cpp
-        * connectors/dds4ccm/impl/ndds/TopicQos.h
-        * connectors/dds4ccm/impl/ndds/TransportPriorityQosPolicy.h
-        * connectors/dds4ccm/impl/ndds/UserDataQosPolicy.h
-        * connectors/dds4ccm/impl/ndds/WriterDataLifecycleQosPolicy.h
-          Guarded all RTI specific code
-
-        * MPC/config/dds4ccm.mpb:
-          Don't compile anything related to dds4ccm when we don't have
-          a dds vendor installed
-
-Tue Feb 23 21:49:52 UTC 2010  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/tools/Split_Plan/Split_Plan_impl.cpp:
-
-          Rogue letter was causing a compile error.
-
-Tue Feb 23 16:22:42 UTC 2010  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/MPC/config/dance_convert_plan.mpb:
-        * DAnCE/MPC/config/dance_split_plan.mpb:
-        * DAnCE/MPC/config/dance_tools.mpb:
-        * DAnCE/NodeApplication/NodeApplication_Impl.cpp:
-        * DAnCE/tools/Convert_Plan/Convert_Plan.cpp:
-        * DAnCE/tools/Convert_Plan/Convert_Plan.mpc:
-        * DAnCE/tools/Convert_Plan/Convert_Plan_Impl.h:
-        * DAnCE/tools/Convert_Plan/Convert_Plan_Impl.cpp:
-        * DAnCE/tools/Split_Plan/Split_Plan.mpc:
-        * DAnCE/tools/Split_Plan/Split_Plan.cpp:
-        * DAnCE/tools/Split_Plan/Split_Plan_impl.cpp:
-
-          Fuzz fixes.
-
-Tue Feb 23 16:13:24 UTC 2010  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/NodeApplication/NodeApplication_Impl.cpp:
-
-          Bugfix for how connections are handled when there are two
-          internalEndpoints but it is _not_ a local conneciton.
-
-        * examples/Hello/descriptors/PlanLocality_DifferentProcesses.cdp:
-        * examples/Hello/descriptors/PlanLocality_SameProcess.cdp:
-
-          Corrected IOR file so test script finds controller.
-
-Tue Feb 23 15:33:33 UTC 2010  Abdul Sowayan  <sowayan@gmail.com>
-
-        * DAnCE/tools/Convert_Plan/Convert_Plan.mpc:
-
-          Added dance_config_handlers as a base project to DAnCE_Convert_Plan
-          project. Thanks to William Otte for the suggestion.
-
-Tue Feb 23 15:16:24 UTC 2010  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/ExecutionManager/ExecutionManager.mpc:
-
-          Added split_plan base project.
-
-Tue Feb 23 14:54:11 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp:
-          Inserted forgotten new line character.
-
-Tue Feb 23 14:46:23 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Plan.cdp:
-        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Plan.cdp:
-          Resolved deployment errors related to generation of the connector
-          code.
-
-Tue Feb 23 14:34:59 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * bin/ciao_tests.lst:
-          CSLUnexpStat is not ready, yet.
-
-        * connectors/dds4ccm/impl/ndds/Getter_T.cpp:
-          Layout changes.
-
-        * connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/Plan.cdp:
-        * connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl:
-        * connectors/dds4ccm/tests/VariousTopicsState/descriptors/Plan.cdp:
-        * connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl:
-          Resolved deployment errors related to generation of the connector
-          code.
-
-Tue Feb 23 14:28:22 UTC 2010  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/tools/Convert_Plan/DAnCE_Convert_Plan_export.h:
-
-          Missing file.
-
-Tue Feb 23 13:25:49 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl
-        * connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl
-        * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl
-          Added various pragma's
-
-        * connectors/dds4ccm/idl/dds4ccm.mpc
-        * connectors/dds4ccm/idl/dds_rtf2_dcps.idl
-        * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.h
-        * connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.cpp
-        * connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.h
-        * connectors/dds4ccm/impl/ndds/Getter_T.h
-        * connectors/dds4ccm/impl/ndds/InstanceHandle_t.h
-        * connectors/dds4ccm/impl/ndds/InstanceHandleSeq.h
-        * connectors/dds4ccm/impl/ndds/Publisher.h
-        * connectors/dds4ccm/impl/ndds/PublisherListener.h
-        * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp
-        * connectors/dds4ccm/impl/ndds/PublisherListener_T.h
-        * connectors/dds4ccm/impl/ndds/QosPolicyCountSeq.h
-        * connectors/dds4ccm/impl/ndds/Reader_T.cpp
-        * connectors/dds4ccm/impl/ndds/RequestedDeadlineMissedStatus.h
-        * connectors/dds4ccm/impl/ndds/StringSeq.h
-        * connectors/dds4ccm/impl/ndds/Subscriber.h
-        * MPC/config/ciaoidldefaults.mpb
-        * MPC/config/componentidldefaults.mpb
-          Portability changes
-
-Tue Feb 23 14:08:20 UTC 2010  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/DomainApplicationManager/DomainApplicationManager.mpc:
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h:
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp:
-
-          Use the split plan library instead of internal split plan impl.
-
-        * DAnCE/MPC/config/dance_convert_plan.mpb:
-        * DAnCE/MPC/config/dance_split_plan.mpb:
-        * DAnCE/MPC/config/dance_tools.mpb:
-
-          Base projects for convert_plan/split_plan.
-
-        * DAnCE/tools:
-        * DAnCE/tools/Convert_Plan:
-        * DAnCE/tools/Convert_Plan/Convert_Plan.cpp:
-        * DAnCE/tools/Convert_Plan/Convert_Plan.mpc:
-        * DAnCE/tools/Convert_Plan/Convert_Plan_Impl.h:
-        * DAnCE/tools/Convert_Plan/Convert_Plan_Impl.cpp:
-
-          Tool allowing validation/conversion of XML deployment plans to
-          CDR.
-
-        * DAnCE/tools/Split_Plan:
-        * DAnCE/tools/Split_Plan/DAnCE_Split_Plan_export.h:
-        * DAnCE/tools/Split_Plan/Split_Plan.mpc:
-        * DAnCE/tools/Split_Plan/Split_Plan.cpp:
-        * DAnCE/tools/Split_Plan/Split_Plan_impl.h:
-        * DAnCE/tools/Split_Plan/Split_Plan_impl.cpp:
-
-          Tool allowing users to split plans into locality constrained
-          partitions. Also contains important bugfixes for process
-          colocation.
-
-Tue Feb 23 13:40:49 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/ciao_tests.lst:
-          Added new 3832 tests
-
-        * ciao/Logger/Logger_Service.cpp:
-        * ciao/Logger/Logger_Service.h:
-        * DAnCE/Logger/Logger_Service.cpp:
-        * DAnCE/Logger/Logger_Service.h:
-          Fixed service config macros which caused this service not
-          to get loaded on linux
-
-        * tests/Bug_3832_Regression/*
-        * DAnCE/tests/Bug_3832_Regression/*
-          Added new test for 3832
-
-Tue Feb 23 12:45:56 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/impl/logger/Log_Macros.h:
-        * connectors/dds4ccm/impl/logger/Log_Macros.cpp:
-          Making use of the CIAO_Debug_Level flag of the
-          CIAO logging framework.
-
-Tue Feb 23 11:54:21 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * MPC/config/dds4ccm_impl.mpb:
-        * MPC/config/dds4ccm_logger.mpb:
-        * connectors/dds4ccm/impl/logger:
-        * connectors/dds4ccm/impl/logger/Log_Macros.h:
-        * connectors/dds4ccm/impl/logger/Log_Macros.cpp:
-        * connectors/dds4ccm/impl/logger/Logger.mpc:
-        * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp:
-        * connectors/dds4ccm/impl/ndds/DDSCallbackStatusHandler.cpp:
-        * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp:
-        * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp:
-        * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp:
-        * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp:
-        * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp:
-        * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp:
-        * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp:
-        * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp:
-        * connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp:
-        * connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp:
-        * connectors/dds4ccm/impl/ndds/DataListenerControl_T.cpp:
-        * connectors/dds4ccm/impl/ndds/DataReader.cpp:
-        * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp:
-        * connectors/dds4ccm/impl/ndds/DataReaderListener.cpp:
-        * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp:
-        * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp:
-        * connectors/dds4ccm/impl/ndds/DataWriter.cpp:
-        * connectors/dds4ccm/impl/ndds/DataWriterListener_T.cpp:
-        * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp:
-        * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp:
-        * connectors/dds4ccm/impl/ndds/DomainParticipantListener.cpp:
-        * connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.cpp:
-        * connectors/dds4ccm/impl/ndds/Getter_T.cpp:
-        * connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.cpp:
-        * connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp:
-        * connectors/dds4ccm/impl/ndds/Publisher.cpp:
-        * connectors/dds4ccm/impl/ndds/PublisherListener.cpp:
-        * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp:
-        * connectors/dds4ccm/impl/ndds/QueryCondition.cpp:
-        * connectors/dds4ccm/impl/ndds/Reader_T.cpp:
-        * connectors/dds4ccm/impl/ndds/StateListenerControl_T.cpp:
-        * connectors/dds4ccm/impl/ndds/StatusCondition.cpp:
-        * connectors/dds4ccm/impl/ndds/Subscriber.cpp:
-        * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp:
-        * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp:
-        * connectors/dds4ccm/impl/ndds/Topic.cpp:
-        * connectors/dds4ccm/impl/ndds/TopicDescription.cpp:
-        * connectors/dds4ccm/impl/ndds/TopicListener.cpp:
-        * connectors/dds4ccm/impl/ndds/TopicListener_T.cpp:
-        * connectors/dds4ccm/impl/ndds/Updater_T.cpp:
-        * connectors/dds4ccm/impl/ndds/Writer_T.cpp:
-        * connectors/dds4ccm/impl/ndds/ndds_impl.mpc:
-        * connectors/dds4ccm/tests/QueryFilter/descriptors/run_test.pl:
-          Created DDS4CCM_DEBUG, DDS4CCM_TRACE and DDS4CCM_ERROR macros.
-          For now these macros make use of the CIAO logging framework. In
-          the future, DDS4CCM should have it's own logging framework.
-
-Tue Feb 23 09:26:15 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/Getter_T.h:
-        * connectors/dds4ccm/impl/ndds/Getter_T.cpp:
-          Refactored get_one, making use of the read_w_condition
-          API method.
-
-Tue Feb 23 08:50:49 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl:
-          Added missing pragma
-
-        * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc:
-          Disabled this project for the moment, rtiddsgen can't handle this
-
-Tue Feb 23 07:47:49 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc
-        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc
-        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc
-        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.mpc
-          Updated to generate connector
-
-        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1_exec.cpp
-        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1_exec.h
-        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2_exec.cpp
-        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2_exec.h
-        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3_exec.cpp
-        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3_exec.h
-          removed
-
-Tue Feb 23 07:22:49 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl
-        * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc
-        * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc
-        * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc
-        * connectors/dds4ccm/examples/Quoter/Broker/Broker.mpc
-        * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc
-        * connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc
-        * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc
-        * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc
-        * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc
-        * connectors/dds4ccm/idl/dds4ccm.mpc
-        * connectors/dds4ccm/idl/dds_rtf2_dcps.idl
-        * connectors/dds4ccm/idl/dds_rtf2_dcps_i_handle.idl
-        * connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handle.idl
-        * connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handleC.cpp
-        * connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handleC.h
-        * connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.h
-        * connectors/dds4ccm/impl/ndds/DataReader.h
-        * connectors/dds4ccm/impl/ndds/DataReaderListener.h
-        * connectors/dds4ccm/impl/ndds/DataWriter.h
-        * connectors/dds4ccm/impl/ndds/DataWriterListener.h
-        * connectors/dds4ccm/impl/ndds/DomainParticipant.h
-        * connectors/dds4ccm/impl/ndds/DomainParticipantListener.h
-        * connectors/dds4ccm/impl/ndds/InconsistentTopicStatus.h
-        * connectors/dds4ccm/impl/ndds/InstanceHandle_t.h
-        * connectors/dds4ccm/impl/ndds/LivelinessChangedStatus.h
-        * connectors/dds4ccm/impl/ndds/Publisher.h
-        * connectors/dds4ccm/impl/ndds/PublisherListener.h
-        * connectors/dds4ccm/impl/ndds/QosPolicyCountSeq.h
-        * connectors/dds4ccm/impl/ndds/QueryCondition.h
-        * connectors/dds4ccm/impl/ndds/ReadCondition.h
-        * connectors/dds4ccm/impl/ndds/RequestedIncompatibleQosStatus.h
-        * connectors/dds4ccm/impl/ndds/SampleRejectedStatus.h
-        * connectors/dds4ccm/impl/ndds/StatusCondition.h
-        * connectors/dds4ccm/impl/ndds/Subscriber.h
-        * connectors/dds4ccm/impl/ndds/SubscriberListener.h
-        * connectors/dds4ccm/impl/ndds/SubscriptionMatchedStatus.h
-        * connectors/dds4ccm/impl/ndds/TopicDescription.h
-        * connectors/dds4ccm/impl/ndds/TopicListener.h
-        * connectors/dds4ccm/impl/ndds/Utils.h
-        * connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc
-        * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.mpc
-        * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.mpc
-        * connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector.mpc
-        * connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver.mpc
-        * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender.mpc
-        * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc
-        * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc
-        * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc
-        * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc
-        * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc
-        * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc
-        * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc
-        * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc
-        * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc
-        * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc
-        * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc
-        * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc
-        * connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.mpc
-        * connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver.mpc
-        * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender.mpc
-        * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc
-        * connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.mpc
-        * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.mpc
-        * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc
-        * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc
-        * connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc
-        * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl
-        * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc
-        * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc
-        * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.mpc
-        * connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc
-        * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc
-        * connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc
-        * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.mpc
-        * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc
-        * connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc
-        * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc
-        * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc
-        * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc
-        * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.mpc
-        * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.mpc
-        * connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc
-        * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.mpc
-        * connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc
-        * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc
-        * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.mpc
-        * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.mpc
-        * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc
-        * connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector.mpc
-        * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver.mpc
-        * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.mpc
-        * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender.mpc
-        * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc
-        * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc
-        * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc
-        * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc
-        * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc
-        * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc
-        * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Starter.mpc
-        * connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector.mpc
-        * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver.mpc
-        * connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender.mpc
-        * connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc
-        * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc
-        * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc
-        * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc
-        * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc
-        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc
-        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc
-        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc
-        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc
-        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc
-        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc
-        * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc
-        * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc
-        * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc
-        * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc
-        * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc
-        * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc
-        * connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc
-        * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.mpc
-        * connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc
-        * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc
-        * connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.mpc
-        * connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc
-        * connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc
-        * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc
-        * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc
-        * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.mpc
-        * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc
-        * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc
-        * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc
-        * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc
-        * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc
-        * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc
-        * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc
-        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc
-        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc
-        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc
-        * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc
-        * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc
-        * connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc
-        * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc
-        * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc
-        * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc
-        * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc
-        * connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc
-        * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc
-        * MPC/config/connectoridldefaults.mpb
-        * MPC/config/dds4ccm.mpb
-        * MPC/config/dds4ccm_base.mpb
-        * MPC/config/dds4ccm_ts_default.mpb
-          More portability changes
-
-Tue Feb 23 04:44:49 UTC 2010  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleProcessColocation.cdp:
-        * DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleProcessColocation_2.cdp:
-        * DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleProcessColocation_Default.cdp:
-
-          Tests to excercise process colocation when passed through the
-          EM.
-
-        * DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl:
-
-          Test script was broken and not actually running tests.
-
-Tue Feb 23 04:05:06 UTC 2010  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/bin/PythonDAnCE/generator/__init__.py:
-        * DAnCE/bin/PythonDAnCE/generator/comp_impl.py:
-        * DAnCE/bin/PythonDAnCE/generator/comp_inst.py:
-        * DAnCE/bin/PythonDAnCE/generator/config_prop.py:
-        * DAnCE/bin/PythonDAnCE/generator/connection.py:
-        * DAnCE/bin/PythonDAnCE/generator/deploy_requirement.py:
-        * DAnCE/bin/PythonDAnCE/generator/external_reference.py:
-        * DAnCE/bin/PythonDAnCE/generator/internal_endpoint.py:
-        * DAnCE/bin/generate_plan.py:
-
-          Improvements to allow more expressive plan generation.
-
-Tue Feb 23 04:03:46 UTC 2010  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/NodeApplication/NodeApplication_Impl.cpp:
-
-          Additional error checking, and an improvements to how
-          colocation groups with NoConstraint are handled.
-
-Tue Feb 23 02:55:31 UTC 2010  Abdul Sowayan  <sowayan@gmail.com>
-
-        * examples/Hello/descriptors/NodeMap.dat:
-        * examples/Hello/descriptors/PlanLocality_DifferentProcesses.cdp:
-        * examples/Hello/descriptors/PlanLocality_SameProcess.cdp:
-        * examples/Hello/descriptors/run_test_PlanLocality_DifferentProcesses.pl:
-        * examples/Hello/descriptors/run_test_PlanLocality_SameProcess.pl:
-
-          Added the files above to test PlanLocality feature.
-
-Tue Feb 23 02:39:25 UTC 2010  Abdul Sowayan  <sowayan@gmail.com>
-
-        * examples/Hello/Receiver/Receiver_exec.h:
-        * examples/Hello/Receiver/Receiver_exec.cpp:
-        * examples/Hello/Sender/Sender_exec.h:
-        * examples/Hello/Sender/Sender_exec.cpp:
-
-          Update this example. It was out of date and as such, it
-          wouldn't work with CoSMIC generated descriptors (due
-          to missing entry points).
-
-Mon Feb 22 22:13:59 UTC 2010  Abdul Sowayan  <sowayan@gmail.com>
-
-        * examples/Null_Component/descriptors/NodeMap.dat:
-
-          Changed port number.
-
-        * examples/Null_Component/descriptors/run_test_without_ns.pl:
-
-          Enhanced this script so it would deploy all cdps (component deployment plans)
-          that are in the directory.
-
-Mon Feb 22 21:39:08 UTC 2010  Abdul Sowayan  <sowayan@gmail.com>
-
-        * examples/Null_Component/descriptors/Null_PlanLocality_DifferentProcesses.cdp:
-        * examples/Null_Component/descriptors/Null_PlanLocality_SameProcess.cdp:
-          Add a couple of deployment plans to test the PlanLocality feature.
-
-Mon Feb 22 20:48:36 UTC 2010  Abdul Sowayan  <sowayan@gmail.com>
-
-        * examples/Null_Component/descriptors/NodeMap.dat:
-        * examples/Null_Component_Glfa/descriptors/NodeMap.dat:
-
-          Fixed a small bug in these files.
-
-        * examples/Null_Component/descriptors/run_test_without_ns.pl:
-
-          Added a new test to deploy this example without using the naming service.
-
-        * bin/ciao_tests.lst:
-
-          Add run_test_without_ns.pl to the daily regression tests.
-
-Feb 22 14:26:16 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/tests/Getter/Base/Get_Invoker.idl:
-        * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl:
-        * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.idl:
-        * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.idl:
-        * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h:
-        * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp:
-        * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.idl:
-        * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h:
-        * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp:
-        * connectors/dds4ccm/tests/Getter/descriptors/Plan.cdp:
-          Extended test with an extra connector which handles a fixed
-          size struct.
-
-Mon Feb 22 13:48:38 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl
-        * connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl
-        * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl
-        * connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.idl
-        * connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.idl
-        * connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.idl
-        * 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/DDSWriterEntity/Base/Writer_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/EventConnector/Connector/FSS_Event_Connector.idl
-        * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.idl
-        * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.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/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/NonChangeableAttribute/Base/NonChangeable_Base.idl
-        * connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/ConnectorStatusListener_Test_Base.idl
-        * connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl
-        * connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.idl
-        * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Test_Base.idl
-        * connectors/dds4ccm/tests/Reader/Base/Reader_Test_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/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/State_Connection_Test/Base/State_Connection_Test_Base.idl
-        * connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl
-        * connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.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/VariousTopicsEvent/Base/VTopic_Base.idl
-        * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl
-          Updated rti typesupport to ndds typesupport, everywhere we talk
-          about ndds
-
-Mon Feb 22 13:39:38 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.h
-        * connectors/dds4ccm/impl/ndds/DataReader.h
-        * connectors/dds4ccm/impl/ndds/DataWriter.h
-        * connectors/dds4ccm/impl/ndds/DomainParticipant.h
-        * connectors/dds4ccm/impl/ndds/Duration_t.h
-        * connectors/dds4ccm/impl/ndds/Getter_T.h
-        * connectors/dds4ccm/impl/ndds/InstanceHandle_t.h
-        * connectors/dds4ccm/impl/ndds/QueryCondition.h
-        * connectors/dds4ccm/impl/ndds/Reader_T.h
-        * connectors/dds4ccm/impl/ndds/SampleInfo.h
-        * connectors/dds4ccm/impl/ndds/Subscriber.h
-        * connectors/dds4ccm/impl/ndds/Time_t.h
-        * connectors/dds4ccm/impl/ndds/Topic.h
-          Portability improvements
-
-        * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl:
-          Updated typesupport
-
-Mon Feb 22 12:47:38 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/MPC/config/dance_nodeapplication.mpb
-        * DAnCE/NodeApplication/NodeApplication.mpc
-          Corrected after
-
-Mon Feb 22 12:46:38 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/MPC/config/dance_nodeapplicationmanager.mpb
-        * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc
-          Corrected after
-
-Mon Feb 22 12:36:38 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc
-        * connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc
-        * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc
-        * connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.mpc
-        * connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.mpc
-        * connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc
-        * connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc
-        * connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc
-        * connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc
-        * connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.mpc
-        * connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc
-        * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.mpc
-        * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.mpc
-        * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc
-        * connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.mpc
-        * connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc
-        * connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc
-        * connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc
-        * connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc
-        * connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc
-        * connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc
-        * connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/ConnectorStatusListener_Test_Base.mpc
-        * connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc
-        * connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc
-        * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Test_Base.mpc
-        * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc
-        * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc
-        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.mpc
-        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.mpc
-        * connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc
-        * connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc
-        * connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc
-        * connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc
-        * connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc
-        * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.mpc
-        * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.mpc
-        * connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc
-        * connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc
-        * connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc
-        * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc
-        * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc
-          Added empty source files to not pickup files that are already generated
-          by other projects in the same directory
-
-Mon Feb 22 12:30:38 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc
-        * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc
-        * connectors/dds4ccm/examples/Quoter/Broker/Broker.mpc
-        * connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc
-        * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc
-        * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc
-        * connectors/dds4ccm/impl/ndds/ndds_impl.mpc
-        * connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc
-        * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.mpc
-        * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.mpc
-        * connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector.mpc
-        * connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver.mpc
-        * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender.mpc
-        * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc
-        * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc
-        * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc
-        * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc
-        * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc
-        * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc
-        * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc
-        * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc
-        * connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver.mpc
-        * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender.mpc
-        * connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.mpc
-        * connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.mpc
-        * connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc
-        * connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc
-        * connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.mpc
-        * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc
-        * connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.mpc
-        * connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc
-        * connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc
-        * connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc
-        * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.mpc
-        * connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.mpc
-        * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.mpc
-        * connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc
-        * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.mpc
-        * connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.mpc
-        * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver.mpc
-        * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender.mpc
-        * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc
-        * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc
-        * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc
-        * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc
-        * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Starter.mpc
-        * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver.mpc
-        * connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender.mpc
-        * connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc
-        * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc
-        * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc
-        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc
-        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc
-        * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc
-        * connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc
-        * connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc
-        * connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc
-        * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.mpc
-        * connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc
-        * connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.mpc
-        * connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc
-        * connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.mpc
-        * connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc
-        * connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc
-        * connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc
-        * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc
-        * connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc
-        * connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc
-        * connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc
-        * connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc
-        * connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc
-          Removed nddslib as base project
-
-        * MPC/config/dds4ccm_base.mpb:
-          Added nddslib as base project
-
-Mon Feb 22 12:25:38 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/Getter_T.h:
-        * connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.h
-        * connectors/dds4ccm/impl/ndds/Reader_T.cpp
-          Layout changes
-
-Mon Feb 22 12:11:38 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc
-        * connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc
-        * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc
-        * connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.mpc
-        * connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.mpc
-        * connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc
-        * connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc
-        * connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc
-        * connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc
-        * connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.mpc
-        * connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc
-        * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.mpc
-        * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.mpc
-        * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc
-        * connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.mpc
-        * connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc
-        * connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc
-        * connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc
-        * connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc
-        * connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc
-        * connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc
-        * connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/ConnectorStatusListener_Test_Base.mpc
-        * connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc
-        * connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc
-        * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Test_Base.mpc
-        * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc
-        * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc
-        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.mpc
-        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.mpc
-        * connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc
-        * connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc
-        * connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc
-        * connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc
-        * connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc
-        * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.mpc
-        * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.mpc
-        * connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc
-        * connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc
-        * connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc
-        * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc
-        * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc
-          Fixed casing problems
-
-Mon Feb 22 11:37:38 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        Reverted change below
-
-Mon Feb 22 10:34:38 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc
-        * connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc
-        * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc
-        * connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.mpc
-        * connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.mpc
-        * connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc
-        * connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc
-        * connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc
-        * connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc
-        * connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.mpc
-        * connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc
-        * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.mpc
-        * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.mpc
-        * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc
-        * connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.mpc
-        * connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc
-        * connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc
-        * connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc
-        * connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc
-        * connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc
-        * connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc
-        * connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/ConnectorStatusListener_Test_Base.mpc
-        * connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc
-        * connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc
-        * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Test_Base.mpc
-        * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc
-        * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc
-        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.mpc
-        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.mpc
-        * connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc
-        * connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc
-        * connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc
-        * connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc
-        * connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc
-        * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.mpc
-        * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.mpc
-        * connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc
-        * connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc
-        * connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc
-        * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc
-        * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc
-          Added custom_only=1
-
-Mon Feb 22 10:16:38 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/DDS4CCM_Traits.h:
-          Updated ifdef guards
-
-        * connectors/dds4ccm/impl/ndds/Reader_T.cpp:
-        * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender.mpc:
-          Layout changes
-
-        * MPC/config/dds4ccm_base.mpb:
-        * MPC/config/dds4ccm_impl.mpb:
-          Simplified thse projects
-
-Mon Feb 22 09:49:50 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc:
-          Resolved MPC-warning.
-
-Mon Feb 22 09:29:38 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.mpc
-        * connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc
-        * connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.mpc
-        * connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector.mpc
-        * connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc
-        * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc
-        * connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc
-        * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc
-        * connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc
-        * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc
-        * connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc
-        * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc
-        * connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.mpc
-        * connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.mpc
-        * connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc
-        * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc
-        * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.mpc
-        * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc
-        * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.mpc
-        * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc
-        * connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc
-        * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc
-        * connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.mpc
-        * connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc
-        * connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc
-        * connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc
-        * connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc
-        * connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc
-        * connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc
-        * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc
-        * connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc
-        * connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc
-        * connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc
-        * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc
-        * connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc
-        * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc
-        * connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/ConnectorStatusListener_Test_Base.mpc
-        * connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector.mpc
-        * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.mpc
-        * connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc
-        * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc
-        * connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc
-        * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc
-        * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Test_Base.mpc
-        * connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector.mpc
-        * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc
-        * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc
-        * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc
-        * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc
-        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.mpc
-        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc
-        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc
-        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc
-        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.mpc
-        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc
-        * connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc
-        * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc
-        * connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc
-        * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc
-        * connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc
-        * connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc
-        * connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc
-        * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc
-        * connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc
-        * connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc
-        * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc
-        * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.mpc
-        * connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.mpc
-        * connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc
-        * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc
-        * connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc
-        * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc
-        * connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc
-        * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc
-        * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc
-        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc
-        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc
-        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc
-        * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc
-        * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc
-        * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc
-        * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc
-        * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc
-        * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc
-          Use the new dds4ccm_ts_defaults base project
-
-Mon Feb 22 08:29:03 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/DDS_Read_T.h:
-        * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp:
-        * connectors/dds4ccm/impl/ndds/DDS_Update_T.h:
-        * connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp:
-          Created typedefs of templated classes.
-
-Mon Feb 22 08:21:57 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.h:
-        * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp:
-        * connectors/dds4ccm/impl/ndds/DDS_Get_T.h:
-        * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp:
-        * connectors/dds4ccm/impl/ndds/DDS_Listen_T.h:
-        * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp:
-        * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp:
-        * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.h:
-        * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp:
-        * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.h:
-        * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp:
-        * connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp:
-        * connectors/dds4ccm/impl/ndds/DDS_Write_T.h:
-        * connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp:
-        * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h:
-        * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp:
-        * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h:
-        * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp:
-        * connectors/dds4ccm/impl/ndds/DataWriter.cpp:
-        * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp:
-        * connectors/dds4ccm/impl/ndds/PortStatusListener_T.h:
-        * connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp:
-        * connectors/dds4ccm/impl/ndds/Publisher.cpp:
-        * connectors/dds4ccm/impl/ndds/Subscriber.cpp:
-        * connectors/dds4ccm/impl/ndds/TopicListener_T.cpp:
-          Using the ACE_NEW_* macros (instead of C++ new).
-
-Mon Feb 22 08:22:38 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp:
-          Layout change
-
-        * DAnCE/RepositoryManager/repository_manager_admin_exec.cpp
-        * DAnCE/RepositoryManager/RepositoryManager.cpp
-          Shutdown the orb
-
-        * MPC/config/connectoridldefaults.mpb:
-          No executor header file for a connector
-
-Mon Feb 22 08:20:38 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp:
-        * connectors/dds4ccm/impl/ndds/Reader_T.cpp:
-          Layout and const changes
-
-Mon Feb 22 07:18:38 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc
-        * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc
-        * connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc
-        * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc
-        * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc
-        * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc
-          Simplified these base projects
-
-Sun Feb 21 09:24:38 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ChangeLogs/*:
-          Use full year
-
-Sat Feb 20 20:31:38 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * MPC/config/dds4ccm_ts_default.mpb:
-          New base project for dds4ccm dds type support generation. This
-          base project will be soon be used for all dds4ccm examples and
-          tests. The typesupport files will now be linked together with
-          the tao type code to one shared library. dds4ccm should work
-          on the long term with multiple dds implementations, the fact
-          that you have an implementation doesn't mean you want to use
-          it with dds4ccm. with the new features dds4ccm_ndds, dds4ccm_opendds,
-          and dds4ccm_splice you can control which dds vendor dds4ccm
-          should use. At this moment ndds is supported and tested
-
-          Thanks to Adam Mitz for extending MPC to make this base
-          project possible
-
-Fri Feb 19 15:44:38 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp:
-
-          Added #include, newly required due to reordering of
-          #includes in the front end.
-
-Fri Feb 19 15:11:38 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * docs/OMG-CCM-Tutorial.ppt:
-          Improved AMI4CCM one step further
-
-Fri Feb 19 12:53:38 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp
-        * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.h
-        * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp
-        * connectors/dds4ccm/impl/ndds/DDS_Get_T.h
-        * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp
-        * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.h
-        * connectors/dds4ccm/impl/ndds/Getter_T.cpp
-        * connectors/dds4ccm/impl/ndds/Getter_T.h
-          Added a boolean to the connectors to let the TAO_IDL
-          compiler generate whether we have a fixed or non fixed
-          type. The memory management is different and caused
-          compile and runtime problems with getter::get_one.
-          We now specialized the Getter::get_one method for
-          fixed and for non fixed types
-
-Fri Feb 19 11:53:38 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp:
-        * connectors/dds4ccm/impl/ndds/Publisher.cpp:
-        * connectors/dds4ccm/impl/ndds/Topic.cpp:
-          Implemented some more ACE_NEW_* macros.
-
-Fri Feb 19 11:29:08 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/DataReaderListener.cpp:
-        * connectors/dds4ccm/impl/ndds/DataWriter.cpp:
-        * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp:
-        * connectors/dds4ccm/impl/ndds/Publisher.cpp:
-        * connectors/dds4ccm/impl/ndds/Subscriber.cpp:
-        * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp:
-        * connectors/dds4ccm/impl/ndds/Topic.cpp:
-          Implemented some more ACE_NEW_* macros.
-
-Fri Feb 19 10:51:49 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/idl/dds_rtf2_dcps.idl:
-          Changed value of RELIABLE_READER_ACTIVITY_CHANGED_STATUS.
-
-        * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h:
-        * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp:
-          Prepared the test to receive the RELIABLE_READER_ACTIVITY_CHANGED_STATUS.
-
-Fri Feb 19 08:43:52 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/tests/TwoTopicsDifferentNs/*:
-          Added tests in order to test the TAO_IDL compliler.
-
-Fri Feb 19 08:35:57 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector_exec.cpp
-        * connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector_exec.cpp
-        * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector_exec.cpp
-        * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector_exec.cpp
-        * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/CSL_TestSec_Connector_exec.cpp
-        * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector_exec.cpp
-        * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector_exec.cpp
-        * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector_exec.cpp
-        * connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector_exec.cpp
-        * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector_exec.cpp
-        * connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector_exec.cpp
-        * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector_exec.cpp
-        * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.cpp
-        * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector_exec.cpp
-        * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector_exec.cpp
-        * connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector_exec.cpp
-        * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector_exec.cpp
-        * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector_exec.cpp
-        * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector_exec.cpp
-        * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector_exec.cpp
-        * connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector_exec.cpp
-        * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector_exec.cpp
-        * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector_exec.cpp
-        * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector_exec.cpp
-        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector_exec.cpp
-        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector_exec.cpp
-        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector_exec.cpp
-        * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector_exec.cpp
-        * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector_exec.cpp
-        * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector_exec.cpp
-        * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector_exec.cpp
-        * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector_exec.cpp
-        * connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector_exec.cpp
-        * connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector_exec.cpp
-        * connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector_exec.cpp
-        * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector_exec.cpp
-        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector_exec.h
-        * connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector_exec.h
-        * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector_exec.h
-        * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector_exec.h
-        * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/CSL_TestSec_Connector_exec.h
-        * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector_exec.h
-        * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector_exec.h
-        * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector_exec.h
-        * connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector_exec.h
-        * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector_exec.h
-        * connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector_exec.h
-        * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector_exec.h
-        * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.h
-        * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector_exec.h
-        * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector_exec.h
-        * connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector_exec.h
-        * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector_exec.h
-        * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector_exec.h
-        * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector_exec.h
-        * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector_exec.h
-        * connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector_exec.h
-        * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector_exec.h
-        * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector_exec.h
-        * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector_exec.h
-        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector_exec.h
-        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector_exec.h
-        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector_exec.h
-        * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector_exec.h
-        * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector_exec.h
-        * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector_exec.h
-        * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector_exec.h
-        * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector_exec.h
-        * connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector_exec.h
-        * connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector_exec.h
-        * connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector_exec.h
-        * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector_exec.h
-          Removed from the archive, generated by tao_idl from now
-
-        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl
-        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl
-        * connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/ConnectorStatusListener_Test_Base.idl
-        * 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/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/Getter/Base/Getter_Test_Base.idl
-        * connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_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/NonChangeableAttribute/Base/NonChangeable_Base.idl
-        * connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl
-        * connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.idl
-        * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Starter.idl
-        * connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Test_Base.idl
-        * connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl
-        * connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_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/State_Connection_Test/Base/State_Connection_Test_Base.idl
-        * connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl
-        * connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.idl
-        * connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl
-        * connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl
-        * connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl
-        * connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.idl
-        * connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl
-        * connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.idl
-        * connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl
-          Added RTI typesupport pragma
-
-        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc
-        * connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector.mpc
-        * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.mpc
-        * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc
-        * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc
-        * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc
-        * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc
-        * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc
-        * connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc
-        * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc
-        * connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc
-        * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc
-        * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc
-        * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc
-        * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc
-        * connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector.mpc
-        * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc
-        * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc
-        * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc
-        * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc
-        * connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc
-        * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc
-        * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc
-        * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc
-        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc
-        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc
-        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc
-        * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc
-        * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc
-        * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc
-        * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc
-        * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc
-        * connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.mpc
-        * connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc
-        * connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc
-        * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc
-          Updated to let tao_idl generate the connector
-
-Thu Feb 18 16:07:57 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.idl
-          Added rti typesupport pragma
-
-        * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector_exec.cpp
-        * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector_exec.h
-          Removed from the archive
-
-        * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc
-          Updated to generate the connector
-        * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp
-          Layout change
-
-Thu Feb 18 15:47:57 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/id3p_test/*:
-          Removed, obsolete
-
-Thu Feb 18 15:43:57 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.idl:
-        * connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.idl:
-          Added rti typesupport pragma
-
-        * connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector_exec.cpp
-        * connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector_exec.h
-        * connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector_exec.cpp
-        * connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector_exec.h
-          Removed from the archive
-
-        * connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc
-        * connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector.mpc
-          Updated to generate the connector
-
-Thu Feb 18 15:36:06 UTC 2010  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
-
-        * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.cpp:
-          Remove some tabs.
-
-Thu Feb 18 15:35:57 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc:
-          Updated to use tao_idl generation
-
-        * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector_exec.cpp:
-        * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector_exec.h:
-          Removed from the archive
-
-Thu Feb 18 14:22:29 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/DataWriterListener.cpp:
-        * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp:
-        * connectors/dds4ccm/impl/ndds/PublisherListener.cpp:
-        * connectors/dds4ccm/impl/ndds/QueryCondition.cpp:
-        * connectors/dds4ccm/impl/ndds/ReadCondition.cpp:
-        * connectors/dds4ccm/impl/ndds/TopicDescription.cpp:
-        * connectors/dds4ccm/impl/ndds/TopicListener.cpp:
-          Implemented ACE_NEW_* macros.
-
-Thu Feb 18 13:48:20 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc:
-          Removed dummy label to enable compilation.
-
-Thu Feb 18 13:44:59 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc:
-        * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc:
-          Removed dummy label.
-
-        * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Receiver/*:
-        * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Sender/*:
-        * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/descriptors/*:
-        * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Receiver/*:
-        * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Sender/*:
-        * connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/descriptors/*:
-          Removed these files since this is there to capture compiler errors.
-
-Thu Feb 18 13:26:06 UTC 2010  Marijke Hnegstmengel  <mhengstmengel@remedy.nl>
-
-        * connectors/dds4ccm/performance-tests/Latency:
-        * connectors/dds4ccm/performance-tests/Latency/Base:
-        * connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.idl:
-        * connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.mpc:
-        * connectors/dds4ccm/performance-tests/Latency/Connector:
-        * connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector.idl:
-        * connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector.mpc:
-        * connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector_exec.cpp:
-        * connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector_exec.h:
-        * connectors/dds4ccm/performance-tests/Latency/descriptors:
-        * connectors/dds4ccm/performance-tests/Latency/descriptors/Plan.cdp:
-        * connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_pub.cdp:
-        * connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_sub.cdp:
-        * connectors/dds4ccm/performance-tests/Latency/descriptors/run_pub.pl:
-        * connectors/dds4ccm/performance-tests/Latency/descriptors/run_sub.pl:
-        * connectors/dds4ccm/performance-tests/Latency/descriptors/run_test.pl:
-        * connectors/dds4ccm/performance-tests/Latency/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/performance-tests/Latency/Receiver:
-        * connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver.idl:
-        * connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver.mpc:
-        * connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver_exec.cpp:
-        * connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver_exec.h:
-        * connectors/dds4ccm/performance-tests/Latency/Sender:
-        * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender.idl:
-        * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender.mpc:
-        * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.cpp:
-        * connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.h:
-                First base of new latency test dds4ccm.
-
-Thu Feb 18 13:22:43 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp:
-        * connectors/dds4ccm/impl/ndds/DataReader.cpp:
-        * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp:
-        * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp:
-          Made better use of the ACE_NEW_* macros.
-
-Thu Feb 18 13:13:57 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/Getter_T.cpp:
-          Fixed gcc compile error
-
-Thu Feb 18 12:33:06 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp:
-        * connectors/dds4ccm/impl/ndds/DataReader.cpp:
-        * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp:
-        * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp:
-          Using the ACE_NEW_* marcros instead of the
-          regular C++ new.
-
-Thu Feb 18 11:36:08 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/tests/TwoTopics/*:
-          Test to check whether the generated exec code
-          compiles without errors when defining two topics
-          in one connector.
-
-Thu Feb 18 09:00:40 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/*:
-          Added test to test fixed size data. Fixed size data is handled
-          in a different way. This'll result in compliler errors when not
-          coded properly.
-
-Thu Feb 18 08:37:49 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/docs/TestCoverage.ods:
-          Updated
-
-        * connectors/dds4ccm/impl/ndds/Subscriber.cpp:
-          Added some more tracing.
-
-        * connectors/dds4ccm/tests/FixedSizeStruct/*:
-          Added test to test fixed size data. Fixed size data is handled
-          in a different way. This'll result in compliler errors when not
-          coded properly.
-
-        * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.h:
-        * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp:
-          Improved the way the Receiver receives data.
-
-Thu Feb 18 08:30:57 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/Getter_T.cpp:
-          Fixed compile error with fixed size datatypes
-
-        * connectors/dds4ccm/impl/ndds/Reader_T.cpp:
-          Layout and documentation fixes
-
-        * connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc:
-          No need for C.inl
-
-Wed Feb 17 15:24:57 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp:
-        * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp:
-          Layout changes
-
-        * DAnCE/DomainApplication/Domain_Application_Impl.cpp
-        * DAnCE/DomainApplication/Domain_Application_Impl.h
-        * DAnCE/DomainApplication/DomainApplication.mpc
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
-          Cleanup
-
-Wed Feb 17 13:57:57 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h:
-          Deleted reactor member which is not needed here
-
-        * DAnCE/NodeManager/Node_Manager_Module.h:
-        * DAnCE/RepositoryManager/Repository_Manager_Module.h:
-          Removed not needed include
-
-        * DAnCE/RepositoryManager/RepositoryManager.mpc:
-          Cleanup base projects
-
-Wed Feb 17 12:14:57 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/MPC/config/dance_plan_generator.mpb
-        * DAnCE/Plan_Generator/PCVisitor.cpp
-        * DAnCE/Plan_Generator/PCVisitor.h
-        * DAnCE/Plan_Generator/PCVisitorBase.cpp
-        * DAnCE/Plan_Generator/PCVisitorBase.h
-        * DAnCE/Plan_Generator/PCVisitorBase.inl
-        * DAnCE/Plan_Generator/Plan_Generator.mpc
-        * DAnCE/Plan_Generator/Plan_Generator_Impl.cpp
-        * DAnCE/Plan_Generator/Plan_Generator_Impl.h
-        * DAnCE/Plan_Generator/Plan_Generator_Impl_Export.h
-          removed, not used at all
-
-Wed Feb 17 12:10:57 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl:
-          Added pragma
-
-        * DAnCE/RepositoryManager/DAnCE_RepositoryManager_Module_Export.h:
-          Deleted
-
-Wed Feb 17 12:09:57 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/NodeManager/Node_Manager_Module.h:
-          Removed obsolete header
-
-        * DAnCE/MPC/config/dance_utils.mpb
-        * DAnCE/Utils
-        * DAnCE/Utils/DAnCE_Utils.mpc
-        * DAnCE/Utils/DAnCE_Utils_Export.h
-        * DAnCE/Utils/Plan_Handler.cpp
-        * DAnCE/Utils/Plan_Handler.h
-          Removed, not used at all
-
-Wed Feb 17 11:40:57 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        Cleanup of the repository manager
-
-        * DAnCE/DAnCE/DAnCE_Loader.h:
-        * DAnCE/MPC/config/dance_repositorymanager.mpb:
-        * DAnCE/RepositoryManager/Repository_Manager_Admin_Export.h
-          Deleted
-
-        * DAnCE/RepositoryManager/PC_Updater.h
-        * DAnCE/RepositoryManager/Repository_Manager.cpp
-        * DAnCE/RepositoryManager/repository_manager_admin.h
-        * DAnCE/RepositoryManager/Repository_Manager_Exec.cpp
-        * DAnCE/RepositoryManager/Repository_Manager_Module.cpp
-        * DAnCE/RepositoryManager/Repository_Manager_Module.h
-        * DAnCE/RepositoryManager/RepositoryManager.mpc
-        * DAnCE/RepositoryManager/RepositoryManager_Impl.h
-        * DAnCE/RepositoryManager/RM_Helper.h
-        * DAnCE/RepositoryManager/URL_Parser.h
-          Cleanup
-
-Wed Feb 17 11:20:57 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        Cleanup of the target manager
-
-        * DAnCE/MPC/config/dance_nodemanager.mpb:
-        * DAnCE/MPC/config/dance_targetmanager.mpb
-          Deleted, obsolete
-
-        * DAnCE/NodeApplication/NodeApplication.mpc:
-        * DAnCE/RepositoryManager/RM_Helper.h:
-        * DAnCE/TargetManager/ResourceCommitmentManager.h:
-          layout change
-
-        * DAnCE/NodeManager/NodeManager.mpc:
-          Reduced dependency
-
-        * DAnCE/TargetManager/Target_Manager_Exec.cpp
-        * DAnCE/TargetManager/Target_Manager_Module_export.h
-        * DAnCE/TargetManager/TargetManager_Impl_export.h
-          Deleted from the archive
-
-        * DAnCE/TargetManager/Target_Manager.cpp
-        * DAnCE/TargetManager/Target_Manager_Module.cpp
-        * DAnCE/TargetManager/Target_Manager_Module.h
-        * DAnCE/TargetManager/TargetManager.mpc
-        * DAnCE/TargetManager/TargetManager_Impl.cpp
-        * DAnCE/TargetManager/TargetManager_Impl.h
-          Simplified and cleanup
-
-Wed Feb 17 10:54:57 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/TargetManager/CmpClient.cpp
-        * DAnCE/TargetManager/TM_Client.mpc
-          Moved to DAnCE/tests/TargetManager
-
-Wed Feb 17 09:49:35 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp:
-          Stopping time when the run actualy starts.
-
-Wed Feb 17 09:41:57 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl:
-          Added rti typesupport trait
-
-        * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc:
-          Updated to use tao_idl generated connector
-
-        * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector_exec.cpp:
-        * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector_exec.h:
-          Removed from the archive
-
-Wed Feb 17 09:36:32 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/Reader_T.cpp:
-          Check whether the get_listener returns nil.
-
-        * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.idl:
-        * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.h:
-        * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp:
-        * connectors/dds4ccm/tests/InstanceHandle/descriptors/Plan.cdp:
-        * connectors/dds4ccm/tests/InstanceHandle/descriptors/run_test.pl:
-          Improved implementation. Sometimes unregister_handles hangs in
-          a never ending loop.
-
-        * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.h:
-        * connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp:
-          Improved implementation. Polling for the last sample in DDS now
-          is done using the reactor thread.
-
-Wed Feb 17 09:21:57 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector_exec.cpp:
-        * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector_exec.h:
-          Deleted, generated by tao_idl now
-
-Wed Feb 17 09:07:57 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        Simplified NodeManager
-
-        * DAnCE/NodeManager/DAnCE_NodeManager_Module_Export.h
-        * DAnCE/NodeManager/Node_Manager_Exec.cpp
-        * DAnCE/NodeManager/NodeManager_Export.h
-          Removed
-
-        * DAnCE/NodeManager/Node_Manager.cpp
-        * DAnCE/NodeManager/Node_Manager_Module.cpp
-        * DAnCE/NodeManager/Node_Manager_Module.h
-        * DAnCE/NodeManager/NodeManager.mpc
-        * DAnCE/NodeManager/NodeManager_Impl.cpp
-        * DAnCE/NodeManager/NodeManager_Impl.h
-          Simplified
-
-        * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp
-          Fixed warning
-
-Tue Feb 16 20:34:27 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * connectors/dds4ccm/idl/dds4ccm_Connector.idl:
-
-          Removed the line '#define connector component' since we
-          now have backend and frontend connector support.
-
-        * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc:
-
-          Modified projects to generate and compile the
-          connector implementation.
-
-        * examples/BasicSP/BMClosedED/BMClosedED.idl:
-        * tests/IDL_Test/IDL3_Plus/KitchenSink.idl:
-
-          Cosmetic changes.
-
-Tue Feb 16 20:04:57 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        Simplified execution manager
-
-        * DAnCE/ExecutionManager/DAnCE_ExecutionManager_Module_Export.h
-        * DAnCE/ExecutionManager/Execution_Manager_Exec.cpp
-        * DAnCE/ExecutionManager/ExecutionManager_Export.h
-          Removed
-
-        * DAnCE/ExecutionManager/Execution_Manager.cpp
-        * DAnCE/ExecutionManager/ExecutionManager.mpc
-        * DAnCE/ExecutionManager/ExecutionManager_Impl.h
-        * DAnCE/ExecutionManager/ExecutionManager_Module.cpp
-        * DAnCE/ExecutionManager/ExecutionManager_Module.h
-          Simplified
-
-        * DAnCE/Plan_Launcher/Plan_Launcher.cpp:
-          Layout changes
-
-Tue Feb 16 19:33:57 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        Simplified the plan_launcher, it was way to complex to
-        build
-
-        * DAnCE/MPC/config/dance_plan_launcher.mpb
-        * DAnCE/MPC/config/dance_plan_launcher_base.mpb
-        * DAnCE/Plan_Launcher/Plan_Launcher.h
-        * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl_Export.h
-        * DAnCE/Plan_Launcher/Plan_Launcher_Base_Module.cpp
-        * DAnCE/Plan_Launcher/Plan_Launcher_Base_Module.h
-        * DAnCE/Plan_Launcher/Plan_Launcher_Base_Module_Export.h
-        * DAnCE/Plan_Launcher/Plan_Launcher_Impl_Export.h
-        * DAnCE/Plan_Launcher/Plan_Launcher_Module.cpp
-        * DAnCE/Plan_Launcher/Plan_Launcher_Module.h
-        * DAnCE/Plan_Launcher/Plan_Launcher_Module_Export.h
-        * DAnCE/Plan_Launcher/Plan_Launcher_Exec.cpp
-          Deleted, all not used
-
-        * DAnCE/Plan_Launcher/Plan_Launcher.cpp
-        * DAnCE/Plan_Launcher/Plan_Launcher.mpc
-        * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp
-        * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h
-        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp
-        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h
-          Updated to contain the Plan_Launcher implementation and main
-
-Tue Feb 16 18:45:57 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/Plan_Launcher/launcher.cpp:
-          Removed, not used
-
-        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h:
-          Layout changes
-
-Tue Feb 16 18:04:57 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/DAnCE/CIAO_ExecutionManagerDaemon.idl
-        * DAnCE/DAnCE/CIAO_Interfaces.mpc
-        * DAnCE/ExecutionManager/ExecutionManager.mpc
-        * DAnCE/ExecutionManager/ExecutionManager_Impl.cpp
-        * DAnCE/ExecutionManager/ExecutionManager_Impl.h
-        * DAnCE/MPC/config/ciao_executionmanager_skel.mpb
-        * DAnCE/MPC/config/ciao_executionmanager_stub.mpb
-        * DAnCE/RepositoryManager/RepositoryManager.cpp
-          Removed shutdown method, it was not used and a non spec interface
-
-Tue Feb 16 15:48:57 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/DAnCE/DAnCE_Properties.mpc:
-          Added mpc file which should have been committed earlier today
-
-Tue Feb 16 13:08:57 UTC 2010  Marijke Hemgstmengel  <mhengstmengel@remedy.nl>
-
-        * connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.idl:
-        * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub.cdp:
-        * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub3.cdp:
-        * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub_BE.cdp:
-        * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_sub.cdp:
-        * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_sub_BE.cdp:
-        * connectors/dds4ccm/performance-tests/Keyed/descriptors/README:
-        * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub3.pl:
-        * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub_BE.pl:
-        * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub2.pl:
-        * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub3.pl:
-        * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub_BE.pl:
-        * connectors/dds4ccm/performance-tests/Keyed/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.idl:
-        * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp:
-        * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.h:
-        Add attribute number_of_subscribers, made different test scripts.
-
-Tue Feb 16 12:47:57 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/Config_Handlers/Config_Handlers.mpc
-        * DAnCE/DAnCE/DAnCE_Loader.h
-        * DAnCE/DAnCE/DAnCE_Properties.idl
-        * DAnCE/DAnCE/Deployment_common.h
-        * DAnCE/Deployment/DAnCE_Core.mpc
-        * DAnCE/Deployment/DAnCE_Loader.h
-        * DAnCE/Deployment/DAnCE_Properties.idl
-        * DAnCE/Deployment/Deployment.idl
-        * DAnCE/Deployment/Deployment_Application.idl
-        * DAnCE/Deployment/Deployment_ApplicationManager.idl
-        * DAnCE/Deployment/Deployment_Base.idl
-        * DAnCE/Deployment/Deployment_common.h
-        * DAnCE/Deployment/Deployment_DeploymentPlan.idl
-        * DAnCE/Deployment/Deployment_NodeManager.idl
-        * DAnCE/Deployment/Deployment_Packaging_Data.idl
-        * DAnCE/Deployment/Deployment_RepositoryManager.idl
-        * DAnCE/Deployment/Deployment_ResourceCommitmentManager.idl
-        * DAnCE/Deployment/Deployment_stub_export.h
-        * DAnCE/Deployment/Deployment_svnt_export.h
-        * DAnCE/Deployment/Deployment_TargetData.idl
-        * DAnCE/ExecutionManager/ExecutionManager_Module.cpp
-        * DAnCE/NodeApplication/NodeApplication.mpc
-        * DAnCE/NodeApplication/NodeApplication_Impl.cpp
-        * DAnCE/NodeApplication/NodeApplication_Impl.h
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
-        * DAnCE/NodeManager/Node_Manager_Module.cpp
-        * DAnCE/NodeManager/Node_Manager_Module.h
-        * DAnCE/NodeManager/NodeManager_Impl.h
-        * DAnCE/Plan_Launcher/Plan_Launcher.mpc
-        * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp
-        * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h
-        * DAnCE/Plan_Launcher/Plan_Launcher_Base_Module.cpp
-        * DAnCE/Plan_Launcher/Plan_Launcher_Base_Module.h
-        * DAnCE/RepositoryManager/Repository_Manager_Module.cpp
-        * DAnCE/RepositoryManager/Repository_Manager_Module.h
-        * DAnCE/TargetManager/Target_Manager_Module.cpp
-        * DAnCE/TargetManager/Target_Manager_Module.h
-          Removed DAnCE/Deployment to just contain the spec compliant IDL,
-          non compliant parts have been moved to DAnCE/DAnCE. All using
-          code has been updated. We did found some problems in the OMG IDL
-          07-02-01 which has been reported to the OMG:
-          - LastConfiguration and InvalidReference are listed in 07-02-01
-            but not used at all.
-          - PlanLocalityKind members have a Plan prefix to resolve a conflict
-            with LocalityKind::SameProcess.
-          All extensions for DDS4CCM have now a comment indicating that
-
-Tue Feb 16 12:32:37 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.cpp:
-        * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp:
-          Resolved shutdown errors.
-
-Tue Feb 16 10:54:26 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.idl:
-        * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h:
-        * connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp:
-        * connectors/dds4ccm/tests/Updater/descriptors/Plan.cdp:
-          Added data listener and test thread switch for this
-          data listener.
-
-Tue Feb 16 09:45:32 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp:
-          Improved code for thread switch.
-
-        * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h:
-        * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp:
-          Removed reader implementation since it's unnecessary. Also
-          optimized logging.
-
-        * connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.cpp:
-          Improved logging.
-
-Tue Feb 16 08:23:57 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/Config_Handlers/Config_Handlers.mpc
-        * DAnCE/Config_Handlers/DynAny_Handler/DynAny_Handler.mpc
-        * DAnCE/Config_Handlers/Package_Handlers/Package_Handlers.mpc
-        * DAnCE/Deployment/DAnCE_Core.mpc
-        * DAnCE/DomainApplication/DomainApplication.mpc
-        * DAnCE/DomainApplicationManager/DomainApplicationManager.mpc
-        * DAnCE/ExecutionManager/ExecutionManager.mpc
-        * DAnCE/ExecutionManager/ExecutionManager_Impl.h
-        * DAnCE/MPC/config/ciao_config_handlers.mpb
-        * DAnCE/MPC/config/ciao_config_handlers_base.mpb
-        * DAnCE/MPC/config/ciao_nodeapplication.mpb
-        * DAnCE/MPC/config/ciao_nodeapplicationmanager.mpb
-        * DAnCE/MPC/config/ciao_plan_generator.mpb
-        * DAnCE/MPC/config/ciao_targetmanager_stub.mpb
-        * DAnCE/MPC/config/ciao_targetmanager_svnt.mpb
-        * DAnCE/MPC/config/dance_applicationmanager_skel.mpb
-        * DAnCE/MPC/config/dance_component_server.mpb
-        * DAnCE/MPC/config/dance_component_server_svnt.mpb
-        * DAnCE/MPC/config/dance_config_handlers.mpb
-        * DAnCE/MPC/config/dance_config_handlers_base.mpb
-        * DAnCE/MPC/config/dance_deployment_skel.mpb
-        * DAnCE/MPC/config/dance_deployment_svnt.mpb
-        * DAnCE/MPC/config/dance_domainapplication_skel.mpb
-        * DAnCE/MPC/config/dance_executionmanager_skel.mpb
-        * DAnCE/MPC/config/dance_extension_stub.mpb
-        * DAnCE/MPC/config/dance_nodeapplication_skel.mpb
-        * DAnCE/MPC/config/dance_nodemanager_skel.mpb
-        * DAnCE/MPC/config/dance_nodemanager_svnt.mpb
-        * DAnCE/MPC/config/dance_output.mpb
-        * DAnCE/MPC/config/dance_plan_generator.mpb
-        * DAnCE/MPC/config/dance_repositorymanager.mpb
-        * DAnCE/MPC/config/dance_repositorymanager_skel.mpb
-        * DAnCE/MPC/config/dance_targetmanager.mpb
-        * DAnCE/MPC/config/dance_targetmanager_skel.mpb
-        * DAnCE/MPC/config/dance_tm_daemon.mpb
-        * DAnCE/NodeApplication/NodeApplication.mpc
-        * DAnCE/NodeManager/NodeManager.mpc
-        * DAnCE/Plan_Launcher/Plan_Launcher.mpc
-        * DAnCE/RepositoryManager/RepositoryManager.mpc
-        * DAnCE/TargetManager/TargetManager.mpc
-        * DAnCE/TargetManager/TM_Client.mpc
-        * DAnCE/tests/CIAO/ExecutionManager-Deployments/em_launcher.mpc
-        * DAnCE/tests/CIAO/NodeManager-Deployments/nm_launcher.mpc
-        * DAnCE/tests/Config_Handlers/Config_Handlers.mpc
-        * DAnCE/tests/Config_Handlers/DynAny_Handler/test.mpc
-        * DAnCE/tests/Config_Handlers/Package_Handlers/Package_Handlers.mpc
-        * DAnCE/tests/DeploymentPlanDump/DeploymentPlanDump.mpc
-        * DAnCE/tests/DeploymentPlanTestReferences/DeploymentPlanTestReferences.mpc
-        * DAnCE/tests/DeploymentTest1/DeploymentTest1.mpc
-        * DAnCE/Utils/DAnCE_Utils.mpc
-          Cleanup of DAnCE base projects
-
-Mon Feb 15 19:48:57 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/DAnCE
-        * DAnCE/DAnCE/CIAO_Interfaces.mpc
-        * DAnCE/DAnCE/CIAO_NodeManagerDaemon.idl
-        * DAnCE/Deployment/ciao
-        * DAnCE/Deployment/ciao/CIAO_ExecutionManagerDaemon.idl
-        * DAnCE/Deployment/ciao/CIAO_Interfaces.mpc
-        * DAnCE/Deployment/ciao/CIAO_NodeManagerDaemon.idl
-        * DAnCE/Deployment/ciao/Module_Main.h
-        * DAnCE/ExecutionManager/Execution_Manager_Exec.cpp
-        * DAnCE/ExecutionManager/ExecutionManager_Impl.h
-        * DAnCE/MPC/config/ciao_nodemanager_skel.mpb
-        * DAnCE/MPC/config/ciao_nodemanager_stub.mpb
-        * DAnCE/NodeManager/Node_Manager_Exec.cpp
-        * DAnCE/NodeManager/NodeManager_Impl.h
-        * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h
-        * DAnCE/Plan_Launcher/Plan_Launcher_Exec.cpp
-        * DAnCE/Plan_Launcher/Plan_Launcher_Module.cpp
-        * DAnCE/RepositoryManager/Repository_Manager_Exec.cpp
-        * DAnCE/TargetManager/Target_Manager_Exec.cpp
-        * DAnCE/TargetManager/TM_Client.mpc
-          Moved DAnCE/Deployment/ciao to DAnCE/DAnCE and removed the
-          CIAO_NodeManagerDeamon interface, it was not used at all
-
-Mon Feb 15 19:05:57 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/Deployment/ciao/CIAO_NodeManagerDaemon.idl:
-          Fixed comments and removed commented out stuff
-
-        * DAnCE/NodeManager/Node_Manager_Module.cpp:
-        * DAnCE/TargetManager/Target_Manager_Module.cpp
-          Fixed typo in comment
-
-        * DAnCE/Plan_Launcher/Plan_Launcher_Module.cpp:
-          Fixed warning
-
-        * DAnCE/RepositoryManager/PC_Updater.cpp:
-        * DAnCE/RepositoryManager/PC_Updater.h
-          Layout and documentation fixes
-
-        * DAnCE/RepositoryManager/repository_manager_admin.cpp:
-          Unicode fixes
-
-        * DAnCE/RepositoryManager/Repository_Manager_Module.cpp
-        * DAnCE/RepositoryManager/Repository_Manager_Module.h
-          Removed not used servant map
-
-        * DAnCE/RepositoryManager/RepositoryManager.cpp:
-          Doxygen fixes
-
-        * DAnCE/RepositoryManager/RepositoryManager_Impl.h:
-        * DAnCE/RepositoryManager/RM_Helper.cpp
-        * DAnCE/RepositoryManager/RM_Helper.h
-          Layout changes
-
-        * DAnCE/TargetManager/DAnCE_TargetManagerDaemon.idl:
-          Removed, this interface was used, but not implemented at all
-
-        * DAnCE/TargetManager/TargetManager.mpc:
-          Removed obsolete projects
-
-        * DAnCE/TargetManager/TargetManager_Impl.cpp
-        * DAnCE/TargetManager/TargetManager_Impl.h
-          removed not used shutdown
-
-Mon Feb 15 14:04:57 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/ExecutionManager/ExecutionManager_Impl.cpp
-        * DAnCE/TargetManager/DomainDataManager.cpp
-        * DAnCE/TargetManager/DomainDataManager.h
-        * DAnCE/TargetManager/ResourceCommitmentManager.cpp
-        * DAnCE/TargetManager/ResourceCommitmentManager.h
-        * DAnCE/TargetManager/TargetManager_Impl.cpp
-          Various code improvements
-
-Mon Feb 15 13:32:57 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/NodeApplication/NodeApplication_Impl.cpp:
-        * DAnCE/NodeApplication/NodeApplication_Impl.h:
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp:
-        * DAnCE/NodeManager/Node_Manager_Module.cpp:
-        * DAnCE/NodeManager/NodeManager_Impl.h:
-          Various code improvements
-
-Mon Feb 15 13:20:10 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * DAnCE/DomainApplication/Domain_Application_Impl.cpp:
-          Throwing exception when errors occur during shutdown.
-
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp:
-          New line appended to log message.
-
-        * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp:
-        * DAnCE/Plan_Launcher/Plan_Launcher_Base_Module.cpp:
-        * DAnCE/Plan_Launcher/Plan_Launcher_Module.cpp:
-          Throwing and catching exceptions when errors occur
-          during shutdown. When errors occur, ccm_remove is not
-          invoked and when it isn't, tests seems to be ok while they're
-          not.
-
-        * connectors/dds4ccm/docs/ccm_dds.idl:
-          Layout changes.
-
-        * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp:
-          Added trace.
-
-        * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp:
-          Optimized logging.
-
-Mon Feb 15 13:15:57 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/TargetManager/TargetManager_exec.cpp:
-        * DAnCE/TargetManager/TargetManager_exec.h:
-          Removed, not used
-
-        * DAnCE/ExecutionManager/ExecutionManager_Impl.cpp
-        * DAnCE/ExecutionManager/ExecutionManager_Impl.h
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
-        * DAnCE/TargetManager/DomainDataManager.cpp
-        * DAnCE/TargetManager/DomainDataManager.h
-        * DAnCE/TargetManager/ResourceCommitmentManager.cpp
-          Reduced includes and dependencies
-
-Mon Feb 15 12:50:57 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/Deployment/ciao
-        * DAnCE/Deployment/ciao/CIAO_ExecutionManagerDaemon.idl
-        * DAnCE/Deployment/ciao/CIAO_Interfaces.mpc
-        * DAnCE/Deployment/ciao/CIAO_NodeManagerDaemon.idl
-        * DAnCE/Deployment/ciao/Module_Main.h
-        * DAnCE/Deployment/CIAO_ExecutionManagerDaemon.idl
-        * DAnCE/Deployment/CIAO_Interfaces.mpc
-        * DAnCE/Deployment/CIAO_NodeManagerDaemon.idl
-        * DAnCE/Deployment/DAnCE_Core.mpc
-        * DAnCE/Deployment/Deployment_common.h
-        * DAnCE/Deployment/Deployment_NodeManager.idl
-        * DAnCE/Deployment/Module_Main.h
-        * DAnCE/DomainApplication/Domain_Application_Impl.cpp
-        * DAnCE/DomainApplication/Domain_Application_Impl.h
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
-        * DAnCE/ExecutionManager/Execution_Manager_Exec.cpp
-        * DAnCE/ExecutionManager/ExecutionManager_Impl.h
-        * DAnCE/ExecutionManager/ExecutionManager_Module.cpp
-        * DAnCE/MPC/config/dance_domainapplicationmanager_skel.mpb
-        * DAnCE/MPC/config/dance_domainapplicationmanager_stub.mpb
-        * DAnCE/MPC/config/dance_nodeapplication_stub.mpb
-        * DAnCE/MPC/config/dance_nodeapplicationmanager_skel.mpb
-        * DAnCE/MPC/config/dance_nodeapplicationmanager_stub.mpb
-        * DAnCE/NodeManager/Node_Manager_Exec.cpp
-        * DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h
-        * DAnCE/Plan_Launcher/Plan_Launcher_Exec.cpp
-        * DAnCE/RepositoryManager/Repository_Manager_Exec.cpp
-        * DAnCE/TargetManager/Target_Manager_Exec.cpp
-          Moved the CIAO specific idl/code from DAnCE/Deployment to
-          DAnCE/Deployment/ciao and updated using code. Move
-          ApplicationManager to its own DLL and enabled in some projects
-          AMI.
-
-Mon Feb 15 09:50:57 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp:
-        * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp:
-          Optimized logging regarding domain_id.
-
-Mon Feb 15 09:35:55 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp:
-          Changed the startup sequence. Don't use a sleep.
-
-        * connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl:
-        * connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl:
-          Extended test time.
-
-Mon Feb 15 09:19:44 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp:
-          Layout changes
-
-        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.idl:
-        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.h:
-        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp:
-        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Plan.cdp:
-        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test.pl:
-          Extend test with two connectors sharing the same topic.
-
-Fri Feb 12 19:08:36 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * MPC/config/dance_applicationmanager.mpb:
-        * MPC/config/dance_applicationmanager_skel.mpb:
-        * MPC/config/dance_applicationmanager_stub.mpb:
-          New base projects for the dance am library
-
-Fri Feb 12 18:49:36 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector_exec.h:
-          Added some missing includes
-
-Fri Feb 12 18:31:36 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/Null_Component_Glfa/Null_Component.mpc:
-          Removed not needed after
-
-Fri Feb 12 15:50:36 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/DomainParticipant.cpp:
-          Reusing topic when reusing a domainparticipant.
-
-        * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp:
-          Optimized logging.
-
-Fri Feb 12 13:18:06 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl:
-        * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector_exec.h:
-        * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.idl:
-        * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.h:
-        * connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp:
-        * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.idl:
-        * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.h:
-        * connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.cpp:
-          Moved typed module ShapeType from the CCM_DDS module to the Shapes module
-          and renamed it to ShapeTypeConn.
-
-Fri Feb 12 12:37:15 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.idl:
-        * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector_exec.h:
-        * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.idl:
-        * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.h:
-        * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp:
-        * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.idl:
-        * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.h:
-        * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.idl:
-        * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector_exec.h:
-        * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.idl:
-        * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.h:
-        * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp:
-        * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.idl:
-        * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector_exec.h:
-        * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.idl:
-        * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h:
-        * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp:
-        * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.idl:
-        * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.h:
-          Moved typed module TestTopic from the CCM_DDS module to the TestTopic module
-          and renamed it to TestTopicConn.
-
-Fri Feb 12 11:31:59 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/idl/dds_rtf2_dcps.idl:
-          Changed number of RELIABLE_READER_ACTIVITY_CHANGED_STATUS. This now
-          reflects the DDS_RELIABLE_READER_ACTIVITY_CHANGED_STATUS.
-
-        * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.idl:
-        * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector_exec.h:
-          Moved typed connector to the test module.
-
-        * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.idl:
-        * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h:
-        * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp:
-          Added a reader. Stopping reading after a while.
-          Also changes related to movement of the connector.
-
-        * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.idl:
-        * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h:
-        * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp:
-          Changed timing.
-
-        * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/Plan.cdp:
-          Added reader connection.
-
-        * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/USER_QOS_PROFILES.xml:
-          Removed some unused settings.
-
-        * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl:
-          Sleeping 20 seconds.
-
-Thu Feb 11 15:41:08 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/docs/TestCoverage.ods:
-          Updated.
-
-Thu Feb 11 15:26:11 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.h:
-        * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp:
-          Don't need to test thread switch in the receiver because
-          on_offered_deadline_missed-status is not related to a subsciber and should not
-          be reaceived.
-
-Thu Feb 11 15:22:11 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/docs/TestCoverage.ods:
-          Updated to reflect the latest status.
-
-        * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp:
-          Resolved test errors.
-
-Thu Feb 11 11:34:38 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/Utils.h:
-          Added RELIABLE_READER_ACTIVITY_CHANGED_STATUS to string
-          conversion.
-
-        * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp:
-          Layout changes.
-
-        * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp:
-          Enabled listener.
-
-        * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h:
-        * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp:
-        * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/Plan.cdp:
-        * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/USER_QOS_PROFILES.xml:
-          Added ON_LIVELINESS_LOST status test.
-
-        * connectors/dds4ccm/tests/Reader/descriptors/Plan.cdp:
-          Removed ConnectorStatusListener from connection list.
-
-Thu Feb 11 10:42:55 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/Null_Component_Glfa/Null_Component.mpc:
-          Glem is required
-
-        * connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc:
-          Small cleanup
-
-Thu Feb 11 08:31:27 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.idl:
-        * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h:
-        * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp:
-        * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp:
-          Improved test by using a timer to check for last sample in DDS.
-
-        * connectors/dds4ccm/tests/Reader/descriptors/Plan.cdp:
-          Incremented iterations
-
-Thu Feb 11 02:27:37 UTC 2010  Abdul Sowayan  <sowayan@gmail.com>
-
-        * bin/ciao_tests.lst:
-
-          Add TAO/CIAO/examples/Null_Component_Glfa to the list of
-          daily tests we run so we can ensure that the feature
-          is still functional.
-
-Thu Feb 11 02:21:29 UTC 2010  Abdul Sowayan  <sowayan@gmail.com>
-
-        * examples/Null_Component_Glfa/Null_Component.mpc:
-        * examples/Null_Component_Glfa/Null_Interface.mpc:
-
-          Decorated project names with Glfa token so project names
-          won't clash with the Null_Component example.
-
-Wed Feb 10 22:22:55 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * connectors/dds4ccm/idl/dds4ccm_Base.idl:
-
-          Removed the line '#define connector component'
-
-Wed Feb 10 21:36:32 UTC 2010  Abdul Sowayan  <sowayan@gmail.com>
-
-        * examples/Null_Component_Glfa/Null_Interface.mpc:
-
-          Minor changes to the MPC files to accomodate Glfa changes.
-
-Wed Feb 10 21:15:28 UTC 2010  Abdul Sowayan  <sowayan@gmail.com>
-
-        * examples/Null_Component_Glfa/StaticDAnCEApp.cpp:
-        * examples/Null_Component_Glfa/StaticDAnCEApp.mpc:
-        * examples/Null_Component_Glfa/plan.h:
-
-          Removed these files. They are not relavent to the Glfa
-          example.
-
-Wed Feb 10 21:13:53 UTC 2010  Abdul Sowayan  <sowayan@gmail.com>
-
-        * examples/Null_Component_Glfa/Null_Component.mpc:
-
-          Added -Glfa option to the project.
-
-Wed Feb 10 21:02:03 UTC 2010  Abdul Sowayan  <sowayan@gmail.com>
-
-        * examples/Null_Component_Glfa/*:
-
-          We should have an example to test the -Glfa feature.
-          This is a place holder for now, more modifications
-          are needed to make this functional.
-
-Wed Feb 10 19:49:13 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/DomainParticipant.h:
-        * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp:
-          Using refcounting of CORBA::LocalObject since it's thread safe.
-
-        * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp:
-          Removed unnecessary debug statement.
-
-Wed Feb 10 15:33:37 UTC 2010  Marijke Hengstmengelt  <mhengstmengel@remedy.nl>
-
-        * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub.cdp:
-        * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.cpp
-        * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp:
-        * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.h:
-        Use a High_Res_Timer in sender in order to make it possible to send more messages in a timeinterval.
-
-Wed Feb 10 14:23:51 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp:
-          Checking whether a connection to the reader is in place before read.
-
-        * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp:
-          Wait a while before informing the receiver that the samples
-          were written.
-
-Wed Feb 10 14:06:59 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * bin/ciao_tests.lst:
-          SharedDomainParticipant tests should work again.
-
-        * connectors/dds4ccm/impl/ndds/DomainParticipant.h:
-        * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h:
-        * connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp:
-          Made DomainParticipant proxy class refcounted. Prevented
-          deleting the DomainParticipant proxy when still in use.
-
-        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp:
-        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp:
-          Optimized logging.
-
-Wed Feb 10 10:26:55 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp:
-        * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h:
-        * connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.h:
-          Removed generated headers
-
-Wed Feb 10 10:03:26 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h:
-        * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp:
-          Implemented thread switch for DataReaderStateListener.
-
-        * connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.idl:
-          Layout changes.
-
-Wed Feb 10 09:36:55 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/IDL_Test/IDL3_Plus/KitchenSink.idl:
-          Extended native example
-
-        * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc:
-          Added the exec export flags to get svn head to compile
-
-        * connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl:
-          Added another pragma
-
-Wed Feb 10 08:12:55 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.h:
-        * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp:
-          Preparing thread switch DataReaderStateListener_T.
-
-        * connectors/dds4ccm/impl/ndds/Publisher.cpp:
-          Code alignment.
-
-        * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp:
-          Check on error listeners pointer.
-
-        * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h:
-        * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp:
-          Optimized logging. Code alignment.
-
-Wed Feb  10 8:10:37 UTC 2010  Marijke Hengstmengelt  <mhengstmengel@remedy.nl>
-
-        * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.cpp:
-        * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.h:
-        Removed unused parameter.
-
-Tue Feb  9 22:57:04 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc:
-
-          Added generation of connector export header file, and cosmetic
-          changes.
-
-        * MPC/config/connectoridldefaults.mpb:
-
-          Added command line options to trigger generation of connector
-          implementation and connector export header file.
-
-Tue Feb  9 13:27:37 UTC 2010  Marijke Hengstmengelt  <mhengstmengel@remedy.nl>
-
-        * connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.idl:
-        * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan.cdp:
-        * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub.cdp:
-        * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub.pl:
-        * connectors/dds4ccm/performance-tests/Keyed/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.idl:
-        * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.cpp:
-        * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.h:
-        * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.idl:
-        * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp:
-        * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.h:
-        Get and print throughput statistics, print latency one way, code optimalizations.
-
-Tue Feb  9 13:27:37 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.idl:
-        * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector_exec.h:
-        * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.idl:
-        * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h:
-        * connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp:
-        * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.idl:
-        * connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h:
-          Moved typed module Hello to Hello namespace (instead of leaving
-          it in the CCM_DDS namespace).
-
-Tue Feb  9 13:25:17 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciao/Valuetype_Factories/Cookies.h:
-          Layout change
-
-        * tests/IDL_Test/IDL3_Plus/KitchenSink.idl:
-          Added commented out example using native that causes tao_idl to crash
-
-Tue Feb  9 12:49:17 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.h:
-        * connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp:
-        * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.h:
-        * connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.cpp:
-          Code alignment in order to be consistent with other tests.
-
-Tue Feb  9 12:36:38 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver_exec.cpp:
-          Optimized logging.
-
-        * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender_exec.h:
-        * connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender_exec.cpp:
-          Added test for thread switch.
-
-Tue Feb  9 12:24:14 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp:
-          Optimized logging.
-
-        * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.h:
-        * connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp:
-          Added test for thread switch.
-
-        * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp:
-          Resolved compiler warnings on Linux.
-
-Tue Feb  9 12:02:59 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.h:
-        * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp:
-          Code alignment and optimized logging.
-
-        * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.h:
-        * connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp:
-          Added thread switch test.
-
-        * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h:
-          Code aligning.
-
-Tue Feb  9 11:04:46 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp:
-        * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.h:
-        * connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp:
-          Added thread swich test to Sender component.
-
-        * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp:
-        * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp:
-          Optimized logging.
-
-Tue Feb  9 10:21:44 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h:
-        * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp:
-          Minor code changes.
-
-        * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h:
-        * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp:
-          Tested thread switch on sender side. Minor code changes.
-
-Tue Feb  9 10:15:43 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciao/ComponentServer/CIAO_RTComponentServer_Task.cpp:
-          Fixed memory leak
-
-        * connectors/ami4ccm/docs/AMI4CCM-explanation.odt:
-        * connectors/ami4ccm/docs/AMI4CCM-spec.odt:
-          Small updates
-
-Tue Feb  9 10:03:55 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/tests/Reader/Base/Reader_Starter.idl:
-        * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h:
-        * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp:
-        * connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp:
-          Since on_data_on_readers is not available anymore, this test
-          didn't start. Resolved this by letting the receiver know that
-          all samples were written.
-
-Tue Feb  9 09:29:54 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp:
-          Resolved compiler issue.
-
-Tue Feb  9 08:40:07 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/DataReader.cpp:
-        * connectors/dds4ccm/impl/ndds/DataWriter.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:
-          When DDS returns nil as a listener, we don't need
-          to create a proxy. Just return nil will be enough.
-          Implemented get_listener methods.
-
-Mon Feb  8 20:22:40 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/docs/TestCoverage.ods:
-          Updated.
-
-        * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp:
-        * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp:
-          Optimized logging.
-
-        * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.idl:
-        * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.h:
-        * connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp:
-        * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.idl:
-        * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.h:
-        * connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.cpp:
-        * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.idl:
-        * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.h:
-        * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp:
-          Since on_data_on_readers is not available anymore, these tests
-          didn't start. Resolved this by start listening on ccm_activate.
-
-Mon Feb  8 15:14:43 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector_exec.h:
-          Added explicit global scope
-
-        * connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl:
-          Added pragma rti typesupport to indicate the name of the typesupport
-          header that will be generated by rtiddsgen. We need to know the
-          name of this file when generating the dds4ccm connectors by tao_idl
-
-Mon Feb  8 15:00:45 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h:
-        * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp:
-          Extended test with on_publication_matched. Also implemented test regarding
-          thread switch for all unexpected statusses to be received (instead of
-          one thread switch test for all statussses).
-
-Mon Feb  8 13:49:04 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.idl:
-        * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h:
-        * connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp:
-          Add tests for thread switch.
-
-        * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h:
-        * connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp:
-          Code aligning.
-
-Mon Feb  8 13:33:43 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * bin/ciao_tests.lst:
-          Fixed incorrect path
-
-Mon Feb  8 13:16:43 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp
-        * connectors/dds4ccm/impl/ndds/DataReader.cpp
-        * connectors/dds4ccm/impl/ndds/DataReaderListener.cpp
-        * connectors/dds4ccm/impl/ndds/DataWriter.cpp
-        * connectors/dds4ccm/impl/ndds/DataWriterListener.cpp
-        * connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.cpp
-        * connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.cpp
-        * connectors/dds4ccm/impl/ndds/Publisher.cpp
-        * connectors/dds4ccm/impl/ndds/PublisherListener.cpp
-        * connectors/dds4ccm/impl/ndds/QueryCondition.cpp
-        * connectors/dds4ccm/impl/ndds/ReadCondition.cpp
-        * connectors/dds4ccm/impl/ndds/Reader_T.cpp
-        * connectors/dds4ccm/impl/ndds/StatusCondition.cpp
-        * connectors/dds4ccm/impl/ndds/Subscriber.cpp
-        * connectors/dds4ccm/impl/ndds/SubscriberListener.cpp
-        * connectors/dds4ccm/impl/ndds/Topic.cpp
-        * connectors/dds4ccm/impl/ndds/TopicDescription.cpp
-        * connectors/dds4ccm/impl/ndds/Writer_T.cpp
-        * DAnCE/TargetManager/ResourceCommitmentManager.cpp
-          Removed generated comments which didn't had any value
-
-Mon Feb  8 13:02:39 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp:
-          Resolved compiler issue.
-
-        * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver_exec.h:
-        * connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver_exec.cpp:
-          Extended test with thread switch test.
-
-Mon Feb  8 12:28:48 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp:
-        * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp:
-        * connectors/dds4ccm/impl/ndds/DataWriterListener_T.cpp:
-        * connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.cpp:
-        * connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp:
-        * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp:
-        * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp:
-        * connectors/dds4ccm/impl/ndds/TopicListener_T.cpp:
-          Replaced DDS_STATUS_MASK_NONE with 0 since DDS_STATUS_MASK_NONE
-          is not part of the DDS spec. Also using the DDS namespace to
-          determine mask.
-
-Mon Feb  8 12:03:55 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp:
-          Shouldn't propagate on_data_on_readers to the user component.
-
-Mon Feb  8 11:35:22 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/DataWriterListener_T.h:
-        * connectors/dds4ccm/impl/ndds/DataWriterListener_T.cpp:
-        * connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.h:
-        * connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.cpp:
-        * connectors/dds4ccm/impl/ndds/PortStatusListener_T.h:
-        * connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp:
-        * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h:
-        * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp:
-          Moved all empty inline methods from header to source file.
-
-Mon Feb  8 11:15:00 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-
-        * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.h:
-        * connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp:
-        * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h:
-        * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp:
-          Added test scenario for thread switch.
-
-        * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp:
-        * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp:
-        * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp:
-        * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp:
-        * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp:
-          Optimized logging regarding thread switch test.
-
-Mon Feb  8 10:56:43 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.mpc:
-          Added missing after
-
-        * connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp:
-          Layout change
-
-Mon Feb  8 09:54:01 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp:
-        * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp:
-        * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp:
-        * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp:
-        * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp:
-          Only test thread switch when CIAO_DDS4CCM_CONTEXT_SWITCH is turned on.
-
-Mon Feb  8 07:46:43 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciao/ComponentServer/CIAO_ComponentServer_Task.cpp:
-          Fixed memory leak
-
-Fri Feb  5 19:45:46 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.h:
-        * tools/IDL3_to_XMI/IR_Simulator_visitor.cpp:
-        * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp:
-        * tools/IDL3_to_XMI/IR_Simulator_visitor.h:
-
-          Updates to eliminate build errors due to frontend
-          changes in home factories and finders. Further
-          work is needed for this tool to support home factories
-          and finders.
-
-Fri Feb  5 15:02:23 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.h:
-        * connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp:
-          Implemented thread switch. Test result was incorrectly printed.
-
-        * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp:
-          Code aligning.
-
-Fri Feb  5 14:07:48 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/tests/TimeConversion/Time_Conversion.mpc:
-          Resolved compiler issues on windows.
-
-Fri Feb  5 13:11:13 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/docs/TestCoverage.ods:
-          Updated.
-
-        * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp:
-        * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp:
-        * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp:
-        * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h:
-        * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp:
-          Test on thread handle is NIL.
-
-        * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h:
-        * connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp:
-          Tested thread switch for StatusListener.
-
-Fri Feb  5 12:37:55 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h:
-          Code aligning.
-
-        * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h:
-        * connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp:
-          Tested thread switch for PortStatusListener.
-
-Fri Feb  5 12:10:58 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/docs/TestCoverage.ods:
-          Added new tests.
-
-        * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h:
-        * connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp:
-          Tested thread switch for ConnectorStatusListener.
-
-        * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.h:
-        * connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp:
-          Tested thread switch for ReaderListener.
-
-Fri Feb  5 10:07:39 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/DDSCallbackStatusHandler.h:
-        * connectors/dds4ccm/impl/ndds/DDSCallbackStatusHandler.cpp:
-        * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp:
-        * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp:
-        * connectors/dds4ccm/impl/ndds/TopicListener_T.cpp:
-        * connectors/dds4ccm/impl/ndds/ndds_impl.mpc:
-        * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.h:
-        * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.cpp:
-          Renamed OnUnexpectedStatusHandler to DDSCallbackStatusHandler.
-
-Fri Feb  5 09:38:48 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp:
-        * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp:
-        * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp:
-        * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp:
-        * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp:
-        * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h:
-        * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp:
-        * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h:
-        * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp:
-        * connectors/dds4ccm/impl/ndds/PortStatusListener_T.h:
-        * connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp:
-        * connectors/dds4ccm/impl/ndds/PublisherListener_T.h:
-        * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp:
-        * connectors/dds4ccm/impl/ndds/Reader_T.cpp:
-        * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h:
-        * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp:
-        * connectors/dds4ccm/impl/ndds/TopicListener_T.h:
-        * connectors/dds4ccm/impl/ndds/TopicListener_T.cpp:
-          Only use the DDS listener callbacks when the listener
-          connection is there or when logging is required.
-
-Fri Feb  5 07:25:43 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/tests/TimeConversion/time_conversion.cpp:
-          Resolved compiler issue.
-
-Thu Feb  4 15:44:43 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/IDL_Test/IDL3_Plus/KitchenSink.idl:
-          Added a test related to 3819
-
-Thu Feb  4 15:27:32 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * bin/ciao_tests.lst:
-        * connectors/dds4ccm/tests/TimeConversion:
-        * connectors/dds4ccm/tests/TimeConversion/Time_Conversion.mpc:
-        * connectors/dds4ccm/tests/TimeConversion/run_test.pl:
-        * connectors/dds4ccm/tests/TimeConversion/time_conversion.cpp:
-          Added test for testing conversions from and to DDS::Time_t.
-
-Thu Feb  4 15:21:22 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp:
-        * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp:
-        * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp:
-        * connectors/dds4ccm/impl/ndds/Utils.h:
-          Resolved runtime issues regarding logging an instance_handle
-
-Thu Feb  4 14:09:43 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/NodeApplication/ComponentAttributesSetter.cpp:
-          Cleanup and log which attribute is causing the exception
-
-Thu Feb  4 13:21:11 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/Utils.h:
-        * connectors/dds4ccm/impl/ndds/Utils.cpp:
-          Resolved compiler issues on windows.
-
-Thu Feb  4 12:42:05 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp:
-        * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp:
-          Resolved compiler errors.
-
-Thu Feb  4 12:37:44 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.h:
-        * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.cpp:
-          Resolved compiler errors.
-
-Thu Feb  4 12:31:22 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.h:
-        * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.cpp:
-        * connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp:
-        * connectors/dds4ccm/impl/ndds/TopicListener_T.cpp:
-          Added status logging for each DDS callback. Also implemented
-          thread switch.
-
-Thu Feb  4 11:45:20 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h:
-        * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp:
-          Corrected mask and according methods.
-
-Thu Feb  4 10:46:25 UTC 2010  Marcel Smit  <msmit@remedy.nl>
-
-        * connectors/dds4ccm/idl/ccm_dds.idl:
-          Code aligning.
-
-        * connectors/dds4ccm/idl/dds_rtf2_dcps.idl:
-        * connectors/dds4ccm/impl/ndds/DataWriterListener_T.h:
-        * connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.h:
-          Added implementation regarding
-          ReliableReaderActivityChangedStatus.
-
-        * connectors/dds4ccm/impl/ndds/PublisherListener_T.h:
-        * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp:
-        * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h:
-        * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp:
-        * connectors/dds4ccm/impl/ndds/TopicListener_T.cpp:
-          Added status logging for each DDS callback.
-
-        * connectors/dds4ccm/impl/ndds/Utils.h:
-        * connectors/dds4ccm/impl/ndds/Utils.cpp:
-          Added helper methods for status logging in
-          DDS callbacks.
-
-        * connectors/dds4ccm/impl/ndds/TimeUtilities.h:
-          Removed unnecessary comment.
-
-        * connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl:
-        * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h:
-        * connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp:
-        * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h:
-        * connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp:
-        * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/Plan.cdp:
-          Rewritten to test all unexpected status. Also removed unused
-          DDS callbacks and realigned some code.
-
-Thu Feb  4 10:38:43 UTC 2010  Martin Corino  <mcorino@remedy.nl>
-
-        * tests/Bug_2130_Regression/descriptors/run_test.pl:
-        * tests/Bug_3769_Regression/descriptors/run_test.pl:
-        * tests/IDL_Test/Double_Inherited_Component/run_test.pl:
-        * DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl:
-        * DAnCE/tests/CIAO/NodeManager-Deployments/run_test.pl:
-        * DAnCE/tests/CIAO/CommandlinePassage/run_test.pl:
-        * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_test.pl:
-        * connectors/dds4ccm/tests/InstanceHandle/descriptors/run_test.pl:
-        * connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl:
-        * connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl:
-        * connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl:
-        * connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl:
-        * connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl:
-        * connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl:
-        * connectors/dds4ccm/tests/Getter/descriptors/run_test.pl:
-        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test.pl:
-        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/run_test.pl:
-        * connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl:
-        * connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl:
-        * connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl:
-        * connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl:
-        * connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl:
-        * connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl:
-        * connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl:
-        * connectors/dds4ccm/tests/Reader/descriptors/run_test.pl:
-        * connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl:
-        * connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl:
-        * connectors/dds4ccm/tests/Updater/descriptors/run_test.pl:
-        * connectors/dds4ccm/tests/DDSWriterEntity/descriptors/run_test.pl:
-        * connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl:
-        * connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl:
-        * connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl:
-        * connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl:
-        * connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl:
-        * connectors/dds4ccm/tests/QueryFilter/descriptors/run_test.pl:
-        * connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl:
-        * connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl:
-        * connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl:
-        * connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl:
-        * connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl:
-        * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl:
-        * connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl:
-        * connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl:
-        * connectors/dds4ccm/examples/Hello/descriptors/run_test.pl:
-        * connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl:
-        * connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl:
-        * connectors/ami4ccm/examples/Hello/descriptors/run_test.pl:
-        * examples/Hello/descriptors/run_test_without_ns.pl:
-        * examples/Hello/descriptors/run_test_alias.pl:
-        * examples/Hello/descriptors/run_test.pl:
-        * examples/BasicSP/descriptors/run_test.pl:
-        * examples/DevGuideExamples/Messenger/StaticDAnCE/run_test.pl:
-        * examples/DevGuideExamples/Messenger/descriptors/run_test.pl:
-        * examples/Null_Component/descriptors/run_test.pl:
-
-         Added cleanup code to kill off remaining ciao_componentserver processes
-         (in case of certain test failures) since these otherwise tend to choke test
-         machines.
-
-Thu Feb  4 10:30:43 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/IDL_Test/IDL3_Plus/KitchenSink.idl:
-          Extended this idl file
-
-        * tests/IDL_Test/IDL3_Plus/KitchenSink.mpc:
-          enabled this test for compilation again
-
-Thu Feb  4 10:25:43 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciao/Servants/Home_Servant_Impl_T.h:
-          Layout changes
-
-        * tests/IDL_Test/Two_Templ_Args/TwoTemplArgs.mpc:
-          New MPC file, this test compiles fine now
-
-Thu Feb  4 10:23:43 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tools/IDL3_to_IDL2/basic_visitor.cpp
-        * tools/IDL3_to_IDL2/basic_visitor.h
-        * tools/IDL3_to_IDL2/checking_visitor.cpp
-        * tools/IDL3_to_IDL2/checking_visitor.h
-        * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp
-        * tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h
-        * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp
-        * tools/IDL3_to_XMI/IDL3_to_XMI_visitor.h
-        * tools/IDL3_to_XMI/IR_Simulator_visitor.cpp
-        * tools/IDL3_to_XMI/IR_Simulator_visitor.h
-          Merged changes from idl3_plus_backend2 branch to svn head
-
-Thu Feb 4 09:22:31 UTC 2009  Marijke Hengstmengel  <mhengstmengel@remedy.nl>
-
-        * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.cpp:
-        * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp:
-        Solve some compiler warnings.
-
-Wed Feb  3 15:08:43 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp:
-        * connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp:
-          Reduced scope of the try/catch blocks
-
-Wed Feb  3 13:16:43 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp
-        * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h
-        * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp
-        * connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h
-        * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp
-        * connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp
-        * connectors/dds4ccm/impl/ndds/DDS_Get_T.h
-        * connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp
-        * connectors/dds4ccm/impl/ndds/DDS_Read_T.h
-        * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp
-        * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp
-        * connectors/dds4ccm/impl/ndds/DDS_StateListen_T.h
-        * connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp
-        * connectors/dds4ccm/impl/ndds/PortStatusListener_T.h
-        * connectors/dds4ccm/impl/ndds/Reader_T.cpp
-          Distribute the reactor through the connector code
-
-Wed Feb  3 12:10:43 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp
-        * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp
-        * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp
-        * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.cpp
-        * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.h
-        * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp
-          Extended thread swit code, if you want to use this feature,
-          add CIAO_DDS4CCM_CONTEXT_SWITCH as 1 to your config.h file,
-          the code is not tested yet, when that is done, we will enable
-          this flag by default
-
-Wed Feb  3 11:59:43 UTC 2010  Marijke Hengstmengel  <mhengstmengle@remedy.nl>
-
-        * connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.idl:
-        * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan.cdp:
-        * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub.cdp:
-        * connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_sub.cdp:
-        * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub.pl:
-        * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub.pl:
-        * connectors/dds4ccm/performance-tests/Keyed/descriptors/run_test.pl:
-        * connectors/dds4ccm/performance-tests/Keyed/descriptors/USER_QOS_PROFILES.xml:
-        * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.cpp:
-        * connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.h:
-        * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.idl:
-        * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp:
-        * connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.h:
-        Split in publisher and subscriber proces. Use other time functions. Set some attributes.
-
-Wed Feb  3 11:30:43 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp:
-        * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.h:
-        * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.cpp:
-        * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.h:
-        * connectors/dds4ccm/impl/ndds/TopicListener_T.cpp:
-        * connectors/dds4ccm/impl/ndds/TopicListener_T.h:
-          Thread switch for the on_inconsistent_topic
-
-Wed Feb  3 11:19:43 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.cpp
-        * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.h
-        * connectors/dds4ccm/impl/ndds/PublisherListener_T.h
-        * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp
-        * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h
-          More thread switch infrastructure code
-
-Wed Feb  3 08:10:43 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/IDL_Test/Two_Templ_Args/TwoTemplArgs.idl:
-          New IDL3+ test file, fails to compile, when TAO_IDL can
-          handle this, we will add the mpc file
-
-Tue Feb  2 12:43:43 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.h:
-          Added missing export
-
-        * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp:
-          create eh when there is a reactor
-
-Tue Feb  2 12:36:43 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.h
-        * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp
-        * connectors/dds4ccm/impl/ndds/ndds_impl.mpc
-        * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.cpp
-        * connectors/dds4ccm/impl/ndds/OnUnexpectedStatusHandler.h
-        * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp
-        * connectors/dds4ccm/impl/ndds/PublisherListener_T.h
-        * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp
-        * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h
-          More rework for the thread switch
-
-Tue Feb  2 12:34:43 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/CIAO/CommandlinePassage/CommandlinePassage.mpc:
-          This test doesn't dependent on dds4ccm
-
-Tue Feb  2 12:32:43 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/IDL_Test/Double_Inherited_Component/Inherited_components.mpc:
-          This test doesn't dependent on dds4ccm
-
-Tue Feb  2 12:14:43 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.h
-        * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp
-        * connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp
-        * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp
-        * connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.h
-        * connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp
-        * connectors/dds4ccm/impl/ndds/PublisherListener_T.h
-        * connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp
-        * connectors/dds4ccm/impl/ndds/SubscriberListener_T.h
-          More rework for the thread switch
-
-Tue Feb  2 10:44:43 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp
-        * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp
-        * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h
-        * connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp
-        * connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp
-        * connectors/dds4ccm/impl/ndds/DDS_Listen_T.h
-        * connectors/dds4ccm/impl/ndds/TopicListener_T.h
-          The internal dds4ccm classes will get an ACE_Reactor point, if
-          that is set, they will handle the thread switch using that
-          reactor. From the connector side we than only have to pass a
-          zero pointer or a pointer to a valid reactor
-
-Tue Feb  2 09:49:43 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/examples/Hello/Connector/Hello_Connector_exec.h
-        * connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector_exec.h
-        * connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector_exec.h
-        * connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector_exec.h
-        * connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector_exec.h
-        * connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector_exec.h
-        * connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector_exec.h
-        * connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector_exec.h
-        * connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector_exec.h
-        * connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector_exec.h
-        * connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector_exec.h
-        * connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector_exec.h
-        * connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector_exec.h
-        * connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector_exec.h
-        * connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector_exec.h
-        * connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector_exec.h
-        * connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector_exec.h
-        * connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.h
-        * connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector_exec.h
-        * connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/CSL_TestSec_Connector_exec.h
-        * connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector_exec.h
-        * connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector_exec.h
-        * connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector_exec.h
-        * connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector_exec.h
-        * connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector_exec.h
-        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector_exec.h
-        * connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector_exec.h
-        * connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector_exec.h
-        * connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector_exec.h
-        * connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector_exec.h
-        * connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector_exec.h
-        * connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector_exec.h
-        * connectors/dds4ccm/tests/Updater/Connector/Updater_Connector_exec.h
-        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector_exec.h
-        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector_exec.h
-        * connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector_exec.h
-        * connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector_exec.h
-        * connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector_exec.h
-        * connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector_exec.h
-        * connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector_exec.h
-        * connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector_exec.h
-          removed not needed include of LocalObject
-
-        * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp
-        * connectors/dds4ccm/impl/ndds/DataReaderHandler_T.h
-        * connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp
-        * connectors/dds4ccm/impl/ndds/DataReaderListener_T.h
-          First rework to implement the required thread switch
-
-Mon Feb  1 19:16:43 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * connectors/dds4ccm/examples/Quoter/Distributor/Distributor.idl:
-          Removed commented out code
-
-        * connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc:
-        * connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender.mpc:
-        * connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc:
-        * connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc
-        * connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc
-          Cleanup
-
-        * MPC/config/ciao_dds4ccm_ndds_impl.mpb:
-          Deleted, not used
-
 Sun Jan 31 01:04:43 CST 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * CIAO version 0.7.6 released.
+	* CIAO version 0.7.6 released.
 
 Fri Jan 29 13:36:30 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
 
diff --git a/CIAO/ChangeLogs/ChangeLog-2004a b/CIAO/ChangeLogs/ChangeLog-04a
index e344fe85bee..e344fe85bee 100644
--- a/CIAO/ChangeLogs/ChangeLog-2004a
+++ b/CIAO/ChangeLogs/ChangeLog-04a
diff --git a/CIAO/ChangeLogs/ChangeLog-2004b b/CIAO/ChangeLogs/ChangeLog-04b
index 233cfed69fc..233cfed69fc 100644
--- a/CIAO/ChangeLogs/ChangeLog-2004b
+++ b/CIAO/ChangeLogs/ChangeLog-04b
diff --git a/CIAO/ChangeLogs/ChangeLog-2006a b/CIAO/ChangeLogs/ChangeLog-06a
index f2d22b3e963..f2d22b3e963 100644
--- a/CIAO/ChangeLogs/ChangeLog-2006a
+++ b/CIAO/ChangeLogs/ChangeLog-06a
diff --git a/CIAO/ChangeLogs/ChangeLog-2006b b/CIAO/ChangeLogs/ChangeLog-06b
index b7797cca18a..b7797cca18a 100644
--- a/CIAO/ChangeLogs/ChangeLog-2006b
+++ b/CIAO/ChangeLogs/ChangeLog-06b
diff --git a/CIAO/ChangeLogs/ChangeLog-2007a b/CIAO/ChangeLogs/ChangeLog-07a
index 613da3f1e4c..613da3f1e4c 100644
--- a/CIAO/ChangeLogs/ChangeLog-2007a
+++ b/CIAO/ChangeLogs/ChangeLog-07a
diff --git a/CIAO/ChangeLogs/ChangeLog-2007b b/CIAO/ChangeLogs/ChangeLog-07b
index 5ffc3af510a..5ffc3af510a 100644
--- a/CIAO/ChangeLogs/ChangeLog-2007b
+++ b/CIAO/ChangeLogs/ChangeLog-07b
diff --git a/CIAO/ChangeLogs/ChangeLog-2009a b/CIAO/ChangeLogs/ChangeLog-09a
index 2ac01dcc17a..2ac01dcc17a 100644
--- a/CIAO/ChangeLogs/ChangeLog-2009a
+++ b/CIAO/ChangeLogs/ChangeLog-09a
diff --git a/CIAO/DAnCE/Config_Handlers/Config_Handlers.mpc b/CIAO/DAnCE/Config_Handlers/Config_Handlers.mpc
index 4d578c4a2b2..942730618e8 100644
--- a/CIAO/DAnCE/Config_Handlers/Config_Handlers.mpc
+++ b/CIAO/DAnCE/Config_Handlers/Config_Handlers.mpc
@@ -31,11 +31,11 @@ project (XSC_XML_Generation) : xscdefaults {
   }
 }
 
-project (XSC_XML_Handlers) : acelib, xerces, dance_lib, ciao_xml_utils {
+project (XSC_XML_Handlers) : acelib, xerces, ciao_lib, ciao_xml_utils {
   sharedname    += XSC_XML_Handlers
   dynamicflags  = XSC_XML_HANDLERS_BUILD_DLL
-  macros += XML_USE_PTHREADS
-  includes += $(DANCE_ROOT)/Config_Handlers
+  macros       += XML_USE_PTHREADS
+  includes += $(DANCE_ROOT)/Config_Handlers $(CIAO_ROOT)/tools
   after += XSC_XML_Generation
 
   Source_Files {
@@ -64,7 +64,7 @@ project (XSC_XML_Handlers) : acelib, xerces, dance_lib, ciao_xml_utils {
 
 }
 
-project (XSC_Config_Handlers) : dance_deployment_stub, dance_config_handlers_base, ciao_lib, dance, dance_logger {
+project (XSC_Config_Handlers) : dance_deployment_stub, ciao_config_handlers_base, ciao_lib, dance, dance_logger {
   after += XSC_DynAny_Handler \
            XSC_Config_Handlers_Common
 
@@ -105,7 +105,7 @@ project (XSC_Config_Handlers) : dance_deployment_stub, dance_config_handlers_bas
 
 }
 
-project (XSC_Config_Handlers_Common) : dance_deployment_stub, dance_config_handlers_base, ciao_lib, dance {
+project (XSC_Config_Handlers_Common) : dance_deployment_stub, ciao_config_handlers_base, ciao_lib, dance {
   after += XSC_DynAny_Handler
   sharedname = XSC_Config_Handlers_Common
   dynamicflags = CONFIG_HANDLERS_COMMON_BUILD_DLL
diff --git a/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynAny_Handler.mpc b/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynAny_Handler.mpc
index 1004dde9243..857e013e131 100644
--- a/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynAny_Handler.mpc
+++ b/CIAO/DAnCE/Config_Handlers/DynAny_Handler/DynAny_Handler.mpc
@@ -1,7 +1,7 @@
 // $Id$
 
 project (XSC_DynAny_Handler) : xerces, dynamicany, typecodefactory, dance_deployment_stub, \
-  dance_config_handlers_base, dance_lib, dance, ifr_client {
+	ciao_config_handlers_base, ciao_lib, dance, ifr_client {
   after += XSC_XML_Handlers
   libs += XSC_XML_Handlers
   dynamicflags += DYNANY_HANDLER_BUILD_DLL
diff --git a/CIAO/DAnCE/Config_Handlers/Package_Handlers/Package_Handlers.mpc b/CIAO/DAnCE/Config_Handlers/Package_Handlers/Package_Handlers.mpc
index d631343c9e5..4ac1cf47981 100644
--- a/CIAO/DAnCE/Config_Handlers/Package_Handlers/Package_Handlers.mpc
+++ b/CIAO/DAnCE/Config_Handlers/Package_Handlers/Package_Handlers.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project (Package_Config_Handlers) : acelib, dance_deployment_stub, dance_config_handlers_base, dance, typecodefactory, dance_output  {
+project (Package_Config_Handlers) : acelib, dance_deployment_stub, ciao_config_handlers_base, dance, typecodefactory, ciao_output  {
   sharedname = Package_Config_Handlers
   dynamicflags = PACKAGING_HANDLERS_BUILD_DLL
 
diff --git a/CIAO/DAnCE/DAnCE/DAnCE_Properties.mpc b/CIAO/DAnCE/DAnCE/DAnCE_Properties.mpc
deleted file mode 100644
index 9f7613fb127..00000000000
--- a/CIAO/DAnCE/DAnCE/DAnCE_Properties.mpc
+++ /dev/null
@@ -1,12 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(DAnCE_Properties_IDL) : ciaolib_with_idl, dance_output {
-  custom_only = 1
-
-  IDL_Files {
-    idlflags += -SS -Sci
-    DAnCE_Properties.idl
-  }
-}
-
diff --git a/CIAO/DAnCE/Deployment/CIAO_ExecutionManagerDaemon.idl b/CIAO/DAnCE/Deployment/CIAO_ExecutionManagerDaemon.idl
new file mode 100644
index 00000000000..7f4708baa37
--- /dev/null
+++ b/CIAO/DAnCE/Deployment/CIAO_ExecutionManagerDaemon.idl
@@ -0,0 +1,25 @@
+// $Id$
+
+/**
+ * @file CIAO_ExecutionManagerDaemon.idl
+ *
+ * @brief Simple interface to control the ExecutionManager. This
+ * interface currently provides an additional method called shutdown
+ * to terminate the process cleanly.
+ */
+
+#include "DAnCE/Deployment/Deployment_ExecutionManager.idl"
+
+module DAnCE
+{
+  /**
+   * @brief CIAO Execution Manager Program
+   *
+   * This feature addition is added using inheritance mechanism currently
+   */
+  interface ExecutionManagerDaemon : Deployment::ExecutionManager
+  {
+    // Shutdown the daemon process.
+    oneway void shutdown ();
+  };
+};
diff --git a/CIAO/DAnCE/Deployment/CIAO_Interfaces.mpc b/CIAO/DAnCE/Deployment/CIAO_Interfaces.mpc
new file mode 100644
index 00000000000..9a5da6c324d
--- /dev/null
+++ b/CIAO/DAnCE/Deployment/CIAO_Interfaces.mpc
@@ -0,0 +1,85 @@
+// -*- MPC -*-
+// $Id$
+
+project (CIAO_ExecutionManager_idl): ciaoidldefaults, anytypecode {
+  custom_only = 1
+  idlflags += -Wb,stub_export_macro=CIAO_EXECUTIONMANAGER_STUB_Export \
+              -Wb,stub_export_include=CIAO_ExecutionManager_stub_export.h \
+              -Wb,skel_export_macro=CIAO_EXECUTIONMANAGER_SKEL_Export \
+              -Wb,skel_export_include=CIAO_ExecutionManager_skel_export.h \
+              -Gxhst -Gxhsk
+
+  IDL_Files {
+    CIAO_ExecutionManagerDaemon.idl
+  }
+}
+
+project (CIAO_ExecutionManager_stub): dance_lib, messaging, dance_executionmanager_stub {
+  sharedname = CIAO_ExecutionManager_stub
+  after += CIAO_ExecutionManager_idl
+  dynamicflags = CIAO_EXECUTIONMANAGER_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+   CIAO_ExecutionManagerDaemonC.cpp
+  }
+}
+
+project (CIAO_ExecutionManager_skel): dance_lib, messaging, ciao_executionmanager_stub, dance_executionmanager_skel {
+  sharedname = CIAO_ExecutionManager_skel
+  after += CIAO_ExecutionManager_stub
+  dynamicflags = CIAO_EXECUTIONMANAGER_SKEL_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+   CIAO_ExecutionManagerDaemonS.cpp
+  }
+}
+
+project (CIAO_NodeManager_idl): ciaoidldefaults, anytypecode {
+  custom_only = 1
+  idlflags     += -Wb,stub_export_macro=CIAO_NODEMANAGER_STUB_Export \
+                  -Wb,stub_export_include=CIAO_NodeManager_stub_export.h \
+                  -Wb,skel_export_macro=CIAO_NODEMANAGER_SKEL_Export \
+                  -Wb,skel_export_include=CIAO_NodeManager_skel_export.h \
+                  -Gxhst -Gxhsk
+                  
+  IDL_Files {
+   CIAO_NodeManagerDaemon.idl
+  }
+}
+
+project (CIAO_NodeManager_stub): dance_lib, messaging, dance_nodemanager_stub {
+  after += CIAO_NodeManager_idl
+  sharedname = CIAO_NodeManager_stub
+
+  dynamicflags = CIAO_NODEMANAGER_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+   CIAO_NodeManagerDaemonC.cpp
+  }
+}
+
+project (CIAO_NodeManager_skel): dance_lib, messaging, dance_nodemanager_skel, ciao_nodemanager_stub {
+  after += CIAO_NodeManager_idl
+  sharedname = CIAO_NodeManager_skel
+
+  dynamicflags = CIAO_NODEMANAGER_SKEL_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+   CIAO_NodeManagerDaemonS.cpp
+  }
+}
+
+
+
diff --git a/CIAO/DAnCE/Deployment/CIAO_NodeManagerDaemon.idl b/CIAO/DAnCE/Deployment/CIAO_NodeManagerDaemon.idl
new file mode 100644
index 00000000000..20b208697b3
--- /dev/null
+++ b/CIAO/DAnCE/Deployment/CIAO_NodeManagerDaemon.idl
@@ -0,0 +1,34 @@
+// $Id$
+
+/**
+ * @file CIAO_NodeManagerDaemon.idl
+ *
+ * @brief Controling interface for managing and controling CIAO daemon.
+ */
+
+#include "DAnCE/Deployment/Deployment_NodeManager.idl"
+
+module DAnCE
+{
+  /**
+   * @brief CIAO daemon process control program.
+   *
+   * @@The Inheritage might cause binary code bloating but
+   * it's an easy way of combining features. In the future we could
+   * move this definition into Deployment.idl.
+   */
+  interface NodeManagerDaemon : Deployment::NodeManager
+  {
+    // Canonical name of this daemon
+    readonly attribute string name;
+
+    // Shutdown the daemon process.
+    oneway void shutdown ();
+
+    /// RACE specific extension.
+    /// Modify the priority of a node application process.
+//    long set_priority (in string plan_id,
+//                       in string cid,
+//                       in ::Deployment::Sched_Params nm_params);
+  };
+};
diff --git a/CIAO/DAnCE/Deployment/DAnCE_Core.mpc b/CIAO/DAnCE/Deployment/DAnCE_Core.mpc
index 9a381dca3da..d905c176b52 100644
--- a/CIAO/DAnCE/Deployment/DAnCE_Core.mpc
+++ b/CIAO/DAnCE/Deployment/DAnCE_Core.mpc
@@ -1,71 +1,57 @@
 // -*- MPC -*-
 // $Id$
 
-project(Deployment_IDL) : ciaolib_with_idl, dance_output, valuetype, gen_ostream {
+project(Deployment_IDL) : ciaolib_with_idl, ciao_output, valuetype, gen_ostream {
   custom_only = 1
-  idlflags     += -Wb,stub_export_macro=DEPLOYMENT_STUB_Export \
+  idlflags     += -Wb,stub_export_macro=Deployment_stub_Export \
                   -Wb,stub_export_include=Deployment_stub_export.h \
-                  -Wb,skel_export_macro=DEPLOYMENT_SKEL_Export \
-                  -Wb,skel_export_include=Deployment_skel_export.h
-  after += DAnCE_Properties_IDL
+                  -Wb,skel_export_macro=Deployment_svnt_Export \
+                  -Wb,skel_export_include=Deployment_svnt_export.h
 
   IDL_Files {
     idlflags += -SS -Sci
     Deployment_Packaging_Data.idl
     Deployment_PlanError.idl
-    Deployment_Connection.idl
-    Deployment_StopError.idl
-    Deployment_StartError.idl
-    Deployment_DeploymentPlan.idl
-    Deployment_Data.idl
-    Deployment_TargetData.idl
-    Deployment.idl
+    DAnCE_Properties.idl
   }
 
   IDL_Files {
     idlflags += -SS
     Deployment_Base.idl
+    Deployment_Connection.idl
+    Deployment_Data.idl
+    Deployment_DeploymentPlan.idl
+    Deployment_TargetData.idl
   }
 
   IDL_Files {
-    idlflags += -Gxhst -Gxhsk
-    Deployment_Application.idl
+    idlflags += -GC
+    Deployment_ApplicationManager.idl
   }
 
   IDL_Files {
-    idlflags += -Ssi
     Deployment_ResourceCommitmentManager.idl
+    Deployment_StopError.idl
+    Deployment_StartError.idl
+    Deployment_Application.idl
+    Deployment.idl
   }
 }
 
-project(Deployment_ApplicationManager_IDL) : ciaolib_with_idl, dance_output, valuetype, gen_ostream, ami {
-  custom_only = 1
-  idlflags     += -Wb,stub_export_macro=DEPLOYMENT_APPLICATIONMANAGER_STUB_Export \
-                  -Wb,stub_export_include=Deployment_ApplicationManager_stub_export.h \
-                  -Wb,skel_export_macro=DEPLOYMENT_APPLICATIONMANAGER_SKEL_Export \
-                  -Wb,skel_export_include=Deployment_ApplicationManager_skel_export.h \
-                  -Gxhst -Gxhsk
-
-  idlflags += -GC
-  IDL_Files {
-    Deployment_ApplicationManager.idl
-  }
-}
-
-project(Deployment_TargetManager_IDL) : ciaolib_with_idl, dance_output, valuetype, gen_ostream {
+project(Deployment_TargetManager_IDL) : ciaolib_with_idl, ciao_output, valuetype, gen_ostream {
   custom_only = 1
   idlflags     += -Wb,stub_export_macro=DEPLOYMENT_TARGETMANAGER_STUB_Export \
                   -Wb,stub_export_include=Deployment_TargetManager_stub_export.h \
                   -Wb,skel_export_macro=DEPLOYMENT_TARGETMANAGER_SKEL_Export \
                   -Wb,skel_export_include=Deployment_TargetManager_skel_export.h \
-                  -Gxhst -Gxhsk -Ssi
+                  -Gxhst -Gxhsk
 
   IDL_Files {
     Deployment_TargetManager.idl
   }
 }
 
-project(Deployment_RepositoryManager_IDL) : ciaolib_with_idl, dance_output, valuetype, gen_ostream {
+project(Deployment_RepositoryManager_IDL) : ciaolib_with_idl, ciao_output, valuetype, gen_ostream {
   custom_only = 1
   idlflags     += -Wb,stub_export_macro=DEPLOYMENT_REPOSITORYMANAGER_STUB_Export \
                   -Wb,stub_export_include=Deployment_RepositoryManager_stub_export.h \
@@ -78,7 +64,7 @@ project(Deployment_RepositoryManager_IDL) : ciaolib_with_idl, dance_output, valu
   }
 }
 
-project(Deployment_ExecutionManager_IDL) : ciaolib_with_idl, dance_output, valuetype, gen_ostream {
+project(Deployment_ExecutionManager_IDL) : ciaolib_with_idl, ciao_output, valuetype, gen_ostream {
   custom_only = 1
   idlflags     += -Wb,stub_export_macro=DEPLOYMENT_EXECUTIONMANAGER_STUB_Export \
                   -Wb,stub_export_include=Deployment_ExecutionManager_stub_export.h \
@@ -91,7 +77,7 @@ project(Deployment_ExecutionManager_IDL) : ciaolib_with_idl, dance_output, value
   }
 }
 
-project(Deployment_DAM_IDL) : ciaolib_with_idl, dance_output, valuetype, gen_ostream {
+project(Deployment_DAM_IDL) : ciaolib_with_idl, ciao_output, valuetype, gen_ostream {
   custom_only = 1
   idlflags     += -Wb,stub_export_macro=DEPLOYMENT_DOMAINAPPLICATIONMANAGER_STUB_Export \
                   -Wb,stub_export_include=Deployment_DomainApplicationManager_stub_export.h \
@@ -104,7 +90,7 @@ project(Deployment_DAM_IDL) : ciaolib_with_idl, dance_output, valuetype, gen_ost
   }
 }
 
-project(Deployment_DomainApplication_IDL) : ciaolib_with_idl, dance_output, valuetype, gen_ostream {
+project(Deployment_DomainApplication_IDL) : ciaolib_with_idl, ciao_output, valuetype, gen_ostream {
   custom_only = 1
   idlflags     += -Wb,stub_export_macro=DEPLOYMENT_DOMAINAPPLICATION_STUB_Export \
                   -Wb,stub_export_include=Deployment_DomainApplication_stub_export.h \
@@ -117,7 +103,7 @@ project(Deployment_DomainApplication_IDL) : ciaolib_with_idl, dance_output, valu
   }
 }
 
-project(Deployment_NAM_IDL) : ciaolib_with_idl, dance_output, valuetype, gen_ostream {
+project(Deployment_NAM_IDL) : ciaolib_with_idl, ciao_output, valuetype, gen_ostream {
   custom_only = 1
   idlflags     += -Wb,stub_export_macro=DEPLOYMENT_NODEAPPLICATIONMANAGER_STUB_Export \
                   -Wb,stub_export_include=Deployment_NodeApplicationManager_stub_export.h \
@@ -130,7 +116,7 @@ project(Deployment_NAM_IDL) : ciaolib_with_idl, dance_output, valuetype, gen_ost
   }
 }
 
-project(Deployment_NodeManager_IDL) : ciaolib_with_idl, dance_output, valuetype, gen_ostream, ami {
+project(Deployment_NodeManager_IDL) : ciaolib_with_idl, ciao_output, valuetype, gen_ostream {
   custom_only = 1
   idlflags     += -Wb,stub_export_macro=DEPLOYMENT_NODEMANAGER_STUB_Export \
                   -Wb,stub_export_include=Deployment_NodeManager_stub_export.h \
@@ -143,7 +129,7 @@ project(Deployment_NodeManager_IDL) : ciaolib_with_idl, dance_output, valuetype,
   }
 }
 
-project(Deployment_NodeApplication_IDL) : ciaolib_with_idl, dance_output, valuetype, gen_ostream {
+project(Deployment_NodeApplication_IDL) : ciaolib_with_idl, ciao_output, valuetype, gen_ostream {
   custom_only = 1
   idlflags     += -Wb,stub_export_macro=DEPLOYMENT_NODEAPPLICATION_STUB_Export \
                   -Wb,stub_export_include=Deployment_NodeApplication_stub_export.h \
@@ -158,7 +144,7 @@ project(Deployment_NodeApplication_IDL) : ciaolib_with_idl, dance_output, valuet
 
 // Valuetype library must be linked for this project.
 // Please don't remove.
-project(Deployment_stub) : ciaolib_with_idl, dance_output, valuetype, ifr_client, messaging, dance_lib, dance_logger, gen_ostream {
+project(Deployment_stub) : ciaolib_with_idl, ciao_output, valuetype, ifr_client, messaging, dance_lib, dance_logger, gen_ostream {
   sharedname   =  DAnCE_Deployment_stub
   after += Deployment_IDL
 
@@ -181,44 +167,13 @@ project(Deployment_stub) : ciaolib_with_idl, dance_output, valuetype, ifr_client
     Deployment_Packaging_DataC.cpp
     Deployment_PlanErrorC.cpp
     DeploymentC.cpp
-    Deployment_ResourceCommitmentManagerC.cpp
-  }
-}
-
-project(Deployment_AM_stub) : dance_output, dance_deployment_stub {
-  sharedname = DAnCE_ApplicationManager_stub
-  after += Deployment_ApplicationManager_IDL
-  dynamicflags = DEPLOYMENT_APPLICATIONMANAGER_STUB_BUILD_DLL
-
-  // This is necessary for MPC to pull in rules.ciao.GNU
-  includes += $(CIAO_ROOT)
-
-  IDL_Files {
-  }
-
-  Source_Files {
     Deployment_ApplicationManagerC.cpp
+    Deployment_ResourceCommitmentManagerC.cpp
+    DAnCE_PropertiesC.cpp
   }
 }
 
-project(Deployment_AM_skel) : dance_output, dance_deployment_skel, dance_applicationmanager_stub {
-  sharedname = DAnCE_ApplicationManager_skel
-  after += Deployment_AM_stub
-  dynamicflags = DEPLOYMENT_APPLICATIONMANAGER_SKEL_BUILD_DLL
-
-  // This is necessary for MPC to pull in rules.ciao.GNU
-  includes += $(CIAO_ROOT)
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Deployment_ApplicationManagerS.cpp
-  }
-}
-
-
-project(Deployment_DAM_stub) : dance_output, dance_applicationmanager_stub {
+project(Deployment_DAM_stub) : ciao_output, dance_deployment_stub {
   sharedname = DAnCE_DomainApplicationManager_stub
   after += Deployment_DAM_IDL
   dynamicflags = DEPLOYMENT_DOMAINAPPLICATIONMANAGER_STUB_BUILD_DLL
@@ -234,7 +189,7 @@ project(Deployment_DAM_stub) : dance_output, dance_applicationmanager_stub {
   }
 }
 
-project(Deployment_DAM_skel) : dance_output, dance_applicationmanager_skel, dance_domainapplicationmanager_stub {
+project(Deployment_DAM_skel) : ciao_output, dance_deployment_svnt, dance_domainapplicationmanager_stub {
   sharedname = DAnCE_DomainApplicationManager_skel
   after += Deployment_DAM_stub
   dynamicflags = DEPLOYMENT_DOMAINAPPLICATIONMANAGER_SKEL_BUILD_DLL
@@ -250,7 +205,7 @@ project(Deployment_DAM_skel) : dance_output, dance_applicationmanager_skel, danc
   }
 }
 
-project(Deployment_ExecutionManager_stub) : dance_output, dance_deployment_stub, dance_domainapplicationmanager_stub {
+project(Deployment_ExecutionManager_stub) : ciao_output, dance_deployment_stub, dance_domainapplicationmanager_stub {
   sharedname = DAnCE_ExecutionManager_stub
   after += Deployment_ExecutionManager_IDL
   dynamicflags = DEPLOYMENT_EXECUTIONMANAGER_STUB_BUILD_DLL
@@ -266,7 +221,7 @@ project(Deployment_ExecutionManager_stub) : dance_output, dance_deployment_stub,
   }
 }
 
-project(Deployment_ExecutionManager_skel) : dance_output, dance_deployment_skel, dance_executionmanager_stub {
+project(Deployment_ExecutionManager_skel) : ciao_output, dance_deployment_svnt, dance_executionmanager_stub {
   sharedname = DAnCE_ExecutionManager_skel
   after += Deployment_ExecutionManager_stub
   dynamicflags = DEPLOYMENT_EXECUTIONMANAGER_SKEL_BUILD_DLL
@@ -282,7 +237,7 @@ project(Deployment_ExecutionManager_skel) : dance_output, dance_deployment_skel,
   }
 }
 
-project(Deployment_DomainApplication_stub) : dance_output, dance_deployment_stub {
+project(Deployment_DomainApplication_stub) : ciao_output, dance_deployment_stub {
   sharedname = DAnCE_DomainApplication_stub
   after += Deployment_DomainApplication_IDL
   dynamicflags = DEPLOYMENT_DOMAINAPPLICATION_STUB_BUILD_DLL
@@ -298,7 +253,7 @@ project(Deployment_DomainApplication_stub) : dance_output, dance_deployment_stub
   }
 }
 
-project(Deployment_DomainApplication_skel) : dance_output, dance_deployment_skel, dance_domainapplication_stub {
+project(Deployment_DomainApplication_skel) : ciao_output, dance_deployment_svnt, dance_domainapplication_stub {
   sharedname = DAnCE_DomainApplication_skel
   after += Deployment_DomainApplication_stub
   dynamicflags = DEPLOYMENT_DOMAINAPPLICATION_SKEL_BUILD_DLL
@@ -314,7 +269,7 @@ project(Deployment_DomainApplication_skel) : dance_output, dance_deployment_skel
   }
 }
 
-project(Deployment_NAM_stub) : dance_output, dance_applicationmanager_stub {
+project(Deployment_NAM_stub) : ciao_output, dance_deployment_stub {
   sharedname = DAnCE_NodeApplicationManager_stub
   after += Deployment_NAM_IDL
   dynamicflags = DEPLOYMENT_NODEAPPLICATIONMANAGER_STUB_BUILD_DLL
@@ -330,7 +285,7 @@ project(Deployment_NAM_stub) : dance_output, dance_applicationmanager_stub {
   }
 }
 
-project(Deployment_NAM_skel) : dance_output, dance_applicationmanager_skel, dance_nodeapplicationmanager_stub {
+project(Deployment_NAM_skel) : ciao_output, dance_deployment_svnt, dance_nodeapplicationmanager_stub {
   sharedname = DAnCE_NodeApplicationManager_skel
   after += Deployment_NAM_stub
   dynamicflags = DEPLOYMENT_NODEAPPLICATIONMANAGER_SKEL_BUILD_DLL
@@ -346,7 +301,7 @@ project(Deployment_NAM_skel) : dance_output, dance_applicationmanager_skel, danc
   }
 }
 
-project(Deployment_NodeManager_stub) : dance_output, dance_deployment_stub, dance_nodeapplicationmanager_stub, dance_targetmanager_stub {
+project(Deployment_NodeManager_stub) : ciao_output, dance_deployment_stub, dance_nodeapplicationmanager_stub, dance_targetmanager_stub {
   sharedname = DAnCE_NodeManager_stub
   after += Deployment_NodeManager_IDL
   dynamicflags = DEPLOYMENT_NODEMANAGER_STUB_BUILD_DLL
@@ -362,7 +317,7 @@ project(Deployment_NodeManager_stub) : dance_output, dance_deployment_stub, danc
   }
 }
 
-project(Deployment_NodeManager_skel) : dance_output, dance_deployment_skel, dance_nodemanager_stub, dance_nodeapplicationmanager_skel {
+project(Deployment_NodeManager_skel) : ciao_output, dance_deployment_svnt, dance_nodemanager_stub, dance_nodeapplicationmanager_skel {
   sharedname = DAnCE_NodeManager_skel
   after += Deployment_NodeManager_stub
   dynamicflags = DEPLOYMENT_NODEMANAGER_SKEL_BUILD_DLL
@@ -378,7 +333,7 @@ project(Deployment_NodeManager_skel) : dance_output, dance_deployment_skel, danc
   }
 }
 
-project(Deployment_TargetManager_stub) : dance_output, dance_deployment_stub {
+project(Deployment_TargetManager_stub) : ciao_output, dance_deployment_stub {
   sharedname = DAnCE_TargetManager_stub
   after += Deployment_TargetManager_IDL
   dynamicflags = DEPLOYMENT_TARGETMANAGER_STUB_BUILD_DLL
@@ -394,7 +349,7 @@ project(Deployment_TargetManager_stub) : dance_output, dance_deployment_stub {
   }
 }
 
-project(Deployment_TargetManager_skel) : dance_output, dance_deployment_skel, dance_targetmanager_stub {
+project(Deployment_TargetManager_skel) : ciao_output, dance_deployment_svnt, dance_targetmanager_stub {
   sharedname = DAnCE_TargetManager_skel
   after += Deployment_TargetManager_stub
   dynamicflags = DEPLOYMENT_TARGETMANAGER_SKEL_BUILD_DLL
@@ -410,7 +365,7 @@ project(Deployment_TargetManager_skel) : dance_output, dance_deployment_skel, da
   }
 }
 
-project(Deployment_RepositoryManager_stub) : dance_output, dance_deployment_stub {
+project(Deployment_RepositoryManager_stub) : ciao_output, dance_deployment_stub {
   sharedname = DAnCE_RepositoryManager_stub
   after += Deployment_RepositoryManager_IDL
   dynamicflags = DEPLOYMENT_REPOSITORYMANAGER_STUB_BUILD_DLL
@@ -426,7 +381,7 @@ project(Deployment_RepositoryManager_stub) : dance_output, dance_deployment_stub
   }
 }
 
-project(Deployment_RepositoryManager_skel) : dance_output, dance_deployment_skel, dance_repositorymanager_stub {
+project(Deployment_RepositoryManager_skel) : ciao_output, dance_deployment_svnt, dance_repositorymanager_stub {
   sharedname = DAnCE_RepositoryManager_skel
   after += Deployment_RepositoryManager_stub
   dynamicflags = DEPLOYMENT_REPOSITORYMANAGER_SKEL_BUILD_DLL
@@ -442,7 +397,7 @@ project(Deployment_RepositoryManager_skel) : dance_output, dance_deployment_skel
   }
 }
 
-project(Deployment_NodeApplication_stub) : dance_output, dance_deployment_stub {
+project(Deployment_NodeApplication_stub) : ciao_output, dance_deployment_stub {
   sharedname = DAnCE_NodeApplication_stub
   after += Deployment_NodeApplication_IDL
   dynamicflags = DEPLOYMENT_NODEAPPLICATION_STUB_BUILD_DLL
@@ -458,7 +413,7 @@ project(Deployment_NodeApplication_stub) : dance_output, dance_deployment_stub {
   }
 }
 
-project(Deployment_NodeApplication_skel) : dance_output, dance_deployment_skel, dance_nodeapplication_stub {
+project(Deployment_NodeApplication_skel) : ciao_output, dance_deployment_svnt, dance_nodeapplication_stub {
   sharedname = DAnCE_NodeApplication_skel
   after += Deployment_NodeApplication_stub
   dynamicflags = DEPLOYMENT_NODEAPPLICATION_SKEL_BUILD_DLL
@@ -476,9 +431,9 @@ project(Deployment_NodeApplication_skel) : dance_output, dance_deployment_skel,
 
 // CIAO_DnC_Client library must be linked for this project.
 // Please don't remove. dance_deployment_stub,
-project(Deployment_skel) : dance_deployment_stub, dance_output, ciaolib_with_idl, portableserver, valuetype, ifr_client, naming, dance_lib, dance_logger, messaging, gen_ostream {
-  sharedname   =  DAnCE_Deployment_skel
-  dynamicflags =  DEPLOYMENT_SKEL_BUILD_DLL
+project(Deployment_svnt) : dance_deployment_stub, ciao_output, ciaolib_with_idl, portableserver, valuetype, ifr_client, naming, dance_lib, dance_logger, messaging, gen_ostream {
+  sharedname   =  DAnCE_Deployment_svnt
+  dynamicflags =  DEPLOYMENT_SVNT_BUILD_DLL
   after += Deployment_IDL
 
   // This is necessary for MPC to pull in rules.ciao.GNU
@@ -488,7 +443,11 @@ project(Deployment_skel) : dance_deployment_stub, dance_output, ciaolib_with_idl
   }
 
   Source_Files {
+    Deployment_StopErrorS.cpp
+    Deployment_StartErrorS.cpp
     Deployment_ApplicationS.cpp
+    DeploymentS.cpp
+    Deployment_ApplicationManagerS.cpp
     Deployment_ResourceCommitmentManagerS.cpp
   }
 
diff --git a/CIAO/DAnCE/Deployment/DAnCE_Loader.h b/CIAO/DAnCE/Deployment/DAnCE_Loader.h
new file mode 100644
index 00000000000..cf40a32c288
--- /dev/null
+++ b/CIAO/DAnCE/Deployment/DAnCE_Loader.h
@@ -0,0 +1,26 @@
+// $Id$
+
+/** 
+ * @file DAnCE_Loader.h
+ * Abstract class for DAnCE object loaders. 
+ */
+
+#ifndef DANCE_LOADDER_H_
+#define DANCE_LOADDER_H_
+
+namespace DAnCE
+{
+  class DAnCE_Object_Loader : public TAO_Object_Loader
+  {
+  public:
+    /// Deliver a usage statement about the object.
+    virtual const char * usage (void) = 0;
+    
+    /// Parse args passed to it; is not destructive
+    virtual bool parse_args (int argc, ACE_TCHAR *argv []) = 0;
+  };
+    
+
+}
+
+#endif
diff --git a/CIAO/DAnCE/DAnCE/DAnCE_Properties.idl b/CIAO/DAnCE/Deployment/DAnCE_Properties.idl
index a93fcdc40af..a93fcdc40af 100644
--- a/CIAO/DAnCE/DAnCE/DAnCE_Properties.idl
+++ b/CIAO/DAnCE/Deployment/DAnCE_Properties.idl
diff --git a/CIAO/DAnCE/Deployment/Deployment.idl b/CIAO/DAnCE/Deployment/Deployment.idl
index a2acad632f1..949903e0af4 100644
--- a/CIAO/DAnCE/Deployment/Deployment.idl
+++ b/CIAO/DAnCE/Deployment/Deployment.idl
@@ -4,18 +4,30 @@
 #define DEPLOYMENT_IDL
 
 module Deployment {
-  /*
-   * This exception is listed in OMG 07-02-01 but not in 06-04-01 and 06-04-02
-   */
+  exception InvalidProperty {
+    string name;
+    string reason;
+  };
+
+  exception InvalidNodeExecParameter {
+    string name;
+    string reason;
+  };
+
+  exception InvalidComponentExecParameter {
+    string name;
+    string reason;
+  };
+
+  exception NoSuchName {
+  };
+
   exception LastConfiguration {
   };
 
-  /*
-   * This exception is listed in OMG 07-02-01 and in the text of 06-04-02 but never
-   * used in idl
-   */
   exception InvalidReference {
   };
+  //@! in DOCGroup added 1 additional exception and one structure
 };
 
 #endif /* DEPLOYMENT_IDL */
diff --git a/CIAO/DAnCE/Deployment/Deployment_Application.idl b/CIAO/DAnCE/Deployment/Deployment_Application.idl
index d0f46188d25..8367689d7e8 100644
--- a/CIAO/DAnCE/Deployment/Deployment_Application.idl
+++ b/CIAO/DAnCE/Deployment/Deployment_Application.idl
@@ -20,9 +20,9 @@ module Deployment
 
     void start ()
       raises (StartError);
-  };
+    };
 
-  typedef sequence < Application > Applications;
+    typedef sequence < Application > Applications;
 };
 
 #endif /* DEPLOYMENT_APPLICATION_IDL */
diff --git a/CIAO/DAnCE/Deployment/Deployment_ApplicationManager.idl b/CIAO/DAnCE/Deployment/Deployment_ApplicationManager.idl
index ed5eab97c08..215eb31f603 100644
--- a/CIAO/DAnCE/Deployment/Deployment_ApplicationManager.idl
+++ b/CIAO/DAnCE/Deployment/Deployment_ApplicationManager.idl
@@ -18,21 +18,6 @@ module Deployment {
     string resourceName;
   };
 
-  exception InvalidNodeExecParameter {
-    string name;
-    string reason;
-  };
-
-  exception InvalidComponentExecParameter {
-    string name;
-    string reason;
-  };
-
-  exception InvalidProperty {
-    string name;
-    string reason;
-  };
-
   interface ApplicationManager {
     Application startLaunch (in Properties configProperty,
                              out Connections providedReference)
diff --git a/CIAO/DAnCE/Deployment/Deployment_Base.idl b/CIAO/DAnCE/Deployment/Deployment_Base.idl
index 91ad3722919..c0db10ecb14 100644
--- a/CIAO/DAnCE/Deployment/Deployment_Base.idl
+++ b/CIAO/DAnCE/Deployment/Deployment_Base.idl
@@ -4,38 +4,39 @@
 #define DEPLOYMENT_BASE_IDL
 
 module Deployment {
-  struct Property {
-    string name;
-    any value;
-  };
-
-  typedef sequence < Property > Properties;
-
-  struct Requirement {
-    string name;
-    string resourceType;
-    Properties property;
-  };
-
-  typedef sequence < Requirement > Requirements;
-
-  enum SatisfierPropertyKind {
-    Quantity,
-    Capacity,
-    Minimum,
-    Maximum,
-    _Attribute,
-    Selection
-  };
-
-  struct SatisfierProperty {
-    string name;
-    SatisfierPropertyKind kind;
-    boolean dynamic;
-    any value;
-  };
-
-  typedef sequence < SatisfierProperty > SatisfierProperties;
+
+        struct Property {
+                string name;
+                any value;
+        };
+
+        typedef sequence < Property > Properties;
+        
+        struct Requirement {
+                string name;
+                string resourceType;
+                Properties property;
+        };
+
+        typedef sequence < Requirement > Requirements;
+
+        enum SatisfierPropertyKind {
+                Quantity,
+                Capacity,
+                Minimum,
+                Maximum,
+                _Attribute,
+                Selection
+        };
+
+        struct SatisfierProperty {
+                string name;
+                SatisfierPropertyKind kind;
+                boolean dynamic;
+                any value;
+        };
+        
+        typedef sequence < SatisfierProperty > SatisfierProperties;
 };
 
 #endif /* DEPLOYMENT_BASE_IDL */
diff --git a/CIAO/DAnCE/Deployment/Deployment_DeploymentPlan.idl b/CIAO/DAnCE/Deployment/Deployment_DeploymentPlan.idl
index b594e535400..14aac0c6f77 100644
--- a/CIAO/DAnCE/Deployment/Deployment_DeploymentPlan.idl
+++ b/CIAO/DAnCE/Deployment/Deployment_DeploymentPlan.idl
@@ -16,8 +16,8 @@ module Deployment {
                 EventEmitter,
                 EventPublisher,
                 EventConsumer,
-                ExtendedPort, // New from DDS4CCM
-                _MirrorPort   // New from DDS4CCM
+                ExtendedPort,
+                _MirrorPort
         };
 
         struct ComponentPortDescription {
@@ -29,7 +29,7 @@ module Deployment {
                 boolean exclusiveUser;
                 boolean optional;
                 CCMComponentPortKind kind;
-               ::CORBA::StringSeq templateParam; // New from DDS4CCM
+               ::CORBA::StringSeq templateParam;
         };
 
         typedef sequence < ComponentPortDescription > ComponentPortDescriptions;
@@ -107,6 +107,7 @@ module Deployment {
 
         typedef sequence < PlanSubcomponentPortEndpoint > PlanSubcomponentPortEndpoints;
 
+        //@! in DOCGroup provider, portName and supportesType are removed
         struct ExternalReferenceEndpoint {
                 string location;
                 boolean provider;
@@ -179,8 +180,6 @@ module Deployment {
 
         typedef sequence < ArtifactDeploymentDescription > ArtifactDeploymentDescriptions;
 
-        // OMG 06-04-02 has this without Plan prefix but that results in illegal IDL
-        // because LocalityKind also has DifferentProcess as value
         enum PlanLocalityKind {
                 PlanSameProcess,
                 PlanDifferentProcess,
@@ -191,9 +190,9 @@ module Deployment {
                 PlanLocalityKind constraint;
                 ::CORBA::ULongSeq constrainedInstanceRef;
         };
-
+        //@! in DOCGroup not implemented
         typedef sequence < PlanLocality > PlanLocalities;
-
+        //@! in DOCGroup localityConstraint is commented
         struct DeploymentPlan {
                 string label;
                 string UUID;
diff --git a/CIAO/DAnCE/Deployment/Deployment_NodeManager.idl b/CIAO/DAnCE/Deployment/Deployment_NodeManager.idl
index ba488013c00..b87bba8db31 100644
--- a/CIAO/DAnCE/Deployment/Deployment_NodeManager.idl
+++ b/CIAO/DAnCE/Deployment/Deployment_NodeManager.idl
@@ -1,6 +1,6 @@
 // $Id$
-#ifndef DEPLOYMENT_NODEMANAGER_IDL
-#define DEPLOYMENT_NODEMANAGER_IDL
+#ifndef NODEMANAGER_IDL
+#define NODEMANAGER_IDL
 
 #include "DAnCE/Deployment/Deployment.idl"
 #include "DAnCE/Deployment/Deployment_TargetManager.idl"
@@ -13,10 +13,10 @@ module Deployment {
   };
 
   interface NodeManager {
-    void joinDomain (in Domain theDomain,
-                     in TargetManager manager,
-                     in Logger log,
-                     in long updateInterval);
+    void joinDomain (   in Domain theDomain,
+                        in TargetManager manager,
+                        in Logger log,
+                        in long updateInterval);
 
     void leaveDomain ();
 
@@ -31,4 +31,4 @@ module Deployment {
   };
 };
 
-#endif /* DEPLOYMENT_NODEMANAGER_IDL */
+#endif /* NODEMANAGER_IDL */
diff --git a/CIAO/DAnCE/Deployment/Deployment_Packaging_Data.idl b/CIAO/DAnCE/Deployment/Deployment_Packaging_Data.idl
index 266bb0a8481..88b3ff7c291 100644
--- a/CIAO/DAnCE/Deployment/Deployment_Packaging_Data.idl
+++ b/CIAO/DAnCE/Deployment/Deployment_Packaging_Data.idl
@@ -130,7 +130,6 @@ module Deployment {
                 Properties infoProperty;
         };
 
-        // From DDS4CCM
         struct ConnectorImplementationDescription {
                 string label;
                 string UUID;
@@ -159,7 +158,6 @@ module Deployment {
                 Properties infoProperty;
         };
 
-        // From DDS4CCM
         struct ConnectorPackageDescription {
                 string label;
                 string UUID;
@@ -179,10 +177,10 @@ module Deployment {
                 ComponentPackageReferences referencedPackage;
                 ComponentPackageImports importedPackage;
         };
-
+        
         struct ComponentUsageDescription {
                 ComponentPackageDescriptions basePackage;
-                ConnectorPackageDescription baseConnectorPackage; // From DDS4CCM
+                ConnectorPackageDescription baseConnectorPackage;
                 PackageConfigurations specializedConfig;
                 Requirements selectRequirement;
                 Properties configProperty;
@@ -195,7 +193,7 @@ module Deployment {
                 ::CORBA::StringSeq resourceType;
                 SatisfierProperties property;
         };
-
+        
 };
 
 #endif /* PACKAGING_DATA_IDL */
diff --git a/CIAO/DAnCE/Deployment/Deployment_RepositoryManager.idl b/CIAO/DAnCE/Deployment/Deployment_RepositoryManager.idl
index 6c5f055b484..5000b487590 100644
--- a/CIAO/DAnCE/Deployment/Deployment_RepositoryManager.idl
+++ b/CIAO/DAnCE/Deployment/Deployment_RepositoryManager.idl
@@ -15,33 +15,30 @@ module Deployment {
     string reason;
   };
 
-  exception NoSuchName {
-  };
-
   interface RepositoryManager {
-    void installPackage (in string installationName,
-                         in string location,
+    void installPackage (in string installationName, 
+                         in string location, 
                          in boolean replace)
       raises (NameExists, PackageError);
-
-    void createPackage (in string installationName,
-                        in PackageConfiguration package,
-                        in string baseLocation,
+                
+    void createPackage (in string installationName, 
+                        in PackageConfiguration package, 
+                        in string baseLocation, 
                         in boolean replace)
       raises (NameExists, PackageError);
-
+                
     PackageConfiguration findPackageByName (in string name)
       raises (NoSuchName);
-
+          
     PackageConfiguration findPackageByUUID (in string UUID)
       raises (NoSuchName);
-
+          
     ::CORBA::StringSeq findNamesByType (in string type);
-
+                
     ::CORBA::StringSeq getAllNames ();
-
+                
     ::CORBA::StringSeq getAllTypes ();
-
+                
     void deletePackage (in string installationName)
       raises (NoSuchName);
   };
diff --git a/CIAO/DAnCE/Deployment/Deployment_ResourceCommitmentManager.idl b/CIAO/DAnCE/Deployment/Deployment_ResourceCommitmentManager.idl
index 9f534d9a364..346c2626950 100644
--- a/CIAO/DAnCE/Deployment/Deployment_ResourceCommitmentManager.idl
+++ b/CIAO/DAnCE/Deployment/Deployment_ResourceCommitmentManager.idl
@@ -7,27 +7,29 @@
 #include "tao/AnyTypeCode/AnySeq.pidl"
 
 module Deployment {
-  struct ResourceAllocation {
-    string elementName;
-    string resourceName;
-    Properties property;
-  };
-
-  typedef sequence < ResourceAllocation > ResourceAllocations;
-
-  exception ResourceCommitmentFailure {
-    string reason;
-    long index;
-    string propertyName;
-    ::CORBA::AnySeq propertyValue;
-  };
-
-  interface ResourceCommitmentManager {
-    void commitResources (in ResourceAllocations resources)
-      raises (ResourceCommitmentFailure);
-    void releaseResources (in ResourceAllocations resources)
-      raises (ResourceCommitmentFailure);
-  };
+
+        struct ResourceAllocation {
+                string elementName;
+                string resourceName;
+                Properties property;
+        };
+
+        typedef sequence < ResourceAllocation > ResourceAllocations;
+
+        exception ResourceCommitmentFailure {
+                string reason;
+                long index;
+                string propertyName;
+                ::CORBA::AnySeq propertyValue;
+        };
+
+        interface ResourceCommitmentManager {
+                void commitResources (in ResourceAllocations resources)
+                        raises (ResourceCommitmentFailure);
+                void releaseResources (in ResourceAllocations resources)
+                        raises (ResourceCommitmentFailure);
+        };
+
 };
 
 #endif //RESOURCE_COMMITMENT_MANAGER_IDL
diff --git a/CIAO/DAnCE/Deployment/Deployment_TargetData.idl b/CIAO/DAnCE/Deployment/Deployment_TargetData.idl
index 4a48b613853..f0ec9732afd 100644
--- a/CIAO/DAnCE/Deployment/Deployment_TargetData.idl
+++ b/CIAO/DAnCE/Deployment/Deployment_TargetData.idl
@@ -8,61 +8,62 @@
 #include "tao/ULongSeq.pidl"
 
 module Deployment {
-  struct Resource {
-    string name;
-    ::CORBA::StringSeq resourceType;
-    SatisfierProperties property;
-  };
 
-  typedef sequence < Resource > Resources;
+        struct Resource {
+                string name;
+                ::CORBA::StringSeq resourceType;
+                SatisfierProperties property;
+        };
 
-  struct SharedResource {
-    string name;
-    ::CORBA::StringSeq resourceType;
-    ::CORBA::ULongSeq nodeRef;
-    SatisfierProperties property;
-  };
+        typedef sequence < Resource > Resources;
 
-  typedef sequence < SharedResource > SharedResources;
+        struct SharedResource {
+                string name;
+                ::CORBA::StringSeq resourceType;
+                ::CORBA::ULongSeq nodeRef;
+                SatisfierProperties property;
+        };
+        
+        typedef sequence < SharedResource > SharedResources;
 
-  struct Node {
-    string name;
-    string label;
-    ::CORBA::ULongSeq sharedResourceRef;
-    ::CORBA::ULongSeq connectionRef;
-    Resources resource;
-  };
+        struct Node {
+                string name;
+                string label;
+                ::CORBA::ULongSeq sharedResourceRef;
+                ::CORBA::ULongSeq connectionRef;
+                Resources resource;
+        };
 
-  typedef sequence < Node > Nodes;
+        typedef sequence < Node > Nodes;
 
-  struct Interconnect {
-    string name;
-    string label;
-    ::CORBA::ULongSeq connectionRef;
-    ::CORBA::ULongSeq connectRef;
-    Resources resource;
-  };
+        struct Interconnect {
+                string name;
+                string label;
+                ::CORBA::ULongSeq connectionRef;
+                ::CORBA::ULongSeq connectRef;
+                Resources resource;
+        };
 
-  typedef sequence < Interconnect > Interconnects;
+        typedef sequence < Interconnect > Interconnects;
 
-  struct Bridge {
-    string name;
-    string label;
-    ::CORBA::ULongSeq connectRef;
-    Resources resource;
-  };
+        struct Bridge {
+                string name;
+                string label;
+                ::CORBA::ULongSeq connectRef;
+                Resources resource;
+        };
 
-  typedef sequence < Bridge > Bridges;
+        typedef sequence < Bridge > Bridges;
 
-  struct Domain {
-    string UUID;
-    string label;
-    SharedResources sharedResource;
-    Nodes node;
-    Interconnects interconnect;
-    Bridges bridge;
-    Properties infoProperty;
-  };
+        struct Domain {
+                string UUID;
+                string label;
+                SharedResources sharedResource;
+                Nodes node;
+                Interconnects interconnect;
+                Bridges bridge;
+                Properties infoProperty;
+        };
 };
 
 #endif /* DEPLOYMENT_TARGETDATA_IDL */
diff --git a/CIAO/DAnCE/DAnCE/Deployment_common.h b/CIAO/DAnCE/Deployment/Deployment_common.h
index 8dd874bb119..dfd44797069 100644
--- a/CIAO/DAnCE/DAnCE/Deployment_common.h
+++ b/CIAO/DAnCE/Deployment/Deployment_common.h
@@ -16,19 +16,47 @@
 #include "ace/config-all.h"
 #include "ace/Hash_Map_Manager_T.h"
 #include "tao/AnyTypeCode/Any.h"
+#include "Deployment/Deployment_ConnectionC.h"
 
 #if !defined ACE_LACKS_PRAGMA_ONCE
 #pragma once
 #endif /* ! ACE_LACKS_PRAGMA_ONCE */
 
 /// A struct which captures the binding information about a component
-namespace DAnCE
+
+namespace DAnCE 
 {
   typedef ACE_Hash_Map_Manager_Ex<ACE_CString,
                                   CORBA::Any,
                                   ACE_Hash<ACE_CString>,
                                   ACE_Equal_To<ACE_CString>,
                                   ACE_Null_Mutex> PROPERTY_MAP;
+  
+  /// A struct which captures the compnent  binding information, which
+  /// is useful for inter-assembly connection setup
+  typedef struct _component_binding
+  {
+    _component_binding ()
+    {
+      providedReference_ = 0;
+    }
+
+    ACE_CString name_;
+    ACE_CString plan_uuid_;
+    ACE_CString node_;
+
+    Deployment::Connections_var providedReference_;
+
+    bool operator==(const struct _component_binding & comp)
+    {
+      if (this->name_ == comp.name_ &&
+          this->plan_uuid_ == comp.plan_uuid_ &&
+          this->node_ == comp.node_)
+        return true;
+      else
+        return false;
+    }
+  } Component_Binding_Info;
 }
 
 #include /**/ "ace/post.h"
diff --git a/CIAO/DAnCE/Deployment/Deployment_stub_export.h b/CIAO/DAnCE/Deployment/Deployment_stub_export.h
new file mode 100644
index 00000000000..12985a68b5b
--- /dev/null
+++ b/CIAO/DAnCE/Deployment/Deployment_stub_export.h
@@ -0,0 +1,58 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl -s Deployment_stub
+// ------------------------------
+#ifndef DEPLOYMENT_STUB_EXPORT_H
+#define DEPLOYMENT_STUB_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (ACE_AS_STATIC_LIBS) && !defined (DEPLOYMENT_STUB_HAS_DLL)
+#  define DEPLOYMENT_STUB_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && DEPLOYMENT_STUB_HAS_DLL */
+
+#if !defined (DEPLOYMENT_STUB_HAS_DLL)
+#  define DEPLOYMENT_STUB_HAS_DLL 1
+#endif /* ! DEPLOYMENT_STUB_HAS_DLL */
+
+#if defined (DEPLOYMENT_STUB_HAS_DLL) && (DEPLOYMENT_STUB_HAS_DLL == 1)
+#  if defined (DEPLOYMENT_STUB_BUILD_DLL)
+#    define Deployment_stub_Export ACE_Proper_Export_Flag
+#    define DEPLOYMENT_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define DEPLOYMENT_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* DEPLOYMENT_STUB_BUILD_DLL */
+#    define Deployment_stub_Export ACE_Proper_Import_Flag
+#    define DEPLOYMENT_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define DEPLOYMENT_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* DEPLOYMENT_STUB_BUILD_DLL */
+#else /* DEPLOYMENT_STUB_HAS_DLL == 1 */
+#  define Deployment_stub_Export
+#  define DEPLOYMENT_STUB_SINGLETON_DECLARATION(T)
+#  define DEPLOYMENT_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* DEPLOYMENT_STUB_HAS_DLL == 1 */
+
+// Set DEPLOYMENT_STUB_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (DEPLOYMENT_STUB_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define DEPLOYMENT_STUB_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define DEPLOYMENT_STUB_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !DEPLOYMENT_STUB_NTRACE */
+
+#if (DEPLOYMENT_STUB_NTRACE == 1)
+#  define DEPLOYMENT_STUB_TRACE(X)
+#else /* (DEPLOYMENT_STUB_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define DEPLOYMENT_STUB_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (DEPLOYMENT_STUB_NTRACE == 1) */
+
+#endif /* DEPLOYMENT_STUB_EXPORT_H */
+
+// End of auto generated file.
diff --git a/CIAO/DAnCE/Deployment/Deployment_svnt_export.h b/CIAO/DAnCE/Deployment/Deployment_svnt_export.h
new file mode 100644
index 00000000000..e403dbf0c41
--- /dev/null
+++ b/CIAO/DAnCE/Deployment/Deployment_svnt_export.h
@@ -0,0 +1,58 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl -s Deployment_svnt
+// ------------------------------
+#ifndef DEPLOYMENT_SVNT_EXPORT_H
+#define DEPLOYMENT_SVNT_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (ACE_AS_STATIC_LIBS) && !defined (DEPLOYMENT_SVNT_HAS_DLL)
+#  define DEPLOYMENT_SVNT_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && DEPLOYMENT_SVNT_HAS_DLL */
+
+#if !defined (DEPLOYMENT_SVNT_HAS_DLL)
+#  define DEPLOYMENT_SVNT_HAS_DLL 1
+#endif /* ! DEPLOYMENT_SVNT_HAS_DLL */
+
+#if defined (DEPLOYMENT_SVNT_HAS_DLL) && (DEPLOYMENT_SVNT_HAS_DLL == 1)
+#  if defined (DEPLOYMENT_SVNT_BUILD_DLL)
+#    define Deployment_svnt_Export ACE_Proper_Export_Flag
+#    define DEPLOYMENT_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define DEPLOYMENT_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* DEPLOYMENT_SVNT_BUILD_DLL */
+#    define Deployment_svnt_Export ACE_Proper_Import_Flag
+#    define DEPLOYMENT_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define DEPLOYMENT_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* DEPLOYMENT_SVNT_BUILD_DLL */
+#else /* DEPLOYMENT_SVNT_HAS_DLL == 1 */
+#  define Deployment_svnt_Export
+#  define DEPLOYMENT_SVNT_SINGLETON_DECLARATION(T)
+#  define DEPLOYMENT_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* DEPLOYMENT_SVNT_HAS_DLL == 1 */
+
+// Set DEPLOYMENT_SVNT_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (DEPLOYMENT_SVNT_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define DEPLOYMENT_SVNT_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define DEPLOYMENT_SVNT_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !DEPLOYMENT_SVNT_NTRACE */
+
+#if (DEPLOYMENT_SVNT_NTRACE == 1)
+#  define DEPLOYMENT_SVNT_TRACE(X)
+#else /* (DEPLOYMENT_SVNT_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define DEPLOYMENT_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (DEPLOYMENT_SVNT_NTRACE == 1) */
+
+#endif /* DEPLOYMENT_SVNT_EXPORT_H */
+
+// End of auto generated file.
diff --git a/CIAO/DAnCE/DAnCE/Module_Main.h b/CIAO/DAnCE/Deployment/Module_Main.h
index 35b4ba4336d..35b4ba4336d 100644
--- a/CIAO/DAnCE/DAnCE/Module_Main.h
+++ b/CIAO/DAnCE/Deployment/Module_Main.h
diff --git a/CIAO/DAnCE/DomainApplication/DomainApplication.mpc b/CIAO/DAnCE/DomainApplication/DomainApplication.mpc
index ae4ffea2875..902d494ccba 100644
--- a/CIAO/DAnCE/DomainApplication/DomainApplication.mpc
+++ b/CIAO/DAnCE/DomainApplication/DomainApplication.mpc
@@ -1,8 +1,9 @@
 // -*- MPC -*-
 // $Id$
 
-project: dance_lib, dance_output, dance_domainapplication_skel, \
-    dance_nodeapplicationmanager_stub, dance_logger {
+
+project: dance_lib, ciao_output, dance_domainapplication_skel, \
+    dance_nodeapplication_stub,  dance_nodeapplicationmanager_stub, dance_logger {
   sharedname   = DAnCE_DomainApplication
   dynamicflags = DOMAIN_APPLICATION_BUILD_DLL
 
diff --git a/CIAO/DAnCE/DomainApplication/Domain_Application_Impl.cpp b/CIAO/DAnCE/DomainApplication/Domain_Application_Impl.cpp
index 17209c66457..b4110075026 100644
--- a/CIAO/DAnCE/DomainApplication/Domain_Application_Impl.cpp
+++ b/CIAO/DAnCE/DomainApplication/Domain_Application_Impl.cpp
@@ -1,10 +1,13 @@
 // $Id$
 
 #include "Domain_Application_Impl.h"
+
+#include "ace/streams.h"
 #include "DAnCE/Logger/Log_Macros.h"
 
 namespace DAnCE
 {
+
   DomainApplication_Impl::DomainApplication_Impl (
     TNam2Nm & nams,
     const Deployment::Properties & configProperty,
@@ -30,13 +33,12 @@ namespace DAnCE
           }
         this->node_applications_.unbind_all();
       }
-    catch (const CORBA::Exception &e)
+    catch (CORBA::Exception &e)
       {
         DANCE_ERROR (1, (LM_ERROR, DLINFO
                     ACE_TEXT("DomainApplication_Impl::~DomainApplication_Impl - ")
                     ACE_TEXT("caught a CORBA exception %C(%C) \"%C\"\n"),
                     e._name(), e._rep_id(), e._info().c_str()));
-        throw;
       }
     catch(...)
       {
@@ -86,6 +88,7 @@ namespace DAnCE
                       ACE_TEXT("Invoking startLaunch on an application\n")));
         ::Deployment::Connections_var conn;
         Deployment::Application_ptr na = (*iter).ext_id_->startLaunch (configProperty, conn.out());
+        //Deployment::NodeApplication_ptr na = Deployment::NodeApplication::_narrow (a);
         if (CORBA::is_nil (na))
           {
             DANCE_ERROR (1, (LM_ERROR, DLINFO
@@ -100,9 +103,9 @@ namespace DAnCE
 
         this->node_applications_.bind (na, (*iter).ext_id_);
 
-        CORBA::ULong const before = this->connections_.length();
+        size_t before = this->connections_.length();
         this->connections_.length (before + conn->length());
-        for (CORBA::ULong i = 0; i < conn->length(); ++i)
+        for (size_t i = 0; i < conn->length(); ++i)
           {
             this->connections_[before+i] = (*conn) [i];
           }
@@ -113,5 +116,6 @@ namespace DAnCE
                   ACE_TEXT("Received %u connections from applications\n"),
                   this->connections_.length ()));
   }
+
 } // DAnCE
 
diff --git a/CIAO/DAnCE/DomainApplication/Domain_Application_Impl.h b/CIAO/DAnCE/DomainApplication/Domain_Application_Impl.h
index 59343244ce5..4d6a848e8f8 100644
--- a/CIAO/DAnCE/DomainApplication/Domain_Application_Impl.h
+++ b/CIAO/DAnCE/DomainApplication/Domain_Application_Impl.h
@@ -20,16 +20,19 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "Deployment/Deployment_DomainApplicationS.h"
+#include "ace/Map_Manager.h"
+#include "Deployment/Deployment_NodeApplicationC.h"
 #include "Deployment/Deployment_NodeApplicationManagerC.h"
 #include "Deployment/Deployment_NodeManagerC.h"
-#include "ace/Map_Manager.h"
 
 namespace DAnCE
   {
+
   /**
    * @class DomainApplication_Impl
    *
    * @brief This class implements the DomainApplication interface.
+   *
    **/
   class Domain_Application_Export DomainApplication_Impl
         : public virtual POA_Deployment::DomainApplication
@@ -45,8 +48,7 @@ namespace DAnCE
       DomainApplication_Impl (TNam2Nm& nams,
                               const Deployment::Properties & configProperty,
                               Deployment::Connections& conn);
-
-      virtual ~DomainApplication_Impl();
+      ~DomainApplication_Impl();
 
       void startLaunch (const Deployment::Properties & configProperty);
 
diff --git a/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager.mpc b/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager.mpc
index a01b3ad421b..bcff8138ea0 100644
--- a/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager.mpc
+++ b/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager.mpc
@@ -1,8 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : dance_lib, dance_output, dance_domainapplicationmanager_skel, \
-	    dance_domainapplication, dance_nodemanager_stub, naming, dance_split_plan  {
+project : dance_lib, ciao_output, dance_domainapplicationmanager_skel, dance_domainapplication, dance_nodemanager_stub, naming  {
   sharedname   = DAnCE_DomainApplicationManager
   dynamicflags = DOMAINAPPLICATIONMANAGER_BUILD_DLL
 
diff --git a/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp b/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
index a70568b07da..7654e4c4f37 100644
--- a/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
+++ b/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
@@ -101,7 +101,7 @@ DomainApplicationManager_Impl::destroyApplication (
 
   try
     {
-      for (TApplications::size_type i = 0; i < this->running_app_.size(); ++i)
+      for (size_t i = 0; i < this->running_app_.size(); ++i)
         {
           DomainApplication_Impl* p = this->running_app_[i];
           Deployment::DomainApplication_var app =
@@ -117,7 +117,7 @@ DomainApplicationManager_Impl::destroyApplication (
                            ACE_TEXT("DomainApplicationManager_impl::destroyApplication - ")
                            ACE_TEXT("deleting application object\n")));
               delete p;
-              for (TApplications::size_type j = i + 1; j < this->running_app_.size(); ++j)
+              for (size_t j = i + 1; j < this->running_app_.size(); ++j)
                 {
                   this->running_app_[j-1] = this->running_app_[j];
                 }
@@ -137,7 +137,7 @@ DomainApplicationManager_Impl::destroyApplication (
     {
       DANCE_ERROR (1, (LM_ERROR, DLINFO
                     ACE_TEXT("DomainApplicationManager_impl::destroyApplication - ")
-                    ACE_TEXT("Caught unknown exception\n")));
+                    ACE_TEXT("Caught unknown exception.")));
       throw Deployment::StopError();
     }
 
@@ -158,7 +158,7 @@ DomainApplicationManager_Impl::getApplications ()
                     CORBA::NO_MEMORY());
   running_app->length (this->running_app_.size());
   CORBA::ULong index = 0;
-  for (TApplications::size_type i = 0; i < this->running_app_.size(); ++i)
+  for (size_t i = 0; i < this->running_app_.size(); ++i)
     {
       CORBA::Object_var ref = this->poa_->servant_to_reference (this->running_app_[i]);
       (*running_app) [index++] =
@@ -186,6 +186,204 @@ DomainApplicationManager_Impl::getPlan ()
 }
 
 void
+DomainApplicationManager_Impl::split_plan (const Deployment::DeploymentPlan & plan,
+                                           TNodePlans & sub_plans)
+{
+  DANCE_TRACE ( "DomainApplicationManager_Impl::split_plan");
+
+  DANCE_DEBUG (9, (LM_TRACE, ACE_TEXT("DomainApplicationManager_Impl::split_plan - ")
+                ACE_TEXT("Creating sub-plans\n")));
+  // Create empty sub-plans
+  for (CORBA::ULong i = 0; i < plan.instance.length(); ++i)
+    {
+      ACE_CString node = plan.instance[i].node.in();
+      if (0 == sub_plans.find (node)) continue;
+
+      ::Deployment::DeploymentPlan tmp_plan;
+
+      // Construct the UUID for the child plan.
+      // Currently, this UUID consists of:
+      // The global UUID for the parent plan + the name of the node the
+      // child plan is to be installed on.
+      ACE_CString child_uuid (plan.UUID.in ());
+      //      child_uuid += "@"; CCM#61
+      //      child_uuid += node;
+
+      tmp_plan.UUID = CORBA::string_dup (child_uuid.c_str());
+      tmp_plan.implementation.length (0);
+      tmp_plan.instance.length (0);
+      tmp_plan.connection.length (0);
+      tmp_plan.externalProperty.length (0);
+      tmp_plan.dependsOn.length (0);
+      tmp_plan.artifact.length (0);
+
+      // @@ There is an optimization point here, since we really don't have to
+      // pass the entire CIAOServerResources into each individual child plan.
+      tmp_plan.infoProperty = plan.infoProperty;
+
+      sub_plans.bind (node, tmp_plan);
+
+      DANCE_DEBUG (9, (LM_TRACE, DLINFO
+                    ACE_TEXT("DomainApplicationManager_Impl::split_plan - ")
+                    ACE_TEXT("Created sub-plan for node %C with UUID %C\n"),
+                    node.c_str (), child_uuid.c_str ()));
+    }
+
+  DANCE_DEBUG (6, (LM_DEBUG, DLINFO
+                ACE_TEXT("DomainApplicationManager_Impl::split_plan - ")
+                ACE_TEXT("First phase produced %u child plans, proceeding to second\n"),
+                sub_plans.current_size ()));
+
+  // (1) Iterate over the <instance> field of the global DeploymentPlan
+  //     structure.
+  // (2) Retrieve the necessary information to contruct the node-level
+  //     plans one by one.
+  for (CORBA::ULong i = 0; i < plan.instance.length (); ++i)
+    {
+      DANCE_DEBUG (9, (LM_TRACE, DLINFO
+                    ACE_TEXT("DomainApplicationManager_Impl::split_plan - ")
+                    ACE_TEXT("Processing instance: %C\n"), plan.instance[i].name.in()));
+      // @@TODO Fill in the child deployment plan in the map.
+      // If the component instance already exists in the child plan,
+      // then we overwrite the existing instance, since the new instance
+      // might have different resource usage requirements.
+
+      // Get the instance deployment description
+      const ::Deployment::InstanceDeploymentDescription & my_instance = plan.instance[i];
+
+      // Get the child plan.
+      ::Deployment::DeploymentPlan child_plan;
+
+      if (0 != sub_plans.find (my_instance.node.in(), child_plan))
+        {
+          DANCE_ERROR (1, (LM_ERROR, DLINFO
+                        ACE_TEXT("DomainApplicationManager_Impl::split_plan - ")
+                        ACE_TEXT("ERROR: Unable to find sub-plan for instance %C\n"),
+                        my_instance.node.in ()));
+        }
+
+      // Fill in the contents of the child plan entry.
+
+      // Append the "MonolithicDeploymentDescriptions implementation"
+      // field with a new "implementation", which is specified by the
+      // <implementationRef> field of <my_instance> entry.  NOTE: The
+      // <artifactRef> field needs to be changed accordingly.
+      ::Deployment::MonolithicDeploymentDescription const & my_implementation
+        = plan.implementation[my_instance.implementationRef];
+
+      CORBA::ULong index_imp = child_plan.implementation.length ();
+      child_plan.implementation.length (++index_imp);
+      child_plan.implementation[index_imp-1] = my_implementation;
+
+      // Initialize with the correct sequence length.
+      CORBA::ULongSeq ulong_seq;
+      ulong_seq.length (my_implementation.artifactRef.length ());
+
+      // Append the "ArtifactDeploymentDescriptions artifact" field
+      // with some new "artifacts", which is specified by the
+      // <artifactRef> sequence of <my_implementation> entry.
+      CORBA::ULong const impl_length = my_implementation.artifactRef.length ();
+      for (CORBA::ULong iter = 0;
+           iter < impl_length;
+           iter ++)
+        {
+          CORBA::ULong artifact_ref = my_implementation.artifactRef[iter];
+
+          // Fill in the <artifact> field of the child plan
+          CORBA::ULong index_art = child_plan.artifact.length ();
+          child_plan.artifact.length (++index_art);
+          child_plan.artifact[index_art-1] = plan.artifact[artifact_ref];
+
+          // Fill in the artifactRef field of the MonolithicDeploymentDescription
+          ulong_seq[iter] = index_art - 1;
+        }
+
+      // Change the <artifactRef> field of the "implementation".
+      child_plan.implementation[index_imp-1].artifactRef = ulong_seq;
+
+      // Append the "InstanceDeploymentDescription instance" field with
+      // a new "instance", which is almost the same as the "instance" in
+      // the global plan except the <implementationRef> field.
+      // NOTE: The <implementationRef> field needs to be changed accordingly.
+      CORBA::ULong index_ins = child_plan.instance.length ();
+      child_plan.instance.length (++index_ins);
+      child_plan.instance[index_ins-1] = my_instance;
+
+      // Change the <implementationRef> field of the "instance".
+      // @@ The implementationRef starts from 0.
+      // @@TODO: Below logic needs to be changed once we want to avoid
+      // duplicate <implementation> for the optimization.
+      child_plan.instance[index_ins-1].implementationRef = index_imp - 1;
+
+      DANCE_DEBUG (9, (LM_TRACE, DLINFO
+                    ACE_TEXT("DomainApplicationManager_Impl::split_plan - ")
+                    ACE_TEXT("Processing connections.\n")));
+      // Copy connections
+      for (CORBA::ULong j = 0; j < plan.connection.length(); ++j)
+        {
+          DANCE_DEBUG (9, (LM_TRACE, DLINFO
+                        ACE_TEXT("DomainApplicationManager_Impl::split_plan - ")
+                        ACE_TEXT("For connection: %C\n"), plan.connection[j].name.in()));
+          for (CORBA::ULong k = 0; k < plan.connection[j].internalEndpoint.length(); ++k)
+            {
+              DANCE_DEBUG (9, (LM_TRACE, DLINFO
+                            ACE_TEXT("DomainApplicationManager_Impl::split_plan - ")
+                            ACE_TEXT("For endpoint: %C(%C)\n"),
+                            plan.connection[j].internalEndpoint[k].portName.in(),
+                            plan.connection[j].internalEndpoint[k].provider ? "provider" : "client"));
+              if (i == plan.connection[j].internalEndpoint[k].instanceRef)   // the instance (i) is referenced by the connection
+                {
+                  Deployment::PlanConnectionDescription * connection_copied = 0;
+                  for (CORBA::ULong m = 0; m < child_plan.connection.length(); ++m)
+                    {
+                      if (ACE_OS::strcmp (plan.connection[j].name.in (), child_plan.connection[m].name.in ()) == 0)
+                        {
+                          connection_copied = &child_plan.connection[m];
+                          break;
+                        }
+                    }
+
+                  if (!connection_copied)
+                    {
+                      // Copy the connection
+                      CORBA::ULong const index_con = child_plan.connection.length();
+                      child_plan.connection.length (index_con + 1);
+                      child_plan.connection[index_con] = plan.connection[j];
+                      connection_copied = &child_plan.connection[index_con];
+                      connection_copied->internalEndpoint.length (0);
+                    }
+
+                  // Copy the endpoint
+                  CORBA::ULong const index_ep = connection_copied->internalEndpoint.length();
+
+                  DANCE_DEBUG (9, (LM_TRACE, DLINFO
+                                ACE_TEXT("DomainApplicationManager_Impl::split_plan - ")
+                                ACE_TEXT ("Copying endpoint %u from connection into endpoint %u\n"),
+                                k, index_ep));
+
+                  connection_copied->internalEndpoint.length (index_ep + 1);
+                  connection_copied->internalEndpoint[index_ep] = plan.connection[j].internalEndpoint[k];
+                  connection_copied->internalEndpoint[index_ep].instanceRef = index_ins - 1;
+                }
+            }
+        }
+      sub_plans.rebind (my_instance.node.in(), child_plan);
+    }
+
+  //Debug
+  DANCE_DEBUG (6, (LM_DEBUG, DLINFO
+                ACE_TEXT("DomainApplicationManager_Impl::split_plan - ")
+                ACE_TEXT("Original plan connection count: %u\n"), plan.connection.length()));
+  CORBA::ULong cnt = 0;
+  for (TNodePlans::iterator it = sub_plans.begin(); it != sub_plans.end(); ++it)
+    {
+      cnt += (*it).int_id_.connection.length();
+    }
+  DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT("DomainApplicationManager_Impl::split_plan - ")
+                ACE_TEXT("Child plans connection count: %u\n"), cnt));
+}
+
+void
 DomainApplicationManager_Impl::preparePlan()
 {
   DANCE_TRACE ("DomainApplicationManager_Impl::preparePlan()");
@@ -193,13 +391,12 @@ DomainApplicationManager_Impl::preparePlan()
   try
     {
       // Map of sub plans for each node
-      Split_Plan::TNodePlans sub_plans;
-      Split_Plan split_plan (this->plan_, sub_plans);
-      split_plan.split_plan ();
-
+      TNodePlans sub_plans;
+      // Splitting deployment plan on sub plans for each node
+      DomainApplicationManager_Impl::split_plan (this->plan_, sub_plans);
       DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DomainApplicationManager_Impl::preparePlan - Plan successfully split\n")));
       // Executing preparePlan on each NodeManager described in DeploymentPlan
-      for (Split_Plan::TNodePlans::iterator iter_plans = sub_plans.begin();
+      for (TNodePlans::iterator iter_plans = sub_plans.begin();
            iter_plans != sub_plans.end();
            ++iter_plans)
         {
diff --git a/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h b/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
index a0515544f9e..5b5b5b7306b 100644
--- a/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
+++ b/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
@@ -23,13 +23,15 @@
 #include "Deployment/Deployment_NodeManagerC.h"
 #include "DomainApplication/Domain_Application_Impl.h"
 #include "Deployment/Deployment_DomainApplicationManagerS.h"
-#include "Split_Plan/Split_Plan_impl.h"
 
 namespace DAnCE
   {
   class DomainApplicationManager_Export DomainApplicationManager_Impl
         : public virtual POA_Deployment::DomainApplicationManager
     {
+    private:
+      typedef ACE_Map_Manager<ACE_CString, Deployment::DeploymentPlan, ACE_Null_Mutex> TNodePlans;
+
     public:
       DomainApplicationManager_Impl (CORBA::ORB_ptr orb,
                                      PortableServer::POA_ptr poa,
@@ -57,6 +59,9 @@ namespace DAnCE
       typedef ACE_Vector<DomainApplication_Impl*> TApplications;
       TApplications running_app_;
 
+      void split_plan (const Deployment::DeploymentPlan & plan,
+                       TNodePlans & sub_plans);
+
       void preparePlan();
     };
 
diff --git a/CIAO/DAnCE/ExecutionManager/DAnCE_ExecutionManager_Module_Export.h b/CIAO/DAnCE/ExecutionManager/DAnCE_ExecutionManager_Module_Export.h
new file mode 100644
index 00000000000..6ab710d4044
--- /dev/null
+++ b/CIAO/DAnCE/ExecutionManager/DAnCE_ExecutionManager_Module_Export.h
@@ -0,0 +1,58 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl DAnCE_ExecutionManager_Module
+// ------------------------------
+#ifndef DANCE_EXECUTIONMANAGER_MODULE_EXPORT_H
+#define DANCE_EXECUTIONMANAGER_MODULE_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (ACE_AS_STATIC_LIBS) && !defined (DANCE_EXECUTIONMANAGER_MODULE_HAS_DLL)
+#  define DANCE_EXECUTIONMANAGER_MODULE_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && DANCE_EXECUTIONMANAGER_MODULE_HAS_DLL */
+
+#if !defined (DANCE_EXECUTIONMANAGER_MODULE_HAS_DLL)
+#  define DANCE_EXECUTIONMANAGER_MODULE_HAS_DLL 1
+#endif /* ! DANCE_EXECUTIONMANAGER_MODULE_HAS_DLL */
+
+#if defined (DANCE_EXECUTIONMANAGER_MODULE_HAS_DLL) && (DANCE_EXECUTIONMANAGER_MODULE_HAS_DLL == 1)
+#  if defined (DANCE_EXECUTIONMANAGER_MODULE_BUILD_DLL)
+#    define DAnCE_ExecutionManager_Module_Export ACE_Proper_Export_Flag
+#    define DANCE_EXECUTIONMANAGER_MODULE_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define DANCE_EXECUTIONMANAGER_MODULE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* DANCE_EXECUTIONMANAGER_MODULE_BUILD_DLL */
+#    define DAnCE_ExecutionManager_Module_Export ACE_Proper_Import_Flag
+#    define DANCE_EXECUTIONMANAGER_MODULE_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define DANCE_EXECUTIONMANAGER_MODULE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* DANCE_EXECUTIONMANAGER_MODULE_BUILD_DLL */
+#else /* DANCE_EXECUTIONMANAGER_MODULE_HAS_DLL == 1 */
+#  define DAnCE_ExecutionManager_Module_Export
+#  define DANCE_EXECUTIONMANAGER_MODULE_SINGLETON_DECLARATION(T)
+#  define DANCE_EXECUTIONMANAGER_MODULE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* DANCE_EXECUTIONMANAGER_MODULE_HAS_DLL == 1 */
+
+// Set DANCE_EXECUTIONMANAGER_MODULE_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (DANCE_EXECUTIONMANAGER_MODULE_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define DANCE_EXECUTIONMANAGER_MODULE_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define DANCE_EXECUTIONMANAGER_MODULE_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !DANCE_EXECUTIONMANAGER_MODULE_NTRACE */
+
+#if (DANCE_EXECUTIONMANAGER_MODULE_NTRACE == 1)
+#  define DANCE_EXECUTIONMANAGER_MODULE_TRACE(X)
+#else /* (DANCE_EXECUTIONMANAGER_MODULE_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define DANCE_EXECUTIONMANAGER_MODULE_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (DANCE_EXECUTIONMANAGER_MODULE_NTRACE == 1) */
+
+#endif /* DANCE_EXECUTIONMANAGER_MODULE_EXPORT_H */
+
+// End of auto generated file.
diff --git a/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc b/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc
index a8452d0f7be..0b5531f05cb 100644
--- a/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc
+++ b/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc
@@ -1,16 +1,23 @@
 // -*- MPC -*-
 // $Id$
 
-project(Execution_Manager_Exec) : dance_exe, naming, \
-                                dance_domainapplicationmanager, \
-                                dance_executionmanager_skel, \
-				utils, dance_logger, avoids_minimum_corba, \
-				iortable, dance_split_plan {
-  exename = dance_execution_manager
+project(ExecutionManager_Module): dance_lib, taolib, iortable, ciao_output, utils, strategies, naming, dance_executionmanager_skel, dance_domainapplicationmanager, dance_deployment_svnt, avoids_minimum_corba, ciao_executionmanager_skel {
+  sharedname = DAnCE_ExecutionManager
+  dynamicflags = EXECUTIONMANAGER_BUILD_DLL DANCE_EXECUTIONMANAGER_MODULE_BUILD_DLL
 
   Source_Files {
     ExecutionManager_Impl.cpp
     ExecutionManager_Module.cpp
-    Execution_Manager.cpp
+  }
+}
+
+project(Execution_Manager_Exec) : dance_exe, naming_serv, ciao_executionmanager_skel, \
+                                dance_domainapplicationmanager, dance_executionmanager_skel, utils, dance_logger, avoids_minimum_corba  {
+  exename = dance_execution_manager
+  after += ExecutionManager_Module
+  libs += DAnCE_ExecutionManager
+
+  Source_Files {
+    Execution_Manager_Exec.cpp
   }
 }
diff --git a/CIAO/DAnCE/ExecutionManager/ExecutionManager_Export.h b/CIAO/DAnCE/ExecutionManager/ExecutionManager_Export.h
new file mode 100644
index 00000000000..8633f5d5400
--- /dev/null
+++ b/CIAO/DAnCE/ExecutionManager/ExecutionManager_Export.h
@@ -0,0 +1,57 @@
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl ExecutionManager
+// ------------------------------
+#ifndef EXECUTIONMANAGER_EXPORT_H
+#define EXECUTIONMANAGER_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (ACE_AS_STATIC_LIBS) && !defined (EXECUTIONMANAGER_HAS_DLL)
+#  define EXECUTIONMANAGER_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && EXECUTIONMANAGER_HAS_DLL */
+
+#if !defined (EXECUTIONMANAGER_HAS_DLL)
+#  define EXECUTIONMANAGER_HAS_DLL 1
+#endif /* ! EXECUTIONMANAGER_HAS_DLL */
+
+#if defined (EXECUTIONMANAGER_HAS_DLL) && (EXECUTIONMANAGER_HAS_DLL == 1)
+#  if defined (EXECUTIONMANAGER_BUILD_DLL)
+#    define ExecutionManager_Export ACE_Proper_Export_Flag
+#    define EXECUTIONMANAGER_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define EXECUTIONMANAGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* EXECUTIONMANAGER_BUILD_DLL */
+#    define ExecutionManager_Export ACE_Proper_Import_Flag
+#    define EXECUTIONMANAGER_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define EXECUTIONMANAGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* EXECUTIONMANAGER_BUILD_DLL */
+#else /* EXECUTIONMANAGER_HAS_DLL == 1 */
+#  define ExecutionManager_Export
+#  define EXECUTIONMANAGER_SINGLETON_DECLARATION(T)
+#  define EXECUTIONMANAGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* EXECUTIONMANAGER_HAS_DLL == 1 */
+
+// Set EXECUTIONMANAGER_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (EXECUTIONMANAGER_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define EXECUTIONMANAGER_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define EXECUTIONMANAGER_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !EXECUTIONMANAGER_NTRACE */
+
+#if (EXECUTIONMANAGER_NTRACE == 1)
+#  define EXECUTIONMANAGER_TRACE(X)
+#else /* (EXECUTIONMANAGER_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define EXECUTIONMANAGER_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (EXECUTIONMANAGER_NTRACE == 1) */
+
+#endif /* EXECUTIONMANAGER_EXPORT_H */
+
+// End of auto generated file.
diff --git a/CIAO/DAnCE/ExecutionManager/ExecutionManager_Impl.cpp b/CIAO/DAnCE/ExecutionManager/ExecutionManager_Impl.cpp
index ca6ce64f810..fba8f55a429 100644
--- a/CIAO/DAnCE/ExecutionManager/ExecutionManager_Impl.cpp
+++ b/CIAO/DAnCE/ExecutionManager/ExecutionManager_Impl.cpp
@@ -6,6 +6,7 @@
 #include "Config_Handlers/DnC_Dump.h"
 #include "DAnCE/Logger/Log_Macros.h"
 
+
 using namespace DAnCE;
 
 ExecutionManager_Impl::ExecutionManager_Impl (CORBA::ORB_ptr orb,
@@ -79,7 +80,7 @@ ExecutionManager_Impl::preparePlan (const ::Deployment::DeploymentPlan & plan,
 }
 
 ::Deployment::DomainApplicationManagers *
-ExecutionManager_Impl::getManagers (void)
+ExecutionManager_Impl::getManagers ()
 {
   DANCE_TRACE ( "ExecutionManager_Impl::getManagers ()");
 
@@ -89,7 +90,7 @@ ExecutionManager_Impl::getManagers (void)
                     CORBA::NO_MEMORY());
 
   managers->length (this->managers_.current_size());
-  CORBA::ULong index = 0;
+  unsigned int index = 0;
   for (TDomainManagers::iterator iter = this->managers_.begin();
        iter != this->managers_.end();
        ++iter)
@@ -121,6 +122,8 @@ ExecutionManager_Impl::destroyManager (::Deployment::DomainApplicationManager_pt
           DANCE_DEBUG (8, (LM_INFO, DLINFO ACE_TEXT("ExecutionManager_Impl::destroyManager - deleting DomainApplicationManager\n")));
           delete (*iter).int_id_;
           (*iter).int_id_ = 0;
+          DANCE_DEBUG (8, (LM_INFO, DLINFO ACE_TEXT("ExecutionManager_Impl::destroyManager - DomainApplicationManager deleted\n")));
+          //this->managers_.unbind ( (*iter).ext_id_);
           DANCE_DEBUG (8, (LM_INFO, DLINFO ACE_TEXT("ExecutionManager_Impl::destroyManager - finished\n")));
           return;
         }
@@ -130,8 +133,19 @@ ExecutionManager_Impl::destroyManager (::Deployment::DomainApplicationManager_pt
   throw ::Deployment::StopError();
 }
 
+// This one derived from ExecutionManagerDaemon interface
+// for shutdowning DAnCE agent
+void
+ExecutionManager_Impl::shutdown ()
+{
+  DANCE_TRACE ("ExecutionManager_Impl::shutdown");
+  this->orb_->shutdown();
+}
+
+
 void
-ExecutionManager_Impl::add_node_manager (const char *name, const char *ior)
+ExecutionManager_Impl::add_node_manager (const char *name,
+                                         const char *ior)
 {
   DANCE_TRACE ("ExecutionManager_Impl::add_node_manager");
   this->locator_.store_ior (name, ior);
diff --git a/CIAO/DAnCE/ExecutionManager/ExecutionManager_Impl.h b/CIAO/DAnCE/ExecutionManager/ExecutionManager_Impl.h
index 2d2f3f7d4f0..9dd74e1d0b2 100644
--- a/CIAO/DAnCE/ExecutionManager/ExecutionManager_Impl.h
+++ b/CIAO/DAnCE/ExecutionManager/ExecutionManager_Impl.h
@@ -18,41 +18,49 @@
 #include "ace/Map_Manager.h"
 #include "ace/SStringfwd.h"
 #include "orbsvcs/orbsvcs/CosNamingC.h"
-#include "Deployment/Deployment_ExecutionManagerS.h"
+#include "ExecutionManager_Export.h"
+#include "Deployment/CIAO_ExecutionManagerDaemonS.h"
 #include "Deployment/Deployment_NodeManagerC.h"
 #include "DomainApplicationManager/DomainApplicationManager_Impl.h"
 #include "DomainApplicationManager/Node_Locator.h"
 
 namespace DAnCE
   {
-  class ExecutionManager_Impl
-        : public virtual POA_Deployment::ExecutionManager
+  class ExecutionManager_Export ExecutionManager_Impl
+        : public virtual POA_DAnCE::ExecutionManagerDaemon
     {
+    private:
+      typedef ACE_Map_Manager<ACE_CString, DomainApplicationManager_Impl*, ACE_Null_Mutex> TDomainManagers;
+
     public:
+
       ExecutionManager_Impl (CORBA::ORB_ptr orb,
                              PortableServer::POA_ptr poa,
                              CosNaming::NamingContext_ptr);
 
-      virtual ~ExecutionManager_Impl(void);
+      virtual ~ExecutionManager_Impl();
 
       virtual ::Deployment::DomainApplicationManager_ptr preparePlan (
         const ::Deployment::DeploymentPlan & plan,
-        ::Deployment::ResourceCommitmentManager_ptr resourceCommitment);
+        ::Deployment::ResourceCommitmentManager_ptr resourceCommitment
+      );
 
-      virtual ::Deployment::DomainApplicationManagers * getManagers (void);
+      virtual ::Deployment::DomainApplicationManagers * getManagers (
+      );
 
       virtual void destroyManager (
-        ::Deployment::DomainApplicationManager_ptr manager);
+        ::Deployment::DomainApplicationManager_ptr manager
+      );
+
+      // This one derived from ExecutionManagerDaemon interface
+      // for shutdowning DAnCE agent
+      virtual void shutdown ();
 
       void add_node_manager (const char *name, const char *ior);
 
       void load_node_map (const ACE_TCHAR *filename);
 
     private:
-      typedef ACE_Map_Manager<
-        ACE_CString,
-        DomainApplicationManager_Impl*,
-        ACE_Null_Mutex> TDomainManagers;
       CORBA::ORB_var orb_;
       PortableServer::POA_var poa_;
       TDomainManagers managers_;
diff --git a/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.cpp b/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.cpp
index 94702c170d4..7c2b3bc16ca 100644
--- a/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.cpp
+++ b/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.cpp
@@ -3,6 +3,8 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+
+#include "tao/TAO_Singleton_Manager.h"
 #include "tao/StringSeqC.h"
 #include "tao/IORTable/IORTable.h"
 #include "tao/Utils/PolicyList_Destroyer.h"
@@ -174,36 +176,36 @@ DAnCE_ExecutionManager_Module::parse_args (int argc, ACE_TCHAR *argv[])
 }
 
 CORBA::Object_ptr
-DAnCE_ExecutionManager_Module::init (CORBA::ORB_ptr orb,
-                                      int argc,
-                                      ACE_TCHAR *argv[])
+DAnCE_ExecutionManager_Module::create_object (CORBA::ORB_ptr orb,
+                                              int argc,
+                                              ACE_TCHAR *argv[])
 {
-  DANCE_TRACE ("DAnCE_ExecutionManager_Module::init");
+  DANCE_TRACE ("DAnCE_ExecutionManager_Module::create_object");
 
   try
     {
       if (this->em_impl_ != 0)
         {
           DANCE_ERROR (1, (LM_ERROR,
-                         DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::init - ")
+                         DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::create_object - ")
                          ACE_TEXT("Error: ExecutionManager already exists.\n")));
           return CORBA::Object::_nil ();
         }
 
-      DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::init - ")
+      DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::create_object - ")
                     ACE_TEXT("before parsing arguments.\n")));
 
       if (!this->parse_args (argc, argv))
         return CORBA::Object::_nil ();
 
-      DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::init - ")
+      DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::create_object - ")
                     ACE_TEXT("before creating value factory.\n")));
       CORBA::ValueFactory_var vf = new Components::Cookie_init();
-      DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::init - ")
+      DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::create_object - ")
                     ACE_TEXT("before registering value factory.\n")));
       vf = orb->register_value_factory ("IDL:omg.org/Components/Cookie:1.0", vf.in());
 
-      DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::init - ")
+      DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::create_object - ")
                     ACE_TEXT("after creating value factory.\n")));
       // Get reference to Root POA.
       CORBA::Object_var poa_obj
@@ -218,7 +220,7 @@ DAnCE_ExecutionManager_Module::init (CORBA::ORB_ptr orb,
       policies.length (2);
       try
         {
-          DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::init - ")
+          DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::create_object - ")
                         ACE_TEXT("before creating the \"Managers\" POA.\n")));
 
           policies[0] = poa->create_id_assignment_policy (PortableServer::USER_ID);
@@ -239,7 +241,7 @@ DAnCE_ExecutionManager_Module::init (CORBA::ORB_ptr orb,
         {
           if (this->options_.domain_nc_)
             {
-              DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::init - ")
+              DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::create_object - ")
                             ACE_TEXT("before resolving \"DomainNC\".\n")));
               CORBA::Object_var domain_obj = orb->string_to_object (this->options_.domain_nc_);
               if (!CORBA::is_nil (domain_obj.in ()))
@@ -275,7 +277,7 @@ DAnCE_ExecutionManager_Module::init (CORBA::ORB_ptr orb,
         }
 
       // Create and install the DAnCE Daemon servant on child POA
-      DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::init - before creating EM servant.\n")));
+      DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::create_object - before creating EM servant.\n")));
       ACE_NEW_RETURN (this->em_impl_,
                       DAnCE::ExecutionManager_Impl (orb,
                                                     poa.in (),
@@ -290,8 +292,8 @@ DAnCE_ExecutionManager_Module::init (CORBA::ORB_ptr orb,
       CORBA::Object_var em_obj = persistent_poa->id_to_reference (oid.in ());
       CORBA::String_var em_ior = orb->object_to_string (em_obj.in ());
 
-      Deployment::ExecutionManager_var em_daemon
-        = Deployment::ExecutionManager::_narrow (em_obj.in ());
+      DAnCE::ExecutionManagerDaemon_var em_daemon
+        = DAnCE::ExecutionManagerDaemon::_narrow (em_obj.in ());
 
       // Binding ior to IOR Table
       adapter->bind ("ExecutionManager", em_ior.in ());
@@ -315,7 +317,7 @@ DAnCE_ExecutionManager_Module::init (CORBA::ORB_ptr orb,
       // End ExecutionManager initialization part
 
       // Initializing NodeManagers
-      DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::init - ")
+      DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::create_object - ")
                     ACE_TEXT("before processing --node-mgr options(%u).\n"), this->options_.node_managers_.size()));
       for (size_t i = 0; i < this->options_.node_managers_.size(); ++i)
         {
@@ -325,7 +327,7 @@ DAnCE_ExecutionManager_Module::init (CORBA::ORB_ptr orb,
 
           if (ACE_CString::npos == pos)
             {
-              DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::init - ")
+              DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::create_object - ")
                             ACE_TEXT("Execution manager received --node-mgr without IOR\n")));
               continue;
             }
@@ -339,7 +341,7 @@ DAnCE_ExecutionManager_Module::init (CORBA::ORB_ptr orb,
 
       if (this->options_.node_map_ != 0)
         {
-          DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::init - ")
+          DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_ExecutionManager_Module::create_object - ")
                         ACE_TEXT("Parsing node map %C\n"),
                         this->options_.node_map_));
           this->em_impl_->load_node_map (this->options_.node_map_);
@@ -357,3 +359,7 @@ DAnCE_ExecutionManager_Module::init (CORBA::ORB_ptr orb,
     }
 }
 
+ACE_FACTORY_DEFINE (DAnCE_ExecutionManager_Module, DAnCE_ExecutionManager_Module)
+
+
+
diff --git a/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.h b/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.h
index 6fe930f794f..eebe3f5f52a 100644
--- a/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.h
+++ b/CIAO/DAnCE/ExecutionManager/ExecutionManager_Module.h
@@ -17,12 +17,16 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/Vector_T.h"
+#include "DAnCE_ExecutionManager_Module_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Service_Config.h"
+#include "ace/Vector_T.h"
+#include "tao/Object_Loader.h"
+
 namespace DAnCE
 {
   class ExecutionManager_Impl;
@@ -31,25 +35,15 @@ namespace DAnCE
 /**
  * @class Execution_Manager_Module
  *
- * This class implements the execution manager instance
+ * @brief The shared object that is instantiated when the execution manager
+ *        module/library is dynamically loaded.
+ *
+ * This class runs the execution manager instance
  */
-class DAnCE_ExecutionManager_Module
+class DAnCE_ExecutionManager_Module_Export DAnCE_ExecutionManager_Module
+      : public TAO_Object_Loader
   {
   public:
-    /// Constructor.
-    DAnCE_ExecutionManager_Module (void);
-
-    /// Destructor.
-    ~DAnCE_ExecutionManager_Module (void);
-
-    /// Setup our infrastructure
-    CORBA::Object_ptr init (CORBA::ORB_ptr orb,
-                            int argc,
-                            ACE_TCHAR *argv []);
-
-  private:
-    bool parse_args (int argc, ACE_TCHAR *argv []);
-
     struct SOptions
       {
         const ACE_TCHAR* exec_mgr_file_;
@@ -80,12 +74,28 @@ class DAnCE_ExecutionManager_Module
         }
     };
 
-    SOptions options_;
+    /// Constructor.
+    DAnCE_ExecutionManager_Module (void);
+
+    /// Destructor.
+    ~DAnCE_ExecutionManager_Module (void);
+
+    /// Overload the base class method to create a new instance
+    /// of a DAnCE_NodeManager_Module object.
+    virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
+                                             int argc,
+                                             ACE_TCHAR *argv []);
+
+    virtual bool parse_args (int argc, ACE_TCHAR *argv []);
 
+    SOptions options_;
+  private:
     /// Storage for ExecutionManager servant.
     DAnCE::ExecutionManager_Impl * em_impl_;
   };
 
+ACE_FACTORY_DECLARE (DAnCE_ExecutionManager_Module, DAnCE_ExecutionManager_Module)
+
 #include /**/ "ace/post.h"
 
 #endif  /* EXECUTION_MANAGER_MODULE_H */
diff --git a/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp b/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp
deleted file mode 100644
index 878db84fffe..00000000000
--- a/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-// $Id$
-
-#include "ace/Dynamic_Service.h"
-#include "tao/ORB.h"
-#include "tao/Object.h"
-#include "DAnCE/Logger/Log_Macros.h"
-#include "DAnCE/Logger/Logger_Service.h"
-#include "ExecutionManager_Module.h"
-
-int
-ACE_TMAIN (int argc, ACE_TCHAR *argv[])
-{
-  DANCE_DISABLE_TRACE ();
-
-  int retval = 0;
-
-  try
-    {
-      DAnCE::Logger_Service
-        * dlf = ACE_Dynamic_Service<DAnCE::Logger_Service>::instance ("DAnCE_Logger");
-
-      if (dlf)
-        {
-          dlf->init (argc, argv);
-        }
-
-      DANCE_DEBUG (6, (LM_TRACE, DLINFO
-                    ACE_TEXT("ExecutionManager - initializing ORB\n")));
-
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
-
-      DANCE_DEBUG (6, (LM_TRACE, DLINFO
-                   ACE_TEXT("ExecutionManager - initializing module instance\n")));
-
-      DAnCE_ExecutionManager_Module em;
-      CORBA::Object_var obj = em.init (orb.in (), argc, argv);
-
-      if (!CORBA::is_nil (obj.in ()))
-        {
-          DANCE_DEBUG (6, (LM_TRACE, DLINFO
-                    ACE_TEXT("ExecutionManager - running ORB\n")));
-          orb->run ();
-        }
-
-      DANCE_DEBUG (6, (LM_TRACE, DLINFO
-                    ACE_TEXT("ExecutionManager - destroying ORB\n")));
-
-      orb->destroy ();
-    }
-  catch (const CORBA::Exception& ex)
-    {
-      ex._tao_print_exception ("ExecutionManager");
-      retval = -1;
-    }
-  catch (...)
-    {
-      DANCE_ERROR (1, (LM_ERROR, "ExecutionManager - Error: Unknown exception.\n"));
-      retval = -1;
-    }
-
-  return retval;
-}
-
diff --git a/CIAO/DAnCE/ExecutionManager/Execution_Manager_Exec.cpp b/CIAO/DAnCE/ExecutionManager/Execution_Manager_Exec.cpp
new file mode 100644
index 00000000000..2331ec167df
--- /dev/null
+++ b/CIAO/DAnCE/ExecutionManager/Execution_Manager_Exec.cpp
@@ -0,0 +1,7 @@
+// $Id$
+#include "ExecutionManager_Module.h"
+
+#define DANCE_MODULE_MAIN_CLASS_NAME DAnCE_ExecutionManager_Module
+#include "Deployment/Module_Main.h"
+
+
diff --git a/CIAO/DAnCE/Logger/Logger_Service.cpp b/CIAO/DAnCE/Logger/Logger_Service.cpp
index 44f8cffa2c3..8a2ddb2ecfb 100644
--- a/CIAO/DAnCE/Logger/Logger_Service.cpp
+++ b/CIAO/DAnCE/Logger/Logger_Service.cpp
@@ -135,15 +135,16 @@ namespace DAnCE
   int
   Logger_Service::Initializer (void)
   {
-    return ACE_Service_Config::process_directive (ace_svc_desc_DANCE_LOGGER_SERVICE);
+    return ACE_Service_Config::process_directive (ace_svc_desc_Logger_Service);
   }
 } // DAnCE
 
-ACE_STATIC_SVC_DEFINE (DANCE_LOGGER_SERVICE,
+using namespace DAnCE;
+ACE_STATIC_SVC_DEFINE (Logger_Service,
                        ACE_TEXT ("DAnCE_Logger"),
                        ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (DANCE_LOGGER_SERVICE),
+                       &ACE_SVC_NAME (Logger_Service),
                        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
                        0)
-ACE_FACTORY_DEFINE (DAnCE_Logger, DANCE_LOGGER_SERVICE)
+ACE_FACTORY_DEFINE (DAnCE_Logger, Logger_Service)
 
diff --git a/CIAO/DAnCE/Logger/Logger_Service.h b/CIAO/DAnCE/Logger/Logger_Service.h
index a6b3d58980e..8bbf6943363 100644
--- a/CIAO/DAnCE/Logger/Logger_Service.h
+++ b/CIAO/DAnCE/Logger/Logger_Service.h
@@ -25,9 +25,7 @@ namespace DAnCE
 static int TAO_Requires_DAnCE_Logger_Service_Initializer =
   DAnCE::Logger_Service::Initializer ();
 
-typedef DAnCE::Logger_Service DANCE_LOGGER_SERVICE;
-
-ACE_STATIC_SVC_DECLARE (DANCE_LOGGER_SERVICE)
-ACE_FACTORY_DECLARE (DAnCE_Logger, DANCE_LOGGER_SERVICE)
+ACE_STATIC_SVC_DECLARE (Logger_Service)
+ACE_FACTORY_DECLARE (DAnCE_Logger, Logger_Service)
 
 #endif /*LOGGER_SERVICE_H_*/
diff --git a/CIAO/DAnCE/MPC/config/dance_config_handlers.mpb b/CIAO/DAnCE/MPC/config/ciao_config_handlers.mpb
index ded1a7ed6ff..4bf1751fbcd 100644
--- a/CIAO/DAnCE/MPC/config/dance_config_handlers.mpb
+++ b/CIAO/DAnCE/MPC/config/ciao_config_handlers.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : dance_config_handlers_base, dynamicany, typecodefactory, dance_deployment_stub, dance_logger {
+project : ciao_config_handlers_base, dynamicany, typecodefactory, dance_deployment_stub, dance_logger {
   verbatim(gnuace, macros) {
    override no_hidden_visibility = 1
   }
diff --git a/CIAO/DAnCE/MPC/config/dance_config_handlers_base.mpb b/CIAO/DAnCE/MPC/config/ciao_config_handlers_base.mpb
index 51a99714ae1..51a99714ae1 100644
--- a/CIAO/DAnCE/MPC/config/dance_config_handlers_base.mpb
+++ b/CIAO/DAnCE/MPC/config/ciao_config_handlers_base.mpb
diff --git a/CIAO/DAnCE/MPC/config/ciao_executionmanager_skel.mpb b/CIAO/DAnCE/MPC/config/ciao_executionmanager_skel.mpb
new file mode 100644
index 00000000000..320c057fd11
--- /dev/null
+++ b/CIAO/DAnCE/MPC/config/ciao_executionmanager_skel.mpb
@@ -0,0 +1,8 @@
+// -*- MPC -*-
+// $Id$
+
+project : dance_deployment_stub, ciao_executionmanager_stub {
+  includes += $(CIAO_ROOT)/DAnCE/ExecutionManager
+  libs     += CIAO_ExecutionManager_skel
+  after    += CIAO_ExecutionManager_skel
+}
diff --git a/CIAO/DAnCE/MPC/config/ciao_executionmanager_stub.mpb b/CIAO/DAnCE/MPC/config/ciao_executionmanager_stub.mpb
new file mode 100644
index 00000000000..a9c5265ed32
--- /dev/null
+++ b/CIAO/DAnCE/MPC/config/ciao_executionmanager_stub.mpb
@@ -0,0 +1,8 @@
+// -*- MPC -*-
+// $Id$
+
+project : dance_deployment_stub, dance_executionmanager_stub {
+  includes += $(CIAO_ROOT)/DAnCE/ExecutionManager
+  libs     += CIAO_ExecutionManager_stub
+  after    += CIAO_ExecutionManager_stub
+}
diff --git a/CIAO/DAnCE/MPC/config/ciao_nodeapplication.mpb b/CIAO/DAnCE/MPC/config/ciao_nodeapplication.mpb
new file mode 100644
index 00000000000..c1854438c7d
--- /dev/null
+++ b/CIAO/DAnCE/MPC/config/ciao_nodeapplication.mpb
@@ -0,0 +1,7 @@
+// -*- MPC -*-
+// $Id$
+
+project : dance_deployment_stub, ciao_nodeapp_configurator {
+  libs  += CIAO_NodeApplication
+  after += NodeApplicationLib
+}
diff --git a/CIAO/DAnCE/MPC/config/ciao_nodeapplicationmanager.mpb b/CIAO/DAnCE/MPC/config/ciao_nodeapplicationmanager.mpb
new file mode 100644
index 00000000000..e7d313f0617
--- /dev/null
+++ b/CIAO/DAnCE/MPC/config/ciao_nodeapplicationmanager.mpb
@@ -0,0 +1,8 @@
+// -*- MPC -*-
+// $Id$
+
+project : ciao_targetmanager_stub, ciao_nodeapplication {
+  includes += $(CIAO_ROOT)/DAnCE/NodeApplicationManager
+  libs  += NodeApplicationManager
+  after += NodeApplicationManager
+}
diff --git a/CIAO/DAnCE/MPC/config/ciao_nodemanager_skel.mpb b/CIAO/DAnCE/MPC/config/ciao_nodemanager_skel.mpb
new file mode 100644
index 00000000000..838b887f7cf
--- /dev/null
+++ b/CIAO/DAnCE/MPC/config/ciao_nodemanager_skel.mpb
@@ -0,0 +1,7 @@
+// -*- MPC -*-
+// $Id$
+
+project : ciao_nodemanager_stub {
+  libs  += CIAO_NodeManager_skel
+  after += CIAO_NodeManager_skel
+}
diff --git a/CIAO/DAnCE/MPC/config/ciao_nodemanager_stub.mpb b/CIAO/DAnCE/MPC/config/ciao_nodemanager_stub.mpb
new file mode 100644
index 00000000000..2d726b00815
--- /dev/null
+++ b/CIAO/DAnCE/MPC/config/ciao_nodemanager_stub.mpb
@@ -0,0 +1,8 @@
+// -*- MPC -*-
+// $Id$
+
+project : dance_nodemanager_stub {
+  after += CIAO_NodeManager_stub
+  libs +=  CIAO_NodeManager_stub
+  includes += $(CIAO_ROOT)/DAnCE/NodeManager
+}
diff --git a/CIAO/DAnCE/MPC/config/ciao_plan_generator.mpb b/CIAO/DAnCE/MPC/config/ciao_plan_generator.mpb
new file mode 100644
index 00000000000..83b78f6f013
--- /dev/null
+++ b/CIAO/DAnCE/MPC/config/ciao_plan_generator.mpb
@@ -0,0 +1,8 @@
+// -*- MPC -*-
+// $Id$
+
+project : ciao_executor {
+  includes += $(CIAO_ROOT)/DAnCE/Plan_Generator
+  libs     += DAnCE_Plan_Generator
+  after    += DAnCE_Plan_Generator
+}
diff --git a/CIAO/DAnCE/MPC/config/ciao_targetmanager_stub.mpb b/CIAO/DAnCE/MPC/config/ciao_targetmanager_stub.mpb
new file mode 100644
index 00000000000..f9cf898c3a0
--- /dev/null
+++ b/CIAO/DAnCE/MPC/config/ciao_targetmanager_stub.mpb
@@ -0,0 +1,8 @@
+// -*- MPC -*-
+// $Id$
+
+project : ciao_nodemanager_stub {
+  includes += $(CIAO_ROOT)/DAnCE/TargetManager
+  libs     += CIAO_TargetManager_stub
+  after    += CIAO_TargetManager_stub
+}
diff --git a/CIAO/DAnCE/MPC/config/ciao_targetmanager_svnt.mpb b/CIAO/DAnCE/MPC/config/ciao_targetmanager_svnt.mpb
new file mode 100644
index 00000000000..edfccb7f45d
--- /dev/null
+++ b/CIAO/DAnCE/MPC/config/ciao_targetmanager_svnt.mpb
@@ -0,0 +1,7 @@
+// -*- MPC -*-
+// $Id$
+
+project : ciao_targetmanager_stub {
+  libs     += CIAO_TargetManager_svnt
+  after    += CIAO_TargetManager_svnt
+}
diff --git a/CIAO/DAnCE/MPC/config/dance_applicationmanager.mpb b/CIAO/DAnCE/MPC/config/dance_applicationmanager.mpb
deleted file mode 100644
index 2efbefc46f0..00000000000
--- a/CIAO/DAnCE/MPC/config/dance_applicationmanager.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : dance, naming, dance_applicationmanager_skel {
-  after += ApplicationManager
-  libs  += DAnCE_ApplicationManager
-}
diff --git a/CIAO/DAnCE/MPC/config/dance_applicationmanager_skel.mpb b/CIAO/DAnCE/MPC/config/dance_applicationmanager_skel.mpb
deleted file mode 100644
index 9599fca3fb6..00000000000
--- a/CIAO/DAnCE/MPC/config/dance_applicationmanager_skel.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : dance, dance_deployment_skel, dance_applicationmanager_stub {
-  after += Deployment_AM_skel
-  libs  += DAnCE_ApplicationManager_skel
-}
diff --git a/CIAO/DAnCE/MPC/config/dance_applicationmanager_stub.mpb b/CIAO/DAnCE/MPC/config/dance_applicationmanager_stub.mpb
deleted file mode 100644
index b945eb28e5b..00000000000
--- a/CIAO/DAnCE/MPC/config/dance_applicationmanager_stub.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project : dance, dance_deployment_stub {
-  after += Deployment_AM_stub
-  libs  += DAnCE_ApplicationManager_stub
-}
diff --git a/CIAO/DAnCE/MPC/config/dance_component_server.mpb b/CIAO/DAnCE/MPC/config/dance_component_server.mpb
new file mode 100644
index 00000000000..5a744e8fa86
--- /dev/null
+++ b/CIAO/DAnCE/MPC/config/dance_component_server.mpb
@@ -0,0 +1,5 @@
+// -*- MPC -*-
+// $Id$
+
+project : ciao_client_dnc {
+   after += DAnCE_ComponentServer_IDL
diff --git a/CIAO/DAnCE/MPC/config/dance_component_server_svnt.mpb b/CIAO/DAnCE/MPC/config/dance_component_server_svnt.mpb
new file mode 100644
index 00000000000..4ba1eef01b0
--- /dev/null
+++ b/CIAO/DAnCE/MPC/config/dance_component_server_svnt.mpb
@@ -0,0 +1,7 @@
+// -*- MPC -*-
+// $Id$
+
+project : ccm_svnt {
+//  after += Cdmw_IDL
+//  libs += DAnCE_Cdmw_IDL
+}
diff --git a/CIAO/DAnCE/MPC/config/dance_convert_plan.mpb b/CIAO/DAnCE/MPC/config/dance_convert_plan.mpb
deleted file mode 100644
index 9a6306ee3e4..00000000000
--- a/CIAO/DAnCE/MPC/config/dance_convert_plan.mpb
+++ /dev/null
@@ -1,6 +0,0 @@
-// $Id$
-project : dance_config_handlers, dance_deployment_stub, dance_tools {
-   after += DAnCE_Convert_Plan
-   libs += DAnCE_Convert_Plan
-
-}
diff --git a/CIAO/DAnCE/MPC/config/dance_deployment_skel.mpb b/CIAO/DAnCE/MPC/config/dance_deployment_svnt.mpb
index 8415b661cc2..752dcbc4568 100644
--- a/CIAO/DAnCE/MPC/config/dance_deployment_skel.mpb
+++ b/CIAO/DAnCE/MPC/config/dance_deployment_svnt.mpb
@@ -2,7 +2,7 @@
 // $Id$
 
 project : dance_deployment_stub, portableserver  {
-  after += Deployment_skel
-  libs  += DAnCE_Deployment_skel
+  after += Deployment_svnt
+  libs  += DAnCE_Deployment_svnt
   idlflags += -I$(CIAO_ROOT)/DAnCE
 }
diff --git a/CIAO/DAnCE/MPC/config/dance_domainapplication_skel.mpb b/CIAO/DAnCE/MPC/config/dance_domainapplication_skel.mpb
index 618687240db..5adfe50065c 100644
--- a/CIAO/DAnCE/MPC/config/dance_domainapplication_skel.mpb
+++ b/CIAO/DAnCE/MPC/config/dance_domainapplication_skel.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : dance, dance_deployment_skel, dance_domainapplication_stub {
+project : dance, dance_deployment_svnt, dance_domainapplication_stub {
   after += Deployment_DomainApplication_skel
   libs  += DAnCE_DomainApplication_skel
 }
diff --git a/CIAO/DAnCE/MPC/config/dance_domainapplicationmanager_skel.mpb b/CIAO/DAnCE/MPC/config/dance_domainapplicationmanager_skel.mpb
index 4c5746405e8..efaec42189e 100644
--- a/CIAO/DAnCE/MPC/config/dance_domainapplicationmanager_skel.mpb
+++ b/CIAO/DAnCE/MPC/config/dance_domainapplicationmanager_skel.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : dance, dance_applicationmanager_skel, dance_domainapplicationmanager_stub {
+project : dance, dance_deployment_svnt, dance_domainapplicationmanager_stub {
   after += Deployment_DAM_skel
   libs  += DAnCE_DomainApplicationManager_skel
 }
diff --git a/CIAO/DAnCE/MPC/config/dance_domainapplicationmanager_stub.mpb b/CIAO/DAnCE/MPC/config/dance_domainapplicationmanager_stub.mpb
index 8b672987f66..717b2e75173 100644
--- a/CIAO/DAnCE/MPC/config/dance_domainapplicationmanager_stub.mpb
+++ b/CIAO/DAnCE/MPC/config/dance_domainapplicationmanager_stub.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : dance, dance_applicationmanager_stub {
+project : dance, dance_deployment_stub {
   after += Deployment_DAM_stub
   libs  += DAnCE_DomainApplicationManager_stub
 }
diff --git a/CIAO/DAnCE/MPC/config/dance_executionmanager_skel.mpb b/CIAO/DAnCE/MPC/config/dance_executionmanager_skel.mpb
index f486efb83b1..847c7028c5a 100644
--- a/CIAO/DAnCE/MPC/config/dance_executionmanager_skel.mpb
+++ b/CIAO/DAnCE/MPC/config/dance_executionmanager_skel.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : dance, dance_deployment_skel, dance_executionmanager_stub {
+project : dance, dance_deployment_svnt, dance_executionmanager_stub {
   after += Deployment_ExecutionManager_skel
   libs  += DAnCE_ExecutionManager_skel
 }
diff --git a/CIAO/DAnCE/MPC/config/dance_extension_stub.mpb b/CIAO/DAnCE/MPC/config/dance_extension_stub.mpb
new file mode 100644
index 00000000000..008ee7e8b04
--- /dev/null
+++ b/CIAO/DAnCE/MPC/config/dance_extension_stub.mpb
@@ -0,0 +1,5 @@
+// -*- MPC -*-
+// $Id$
+
+project : dance_deployment_stub {
+}
diff --git a/CIAO/DAnCE/MPC/config/dance_nodeapplication.mpb b/CIAO/DAnCE/MPC/config/dance_nodeapplication.mpb
index a6d521290eb..1536198a419 100644
--- a/CIAO/DAnCE/MPC/config/dance_nodeapplication.mpb
+++ b/CIAO/DAnCE/MPC/config/dance_nodeapplication.mpb
@@ -3,6 +3,6 @@
 
 project : dance, dance_nodeapplication_skel, dance_logger, \
   ciao_cs_client, ciao_componentserver_stub, dynamicinterface, iortable, naming {
-  after += DAnCE_NodeApplication
+  after += NodeApplication
   libs  += DAnCE_NodeApplication
 }
diff --git a/CIAO/DAnCE/MPC/config/dance_nodeapplication_skel.mpb b/CIAO/DAnCE/MPC/config/dance_nodeapplication_skel.mpb
index bbbcd44505d..d5a818399c2 100644
--- a/CIAO/DAnCE/MPC/config/dance_nodeapplication_skel.mpb
+++ b/CIAO/DAnCE/MPC/config/dance_nodeapplication_skel.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : dance, dance_deployment_skel, dance_nodeapplication_stub {
+project : dance, dance_deployment_svnt, dance_nodeapplication_stub {
   after += Deployment_NodeApplication_skel
   libs  += DAnCE_NodeApplication_skel
 }
diff --git a/CIAO/DAnCE/MPC/config/dance_nodeapplication_stub.mpb b/CIAO/DAnCE/MPC/config/dance_nodeapplication_stub.mpb
index 6d51121c5cd..4bcee8b30d1 100644
--- a/CIAO/DAnCE/MPC/config/dance_nodeapplication_stub.mpb
+++ b/CIAO/DAnCE/MPC/config/dance_nodeapplication_stub.mpb
@@ -2,6 +2,6 @@
 // $Id$
 
 project : dance, dance_deployment_stub {
-  after += Deployment_NodeApplication_stub
+  after += Deployment_DomainApplication_stub
   libs  += DAnCE_NodeApplication_stub
 }
diff --git a/CIAO/DAnCE/MPC/config/dance_nodeapplicationmanager.mpb b/CIAO/DAnCE/MPC/config/dance_nodeapplicationmanager.mpb
index 4954f545d50..25bbb5148d0 100644
--- a/CIAO/DAnCE/MPC/config/dance_nodeapplicationmanager.mpb
+++ b/CIAO/DAnCE/MPC/config/dance_nodeapplicationmanager.mpb
@@ -2,6 +2,6 @@
 // $Id$
 
 project : dance, dance_nodeapplication, dance_nodeapplicationmanager_skel {
-  after += DAnCE_NodeApplicationManager
+  after += NodeApplicationManager
   libs  += DAnCE_NodeApplicationManager
 }
diff --git a/CIAO/DAnCE/MPC/config/dance_nodeapplicationmanager_skel.mpb b/CIAO/DAnCE/MPC/config/dance_nodeapplicationmanager_skel.mpb
index 45215de0150..1cc9812ee18 100644
--- a/CIAO/DAnCE/MPC/config/dance_nodeapplicationmanager_skel.mpb
+++ b/CIAO/DAnCE/MPC/config/dance_nodeapplicationmanager_skel.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : dance, dance_applicationmanager_skel, dance_nodeapplicationmanager_stub {
+project : dance, dance_deployment_svnt, dance_nodeapplicationmanager_stub {
   after += Deployment_NAM_skel
   libs  += DAnCE_NodeApplicationManager_skel
 }
diff --git a/CIAO/DAnCE/MPC/config/dance_nodeapplicationmanager_stub.mpb b/CIAO/DAnCE/MPC/config/dance_nodeapplicationmanager_stub.mpb
index c080ca58472..79e316bd26a 100644
--- a/CIAO/DAnCE/MPC/config/dance_nodeapplicationmanager_stub.mpb
+++ b/CIAO/DAnCE/MPC/config/dance_nodeapplicationmanager_stub.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : dance, dance_applicationmanager_stub {
+project : dance, dance_deployment_stub {
   after += Deployment_NAM_stub
   libs  += DAnCE_NodeApplicationManager_stub
 }
diff --git a/CIAO/DAnCE/MPC/config/dance_nodemanager.mpb b/CIAO/DAnCE/MPC/config/dance_nodemanager.mpb
new file mode 100644
index 00000000000..aab928298ba
--- /dev/null
+++ b/CIAO/DAnCE/MPC/config/dance_nodemanager.mpb
@@ -0,0 +1,8 @@
+// -*- MPC -*-
+// $Id$
+
+// @todo, use nodeapplicationmanager_stb
+project : dance, dance_nodeapplicationmanager, dance_nodemanager_skel, naming_serv {
+  after += Node_Manager_Module
+  libs  += DAnCE_NodeManager
+}
diff --git a/CIAO/DAnCE/MPC/config/dance_nodemanager_skel.mpb b/CIAO/DAnCE/MPC/config/dance_nodemanager_skel.mpb
index f628d49dbbd..f8cdf0db145 100644
--- a/CIAO/DAnCE/MPC/config/dance_nodemanager_skel.mpb
+++ b/CIAO/DAnCE/MPC/config/dance_nodemanager_skel.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : dance, dance_deployment_skel, dance_nodemanager_stub {
+project : dance, dance_deployment_svnt, dance_nodemanager_stub {
   after += Deployment_NodeManager_skel
   libs  += DAnCE_NodeManager_skel
 }
diff --git a/CIAO/DAnCE/MPC/config/dance_nodemanager_svnt.mpb b/CIAO/DAnCE/MPC/config/dance_nodemanager_svnt.mpb
new file mode 100644
index 00000000000..50d4ba02322
--- /dev/null
+++ b/CIAO/DAnCE/MPC/config/dance_nodemanager_svnt.mpb
@@ -0,0 +1,8 @@
+// -*- MPC -*-
+// $Id$
+
+project : dance_deployment_svnt {
+  includes += $(CIAO_ROOT)/DAnCE/NodeManager
+  libs     += DAnCE_NodeManager_svnt
+  after    += DAnCE_NodeManager_svnt
+}
diff --git a/CIAO/DAnCE/MPC/config/dance_output.mpb b/CIAO/DAnCE/MPC/config/dance_output.mpb
deleted file mode 100644
index f8352a6ac48..00000000000
--- a/CIAO/DAnCE/MPC/config/dance_output.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project {
-  libout = $(ACE_ROOT)/lib
-}
-
diff --git a/CIAO/DAnCE/MPC/config/dance_plan_generator.mpb b/CIAO/DAnCE/MPC/config/dance_plan_generator.mpb
new file mode 100644
index 00000000000..42f852d21d8
--- /dev/null
+++ b/CIAO/DAnCE/MPC/config/dance_plan_generator.mpb
@@ -0,0 +1,7 @@
+// -*- MPC -*-
+// $Id$
+
+project : dance_deployment_stub, naming, dance_logger {
+  after += Plan_Generator
+  libs += DAnCE_Plan_Generator
+}
diff --git a/CIAO/DAnCE/MPC/config/dance_plan_launcher.mpb b/CIAO/DAnCE/MPC/config/dance_plan_launcher.mpb
new file mode 100644
index 00000000000..bfc71c3e25a
--- /dev/null
+++ b/CIAO/DAnCE/MPC/config/dance_plan_launcher.mpb
@@ -0,0 +1,6 @@
+// $Id$
+
+project : dance_plan_launcher_base, dance_logger {
+  after += Plan_Launcher
+  libs += DAnCE_Plan_Launcher
+}
diff --git a/CIAO/DAnCE/MPC/config/dance_plan_launcher_base.mpb b/CIAO/DAnCE/MPC/config/dance_plan_launcher_base.mpb
new file mode 100644
index 00000000000..b6f3237118b
--- /dev/null
+++ b/CIAO/DAnCE/MPC/config/dance_plan_launcher_base.mpb
@@ -0,0 +1,6 @@
+// $Id$
+
+project : naming, dance_executionmanager_stub, dance_logger {
+  after += Plan_Launcher_Base
+  libs += DAnCE_Plan_Launcher_Base
+}
diff --git a/CIAO/DAnCE/MPC/config/dance_repositorymanager.mpb b/CIAO/DAnCE/MPC/config/dance_repositorymanager.mpb
new file mode 100644
index 00000000000..2089b7700b8
--- /dev/null
+++ b/CIAO/DAnCE/MPC/config/dance_repositorymanager.mpb
@@ -0,0 +1,8 @@
+// -*- MPC -*-
+// $Id$
+
+project : dance_logger, ciao_config_handlers, ccm_stub, dance_repositorymanagerbase, dance_repositorymanager_skel, naming, iortable, utils, zlib, minizip, dance_logger {
+  requires += zlib
+  after += DAnCE_RepositoryManager
+  libs += DAnCE_RepositoryManager
+}
diff --git a/CIAO/DAnCE/MPC/config/dance_repositorymanager_skel.mpb b/CIAO/DAnCE/MPC/config/dance_repositorymanager_skel.mpb
index 3e07d0d223c..3e9ebb51a4f 100644
--- a/CIAO/DAnCE/MPC/config/dance_repositorymanager_skel.mpb
+++ b/CIAO/DAnCE/MPC/config/dance_repositorymanager_skel.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : dance, dance_deployment_skel, dance_repositorymanager_stub {
+project : dance, dance_deployment_svnt, dance_repositorymanager_stub {
   after += Deployment_RepositoryManager_skel
   libs  += DAnCE_RepositoryManager_skel
 }
diff --git a/CIAO/DAnCE/MPC/config/dance_split_plan.mpb b/CIAO/DAnCE/MPC/config/dance_split_plan.mpb
deleted file mode 100644
index 5ef5536636a..00000000000
--- a/CIAO/DAnCE/MPC/config/dance_split_plan.mpb
+++ /dev/null
@@ -1,5 +0,0 @@
-// $Id$
-project : dance, dance_deployment_stub, dance_tools {
-   after += DAnCE_Split_Plan_Impl
-   libs += DAnCE_Split_Plan_Impl
-}
diff --git a/CIAO/DAnCE/MPC/config/dance_targetmanager.mpb b/CIAO/DAnCE/MPC/config/dance_targetmanager.mpb
new file mode 100644
index 00000000000..f3148d5c00d
--- /dev/null
+++ b/CIAO/DAnCE/MPC/config/dance_targetmanager.mpb
@@ -0,0 +1,7 @@
+// -*- MPC -*-
+// $Id$
+
+project : dance_deployment_svnt, ciao_config_handlers, dance_targetmanager_skel, dance_logger {
+  after += DAnCE_TargetManager_Impl
+  libs += DAnCE_TargetManager_Impl
+}
diff --git a/CIAO/DAnCE/MPC/config/dance_targetmanager_skel.mpb b/CIAO/DAnCE/MPC/config/dance_targetmanager_skel.mpb
index 6256d31121b..7e9faa32ae7 100644
--- a/CIAO/DAnCE/MPC/config/dance_targetmanager_skel.mpb
+++ b/CIAO/DAnCE/MPC/config/dance_targetmanager_skel.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : dance, dance_deployment_skel, dance_targetmanager_stub {
+project : dance, dance_deployment_svnt, dance_targetmanager_stub {
   after += Deployment_TargetManager_skel
   libs  += DAnCE_TargetManager_skel
 }
diff --git a/CIAO/DAnCE/MPC/config/dance_tm_daemon.mpb b/CIAO/DAnCE/MPC/config/dance_tm_daemon.mpb
new file mode 100644
index 00000000000..796e100cad2
--- /dev/null
+++ b/CIAO/DAnCE/MPC/config/dance_tm_daemon.mpb
@@ -0,0 +1,7 @@
+// -*- MPC -*-
+// $Id$
+
+project : dance_deployment_svnt {
+   after += DAnCE_TargetManagerDaemon_svnt DAnCE_TargetManagerDaemon_stub
+   libs += DAnCE_TargetManagerDaemon_svnt DAnCE_TargetManagerDaemon_stub
+}
diff --git a/CIAO/DAnCE/MPC/config/dance_tools.mpb b/CIAO/DAnCE/MPC/config/dance_tools.mpb
deleted file mode 100644
index 411d44a2223..00000000000
--- a/CIAO/DAnCE/MPC/config/dance_tools.mpb
+++ /dev/null
@@ -1,4 +0,0 @@
-// $Id$
-project : dance {
-  includes += $(DANCE_ROOT)/tools
-}
diff --git a/CIAO/DAnCE/MPC/config/dance_utils.mpb b/CIAO/DAnCE/MPC/config/dance_utils.mpb
new file mode 100644
index 00000000000..7c303076fe7
--- /dev/null
+++ b/CIAO/DAnCE/MPC/config/dance_utils.mpb
@@ -0,0 +1,7 @@
+// -*- MPC -*-
+// $Id$
+
+project : dance_deployment_stub, dance_logger {
+  after   += DAnCE_Utils
+  libs    += DAnCE_Utils
+}
diff --git a/CIAO/DAnCE/NodeApplication/ComponentAttributesSetter.cpp b/CIAO/DAnCE/NodeApplication/ComponentAttributesSetter.cpp
index 21783684313..9ea66fc9c78 100644
--- a/CIAO/DAnCE/NodeApplication/ComponentAttributesSetter.cpp
+++ b/CIAO/DAnCE/NodeApplication/ComponentAttributesSetter.cpp
@@ -28,34 +28,41 @@ ComponentAttributesSetter::SetComponentAttributes (ACE_CString /*componentName*/
 
   for (CORBA::ULong i = 0; i < prop.length(); i++)
     {
-      ACE_CString const name = prop[i].name.in();
+      ACE_CString name = prop[i].name.in();
 
       // Ignore configuration properties, since attributes can't have . in them, this seems like a good method.
       if (name.find (".") != ACE_CString::npos)
         {
           continue;
         }
-
       DANCE_DEBUG (6, (LM_DEBUG, DLINFO
                     ACE_TEXT("ComponentAttributesSetter::SetComponentAttributes - ")
-                    ACE_TEXT("Populating attribute name <%C>\n"), name.c_str()));
+                    ACE_TEXT("Populating attribute name %C\n"), name.c_str()));
       ACE_CString method = "_set_";
       method += prop[i].name.in();
 
+      ::CORBA::Request_var req;
+
       try
         {
-          ::CORBA::Request_var req = obj->_request (method.c_str ());
+          req = obj->_request (method.c_str ());
           req->add_in_arg ("x") = prop[i].value;
+
           req->invoke();
         }
-      catch (const CORBA::Exception &e)
+      catch (const CORBA::BAD_OPERATION &)
         {
-          DANCE_ERROR (1, (LM_ERROR, DLINFO
+          DANCE_ERROR (1, (LM_WARNING, DLINFO
                         ACE_TEXT("ComponentAttributesSetter::SetComponentAttributes - ")
-                        ACE_TEXT("ERROR: Exception while trying to set attribute <%C>\n"),
+                        ACE_TEXT("ERROR: BAD_OPERATION while trying to set attribute %C\n"),
                         name.c_str ()));
-          e._tao_print_exception ("ComponentAttributesSetter.cpp::SetComponentAttributes - ");
+        }
+      catch (const CORBA::Exception &e)
+        {
+          CORBA::release (req);
+          e._tao_print_exception ("ComponentAttributesSetter.cpp::SetComponentAttributes ");
           throw ::Deployment::StartError();
         }
+      //Question - How exceptions will be processed, rised by invoked method
     }
 }
diff --git a/CIAO/DAnCE/NodeApplication/NodeApplication.mpc b/CIAO/DAnCE/NodeApplication/NodeApplication.mpc
index bad69ff1e92..6892f1b534a 100644
--- a/CIAO/DAnCE/NodeApplication/NodeApplication.mpc
+++ b/CIAO/DAnCE/NodeApplication/NodeApplication.mpc
@@ -1,19 +1,18 @@
 // -*- MPC -*-
 // $Id$
 
-project(DAnCE_NodeApplication): dance_lib, dynamicinterface, \
+project(NodeApplication): dance_lib, dynamicinterface, dance_component_server_svnt, \
                           dance_nodeapplication_skel, \
                           dance_logger, iortable, naming, ccm_configvalue, ciao_cs_client, ciao_componentserver_stub, \
-                          gen_ostream, avoids_ace_for_tao, dance_applicationmanager_stub {
+                          gen_ostream, avoids_ace_for_tao {
   sharedname   = DAnCE_NodeApplication
   dynamicflags = NODEAPPLICATION_BUILD_DLL
 
-  Source_Files {
+Source_Files {
     NodeApplication_Impl.cpp
     ComponentAttributesSetter.cpp
     Name_Utilities.cpp
   }
-
   Header_Files {
     NodeApplication_Impl.h
     ComponentAttributesSetter.h
diff --git a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
index ac38eb04cd7..660e51c105d 100644
--- a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
+++ b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
@@ -17,9 +17,8 @@
 #include "Deployment/Deployment_BaseC.h"
 #include "Deployment/Deployment_ApplicationC.h"
 #include "Deployment/Deployment_PlanErrorC.h"
-#include "Deployment/Deployment_ApplicationManagerC.h"
-#include "DAnCE/Deployment_common.h"
-#include "DAnCE/DAnCE_PropertiesC.h"
+#include "Deployment/Deployment_common.h"
+#include "Deployment/DAnCE_PropertiesC.h"
 #include "ComponentAttributesSetter.h"
 #include "Name_Utilities.h"
 
@@ -430,7 +429,7 @@ NodeApplication_Impl::configuration_complete_components ()
   bool error = false;
   ::Deployment::StartError exception;
 
-  for (INSTANCES::size_type k = 0; k < this->instances_.size (); ++k)
+  for (size_t k = 0; k < this->instances_.size (); ++k)
     {
       if (this->instances_[k]->type == eHome)
         {
@@ -513,7 +512,7 @@ NodeApplication_Impl::start ()
   bool error (false);
   ::Deployment::StartError exception;
 
-  for (INSTANCES::size_type k = 0; k < this->instances_.size (); ++k)
+  for (size_t k = 0; k < this->instances_.size (); ++k)
     {
       if (this->instances_[k]->type == eHome)
         {
@@ -610,7 +609,7 @@ NodeApplication_Impl::install_home (Container &cont, Instance &inst)
 
   this->instances_[inst.idd_idx] = &inst;
 
-  // Need to get significant property values
+  // need to get significant property values
   const char *entrypt = 0;
   get_property_value (DAnCE::HOME_FACTORY, mdd.execParameter, entrypt);
 
@@ -715,10 +714,8 @@ NodeApplication_Impl::install_component (Container &cont, Instance &inst)
 {
   DANCE_TRACE( "NodeApplication_Impl::install_component");
 
-  ::Deployment::MonolithicDeploymentDescription const &mdd =
-    this->plan_.implementation[inst.mdd_idx];
-  ::Deployment::InstanceDeploymentDescription const &idd =
-    this->plan_.instance[inst.idd_idx];
+  const ::Deployment::MonolithicDeploymentDescription &mdd = this->plan_.implementation[inst.mdd_idx];
+  const ::Deployment::InstanceDeploymentDescription &idd = this->plan_.instance[inst.idd_idx];
 
   DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT("NodeApplication_Impl::install_home - ")
                 ACE_TEXT("Starting installation of home %C on node %C\n"),
@@ -841,8 +838,7 @@ NodeApplication_Impl::install_homed_component (Container &cont, Instance &inst)
 {
   DANCE_TRACE("NodeApplication_Impl::install_homed_component (unsigned int index)");
 
-  ::Deployment::InstanceDeploymentDescription const &idd =
-    this->plan_.instance[inst.idd_idx];
+  const ::Deployment::InstanceDeploymentDescription &idd = this->plan_.instance[inst.idd_idx];
   this->instances_[inst.idd_idx] = &inst;
 
   DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("NodeApplication_Impl::install_homed_component - ")
@@ -982,7 +978,7 @@ NodeApplication_Impl::create_component_server (size_t index)
 
   ComponentServer &server = this->servers_[index];
 
-  try
+    try
     {
       DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT("NodeApplication_Impl::create_component_Server - ")
                    ACE_TEXT("creating component server %u\n"), index));
@@ -990,12 +986,12 @@ NodeApplication_Impl::create_component_server (size_t index)
 
       config_values.length (this->servers_[index].properties.length ());
       for (CORBA::ULong i = 0; i < this->servers_[index].properties.length ();
-         ++i)
-      {
-        config_values[i] = new CIAO::ConfigValue_impl (this->servers_[index].properties[i].name.in (),
-                   this->servers_[index].properties[i].value);
+     ++i)
+  {
+    config_values[i] = new CIAO::ConfigValue_impl (this->servers_[index].properties[i].name.in (),
+               this->servers_[index].properties[i].value);
 
-      }
+  }
 
       server.ref = this->activator_->create_component_server (config_values);
       DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT("NodeApplication_Impl::create_component_server - ")
@@ -1089,10 +1085,9 @@ NodeApplication_Impl::create_container (size_t server, size_t cont_idx)
     }
 
   DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("NodeApplication_Impl::create_container - ")
-                   ACE_TEXT("Configuring %u components on container %u on server %u\n"),
-                   container.components.size (),
-                   server, 
-                   cont_idx));
+                ACE_TEXT("Configuring %u components on container %u on server %u\n"),
+                container.components.size (),
+                server, cont_idx));
 
   // Configure components
   for (size_t i = 0; i < container.components.size (); ++i)
@@ -1127,14 +1122,7 @@ NodeApplication_Impl::create_colocation_groups (void)
 
   for (CORBA::ULong i = 0; i < this->plan_.localityConstraint.length (); ++i)
     {
-      if (this->plan_.localityConstraint[i].constraint == ::Deployment::PlanNoConstraint)
-        {
-          DANCE_DEBUG (10, (LM_INFO, DLINFO
-                            ACE_TEXT ("NodeApplication_Impl::create_colocation_groups - ")
-                            ACE_TEXT ("Skipping NoConstraint Colocation group\n")));
-          continue;
-        }
-      else if (this->plan_.localityConstraint[i].constraint != ::Deployment::PlanSameProcess)
+      if (this->plan_.localityConstraint[i].constraint != ::Deployment::PlanSameProcess)
         {
           DANCE_ERROR (1, (LM_ERROR, DLINFO
                         ACE_TEXT ("NodeApplication_Impl::create_colocation_groups - ")
@@ -1142,9 +1130,8 @@ NodeApplication_Impl::create_colocation_groups (void)
                         i));
           continue;
         }
-      
-      ::CORBA::ULongSeq const &instances =
-        this->plan_.localityConstraint[i].constrainedInstanceRef;
+
+      const ::CORBA::ULongSeq &instances = this->plan_.localityConstraint[i].constrainedInstanceRef;
 
       for (CORBA::ULong j = 0; j < instances.length (); ++j)
         {
@@ -1319,12 +1306,13 @@ NodeApplication_Impl::passivate_components()
   bool error (false);
   ::Deployment::StopError exception ("unfilled", "unfilled passivate components");
 
-  for (INSTANCES::size_type k = 0; k < this->instances_.size (); ++k)
+  for (size_t k = 0; k < this->instances_.size (); ++k)
     {
       if (this->instances_[k]->type == eHome ||
           this->instances_[k]->type == eInvalid)
         continue;
 
+
       try
         {
           CIAO::Deployment::Container_var cont =
@@ -1403,7 +1391,7 @@ NodeApplication_Impl::remove_components()
   ::Deployment::StopError exception ("unfilled", "unfilled remove_components");
 
   // Removing components first.
-  for (INSTANCES::size_type k = 0; k < this->instances_.size (); ++k)
+  for (size_t k = 0; k < this->instances_.size (); ++k)
     {
       try
         {
@@ -1502,7 +1490,7 @@ NodeApplication_Impl::remove_components()
         }
     }
 
-  for (INSTANCES::size_type k = 0; k < this->instances_.size (); ++k)
+  for (size_t k = 0; k < this->instances_.size (); ++k)
     {
       try
         {
@@ -1796,40 +1784,28 @@ NodeApplication_Impl::finishLaunch (const ::Deployment::Connections & providedRe
                           {
                             if (0 == conn.externalReference.length())
                               {
-                                if (conn.internalEndpoint.length () == 2 && 
+                                if (conn.internalEndpoint.length () == 2 &&
                                     (conn.internalEndpoint[1].kind == ::Deployment::MultiplexReceptacle ||
                                      conn.internalEndpoint[1].kind == ::Deployment::SimplexReceptacle))
                                   {
                                     obj = Components::CCMObject::
                                       _narrow (this->instances_[conn.internalEndpoint[1].instanceRef]->ref.in ());
-                                        
-                                    if (this->is_local_facet (conn))
-                                      {
-                                        ::Components::CCMObject_var facet =
-                                            ::Components::CCMObject::_narrow (providedReference[i].endpoint[0].in ());
-                                        
-                                        ::Components::CCMObject_var recep =
-                                            ::Components::CCMObject::_narrow (this->instances_[conn.internalEndpoint[1].instanceRef]->ref.in ());
-                                        
-                                        ::CIAO::Deployment::Container_var cont =
-                                            ::CIAO::Deployment::Container::_narrow (this->instances_[conn.internalEndpoint[1].instanceRef]->container->ref.in ());
-                                        
-                                        this->connect_receptacle (conn,
-                                                                  facet.in (),
-                                                                  conn.internalEndpoint[0].portName.in (),
-                                                                  obj.in (),
-                                                                  conn.internalEndpoint[1].portName.in(),
-                                                                  cont.in ());
-                                      }
-                                    else 
-                                      {
-                                        this->connect_receptacle (conn,
-                                                                  obj.in (),
-                                                                  "",
-                                                                  providedReference[i].endpoint[0].in(),
-                                                                  conn.internalEndpoint[1].portName.in(),
-                                                                  ::CIAO::Deployment::Container::_nil());
-                                      }
+
+                                    ::Components::CCMObject_var facet =
+                                      ::Components::CCMObject::_narrow (providedReference[i].endpoint[0].in ());
+
+                                    ::Components::CCMObject_var recep =
+                                        ::Components::CCMObject::_narrow (this->instances_[conn.internalEndpoint[1].instanceRef]->ref.in ());
+
+                                    ::CIAO::Deployment::Container_var cont =
+                                        ::CIAO::Deployment::Container::_narrow (this->instances_[conn.internalEndpoint[1].instanceRef]->container->ref.in ());
+
+                                    this->connect_receptacle (conn,
+                                                              facet.in (),
+                                                              conn.internalEndpoint[0].portName.in (),
+                                                              obj.in (),
+                                                              conn.internalEndpoint[1].portName.in(),
+                                                              cont.in ());
                                   }
                                  break;
                               }
@@ -1911,17 +1887,10 @@ NodeApplication_Impl::finishLaunch (const ::Deployment::Connections & providedRe
                       {
                         // What we should do with Cookie, returned from connect call???
                         DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT("NodeApplication_Impl::finishLaunch - Set for receptacle\n")));
-                        if (CORBA::is_nil (providedReference[i].endpoint[0].in ()))
-                          {
-                            DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("NodeApplication_Impl::finishLaunch - ")
-                                             ACE_TEXT ("Reference provided from DomainApplication was nil.\n")));
-                            throw 1;
-                          }
-
                         ::Components::CCMObject_var facet =
                            ::Components::CCMObject::_narrow (providedReference[i].endpoint[0].in ());
 
-                        if (/*conn.internalEndpoint.length () == 2*/ this->is_local_facet (conn))
+                        if (conn.internalEndpoint.length () == 2)
                           {
                             ::CIAO::Deployment::Container_var cont =
                                ::CIAO::Deployment::Container::_narrow (this->instances_[conn.internalEndpoint[1].instanceRef]->container->ref.in ());
@@ -2070,22 +2039,13 @@ NodeApplication_Impl::connect_receptacle (const ::Deployment::PlanConnectionDesc
         {
           DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT("NodeApplication_Impl::connect_receptacle - ")
                        ACE_TEXT("connect SimplexReceptacle for [%C] started\n"), recep_name.c_str()));
-          if (CORBA::is_nil (facet))
-            {
-              DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("NodeApplication_Impl::connect_receptacle - ")
-                               "Object reference for facet to connect to [%C] was nil\n",
-                               recep_name.c_str ()));
-              throw ::Deployment::InvalidConnection ("",
-                                                     "Provided facet reference was nil\n");
-            }
-
           res = facet->connect (recep_name.c_str(), receptacle);
           DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT("NodeApplication_Impl::connect_receptacle - connect finished\n")));
         }
     }
   catch (const ::Components::InvalidName& )
     {
-      DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("NodeApplication_Impl::connect_receptacle - ")
+      DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT(" NodeApplication_Impl::connect_receptacle - ")
                    ACE_TEXT("Components::CCMObject_var::connect() returned ::Components::InvalidName exception\n")));
       throw ::Deployment::StartError("",
                                      "Received InvalidName exception while connecting receptacle.");
diff --git a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h
index cb88287dfa7..ad6905fbd17 100644
--- a/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h
+++ b/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h
@@ -31,7 +31,7 @@
 #include "Deployment/Deployment_NodeApplicationS.h"
 #include "Deployment/Deployment_DeploymentPlanC.h"
 #include "Deployment/DeploymentC.h"
-#include "DAnCE/Deployment_common.h"
+#include "Deployment/Deployment_common.h"
 
 #include <map>
 
@@ -40,8 +40,7 @@ namespace DAnCE
 
   class NodeManager_Impl;
 
-  class NodeApplication_Export NodeApplication_Impl :
-    public virtual POA_Deployment::NodeApplication
+  class NodeApplication_Export NodeApplication_Impl : public virtual POA_Deployment::NodeApplication
   {
   public:
     NodeApplication_Impl (CORBA::ORB_ptr orb,
@@ -55,17 +54,18 @@ namespace DAnCE
     virtual void finishLaunch (const ::Deployment::Connections & providedReference,
                                ::CORBA::Boolean start);
 
-    virtual void start (void);
+    virtual void start ();
 
-    ::Deployment::Connections * getAllConnections(void);
+    ::Deployment::Connections * getAllConnections();
 
-    void init_components(void);
+    //TODO Exception specification should be customized
+    void init_components();
 
-    void configuration_complete_components (void);
+    void configuration_complete_components ();
 
-    void passivate_components (void);
+    void passivate_components ();
 
-    void remove_components (void);
+    void remove_components ();
 
     enum ERequestType
     {
@@ -94,8 +94,10 @@ namespace DAnCE
       eInvalidState
     };
 
+
   protected:
-    void init(void);
+    //TODO Add throw specification
+    void init();
 
     struct Container;
 
diff --git a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager.mpc b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager.mpc
index d8bd4e68725..8ce4f18aa89 100644
--- a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager.mpc
+++ b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project (DAnCE_NodeApplicationManager) : dance_lib, naming, dance_nodeapplicationmanager_skel, \
+project: dance_lib, naming, dance_nodeapplicationmanager_skel, \
         dynamicinterface, ccm_componentserver_svnt, ciao_cs_client, \
         dance_nodeapplication, avoids_ace_for_tao {
   sharedname   = DAnCE_NodeApplicationManager
diff --git a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
index 4ecb66face9..a981a1fdc12 100644
--- a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
+++ b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
@@ -2,7 +2,7 @@
 
 
 #include "ace/streams.h"
-#include "DAnCE/DAnCE/DAnCE_PropertiesC.h"
+#include "DAnCE/Deployment/DAnCE_PropertiesC.h"
 #include "DAnCE/Logger/Log_Macros.h"
 
 #include "NodeApplicationManager_Impl.h"
@@ -61,7 +61,7 @@ NodeApplicationManager_Impl::~NodeApplicationManager_Impl()
     }
   catch (...)
     {
-      DANCE_ERROR (1, (LM_ERROR, DLINFO
+      DANCE_ERROR (1, (LM_WARNING, DLINFO
                     ACE_TEXT("NodeApplicationManager_Impl::~NodeApplicationManager_Impl - ")
                     ACE_TEXT("Caught exception in NodeApplicationManager destructor\n")));
     }
@@ -146,20 +146,20 @@ NodeApplicationManager_Impl::destroyApplication (Deployment::Application_ptr app
     this->application_ = 0;
   }
   catch (const CORBA::SystemException &)
-    {
-      throw;
-    }
+  {
+    throw;
+  }
   catch (const Deployment::StopError &)
-    {
-      throw;
-    }
+  {
+    throw;
+  }
   catch (const CORBA::UserException &e)
-    {
-      DANCE_ERROR (1, (LM_ERROR, DLINFO
-                   ACE_TEXT("NodeApplicationManager_Impl::destroyApplication failed with UserException %C(%C) \"%C\"\n"),
-                   e._name(), e._rep_id(), e._info().c_str()));
-      throw Deployment::StopError(e._name(), e._info().c_str());
-    }
+  {
+    DANCE_ERROR (1, (LM_ERROR, DLINFO
+                 ACE_TEXT("NodeApplicationManager_Impl::destroyApplication failed with UserException %C(%C) \"%C\"\n"),
+                 e._name(), e._rep_id(), e._info().c_str()));
+    throw Deployment::StopError(e._name(), e._info().c_str());
+  }
   catch (...)
   {
     DANCE_ERROR (1, (LM_ERROR, DLINFO
diff --git a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
index d72570f30e5..c8310490f66 100644
--- a/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
+++ b/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
@@ -16,13 +16,9 @@
 #define NODEAPPLICATIONMANAGER_IMPL_H_
 
 #include "NodeApplicationManager_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
 #include "Deployment/Deployment_DeploymentPlanC.h"
 #include "Deployment/Deployment_NodeApplicationManagerS.h"
+#include "Deployment/Deployment_NodeApplicationC.h"
 #include "NodeApplication/NodeApplication_Impl.h"
 
 namespace DAnCE
diff --git a/CIAO/DAnCE/NodeManager/DAnCE_NodeManager_Module_Export.h b/CIAO/DAnCE/NodeManager/DAnCE_NodeManager_Module_Export.h
new file mode 100644
index 00000000000..4eaf82f6fee
--- /dev/null
+++ b/CIAO/DAnCE/NodeManager/DAnCE_NodeManager_Module_Export.h
@@ -0,0 +1,58 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl DAnCE_NodeManager_Module
+// ------------------------------
+#ifndef DANCE_NODEMANAGER_MODULE_EXPORT_H
+#define DANCE_NODEMANAGER_MODULE_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (ACE_AS_STATIC_LIBS) && !defined (DANCE_NODEMANAGER_MODULE_HAS_DLL)
+#  define DANCE_NODEMANAGER_MODULE_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && DANCE_NODEMANAGER_MODULE_HAS_DLL */
+
+#if !defined (DANCE_NODEMANAGER_MODULE_HAS_DLL)
+#  define DANCE_NODEMANAGER_MODULE_HAS_DLL 1
+#endif /* ! DANCE_NODEMANAGER_MODULE_HAS_DLL */
+
+#if defined (DANCE_NODEMANAGER_MODULE_HAS_DLL) && (DANCE_NODEMANAGER_MODULE_HAS_DLL == 1)
+#  if defined (DANCE_NODEMANAGER_MODULE_BUILD_DLL)
+#    define DAnCE_NodeManager_Module_Export ACE_Proper_Export_Flag
+#    define DANCE_NODEMANAGER_MODULE_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define DANCE_NODEMANAGER_MODULE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* DANCE_NODEMANAGER_MODULE_BUILD_DLL */
+#    define DAnCE_NodeManager_Module_Export ACE_Proper_Import_Flag
+#    define DANCE_NODEMANAGER_MODULE_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define DANCE_NODEMANAGER_MODULE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* DANCE_NODEMANAGER_MODULE_BUILD_DLL */
+#else /* DANCE_NODEMANAGER_MODULE_HAS_DLL == 1 */
+#  define DAnCE_NodeManager_Module_Export
+#  define DANCE_NODEMANAGER_MODULE_SINGLETON_DECLARATION(T)
+#  define DANCE_NODEMANAGER_MODULE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* DANCE_NODEMANAGER_MODULE_HAS_DLL == 1 */
+
+// Set DANCE_NODEMANAGER_MODULE_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (DANCE_NODEMANAGER_MODULE_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define DANCE_NODEMANAGER_MODULE_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define DANCE_NODEMANAGER_MODULE_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !DANCE_NODEMANAGER_MODULE_NTRACE */
+
+#if (DANCE_NODEMANAGER_MODULE_NTRACE == 1)
+#  define DANCE_NODEMANAGER_MODULE_TRACE(X)
+#else /* (DANCE_NODEMANAGER_MODULE_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define DANCE_NODEMANAGER_MODULE_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (DANCE_NODEMANAGER_MODULE_NTRACE == 1) */
+
+#endif /* DANCE_NODEMANAGER_MODULE_EXPORT_H */
+
+// End of auto generated file.
diff --git a/CIAO/DAnCE/NodeManager/NodeManager.mpc b/CIAO/DAnCE/NodeManager/NodeManager.mpc
index 2a7d1529f9f..e9f44386ae8 100644
--- a/CIAO/DAnCE/NodeManager/NodeManager.mpc
+++ b/CIAO/DAnCE/NodeManager/NodeManager.mpc
@@ -1,12 +1,22 @@
 // -*- MPC -*-
 // $Id$
 
-project(Node_Manager_Exec) : utils, dance_exe, naming, avoids_ace_for_tao, dance_nodeapplicationmanager, dance_nodemanager_skel {
-  exename = dance_node_manager
+project(Node_Manager_Module) : dance_lib, naming_serv, dance_nodeapplicationmanager, dance_nodeapplication_stub, dance_deployment_svnt, dynamicinterface, utils, gen_ostream, dance_nodemanager_skel, avoids_ace_for_tao {
+  sharedname   = DAnCE_NodeManager
+  dynamicflags = NODEMANAGER_BUILD_DLL DANCE_NODEMANAGER_MODULE_BUILD_DLL
 
   Source_Files {
     NodeManager_Impl.cpp
     Node_Manager_Module.cpp
-    Node_Manager.cpp
+  }
+}
+
+project(Node_Manager_Exec) : utils, dance_exe, dance_nodemanager, naming_serv, avoids_ace_for_tao, ccm_componentserver_svnt {
+  exename = dance_node_manager
+  after += Node_Manager_Module
+  libs += DAnCE_NodeManager
+
+  Source_Files {
+    Node_Manager_Exec.cpp
   }
 }
diff --git a/CIAO/DAnCE/NodeManager/NodeManager_Export.h b/CIAO/DAnCE/NodeManager/NodeManager_Export.h
new file mode 100644
index 00000000000..b7240baeb80
--- /dev/null
+++ b/CIAO/DAnCE/NodeManager/NodeManager_Export.h
@@ -0,0 +1,58 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl NodeManager
+// ------------------------------
+#ifndef NODEMANAGER_EXPORT_H
+#define NODEMANAGER_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (ACE_AS_STATIC_LIBS) && !defined (NODEMANAGER_HAS_DLL)
+#  define NODEMANAGER_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && NODEMANAGER_HAS_DLL */
+
+#if !defined (NODEMANAGER_HAS_DLL)
+#  define NODEMANAGER_HAS_DLL 1
+#endif /* ! NODEMANAGER_HAS_DLL */
+
+#if defined (NODEMANAGER_HAS_DLL) && (NODEMANAGER_HAS_DLL == 1)
+#  if defined (NODEMANAGER_BUILD_DLL)
+#    define NodeManager_Export ACE_Proper_Export_Flag
+#    define NODEMANAGER_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define NODEMANAGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* NODEMANAGER_BUILD_DLL */
+#    define NodeManager_Export ACE_Proper_Import_Flag
+#    define NODEMANAGER_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define NODEMANAGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* NODEMANAGER_BUILD_DLL */
+#else /* NODEMANAGER_HAS_DLL == 1 */
+#  define NodeManager_Export
+#  define NODEMANAGER_SINGLETON_DECLARATION(T)
+#  define NODEMANAGER_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* NODEMANAGER_HAS_DLL == 1 */
+
+// Set NODEMANAGER_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (NODEMANAGER_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define NODEMANAGER_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define NODEMANAGER_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !NODEMANAGER_NTRACE */
+
+#if (NODEMANAGER_NTRACE == 1)
+#  define NODEMANAGER_TRACE(X)
+#else /* (NODEMANAGER_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define NODEMANAGER_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (NODEMANAGER_NTRACE == 1) */
+
+#endif /* NODEMANAGER_EXPORT_H */
+
+// End of auto generated file.
diff --git a/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp b/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp
index a49af0d743b..13afc187c8d 100644
--- a/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp
+++ b/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp
@@ -1,8 +1,12 @@
 // $Id$
 
 #include "NodeManager_Impl.h"
+
+
 #include "ace/streams.h"
+
 #include "DAnCE/Logger/Log_Macros.h"
+
 #include "ace/OS_Memory.h"
 
 #ifdef GEN_OSTREAM_OPS
diff --git a/CIAO/DAnCE/NodeManager/NodeManager_Impl.h b/CIAO/DAnCE/NodeManager/NodeManager_Impl.h
index 11029803189..0f13776dc29 100644
--- a/CIAO/DAnCE/NodeManager/NodeManager_Impl.h
+++ b/CIAO/DAnCE/NodeManager/NodeManager_Impl.h
@@ -16,17 +16,17 @@
 #ifndef NODEMANAGER_IMPL_H_
 #define NODEMANAGER_IMPL_H_
 
+#include "NodeManager_Export.h"
 #include "tao/Object.h"
 #include "tao/ORB.h"
-#include "DAnCE/Deployment_common.h"
+#include "Deployment/Deployment_common.h"
 #include "Deployment/Deployment_NodeManagerS.h"
 #include "NodeApplicationManager/NodeApplicationManager_Impl.h"
 #include "ace/Map_Manager.h"
 
 namespace DAnCE
 {
-  class NodeManager_Impl :
-    public virtual POA_Deployment::NodeManager
+  class NodeManager_Export NodeManager_Impl : public virtual POA_Deployment::NodeManager
   {
   public:
     /// The fixed listener port is caused by the usage of CCM Object locator
@@ -52,6 +52,8 @@ namespace DAnCE
 
     virtual ::Deployment::Resources * getDynamicResources (void);
 
+    const char* getName(void);
+
   private:
     CORBA::ORB_var orb_;
     PortableServer::POA_var poa_;
diff --git a/CIAO/DAnCE/NodeManager/Node_Manager.cpp b/CIAO/DAnCE/NodeManager/Node_Manager.cpp
deleted file mode 100644
index ef26925948a..00000000000
--- a/CIAO/DAnCE/NodeManager/Node_Manager.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-// $Id$
-
-#include "ace/Dynamic_Service.h"
-#include "tao/ORB.h"
-#include "tao/Object.h"
-#include "DAnCE/Logger/Log_Macros.h"
-#include "DAnCE/Logger/Logger_Service.h"
-#include "Node_Manager_Module.h"
-
-int
-ACE_TMAIN (int argc, ACE_TCHAR *argv[])
-{
-  DANCE_DISABLE_TRACE ();
-
-  int retval = 0;
-
-  try
-    {
-      DAnCE::Logger_Service
-        * dlf = ACE_Dynamic_Service<DAnCE::Logger_Service>::instance ("DAnCE_Logger");
-
-      if (dlf)
-        {
-          dlf->init (argc, argv);
-        }
-
-      DANCE_DEBUG (6, (LM_TRACE, DLINFO
-                    ACE_TEXT("NodeManager - initializing ORB\n")));
-
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
-
-      DANCE_DEBUG (6, (LM_TRACE, DLINFO
-                   ACE_TEXT("NodeManager - initializing module instance\n")));
-
-      DAnCE_NodeManager_Module nm;
-      CORBA::Object_var obj = nm.init (orb.in (), argc, argv);
-
-      if (!CORBA::is_nil (obj.in ()))
-        {
-          DANCE_DEBUG (6, (LM_TRACE, DLINFO
-                    ACE_TEXT("NodeManager - running ORB\n")));
-          orb->run ();
-        }
-
-      DANCE_DEBUG (6, (LM_TRACE, DLINFO
-                    ACE_TEXT("NodeManager - destroying ORB\n")));
-
-      orb->destroy ();
-    }
-  catch (const CORBA::Exception& ex)
-    {
-      ex._tao_print_exception ("NodeManager");
-      retval = -1;
-    }
-  catch (...)
-    {
-      DANCE_ERROR (1, (LM_ERROR, "NodeManager - Error: Unknown exception.\n"));
-      retval = -1;
-    }
-
-  return retval;
-}
-
diff --git a/CIAO/DAnCE/NodeManager/Node_Manager_Exec.cpp b/CIAO/DAnCE/NodeManager/Node_Manager_Exec.cpp
new file mode 100644
index 00000000000..889604048c5
--- /dev/null
+++ b/CIAO/DAnCE/NodeManager/Node_Manager_Exec.cpp
@@ -0,0 +1,6 @@
+// $Id$
+#include "Node_Manager_Module.h"
+
+#define DANCE_MODULE_MAIN_CLASS_NAME DAnCE_NodeManager_Module
+#include "Deployment/Module_Main.h"
+
diff --git a/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp b/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp
index d2e21614bd9..95839ad5e55 100644
--- a/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp
+++ b/CIAO/DAnCE/NodeManager/Node_Manager_Module.cpp
@@ -4,14 +4,16 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
+#include "tao/TAO_Singleton_Manager.h"
 #include "tao/StringSeqC.h"
 #include "tao/IORTable/IORTable.h"
 #include "tao/Utils/PolicyList_Destroyer.h"
 #include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Loader.h"
 #include "ciao/Valuetype_Factories/Cookies.h"
 #include "ciao/ComponentServer/CIAO_PropertiesC.h"
 #include "DAnCE/Logger/Log_Macros.h"
-#include "DAnCE/DAnCE/DAnCE_PropertiesC.h"
+#include "DAnCE/Deployment/DAnCE_PropertiesC.h"
 #include "Node_Manager_Module.h"
 #include "NodeManager_Impl.h"
 
@@ -242,7 +244,7 @@ DAnCE_NodeManager_Module::parse_args (int argc, ACE_TCHAR * argv[])
 }
 
 CORBA::Object_ptr
-DAnCE_NodeManager_Module::init (CORBA::ORB_ptr orb,
+DAnCE_NodeManager_Module::create_object (CORBA::ORB_ptr orb,
                                          int argc,
                                          ACE_TCHAR *argv[])
 {
@@ -250,20 +252,20 @@ DAnCE_NodeManager_Module::init (CORBA::ORB_ptr orb,
     {
       if (CORBA::is_nil(orb))
         {
-          DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("DAnCE_NodeManager_Module::init - ")
+          DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("DAnCE_NodeManager_Module::create_object - ")
                        ACE_TEXT("Attempted to create Node Manager with a nil orb.\n")));
           return CORBA::Object::_nil();
         }
 
       if (CORBA::is_nil(this->orb_.in()))
         {
-          DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_NodeManager_Module::init - ")
+          DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_NodeManager_Module::create_object - ")
                        ACE_TEXT("NM's orb is nil.\n")));
           this->orb_ = CORBA::ORB::_duplicate (orb);
         }
       else if (ACE_OS::strcmp(orb->id(), this->orb_->id()) != 0)
         {
-          DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_NodeManager_Module::init - ")
+          DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_NodeManager_Module::create_object - ")
                        ACE_TEXT("Resetting NM's orb.\n")));
           this->orb_ = CORBA::ORB::_duplicate (orb);
           this->domain_nc_ = CosNaming::NamingContext::_nil();
@@ -281,7 +283,7 @@ DAnCE_NodeManager_Module::init (CORBA::ORB_ptr orb,
         {
           try
             {
-              DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_NodeManager_Module::init - ")
+              DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_NodeManager_Module::create_object - ")
                            ACE_TEXT("Resolving DomainNC.\n")));
               CORBA::Object_var domain_obj = this->orb_->string_to_object (this->options_.domain_nc_);
               if (!CORBA::is_nil (domain_obj.in ()))
@@ -289,7 +291,7 @@ DAnCE_NodeManager_Module::init (CORBA::ORB_ptr orb,
                   this->domain_nc_ = CosNaming::NamingContext::_narrow (domain_obj.in());
                   if (CORBA::is_nil (this->domain_nc_.in ()))
                     {
-                      DANCE_ERROR (1, (LM_ERROR,DLINFO ACE_TEXT("DAnCE_NodeManager_Module::init - ")
+                      DANCE_ERROR (1, (LM_ERROR,DLINFO ACE_TEXT("DAnCE_NodeManager_Module::create_object - ")
                                     ACE_TEXT("Narrow to NamingContext return nil for DomainNC.\n")));
                       return CORBA::Object::_nil ();
                     }
@@ -297,19 +299,19 @@ DAnCE_NodeManager_Module::init (CORBA::ORB_ptr orb,
             }
           catch (const CORBA::Exception&)
             {
-              DANCE_DEBUG (6, (LM_WARNING, DLINFO ACE_TEXT("DAnCE_NodeManager_Module::init - ")
+              DANCE_DEBUG (6, (LM_WARNING, DLINFO ACE_TEXT("DAnCE_NodeManager_Module::create_object - ")
                              ACE_TEXT("DomainNC context not found!\n")));
             }
         }
 
-      DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_NodeManager_Module::init - ")
+      DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_NodeManager_Module::create_object - ")
                     ACE_TEXT("Resolving plan NS naming context.\n")));
       CosNaming::NamingContext_var rebind_nc;
       if (this->options_.rebind_plan_ns_)
         {
           if (!this->options_.create_plan_ns_)
             {
-              DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("DAnCE_NodeManager_Module::init - ")
+              DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("DAnCE_NodeManager_Module::create_object - ")
                            ACE_TEXT ("Rebind_plan_ns option is enabled but Create_plan_ns is not.\n")));
               return CORBA::Object::_nil();
             }
@@ -323,7 +325,7 @@ DAnCE_NodeManager_Module::init (CORBA::ORB_ptr orb,
             {
               if (CORBA::is_nil (this->domain_nc_.in ()))
                 {
-                  DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("DAnCE_NodeManager_Module::init - ")
+                  DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("DAnCE_NodeManager_Module::create_object - ")
                                 ACE_TEXT ("The rebind plan is enabled but neither NC ")
                                 ACE_TEXT ("nor DomainNC are not supplied. No rebinding will be done.\n")
                                 ACE_TEXT ("Use the \"-rebind-plan-ns NC ior\" ")
@@ -341,16 +343,17 @@ DAnCE_NodeManager_Module::init (CORBA::ORB_ptr orb,
 
       if (CORBA::is_nil (adapter.in ()))
         {
-          DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("DAnCE_NodeManager_Module::init - ")
+          DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("DAnCE_NodeManager_Module::create_object - ")
                         ACE_TEXT ("Unable to RIR the IORTable.\n")));
           return CORBA::Object::_nil ();
         }
 
       // Creating in process nameservice
       CosNaming::NamingContext_var plan_nc;
+      TAO_Naming_Loader loader;
       if (this->options_.create_plan_ns_)
         {
-          DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT ("DAnCE_NodeManager_Module::init - ")
+          DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT ("DAnCE_NodeManager_Module::create_object - ")
                         ACE_TEXT ("Resolving plan-specific naming context.\n")));
           CORBA::Object_var naming_obj;
           if (0 != this->options_.create_plan_ns_ior_)
@@ -359,7 +362,7 @@ DAnCE_NodeManager_Module::init (CORBA::ORB_ptr orb,
               plan_nc = CosNaming::NamingContext::_narrow (naming_obj.in());
               if (CORBA::is_nil (plan_nc.in()))
                 {
-                  DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("DAnCE_NodeManager_Module::init - ")
+                  DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("DAnCE_NodeManager_Module::create_object - ")
                                 ACE_TEXT ("Failed trying to narrow naming context ")
                                 ACE_TEXT ("for dance creating plan NC.\n")
                                 ACE_TEXT ("Use the \"--create-plan-ns NC ior\" ")
@@ -381,7 +384,7 @@ DAnCE_NodeManager_Module::init (CORBA::ORB_ptr orb,
               plan_nc = CosNaming::NamingContext::_narrow (naming_obj.in ());
               if (CORBA::is_nil (plan_nc.in ()))
                 {
-                  DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("DAnCE_NodeManager_Module::init - ")
+                  DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("DAnCE_NodeManager_Module::create_object - ")
                                 ACE_TEXT ("Fails trying to narrow naming context ")
                                 ACE_TEXT ("for dance creating plan NC.\n")
                                 ACE_TEXT ("Use the \"--create-plan-ns NC ior\" ")
@@ -391,7 +394,7 @@ DAnCE_NodeManager_Module::init (CORBA::ORB_ptr orb,
             }
           else if (CORBA::is_nil (this->domain_nc_.in ()))
             {
-              DANCE_ERROR (1, (LM_ERROR,DLINFO ACE_TEXT ("DAnCE_NodeManager_Module::init - ")
+              DANCE_ERROR (1, (LM_ERROR,DLINFO ACE_TEXT ("DAnCE_NodeManager_Module::create_object - ")
                             ACE_TEXT ("The create plan is enabled but neither NC ior ")
                             ACE_TEXT ("nor --process-ns or DomainNC option are not supplied.\n")
                             ACE_TEXT ("Use the \"--create-plan-ns NC ior\", \"--process-ns\" ")
@@ -407,12 +410,12 @@ DAnCE_NodeManager_Module::init (CORBA::ORB_ptr orb,
       // Make sure that we have only one Node Manager
       if (this->options_.node_managers_.size () != 1)
         {
-          DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("DAnCE_NodeManager_Module::init - ")
+          DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("DAnCE_NodeManager_Module::create_object - ")
                         ACE_TEXT ("For now only one node manager creation is supported.\n")));
           return CORBA::Object::_nil ();
         }
 
-      DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT ("DAnCE_NodeManager_Module::init - ")
+      DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT ("DAnCE_NodeManager_Module::create_object - ")
                     ACE_TEXT ("DAnCE_NodeManager::run_main - creating NodeManager for node %C\n"),
                     this->options_.node_managers_[0].c_str()));
 
@@ -426,7 +429,7 @@ DAnCE_NodeManager_Module::init (CORBA::ORB_ptr orb,
           node_name = node_name.substring (0, npos);
         }
 
-      DANCE_DEBUG (8, (LM_INFO, DLINFO ACE_TEXT ("DAnCE_NodeManager_Module::init - ")
+      DANCE_DEBUG (8, (LM_INFO, DLINFO ACE_TEXT ("DAnCE_NodeManager_Module::create_object - ")
                     ACE_TEXT ("Creating node named '%s' and outputting ior to file '%s'\n"),
                     node_name.c_str (),
                     node_file.c_str ()));
@@ -435,7 +438,7 @@ DAnCE_NodeManager_Module::init (CORBA::ORB_ptr orb,
       DAnCE::NodeManager_Impl * nm = 0;
       if (this->nm_map_.find (node_name, nm) == -1)
         {
-          DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT ("DAnCE_NodeManager_Module::init - ")
+          DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT ("DAnCE_NodeManager_Module::create_object - ")
                         ACE_TEXT ("Allocating new NodeManger servant instance for NodeManager\n")));
           int size = 64;
           DAnCE::PROPERTY_MAP properties (size);
@@ -447,7 +450,7 @@ DAnCE_NodeManager_Module::init (CORBA::ORB_ptr orb,
                                                    ACE_TEXT_ALWAYS_CHAR (node_name.c_str()),
                                                    properties),
                           CORBA::Object::_nil ());
-          DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT ("DAnCE_NodeManager_Module::init - ")
+          DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT ("DAnCE_NodeManager_Module::create_object - ")
                         ACE_TEXT ("New NodeManger servant instance for NodeManager allocated.\n")));
           this->nm_map_.bind (node_name, nm);
         }
@@ -466,10 +469,10 @@ DAnCE_NodeManager_Module::init (CORBA::ORB_ptr orb,
       // Binding ior to IOR Table
       adapter->bind (node_manager_oid.c_str (), ior.in ());
 
-      // Binding node manager to DomainNC
+      // Binding node menager to DomainNC
       if (!CORBA::is_nil (this->domain_nc_.in ()))
         {
-          DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT ("DAnCE_NodeManager_Module::init - ")
+          DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT ("DAnCE_NodeManager_Module::create_object - ")
                        ACE_TEXT ("Registering NM in NC as \"%C.NodeManager\".\n"), node_name.c_str ()));
           CosNaming::Name name (1);
           name.length (1);
@@ -481,10 +484,10 @@ DAnCE_NodeManager_Module::init (CORBA::ORB_ptr orb,
       // Writing ior to file
       if (0 != node_file.length ())
         {
-          DANCE_DEBUG (9, (LM_TRACE,  DLINFO ACE_TEXT ("DAnCE_NodeManager_Module::init - ")
+          DANCE_DEBUG (9, (LM_TRACE,  DLINFO ACE_TEXT ("DAnCE_NodeManager_Module::create_object - ")
                         ACE_TEXT ("Writing node IOR %C to file %C.\n"), node_file.c_str (), ior.in ()));
           if (!DAnCE::Node_Manager::write_IOR (node_file.c_str (), ior.in ()))
-            DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("DAnCE_NodeManager_Module::init - ")
+            DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT ("DAnCE_NodeManager_Module::create_object - ")
                           ACE_TEXT ("Error: Unable to write IOR to file %C\n"),
                           node_file.c_str ()));
         }
@@ -495,11 +498,11 @@ DAnCE_NodeManager_Module::init (CORBA::ORB_ptr orb,
 
       // Finishing Deployment part
       DANCE_DEBUG (6, (LM_NOTICE, DLINFO
-                    ACE_TEXT ("DAnCE_NodeManager_Module::init - ")
+                    ACE_TEXT ("DAnCE_NodeManager_Module::create_object - ")
                     ACE_TEXT ("DAnCE_NodeManager is running...\n")));
 
       DANCE_DEBUG (6, (LM_DEBUG, DLINFO
-                    ACE_TEXT ("DAnCE_NodeManager_Module::init - ")
+                    ACE_TEXT ("DAnCE_NodeManager_Module::create_object - ")
                     ACE_TEXT ("NodeManager IOR: %C\n"), ior.in ()));
 
       return nm_obj._retn ();
@@ -515,7 +518,7 @@ void
 DAnCE_NodeManager_Module::register_value_factories (void)
 {
   DANCE_TRACE("DAnCE_Node_Manager_Module::register_value_factories (void)");
-  DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT ("DAnCE_NodeManager_Module::init - ")
+  DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT ("DAnCE_NodeManager_Module::create_object - ")
                 ACE_TEXT ("Registering Cookie value factory.\n")));
   CORBA::ValueFactory_var vf = new Components::Cookie_init();
   vf = this->orb_->register_value_factory ("IDL:omg.org/Components/Cookie:1.0", vf.in());
@@ -554,7 +557,7 @@ DAnCE_NodeManager_Module::create_poas (void)
   catch (const PortableServer::POA::AdapterAlreadyExists &)
     {
       DANCE_DEBUG (8, (LM_INFO, DLINFO ACE_TEXT ("DAnCE_NodeManager_Module::create_poas - ")
-                    ACE_TEXT ("Using existing \"Managers\" POA\n")));
+                    ACE_TEXT ("Using exiswting \"Managers\" POA\n")));
       this->nm_poa_ = this->root_poa_->find_POA ("Managers", 0);
     }
 }
@@ -596,3 +599,6 @@ DAnCE_NodeManager_Module::create_nm_properties (DAnCE::PROPERTY_MAP &props)
     }
 }
 
+#ifndef BUILD_NODE_MANAGER_EXE
+ACE_FACTORY_DEFINE (DAnCE_NodeManager_Module, DAnCE_NodeManager_Module)
+#endif /*BUILD_NODE_MANAGER_EXE */
diff --git a/CIAO/DAnCE/NodeManager/Node_Manager_Module.h b/CIAO/DAnCE/NodeManager/Node_Manager_Module.h
index 8bb4e1efdce..92e9f6319d2 100644
--- a/CIAO/DAnCE/NodeManager/Node_Manager_Module.h
+++ b/CIAO/DAnCE/NodeManager/Node_Manager_Module.h
@@ -18,19 +18,22 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/Service_Config.h"
+#include "DAnCE_NodeManager_Module_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Service_Config.h"
 #include "ace/Vector_T.h"
 #include "ace/Map_Manager.h"
 #include "ace/Null_Mutex.h"
 #include "tao/ORB.h"
-#include "tao/PortableServer/PortableServer.h"
+#include "tao/PortableServer/POAC.h"
 #include "orbsvcs/CosNamingC.h"
-#include "DAnCE/DAnCE/Deployment_common.h"
+#include "tao/Object_Loader.h"
+#include "Deployment/DAnCE_Loader.h"
+#include "DAnCE/Deployment/Deployment_common.h"
 
 namespace DAnCE
 {
@@ -45,9 +48,30 @@ namespace DAnCE
  *
  * This class runs the node manager instance
  */
-class DAnCE_NodeManager_Module
+class DAnCE_NodeManager_Module_Export DAnCE_NodeManager_Module
+  : public DAnCE::DAnCE_Object_Loader
 {
  public:
+      struct SOptions
+      {
+        bool process_ns_;
+        const ACE_TCHAR* process_ns_file_;
+        bool create_plan_ns_;
+        const ACE_TCHAR* create_plan_ns_ior_;
+        bool rebind_plan_ns_;
+        const ACE_TCHAR* rebind_plan_ns_ior_;
+        bool port_indirection_;
+        ACE_Vector<ACE_TString> node_managers_;
+        const ACE_TCHAR * cs_path_;
+        unsigned int timeout_;
+        CORBA::Boolean standalone_;
+        const ACE_TCHAR * server_args_;
+        const ACE_TCHAR * domain_nc_;
+        const ACE_TCHAR * instance_nc_;
+
+        SOptions();
+      };
+
   /// Constructor.
   DAnCE_NodeManager_Module (void);
 
@@ -56,35 +80,15 @@ class DAnCE_NodeManager_Module
 
   /// Overload the base class method to create a new instance
   /// of a DAnCE_NodeManager_Module object.
-  CORBA::Object_ptr init (CORBA::ORB_ptr orb,
-                          int argc,
-                          ACE_TCHAR *argv []);
+  virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
+                                           int argc,
+                                           ACE_TCHAR *argv []);
 
- private:
-  const char * usage (void);
-
-  bool parse_args (int argc, ACE_TCHAR *argv []);
-
-  struct SOptions
-  {
-    bool process_ns_;
-    const ACE_TCHAR* process_ns_file_;
-    bool create_plan_ns_;
-    const ACE_TCHAR* create_plan_ns_ior_;
-    bool rebind_plan_ns_;
-    const ACE_TCHAR* rebind_plan_ns_ior_;
-    bool port_indirection_;
-    ACE_Vector<ACE_TString> node_managers_;
-    const ACE_TCHAR * cs_path_;
-    unsigned int timeout_;
-    CORBA::Boolean standalone_;
-    const ACE_TCHAR * server_args_;
-    const ACE_TCHAR * domain_nc_;
-    const ACE_TCHAR * instance_nc_;
-
-    SOptions();
-  };
+  virtual const char * usage (void);
 
+  virtual bool parse_args (int argc, ACE_TCHAR *argv []);
+
+ private:
   void register_value_factories (void);
   void create_poas (void);
   void create_nm_properties (DAnCE::PROPERTY_MAP &props);
@@ -103,6 +107,8 @@ class DAnCE_NodeManager_Module
   PortableServer::POA_var nm_poa_;
 };
 
+ACE_FACTORY_DECLARE (DAnCE_NodeManager_Module, DAnCE_NodeManager_Module)
+
 #include /**/ "ace/post.h"
 
 #endif  /* NODE_MANAGER_MODULE_H */
diff --git a/CIAO/DAnCE/Plan_Generator/PCVisitor.cpp b/CIAO/DAnCE/Plan_Generator/PCVisitor.cpp
new file mode 100644
index 00000000000..d21a088820f
--- /dev/null
+++ b/CIAO/DAnCE/Plan_Generator/PCVisitor.cpp
@@ -0,0 +1,271 @@
+/* -*- C++ -*- */
+
+//========================================================================
+/*
+ * @file  PCVisitor.cpp
+ *
+ * $Id$
+ *
+ * This file contains the implementation of the PackageConfiguration
+ * Visitor class PCVisitor which derives from PCVisitorBase. Each
+ * Visit function focuses on the functionality necessary to process
+ * the PackageConfiguration element which is passed to it as an argument
+ * and on dispatching the next sequence of calls in the correct order!
+ *
+ * This implementation takes a PackageConfiguration and tries to modify
+ * a DeploymentPlan bases on it by expanding the latter in width and depth
+ * simultaneously. At each level of the PackageConfiguration the
+ * PCVisitor first expands the DeploymentPlan vertically at the
+ * corrsponding level and then dispatches the children of the current
+ * PackageConfiguration element. This in turn might and most probably
+ * will cause another vertical expansion of the DeploymentPlan, however
+ * for a different element. This effect is produced due to the flattened
+ * structure of the DeploymentPlan.
+ *
+ * @author Stoyan Paunov <spaunov@isis.vanderbilt.edu>
+ *         Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
+ */
+//========================================================================
+
+#include "PCVisitorBase.h"
+#include "PCVisitor.h"
+#include "DAnCE/Logger/Log_Macros.h"
+
+//Constructor
+PCVisitor::PCVisitor (Deployment::DeploymentPlan &plan,
+                      Deployment::PackageConfiguration &pc,
+                      bool modify)
+                      : PCVisitorBase (),
+                      plan_ (plan),
+                      pc_ (pc),
+                      modify_ (modify),
+                      last_impl_index_ (-1)
+{
+}
+
+//entry point for the protected visitor to get it do start
+//the visitation process
+int PCVisitor::Visit ()
+{
+  Accept (*this, this->pc_);
+  return last_impl_index_;
+}
+
+// A whole slew of overloaded routines for different IDL
+// data types part of the PackageConfiguration.
+
+void PCVisitor::Visit (Deployment::PackageConfiguration &pc)
+{
+  //visit the ComponentPackageDescription
+  if (pc.basePackage.length ())
+  {
+    //currently no support for that anywhere
+    //for (size_t r = 0; r = pc.selectRequirement.length (); ++r);
+
+    Accept (*this, pc.basePackage);
+  }
+  else
+    DANCE_DEBUG (6, (LM_WARNING,
+    "[PCVisitor - PackageConfiguration] We currently "
+    "do NOT support package references, specializedConfigs",
+    "or imports!\n"));
+}
+
+//ComponentPackageDescription descendents
+
+void PCVisitor::Visit (Deployment::ComponentPackageDescription &cpd)
+{
+  Accept (*this, cpd.realizes);
+  //for (size_t impl = 0; impl < cpd.implementation.length (); ++impl)
+  Accept (*this, cpd.implementation[0]);
+}
+
+
+void PCVisitor::Visit (Deployment::ComponentInterfaceDescription &)
+{
+  //Might want to populate this too once PICML starts supporting it
+}
+
+
+void PCVisitor::Visit (Deployment::PackagedComponentImplementation &pci)
+{
+  Accept (*this, pci.referencedImplementation);
+}
+
+
+void PCVisitor::Visit (Deployment::ComponentImplementationDescription &cid)
+{
+  if (cid.assemblyImpl.length ())
+    Accept (*this, cid.assemblyImpl);
+  else
+    //;//Do nothing - monolithic component deployment not supported
+    Accept (*this, cid.monolithicImpl);
+}
+
+
+void PCVisitor::Visit (Deployment::ComponentAssemblyDescription &cad)
+{
+  //visit the SubcomponentInstantiationDescription
+  Accept (*this, cad.instance);
+  //visit the connections
+  Accept (*this, cad.connection);
+}
+
+
+void PCVisitor::Visit (Deployment::SubcomponentInstantiationDescription &sid)
+{
+  //visit the ComponentPackageDescription (again)
+  if (sid.basePackage.length ())
+  {
+    Accept (*this, sid.basePackage);
+  }
+  else
+    DANCE_DEBUG (6, (LM_WARNING,
+    "[PCVisitor - SubcomponentInstantiationDescription] ",
+    "We currently do NOT support package references, ",
+    "specializedConfigs or imports!\n"));
+}
+
+
+void PCVisitor::Visit (Deployment::MonolithicImplementationDescription &mid)
+{
+  if (!modify_)
+    {
+      //increase the implementation length by one
+      size_t const impl_len = plan_.implementation.length ();
+      last_impl_index_ = impl_len;
+      plan_.implementation.length (impl_len + 1);
+    }
+
+  //visit the NamedImplementationArtifacts
+  Accept (*this, mid.primaryArtifact);
+}
+
+
+void PCVisitor::Visit (Deployment::NamedImplementationArtifact &nia)
+{
+  if (!modify_)
+    {
+      //increase the artifact length by one
+      size_t const arti_len = plan_.artifact.length ();
+      plan_.artifact.length (arti_len + 1);
+
+      //set the name
+      plan_.artifact[arti_len].name = nia.name;
+
+      // Set the artifactRef of implementation
+      size_t const last_mdd = plan_.implementation.length () - 1;
+      Deployment::MonolithicDeploymentDescription& mdd = plan_.implementation[last_mdd];
+      size_t const ref_len = mdd.artifactRef.length ();
+      mdd.artifactRef.length (ref_len + 1);
+      mdd.artifactRef[ref_len] = arti_len;
+    }
+
+  //visit the actual ImplementationArtifactDescriptor
+  Accept (*this, nia.referencedArtifact);
+}
+
+
+void PCVisitor::Visit (Deployment::ImplementationArtifactDescription &iad)
+{
+  if (!modify_)
+    {
+      size_t last_arti = plan_.artifact.length ();
+      Deployment::ArtifactDeploymentDescription& add = plan_.artifact[last_arti - 1];
+
+      //set the location
+      size_t plan_loc_len = add.location.length ();
+      size_t const num_loc = iad.location.length ();
+      for (size_t i = 0; i < num_loc; ++i)
+      {
+        add.location.length (plan_loc_len + 1);
+        add.location[plan_loc_len] = iad.location[i];
+        ++plan_loc_len;
+      }
+
+      //set the execParameter
+      update_execParameter (iad, add);
+    }
+
+  else
+    {
+      size_t const num_arti = plan_.artifact.length ();
+      for (size_t i = 0; i < num_arti; ++i)
+        {
+          if (ACE_OS::strstr (iad.location[0], plan_.artifact[i].location[0]))
+            plan_.artifact[i].location[0] = iad.location[0];
+        }
+    }
+}
+
+
+//ComponentPackageReference descendents
+
+void PCVisitor::Visit (Deployment::ComponentPackageReference &)
+{
+  //not implemented
+}
+
+
+//properties
+
+void PCVisitor::Visit (Deployment::AssemblyPropertyMapping &)
+{
+}
+
+
+void PCVisitor::Visit (Deployment::Property &)
+{
+}
+
+
+//requirements & capabilities
+
+void PCVisitor::Visit (Deployment::Requirement &)
+{
+}
+
+
+void PCVisitor::Visit (Deployment::Capability &)
+{
+}
+
+
+void PCVisitor::Visit (Deployment::ImplementationRequirement &)
+{
+}
+
+
+void PCVisitor::Visit (Deployment::ImplementationDependency &)
+{
+}
+
+//ports and connections
+
+void PCVisitor::Visit (Deployment::AssemblyConnectionDescription &)
+{
+}
+
+
+void PCVisitor::Visit (Deployment::SubcomponentPortEndpoint &)
+{
+}
+
+
+void PCVisitor::Visit (Deployment::ComponentExternalPortEndpoint &)
+{
+}
+
+void PCVisitor::
+update_execParameter (Deployment::ImplementationArtifactDescription& iad,
+                      Deployment::ArtifactDeploymentDescription& add)
+{
+  size_t const num_execP = iad.execParameter.length ();
+  size_t execP_len = add.execParameter.length ();
+  for (size_t j = 0; j < num_execP; ++j)
+  {
+    add.execParameter.length (execP_len + 1);
+    add.execParameter[execP_len] = iad.execParameter[j];
+    ++execP_len;
+  }
+}
diff --git a/CIAO/DAnCE/Plan_Generator/PCVisitor.h b/CIAO/DAnCE/Plan_Generator/PCVisitor.h
new file mode 100644
index 00000000000..8417bc8a630
--- /dev/null
+++ b/CIAO/DAnCE/Plan_Generator/PCVisitor.h
@@ -0,0 +1,128 @@
+/* -*- C++ -*- */
+
+//========================================================================
+/**
+ *  file  PCVisitor.h
+ *
+ * $Id$
+ *
+ *  This file contains a number of Visitor classes which are used to
+ *  traverse the PackageConfiguration element defined in the
+ *  PackagingData.idl
+ *
+ *  author Stoyan Paunov <spaunov@isis.vanderbilt.edu>
+ *         Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
+ */
+//========================================================================
+
+#ifndef PC_VISITOR_H
+#define PC_VISITOR_H
+
+#include /**/ "ace/pre.h"
+#include "PCVisitorBase.h"           //for the base visitor
+
+//===========================================================================
+/**
+ *  class PCVisitor
+ *
+ *  This class is is the actual implementation for the PackageConfiguration
+ *  Visitor. It derives from PCVisitorBase and overloads the functions which
+ *  deal with single elements. Sequences are handled in the base class.
+ */
+//===========================================================================
+
+
+class  PCVisitor : public PCVisitorBase
+{
+public:
+  /// Constructor
+  PCVisitor (Deployment::DeploymentPlan &plan,
+             Deployment::PackageConfiguration &pc,
+             bool modify);
+
+  /// Entry point to protected Visitor functions
+  int Visit ();
+
+protected:
+  /// A whole slew of overloaded routines for different IDL
+  /// data types part of the PackageConfiguration.
+
+  virtual
+  void Visit (Deployment::PackageConfiguration &pc);
+
+  //ComponentPackageDescription descendents
+  virtual
+  void Visit (Deployment::ComponentPackageDescription &cpd);
+
+  virtual
+  void Visit (Deployment::ComponentInterfaceDescription &cid);
+
+  virtual
+  void Visit (Deployment::PackagedComponentImplementation &pci);
+
+  virtual
+  void Visit (Deployment::ComponentImplementationDescription &cid);
+
+  virtual
+  void Visit (Deployment::ComponentAssemblyDescription &cad);
+
+  virtual
+  void Visit (Deployment::SubcomponentInstantiationDescription &sid);
+
+  virtual
+  void Visit (Deployment::MonolithicImplementationDescription &mid);
+
+  virtual
+  void Visit (Deployment::NamedImplementationArtifact &nia);
+
+  virtual
+  void Visit (Deployment::ImplementationArtifactDescription &iad);
+
+  //ComponentPackageReference descendents
+  virtual
+  void Visit (Deployment::ComponentPackageReference &cpr);
+
+  //properties
+  virtual
+  void Visit (Deployment::AssemblyPropertyMapping &apm);
+
+  virtual
+  void Visit (Deployment::Property &property);
+
+  //requirements & capabilities
+  virtual
+  void Visit (Deployment::Requirement &requirement);
+
+  virtual
+  void Visit (Deployment::Capability &capability);
+
+  virtual
+  void Visit (Deployment::ImplementationRequirement &ir);
+
+  virtual
+  void Visit (Deployment::ImplementationDependency &id);
+
+  //ports and connections
+  virtual
+  void Visit (Deployment::AssemblyConnectionDescription &acd);
+
+  virtual
+  void Visit (Deployment::SubcomponentPortEndpoint &spe);
+
+  virtual
+  void Visit (Deployment::ComponentExternalPortEndpoint &cepe);
+
+protected:
+  void update_execParameter (Deployment::ImplementationArtifactDescription& iad,
+                             Deployment::ArtifactDeploymentDescription& add);
+
+private:
+  Deployment::DeploymentPlan& plan_;
+  Deployment::PackageConfiguration& pc_;
+  bool modify_;
+  int last_impl_index_;
+};
+
+#include /**/ "ace/post.h"
+
+#endif /* PC_VISITOR_H */
diff --git a/CIAO/DAnCE/Plan_Generator/PCVisitorBase.cpp b/CIAO/DAnCE/Plan_Generator/PCVisitorBase.cpp
new file mode 100644
index 00000000000..c8ffc983095
--- /dev/null
+++ b/CIAO/DAnCE/Plan_Generator/PCVisitorBase.cpp
@@ -0,0 +1,28 @@
+/* -*- C++ -*- */
+
+//========================================================================
+/*
+ *  file  PCVisitorBase.cpp
+ *
+ * $Id$
+ *
+ *  This file is a dummy which either includes the PCVisitorBase.inl or
+ *  is ignored.
+ *
+ *  author Stoyan Paunov <spaunov@isis.vanderbilt.edu>
+ */
+//========================================================================
+
+#include "PCVisitorBase.h"
+
+PCVisitorBase::PCVisitorBase (void)
+{
+}
+
+PCVisitorBase::~PCVisitorBase (void)
+{
+}
+
+#if !defined (__ACE_INLINE__)
+#include "PCVisitorBase.inl"
+#endif /* __ACE_INLINE__ */
diff --git a/CIAO/DAnCE/Plan_Generator/PCVisitorBase.h b/CIAO/DAnCE/Plan_Generator/PCVisitorBase.h
new file mode 100644
index 00000000000..0dee9f7cc5e
--- /dev/null
+++ b/CIAO/DAnCE/Plan_Generator/PCVisitorBase.h
@@ -0,0 +1,171 @@
+/* -*- C++ -*- */
+
+//========================================================================
+/**
+ *  file  PCVisitorBase.h
+ *
+ *  $Id$
+ *
+ *  This file contains the virtual base class for the PackageConfiguration
+ *  Visitor which is used to traverse the PackageConfiguration element
+ *  defined in the PackagingData.idl. The PackageConfiguration has a
+ *  number of sequence elements. This class actually implements the
+ *  operations which involve sequences and delegates the calls to
+ *  the operations which handle single elements from the sequence type.
+ *
+ *  author Stoyan Paunov <spaunov@isis.vanderbilt.edu>
+ */
+//========================================================================
+
+#ifndef PC_VISITOR_BASE_H
+#define PC_VISITOR_BASE_H
+
+#include /**/ "ace/pre.h"
+#include "DAnCE/Deployment/Deployment_Packaging_DataC.h"
+
+//========================================================================
+/**
+ *  class PCVisitorBase
+ *
+ *  This class is a virtual base class for the PackageConfiguration Visitor
+ *  The operation which deal with sequences are implemented here by means
+ *  of the visit_sequence function above, in order to make the logic of
+ *  derived classes easier to write. Writers of derived classes need only
+ *  overload the functions which deal with single elements. Sequences are
+ *  always handled here.
+ */
+//========================================================================
+
+
+class  PCVisitorBase
+{
+public:
+  /// Constructor
+  PCVisitorBase (void);
+
+  /// Destructor
+  virtual ~PCVisitorBase (void);
+
+  /// Function what dispatches sequences
+  template <typename SEQ>
+  friend void visit_sequence (SEQ &seq, PCVisitorBase& v);
+
+  /// A whole slew of overloaded routines for different IDL
+  /// data types part of the PackageConfiguration.
+
+  virtual
+  void Visit (Deployment::PackageConfiguration &pc) = 0;
+  void Visit (Deployment::PackageConfigurations &pcs);
+
+  /// ComponentPackageDescription descendents
+  virtual
+  void Visit (Deployment::ComponentPackageDescription &cpd) = 0;
+  void Visit (Deployment::ComponentPackageDescriptions &cpds);
+
+  virtual
+  void Visit (Deployment::ComponentInterfaceDescription &cid) = 0;
+  //void Visit (Deployment::ComponentInterfaceDescriptions &cids);
+
+  virtual
+  void Visit (Deployment::PackagedComponentImplementation &pci) = 0;
+  void Visit (Deployment::PackagedComponentImplementations &pcis);
+
+  virtual
+  void Visit (Deployment::ComponentImplementationDescription &cid) = 0;
+  //void Visit (Deployment::ComponentImplementationDescriptions &cids);
+
+  virtual
+  void Visit (Deployment::ComponentAssemblyDescription &cad) = 0;
+  void Visit (Deployment::ComponentAssemblyDescriptions &cads);
+
+  virtual
+  void Visit (Deployment::SubcomponentInstantiationDescription &sid) = 0;
+  void Visit (Deployment::SubcomponentInstantiationDescriptions &sids);
+
+  virtual
+  void Visit (Deployment::MonolithicImplementationDescription &mid) = 0;
+  void Visit (Deployment::MonolithicImplementationDescriptions &mids);
+
+  virtual
+  void Visit (Deployment::NamedImplementationArtifact &nia) = 0;
+  void Visit (Deployment::NamedImplementationArtifacts &nias);
+
+  virtual
+  void Visit (Deployment::ImplementationArtifactDescription &iad) = 0;
+  //void Visit (Deployment::ImplementationArtifactDescriptions &iads);
+
+  //ComponentPackageReference descendents
+  virtual
+  void Visit (Deployment::ComponentPackageReference &cpr) = 0;
+  void Visit (Deployment::ComponentPackageReferences &cprs);
+
+  //properties
+  virtual
+  void Visit (Deployment::AssemblyPropertyMapping &apm) = 0;
+  void Visit (Deployment::AssemblyPropertyMappings &apms);
+
+  virtual
+  void Visit (Deployment::Property &property) = 0;
+  void Visit (Deployment::Properties &properties);
+
+  //requirements & capabilities
+  virtual
+  void Visit (Deployment::Requirement &requirement) = 0;
+  void Visit (Deployment::Requirements &requirements);
+
+  virtual
+  void Visit (Deployment::Capability &capability) = 0;
+  void Visit (Deployment::Capabilities &capabilities);
+
+  virtual
+  void Visit (Deployment::ImplementationRequirement &ir) = 0;
+  void Visit (Deployment::ImplementationRequirements &irs);
+
+  virtual
+  void Visit (Deployment::ImplementationDependency &id) = 0;
+  void Visit (Deployment::ImplementationDependencies &ids);
+
+  //ports and connections
+  virtual
+  void Visit (Deployment::AssemblyConnectionDescription &acd) = 0;
+  void Visit (Deployment::AssemblyConnectionDescriptions &acds);
+
+  virtual
+  void Visit (Deployment::SubcomponentPortEndpoint &spe) = 0;
+  void Visit (Deployment::SubcomponentPortEndpoints &spes);
+
+  virtual
+  void Visit (Deployment::ComponentExternalPortEndpoint &cepe) = 0;
+  void Visit (Deployment::ComponentExternalPortEndpoints &cepes);
+};
+
+template <typename T>
+void Accept (PCVisitorBase &v, T& element_to_visit)
+{
+  v.Visit (element_to_visit);
+}
+
+/**
+ *  function - visit_sequence
+ *
+ *  This function is used to handle sequences of elements where each
+ *  element takes the form of a Visitor Node.
+ */
+template <typename SEQ>
+void visit_sequence (SEQ &seq, PCVisitorBase& v)
+{
+   CORBA::ULong const size = seq.length ();
+
+   for (CORBA::ULong i = 0; i < size; ++i)
+   {
+     Accept(v, seq[i]);
+   }
+}
+
+#if defined (__ACE_INLINE__)
+#include "PCVisitorBase.inl"
+#endif /* __ACE_INLINE__ */
+
+#include /**/ "ace/post.h"
+
+#endif /* PC_VISITOR_BASE_H */
diff --git a/CIAO/DAnCE/Plan_Generator/PCVisitorBase.inl b/CIAO/DAnCE/Plan_Generator/PCVisitorBase.inl
new file mode 100644
index 00000000000..955aefb7c4e
--- /dev/null
+++ b/CIAO/DAnCE/Plan_Generator/PCVisitorBase.inl
@@ -0,0 +1,155 @@
+/* -*- C++ -*- */
+
+//========================================================================
+/*
+ *  file  PCVisitorBase.inl
+ *
+ * $Id$
+ *
+ *  This file contains the implementation of the sequence-based
+ *  PackageConfiguration Visitor functions. By implementing these
+ *  we relieve developers of derived classes of the burden of handling
+ *  the correct traversal of sequence-based elements. This implementation
+ *  used the visit_sequence templatized function to do the heavy lifting.
+ *
+ *  author Stoyan Paunov <spaunov@isis.vanderbilt.edu>
+ */
+//========================================================================
+
+
+/// A whole slew of overloaded routines for different IDL
+/// data types part of the PackageConfiguration.
+
+ACE_INLINE void PCVisitorBase::Visit
+(Deployment::PackageConfigurations &pcs)
+{
+  visit_sequence (pcs, *this);
+}
+
+//ComponentPackageDescription descendents
+
+ACE_INLINE void PCVisitorBase::Visit
+(Deployment::ComponentPackageDescriptions &cpds)
+{
+  visit_sequence (cpds, *this);
+}
+
+//NOT a member of Deployment
+
+//ACE_INLINE void PCVisitorBase::Visit
+//    (Deployment::ComponentInterfaceDescriptions &cids)
+//{
+//  visit_sequence (cids, *this);
+//}
+
+ACE_INLINE void PCVisitorBase::Visit
+(Deployment::PackagedComponentImplementations &pcis)
+{
+  visit_sequence (pcis, *this);
+}
+
+//NOT a member of Deployment
+
+//ACE_INLINE void PCVisitorBase::Visit
+//    (Deployment::ComponentImplementationDescriptions &cids)
+//{
+//  visit_sequence (cids, *this);
+//}
+
+ACE_INLINE void PCVisitorBase::Visit
+(Deployment::ComponentAssemblyDescriptions &cads)
+{
+  visit_sequence (cads, *this);
+}
+
+ACE_INLINE void PCVisitorBase::Visit
+(Deployment::SubcomponentInstantiationDescriptions &sids)
+{
+  visit_sequence (sids, *this);
+}
+
+ACE_INLINE void PCVisitorBase::Visit
+(Deployment::MonolithicImplementationDescriptions &mids)
+{
+  visit_sequence (mids, *this);
+}
+
+ACE_INLINE void PCVisitorBase::Visit
+(Deployment::NamedImplementationArtifacts &nias)
+{
+  visit_sequence (nias, *this);
+}
+
+//ACE_INLINE void PCVisitorBase::Visit
+//    (Deployment::ImplementationArtifactDescriptions &iads)
+//{
+//  visit_sequence (iads, *this);
+//}
+
+//ComponentPackageReference descendents
+
+ACE_INLINE void PCVisitorBase::Visit
+(Deployment::ComponentPackageReferences &cprs)
+{
+  visit_sequence (cprs, *this);
+}
+
+//properties
+
+ACE_INLINE void PCVisitorBase::Visit
+(Deployment::AssemblyPropertyMappings &apms)
+{
+  visit_sequence (apms, *this);
+}
+
+ACE_INLINE void PCVisitorBase::Visit
+(Deployment::Properties &properties)
+{
+  visit_sequence (properties, *this);
+}
+
+//requirements & capabilities
+
+ACE_INLINE void PCVisitorBase::Visit
+(Deployment::Requirements &requirements)
+{
+  visit_sequence (requirements, *this);
+}
+
+ACE_INLINE void PCVisitorBase::Visit
+(Deployment::Capabilities &capabilities)
+{
+  visit_sequence (capabilities, *this);
+}
+
+ACE_INLINE void PCVisitorBase::Visit
+(Deployment::ImplementationRequirements &irs)
+{
+  visit_sequence (irs, *this);
+}
+
+ACE_INLINE void PCVisitorBase::Visit
+(Deployment::ImplementationDependencies &ids)
+{
+  visit_sequence (ids, *this);
+}
+
+//ports and connections
+
+ACE_INLINE void PCVisitorBase::Visit
+(Deployment::AssemblyConnectionDescriptions &acds)
+{
+  visit_sequence (acds, *this);
+}
+
+ACE_INLINE void PCVisitorBase::Visit
+(Deployment::SubcomponentPortEndpoints &spes)
+{
+  visit_sequence (spes, *this);
+}
+
+ACE_INLINE void PCVisitorBase::Visit
+(Deployment::ComponentExternalPortEndpoints &cepes)
+{
+  visit_sequence (cepes, *this);
+}
diff --git a/CIAO/DAnCE/Plan_Generator/Plan_Generator.mpc b/CIAO/DAnCE/Plan_Generator/Plan_Generator.mpc
new file mode 100644
index 00000000000..04855002ed1
--- /dev/null
+++ b/CIAO/DAnCE/Plan_Generator/Plan_Generator.mpc
@@ -0,0 +1,20 @@
+// -*- MPC -*-
+//$Id$
+
+project (Plan_Generator) : dance_deployment_stub, naming, dance_lib, dance_repositorymanager_stub, dance_logger {
+  sharedname = DAnCE_Plan_Generator
+  dynamicflags = PLAN_GENERATOR_IMPL_BUILD_DLL
+
+  Source_Files {
+    Plan_Generator_Impl.cpp
+    PCVisitorBase.cpp
+    PCVisitor.cpp
+  }
+
+  Header_Files {
+    Plan_Generator_Impl.h
+    PCVisitor.h
+    PCVisitorBase.h
+    Plan_Generator_Impl_Export.h
+  }
+}
diff --git a/CIAO/DAnCE/Plan_Generator/Plan_Generator_Impl.cpp b/CIAO/DAnCE/Plan_Generator/Plan_Generator_Impl.cpp
new file mode 100644
index 00000000000..fa8ba989020
--- /dev/null
+++ b/CIAO/DAnCE/Plan_Generator/Plan_Generator_Impl.cpp
@@ -0,0 +1,151 @@
+/**
+ * $Id$
+ * @file Plan_Generator_Impl.cpp
+ * @author Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
+ */
+
+#include "Plan_Generator_Impl.h"
+#include "orbsvcs/CosNamingC.h"
+#include "PCVisitor.h"
+#include "PCVisitorBase.h"
+
+#include "DAnCE/Logger/Log_Macros.h"
+
+namespace CIAO
+{
+  namespace Plan_Generator
+  {
+    // @todo make this a private method
+    static CORBA::Object_ptr
+    fetch_reference_naming (CORBA::ORB_ptr orb,
+                            const char *repoman_name = 0)
+    {
+      CORBA::Object_var tmp = orb->resolve_initial_references ("NameService");
+
+      CosNaming::NamingContext_var pns =
+        CosNaming::NamingContext::_narrow (tmp.in ());
+
+      if (CORBA::is_nil (pns.in ()))
+        {
+          return CORBA::Object::_nil ();
+        }
+
+      CosNaming::Name name (1);
+      name.length (1);
+
+      name[0].id = CORBA::string_dup (repoman_name);
+
+      return pns->resolve (name);
+    }
+
+    Plan_Generator_i::Plan_Generator_i ()
+      : rm_ ()
+    {
+    }
+
+    bool
+    Plan_Generator_i::init (CORBA::ORB_ptr orb,
+                            bool rm_use_naming,
+                            const char *rm_name)
+    {
+      CORBA::Object_var obj;
+
+      if (rm_use_naming)
+        {
+          obj = fetch_reference_naming (orb, rm_name);
+        }
+      else
+        {
+          obj = orb->string_to_object (rm_name);
+        }
+
+      this->rm_ = Deployment::RepositoryManager::_narrow (obj.in ());
+
+      if (CORBA::is_nil (this->rm_.in ()))
+        {
+          DANCE_ERROR (1, (LM_ERROR,
+                      "(%P|%t) Plan_Generator_i: nil Repository "
+                      "Manager reference, narrow failed\n"));
+          return false;
+        }
+
+      return true;
+    }
+
+    bool
+    Plan_Generator_i::generate_plan (Deployment::DeploymentPlan &plan,
+                                     const char *package_uri,
+                                     bool use_package_name)
+    {
+      if (CORBA::is_nil (rm_.in ()))
+        {
+          DANCE_ERROR (1, (LM_ERROR,
+                      "(%P|%t) Plan_Generator_i: nil Execution\n"));
+          return false;
+        }
+
+      ::Deployment::PackageConfiguration_var pc;
+
+      char package[PACKAGE_NAME_LEN];
+
+      size_t length = ACE_OS::strlen (package_uri);
+      size_t pos1 = 0;
+      size_t pos2 = ACE_OS::strcspn (package_uri + pos1, "+");
+
+      while (pos1 < length)
+        {
+          ACE_OS::strsncpy (package, package_uri + pos1, pos2 + 1);
+
+          if (use_package_name)
+            {
+              pc = this->rm_->findPackageByName (package);
+
+              PCVisitor pcv (plan, *pc, true);
+              pcv.Visit ();
+            }
+          else
+            {
+              CORBA::StringSeq_var seq = this->rm_->findNamesByType (package);
+
+              for (CORBA::ULong i = 0; i < seq->length (); ++i)
+                {
+                  pc = this->rm_->findPackageByName (seq[i]);
+
+                  PCVisitor pcv (plan, *pc, true);
+                  pcv.Visit ();
+                }
+            }
+
+          pos1 += pos2 + 1;
+          pos2 = ACE_OS::strcspn (package_uri + pos1, "+");
+        }
+
+        return true;
+    }
+
+    bool
+    Plan_Generator_i::generate_plan (Deployment::DeploymentPlan &plan,
+                                     const char *specific_type,
+                                     int &index)
+    {
+      if (CORBA::is_nil (rm_.in ()))
+        {
+          DANCE_ERROR (1, (LM_ERROR,
+                      "(%P|%t) Plan_Generator_i: nil Execution\n"));
+          return false;
+        }
+
+      CORBA::StringSeq_var seq = rm_->findNamesByType (specific_type);
+      for (CORBA::ULong i = 0; i < seq->length (); ++i)
+        {
+          ::Deployment::PackageConfiguration_var pc =
+            rm_->findPackageByName (seq[i]);
+
+          PCVisitor pcv (plan, *pc, false);
+          index = pcv.Visit ();
+        }
+
+      return true;
+    }
+  }
+}
diff --git a/CIAO/DAnCE/Plan_Generator/Plan_Generator_Impl.h b/CIAO/DAnCE/Plan_Generator/Plan_Generator_Impl.h
new file mode 100644
index 00000000000..98392e4f549
--- /dev/null
+++ b/CIAO/DAnCE/Plan_Generator/Plan_Generator_Impl.h
@@ -0,0 +1,78 @@
+/**
+ * $Id$
+ * @file Plan_Generator_Impl.h
+ * @author Shanshan Jiang <shanshan.jiang@vanderbilt.edu>
+ *
+ * Contains the Plan_Generator_i class, which can be used to generate/modify
+ * DeploymentPlans.
+ */
+
+#ifndef PLAN_GENERATOR_IMPL_H
+#define PLAN_GENERATOR_IMPL_H
+
+#include "DAnCE/Deployment/Deployment_RepositoryManagerC.h"
+#include "Plan_Generator_Impl_Export.h"
+
+namespace CIAO
+{
+  namespace Plan_Generator
+  {
+    const size_t PACKAGE_NAME_LEN = 1024;
+
+    /**
+     * @class Plan_Generator_i
+     * @brief This class generates or modifies deployment plans.
+     */
+    class Plan_Generator_Impl_Export Plan_Generator_i
+    {
+    public:
+      Plan_Generator_i ();
+
+      /**
+       * @fn init
+       * @brief Get the proper Repoman, using naming service or ior file.
+       * @param orb
+       * @param rm_use_naming Whether use naming service or not.
+       * @param rm_name The name of the Repoman.
+       * @returns a boolean denoting if this operation is successful or not.
+       */
+      bool init (CORBA::ORB_ptr orb,
+                 bool rm_use_naming = 0,
+                 const char *rm_name = 0);
+
+      /**
+       * @fn generate_plan
+       * @brief Use the package name(s) or type(s) to get the PackageConfiguration
+       *        provided by Repoman; and then use the PackageConfiguration to
+       *        modify the location of all the artifacts in DeploymentPlan.
+       * @param plan A DeploymentPlan that need to be updated.
+       * @param package_uri The package name(s) or type(s).
+       * @param use_package_name Use package name(s) or type(s).
+       * @returns a boolean denoting if this operation is successful or not.
+       */
+      bool generate_plan (Deployment::DeploymentPlan &plan,
+                          const char *package_uri,
+                          bool use_package_name);
+
+      /**
+       * @fn generate_plan
+       * @brief Use the specific type of a package to get the PackageConfiguration
+       *        provided by Repoman; and then use the PackageConfiguration to
+       *        generate the implementation and artifact fields in DeploymentPlan.
+       * @param plan A DeploymentPlan that need to be updated.
+       * @param package_uri The package specific type.
+       * @param index The index of the newly generated implementation and artifact fields.
+       * @returns a boolean denoting if this operation is successful or not.
+       */
+      bool generate_plan (Deployment::DeploymentPlan &plan,
+                          const char *specific_type,
+                          int &index);
+
+    private:
+      Deployment::RepositoryManager_var rm_;
+    };
+
+  }
+}
+
+#endif /* PLAN_GENERATOR_IMPL_H */
diff --git a/CIAO/DAnCE/Plan_Generator/Plan_Generator_Impl_Export.h b/CIAO/DAnCE/Plan_Generator/Plan_Generator_Impl_Export.h
new file mode 100644
index 00000000000..fd120ff7b73
--- /dev/null
+++ b/CIAO/DAnCE/Plan_Generator/Plan_Generator_Impl_Export.h
@@ -0,0 +1,58 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl Plan_Generator_Impl
+// ------------------------------
+#ifndef PLAN_GENERATOR_IMPL_EXPORT_H
+#define PLAN_GENERATOR_IMPL_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (ACE_AS_STATIC_LIBS) && !defined (PLAN_GENERATOR_IMPL_HAS_DLL)
+#  define PLAN_GENERATOR_IMPL_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && PLAN_GENERATOR_IMPL_HAS_DLL */
+
+#if !defined (PLAN_GENERATOR_IMPL_HAS_DLL)
+#  define PLAN_GENERATOR_IMPL_HAS_DLL 1
+#endif /* ! PLAN_GENERATOR_IMPL_HAS_DLL */
+
+#if defined (PLAN_GENERATOR_IMPL_HAS_DLL) && (PLAN_GENERATOR_IMPL_HAS_DLL == 1)
+#  if defined (PLAN_GENERATOR_IMPL_BUILD_DLL)
+#    define Plan_Generator_Impl_Export ACE_Proper_Export_Flag
+#    define PLAN_GENERATOR_IMPL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define PLAN_GENERATOR_IMPL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* PLAN_GENERATOR_IMPL_BUILD_DLL */
+#    define Plan_Generator_Impl_Export ACE_Proper_Import_Flag
+#    define PLAN_GENERATOR_IMPL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define PLAN_GENERATOR_IMPL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* PLAN_GENERATOR_IMPL_BUILD_DLL */
+#else /* PLAN_GENERATOR_IMPL_HAS_DLL == 1 */
+#  define Plan_Generator_Impl_Export
+#  define PLAN_GENERATOR_IMPL_SINGLETON_DECLARATION(T)
+#  define PLAN_GENERATOR_IMPL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* PLAN_GENERATOR_IMPL_HAS_DLL == 1 */
+
+// Set PLAN_GENERATOR_IMPL_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (PLAN_GENERATOR_IMPL_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define PLAN_GENERATOR_IMPL_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define PLAN_GENERATOR_IMPL_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !PLAN_GENERATOR_IMPL_NTRACE */
+
+#if (PLAN_GENERATOR_IMPL_NTRACE == 1)
+#  define PLAN_GENERATOR_IMPL_TRACE(X)
+#else /* (PLAN_GENERATOR_IMPL_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define PLAN_GENERATOR_IMPL_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (PLAN_GENERATOR_IMPL_NTRACE == 1) */
+
+#endif /* PLAN_GENERATOR_IMPL_EXPORT_H */
+
+// End of auto generated file.
diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp
index d784f689507..99fd3548997 100644
--- a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp
+++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp
@@ -1,61 +1,41 @@
 // $Id$
 
-#include "ace/Dynamic_Service.h"
-#include "tao/ORB.h"
-#include "tao/Object.h"
-#include "DAnCE/Logger/Log_Macros.h"
-#include "DAnCE/Logger/Logger_Service.h"
 #include "Plan_Launcher_Impl.h"
 
-int
-ACE_TMAIN (int argc, ACE_TCHAR *argv[])
-{
-  DANCE_DISABLE_TRACE ();
-
-  int retval = 0;
-
-  try
+namespace DAnCE
+  {
+  namespace Plan_Launcher
     {
-      DAnCE::Logger_Service
-        * dlf = ACE_Dynamic_Service<DAnCE::Logger_Service>::instance ("DAnCE_Logger");
-
-      if (dlf)
-        {
-          dlf->init (argc, argv);
-        }
-
-      DANCE_DEBUG (6, (LM_TRACE, DLINFO
-                    ACE_TEXT("PlanLauncher - initializing ORB\n")));
-
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
+      int
+      run_main_implementation (int argc, ACE_TCHAR *argv[])
+      {
+        try
+          {
+            Plan_Launcher_Impl pl (argc, argv);
+            pl.execute();
+          }
+        catch (const Plan_Launcher_Impl::Deployment_Failure& e)
+          {
+            DANCE_ERROR (1, (LM_ERROR, "PlanLauncher error: %C.\n", e.error_.c_str()));
+            return -1;
+          }
+        catch (const CORBA::Exception& ex)
+          {
+            ex._tao_print_exception ("Plan_Launcher.cpp::run_main_implementation ");
+            return -1;
+          }
+        catch (...)
+          {
+            DANCE_ERROR (1, (LM_ERROR, "Plan_Launcher.cpp::run_main_implementation Unknown exception.\n"));
+            return -1;
+          }
+        return 0;
+      }
+
+
+    } // Plan_Launcher
+} // DAnCE
 
-      DANCE_DEBUG (6, (LM_TRACE, DLINFO
-                   ACE_TEXT("PlanLauncher - initializing module instance\n")));
 
-      Plan_Launcher_Impl pl (orb.in (), argc, argv);
-      pl.execute();
-
-      DANCE_DEBUG (6, (LM_TRACE, DLINFO
-                    ACE_TEXT("PlanLauncher - destroying ORB\n")));
-
-      orb->destroy ();
-    }
-  catch (const Plan_Launcher_Impl::Deployment_Failure& e)
-    {
-      DANCE_ERROR (1, (LM_ERROR, DLINFO "PlanLauncher - Error: %C.\n", e.error_.c_str()));
-      retval = -1;
-    }
-  catch (const CORBA::Exception& ex)
-    {
-      ex._tao_print_exception ("PlanLauncher");
-      retval = -1;
-    }
-  catch (...)
-    {
-      DANCE_ERROR (1, (LM_ERROR, "PlanLauncher - Error: Unknown exception.\n"));
-      retval = -1;
-    }
 
-  return retval;
-}
 
diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.h b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.h
new file mode 100644
index 00000000000..5a65dd9df9f
--- /dev/null
+++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.h
@@ -0,0 +1,26 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ * @file Plan_Launcher.h
+ *
+ * $Id$
+ *
+ * @brief  Run PlanLauncher
+ *
+ * @author Vinzenz Tornow <vt@prismtech.com>
+ */
+//=============================================================================
+
+#ifndef PLAN_LAUNCHER_H
+#define PLAN_LAUNCHER_H
+
+namespace DAnCE
+  {
+  namespace Plan_Launcher
+    {
+      int run_main_implementation (int, ACE_TCHAR*[]);
+    }
+}
+
+#endif /* PLAN_LAUNCHER_H */
diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.mpc b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.mpc
index a838f6e2d68..c397dc20ef1 100644
--- a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.mpc
+++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.mpc
@@ -1,11 +1,43 @@
 // -*- MPC -*-
 // $Id$
 
-project(Plan_Launcher_Exec) : dance_exe, dance_logger, xerces, dance_executionmanager_stub, dance_config_handlers {
-  exename = dance_plan_launcher
+project(Plan_Launcher_Base) : dance_lib, taolib, ciao_output, naming, ciao_executionmanager_stub, dance_logger {
+  sharedname = DAnCE_Plan_Launcher_Base
+  dynamicflags = PLAN_LAUNCHER_BASE_IMPL_BUILD_DLL DANCE_PLAN_LAUNCHER_BASE_MODULE_BUILD_DLL
+
   Source_Files {
-    Plan_Launcher.cpp
     Plan_Launcher_Base_Impl.cpp
+    Plan_Launcher_Base_Module.cpp
+  }
+
+  Header_Files {
+    Plan_Launcher_Base_Impl.h
+    Plan_Launcher_Base_Module.h
+    Plan_Launcher_Base_Impl_Export.h
+    Plan_Launcher_Base_Module_Export.h
+  }
+}
+
+project(Plan_Launcher) : dance_lib, taolib, ciao_output, xerces, naming, dance_domainapplicationmanager_stub, ciao_config_handlers, ciao_executionmanager_stub, dance_logger, dance_plan_launcher_base {
+  sharedname = DAnCE_Plan_Launcher
+  dynamicflags = PLAN_LAUNCHER_IMPL_BUILD_DLL DANCE_PLAN_LAUNCHER_MODULE_BUILD_DLL
+  Source_Files {
     Plan_Launcher_Impl.cpp
+    Plan_Launcher_Module.cpp
+  }
+
+  Header_Files {
+    Plan_Launcher_Impl.h
+    Plan_Launcher_Module.h
+    Plan_Launcher_Impl_Export.h
+    Plan_Launcher_Module_Export.h
+  }
+}
+
+project(Plan_Launcher_Exec) : dance_exe, dance_logger, xerces, naming, dance_executionmanager_stub, ciao_executionmanager_stub, ciao_config_handlers, dance_plan_launcher {
+  exename = dance_plan_launcher
+
+  Source_Files {
+    Plan_Launcher_Exec.cpp
   }
 }
diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp
index 10fcf4083b6..d9a077ea411 100644
--- a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp
+++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.cpp
@@ -1,15 +1,23 @@
 // $Id$
-
 #include "Plan_Launcher_Base_Impl.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "orbsvcs/CosNamingC.h"
+#include "tao/ORB_Core.h"
+#include "ace/Sched_Params.h"
+#include "ccm/CCM_ObjectC.h"
 #include "ace/Env_Value_T.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/Get_Opt.h"
+#include "DAnCE/Logger/Log_Macros.h"
+
+namespace DAnCE
+{
+namespace Plan_Launcher
+{
 
 Plan_Launcher_Base_Impl::Plan_Launcher_Base_Impl(CORBA::ORB_ptr orb, int argc,
     ACE_TCHAR *argv[]) :
       orb_(CORBA::ORB::_duplicate (orb)),
-      em_(Deployment::ExecutionManager::_nil()), em_ior_("file://em.ior") //default
+      em_(DAnCE::ExecutionManagerDaemon::_nil()), em_ior_("file://em.ior") //default
       , mode_(0x0)
 {
   DANCE_TRACE ("Plan_Launcher_Base_Impl::Plan_Launcher_Base_Impl");
@@ -23,7 +31,7 @@ Plan_Launcher_Base_Impl::Plan_Launcher_Base_Impl(CORBA::ORB_ptr orb, int argc,
   this->parse_args(argc, argv);
 
   DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("Plan_Launcher_i::init - em_ior = \"%C\"\n")
-                , this->em_ior_.c_str()));
+                , is_empty (this->em_ior_) ? "NULL" : this->em_ior_.c_str()));
 
   if (this->mode_ & (MODE_START_PLAN | MODE_STOP_PLAN))
     {
@@ -41,9 +49,9 @@ Plan_Launcher_Base_Impl::Plan_Launcher_Base_Impl(CORBA::ORB_ptr orb, int argc,
         }
       try
        {
-         this->em_ = ::Deployment::ExecutionManager::_narrow (obj.in());
+         this->em_ = ::DAnCE::ExecutionManagerDaemon::_narrow (obj.in());
        }
-      catch(const CORBA::Exception&)
+      catch(CORBA::Exception&)
         {
           DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::Plan_Launcher_Base_Impl - ")
                         ACE_TEXT("Failed to retrieve EM object from \"%C\"\n"), this->em_ior_.c_str()));
@@ -104,7 +112,7 @@ void Plan_Launcher_Base_Impl::execute()
 }
 
 const char *
-Plan_Launcher_Base_Impl::launch_plan (const ::Deployment::DeploymentPlan &plan)
+Plan_Launcher_Base_Impl::launch_plan(const ::Deployment::DeploymentPlan &plan)
 {
   DANCE_TRACE ("Plan_Launcher_Base_Impl::launch_plan");
 
@@ -177,7 +185,7 @@ Plan_Launcher_Base_Impl::launch_plan (const ::Deployment::DeploymentPlan &plan)
                         ACE_TEXT("An exception was thrown during DAM->startLaunch.\n")));
           throw;
         }
-
+      //Deployment::DomainApplication_var da = Deployment::DomainApplication::_narrow(obj)
       if (CORBA::is_nil (da.in()))
         {
           DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::launch_plan - ")
@@ -330,7 +338,7 @@ bool Plan_Launcher_Base_Impl::teardown_plan(const char *uuid)
       DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::teardown_plan - ")
                     ACE_TEXT("Unable to find DomainApplicationManager ")
                     ACE_TEXT("for plan with uuid: %C\n"), uuid));
-      throw;
+      return false;
     }
 
   return true;
@@ -347,7 +355,7 @@ Plan_Launcher_Base_Impl::teardown_plan(::Deployment::DomainApplicationManager_pt
       DANCE_DEBUG (6, (LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::teardown_plan - ")
                    ACE_TEXT("DAM has no application.\n")));
     }
-  for (CORBA::ULong i = 0; i < apps->length(); ++i)
+  for (size_t i = 0; i < apps->length(); ++i)
     {
       dam->destroyApplication(apps[i]);
     }
@@ -356,8 +364,7 @@ Plan_Launcher_Base_Impl::teardown_plan(::Deployment::DomainApplicationManager_pt
   DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::teardown_plan - [success]\n")));
 }
 
-void
-Plan_Launcher_Base_Impl::destroy_dam(
+void Plan_Launcher_Base_Impl::destroy_dam(
     ::Deployment::DomainApplicationManager_ptr dam)
 {
   DANCE_DEBUG (6, (LM_DEBUG, DLINFO
@@ -367,9 +374,13 @@ Plan_Launcher_Base_Impl::destroy_dam(
   DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::destroy_dam - [success]\n")));
 }
 
-void
-Plan_Launcher_Base_Impl::usage(const ACE_TCHAR*)
+void Plan_Launcher_Base_Impl::usage(const ACE_TCHAR* program)
 {
+  if (0 == program)
+    {
+      DANCE_ERROR (1, (LM_ERROR, ACE_TEXT ("[(%P|%t) Executor] Usage: %s <options>\n"), program));
+    }
+
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Plan Launcher Options :\n")
           ACE_TEXT ("-k|--em-ior <EXECUTION_MANAGER_IOR>")
           ACE_TEXT (" : Default file://em.ior\n")
@@ -377,13 +388,13 @@ Plan_Launcher_Base_Impl::usage(const ACE_TCHAR*)
           ACE_TEXT ("-w|--write-cdr-plan <CDR_DEPLOYMENT_PLAN_URL>\n")
           ACE_TEXT ("-t|--plan-uuid <PLAN_UUID>\n")
                  //          ACE_TEXT ("-a|dam-ior <DOMAIN_APPLICATION_MANAGER_IOR>\n")
+          //                    ACE_TEXT ("-n|--node-mgr : Use naming service to fetch EM\n")
           ACE_TEXT ("-q|--stop-plan : Stop the plan\n")
           ACE_TEXT ("-h|--help : Show this usage information\n")
           ACE_TEXT ("-x|--read-plan <XML_DEPLOYMENT_PLAN_URL>\n\n")));
 }
 
-void
-Plan_Launcher_Base_Impl::parse_args(int argc, ACE_TCHAR *argv[])
+void Plan_Launcher_Base_Impl::parse_args(int argc, ACE_TCHAR *argv[])
 {
   DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("PL options : \"")));
 
@@ -473,11 +484,10 @@ Plan_Launcher_Base_Impl::parse_args(int argc, ACE_TCHAR *argv[])
   this->check_mode_consistentness();
 }
 
-void
-Plan_Launcher_Base_Impl::write_dam_ior(
+void Plan_Launcher_Base_Impl::write_dam_ior(
     ::Deployment::DomainApplicationManager_ptr dam)
 {
-  if (this->dam_ior_.length () == 0)
+  if (is_empty (this->dam_ior_))
     return;
 
   CORBA::String_var ior = this->orb_->object_to_string(dam);
@@ -499,7 +509,7 @@ Plan_Launcher_Base_Impl::write_dam_ior(
 }
 
 void
-Plan_Launcher_Base_Impl::stop_plan(void)
+Plan_Launcher_Base_Impl::stop_plan()
 {
   bool stopped = false;
   if (!is_empty (this->plan_uuid_))
@@ -567,8 +577,7 @@ Plan_Launcher_Base_Impl::stop_plan(void)
     }
 }
 
-void
-Plan_Launcher_Base_Impl::create_external_connections(
+void Plan_Launcher_Base_Impl::create_external_connections(
     const ::Deployment::DeploymentPlan &plan, Deployment::Connections& conn)
 {
   DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT("create_external_connections - start\n")));
@@ -603,8 +612,8 @@ Plan_Launcher_Base_Impl::create_external_connections(
     }
 }
 
-Deployment::DeploymentPlan*
-Plan_Launcher_Base_Impl::read_cdr_plan_file(const char *cdr_plan_uri)
+Deployment::DeploymentPlan*Plan_Launcher_Base_Impl::read_cdr_plan_file(
+    const char *cdr_plan_uri)
 {
   Deployment::DeploymentPlan* res = 0;
   try
@@ -618,11 +627,12 @@ Plan_Launcher_Base_Impl::read_cdr_plan_file(const char *cdr_plan_uri)
           throw Deployment_Failure (s.c_str());
         }
 
-      size_t buf_size = 0;
+      size_t buf_size;
       ACE_OS::fread (&buf_size, sizeof (buf_size), 1, file);
 
       char * buf = new char[buf_size];
       ACE_OS::fread (buf, 1, buf_size, file);
+
         {
           TAO_InputCDR cdr (buf, buf_size);
           ACE_NEW_THROW_EX (res,
@@ -653,22 +663,16 @@ Plan_Launcher_Base_Impl::write_cdr_plan_file(const char * filename,
           throw Deployment_Failure ("write_cdr_plan_file : failed to open file.");
         }
       TAO_OutputCDR cdr;
-      if (cdr << plan)
+      cdr << plan;
+      size_t buf_size = cdr.total_length();
+      ACE_OS::fwrite (&buf_size, sizeof (buf_size), 1, file);
+      for (const ACE_Message_Block *i = cdr.begin ();
+          i != 0;
+          i = i->cont ())
         {
-          size_t buf_size = cdr.total_length();
-          ACE_OS::fwrite (&buf_size, sizeof (buf_size), 1, file);
-          for (const ACE_Message_Block *i = cdr.begin ();
-              i != 0;
-              i = i->cont ())
-            {
-              ACE_OS::fwrite (i->rd_ptr (), 1, i->length (), file);
-            }
-          ACE_OS::fclose (file);
-        }
-      else
-        {
-          throw Deployment_Failure ("write_cdr_plan_file : failed marshal plan.");
+          ACE_OS::fwrite (i->rd_ptr (), 1, i->length (), file);
         }
+      ACE_OS::fclose (file);
     }
   catch(...)
     {
@@ -718,18 +722,19 @@ Plan_Launcher_Base_Impl::check_mode_consistentness()
 ACE_CString
 Plan_Launcher_Base_Impl::expand_env_vars (const ACE_TCHAR * s)
   {
-    ACE_TString src(s);
-    ACE_TString res;
+    ACE_CString src(ACE_TEXT_ALWAYS_CHAR (s));
+    ACE_CString res;
     size_t pos_done = 0;
     while (pos_done < (size_t) src.length())
       {
         size_t pos_start = src.find ('$', pos_done);
-        if (ACE_TString::npos == pos_start)
+        if (ACE_CString::npos == pos_start)
           {
             res += src.substring (pos_done);
             pos_done = src.length();
           }
         else // take the substring before '$' and append value
+
           {
             if (pos_start > pos_done)
               {
@@ -741,28 +746,27 @@ Plan_Launcher_Base_Impl::expand_env_vars (const ACE_TCHAR * s)
 
             size_t p;
 
-            p = src.find (ACE_TEXT(' '), pos_start + 1);
-            if (ACE_TString::npos != p && pos_end > p) pos_end = p;
+            p = src.find (' ', pos_start + 1);
+            if (ACE_CString::npos != p && pos_end > p) pos_end = p;
 
-            p = src.find (ACE_TEXT('/'), pos_start + 1);
-            if (ACE_TString::npos != p && pos_end > p) pos_end = p;
+            p = src.find ('/', pos_start + 1);
+            if (ACE_CString::npos != p && pos_end > p) pos_end = p;
 
-            p = src.find (ACE_TEXT('\\'), pos_start + 1);
-            if (ACE_TString::npos != p && pos_end > p) pos_end = p;
+            p = src.find ('\\', pos_start + 1);
+            if (ACE_CString::npos != p && pos_end > p) pos_end = p;
 
-            p = src.find (ACE_TEXT('$'), pos_start + 1);
-            if (ACE_TString::npos != p && pos_end > p) pos_end = p;
+            p = src.find ('$', pos_start + 1);
+            if (ACE_CString::npos != p && pos_end > p) pos_end = p;
 
             if (pos_end - pos_start > 1)
               {
-                ACE_Env_Value<const ACE_TCHAR*> val (src.substring (pos_start + 1, pos_end - pos_start - 1).c_str(), 0);
-                res += val;
+                ACE_Env_Value<const ACE_TCHAR*> val (ACE_TEXT_CHAR_TO_TCHAR (src.substring (pos_start + 1, pos_end - pos_start - 1).c_str()), 0);
+                res += ACE_TEXT_ALWAYS_CHAR (val);
                 pos_done = pos_end;
               }
             else
               {
-                DANCE_DEBUG (6, (LM_WARNING, DLINFO
-                              ACE_TEXT("Plan_Launcher_Base_Impl::expand_env_vars - ")
+                DANCE_DEBUG (6, (LM_WARNING, DLINFO ACE_TEXT("Plan_Launcher_Base_Impl::expand_env_vars - ")
                               ACE_TEXT("Envvar can not be parsed out at %i in \"<%s>\""),
                               pos_start,
                               src.c_str()));
@@ -772,3 +776,5 @@ Plan_Launcher_Base_Impl::expand_env_vars (const ACE_TCHAR * s)
     return res;
   }
 
+} // Plan_Launcher
+} // DAnCE
diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h
index e48fdb3997b..bb853a521dc 100644
--- a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h
+++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl.h
@@ -9,18 +9,24 @@
 #ifndef PLAN_LAUNCHER_BASE_IMPL_H
 #define PLAN_LAUNCHER_BASE_IMPL_H
 
+#include "Plan_Launcher_Base_Impl_Export.h"
 #include "DAnCE/Deployment/Deployment_DomainApplicationManagerC.h"
-#include "DAnCE/Deployment/Deployment_ExecutionManagerC.h"
+#include "DAnCE/Deployment/CIAO_ExecutionManagerDaemonC.h"
 #include "DAnCE/Deployment/Deployment_ConnectionC.h"
 #include "ace/Map_Manager.h"
 #include "DAnCE/Deployment/Deployment_DeploymentPlanC.h"
 #include "ace/Vector_T.h"
 
+namespace DAnCE
+{
+namespace Plan_Launcher
+{
+
 /**
  * @class Plan_Launcher_Impl
  * @brief This class launches and manages deployment plans.
  */
-class Plan_Launcher_Base_Impl
+class Plan_Launcher_Base_Impl_Export Plan_Launcher_Base_Impl
 {
 public:
   struct Deployment_Failure
@@ -47,7 +53,8 @@ public:
   static void write_cdr_plan_file(const char * filename,
       const Deployment::DeploymentPlan & plan);
 
-protected:
+ protected:
+
   /**
    * @brief Launch a plan, given an IDL deployment plan
    * @param plan A valid IDL deployment plan
@@ -86,7 +93,7 @@ protected:
   CORBA::ORB_var orb_;
 
   /// Object reference of the ExecutionManager
-  ::Deployment::ExecutionManager_var em_;
+  ::DAnCE::ExecutionManagerDaemon_var em_;
 
   ACE_Vector<ACE_CString> cdr_plan_urls_;
   ACE_CString plan_uuid_;
@@ -103,4 +110,8 @@ protected:
 
 }; // class Plan_Launcher_Impl
 
+} // Plan_Launcher
+} // DAnCE
+
+
 #endif /* PLAN_LAUNCHER_BASE_IMPL_H */
diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl_Export.h b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl_Export.h
new file mode 100644
index 00000000000..5dcb51be117
--- /dev/null
+++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Impl_Export.h
@@ -0,0 +1,58 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl Plan_Launcher_Base_Impl
+// ------------------------------
+#ifndef PLAN_LAUNCHER_BASE_IMPL_EXPORT_H
+#define PLAN_LAUNCHER_BASE_IMPL_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (ACE_AS_STATIC_LIBS) && !defined (PLAN_LAUNCHER_BASE_IMPL_HAS_DLL)
+#  define PLAN_LAUNCHER_BASE_IMPL_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && PLAN_LAUNCHER_BASE_IMPL_HAS_DLL */
+
+#if !defined (PLAN_LAUNCHER_BASE_IMPL_HAS_DLL)
+#  define PLAN_LAUNCHER_BASE_IMPL_HAS_DLL 1
+#endif /* ! PLAN_LAUNCHER_BASE_IMPL_HAS_DLL */
+
+#if defined (PLAN_LAUNCHER_BASE_IMPL_HAS_DLL) && (PLAN_LAUNCHER_BASE_IMPL_HAS_DLL == 1)
+#  if defined (PLAN_LAUNCHER_BASE_IMPL_BUILD_DLL)
+#    define Plan_Launcher_Base_Impl_Export ACE_Proper_Export_Flag
+#    define PLAN_LAUNCHER_BASE_IMPL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define PLAN_LAUNCHER_BASE_IMPL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* PLAN_LAUNCHER_BASE_IMPL_BUILD_DLL */
+#    define Plan_Launcher_Base_Impl_Export ACE_Proper_Import_Flag
+#    define PLAN_LAUNCHER_BASE_IMPL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define PLAN_LAUNCHER_BASE_IMPL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* PLAN_LAUNCHER_BASE_IMPL_BUILD_DLL */
+#else /* PLAN_LAUNCHER_BASE_IMPL_HAS_DLL == 1 */
+#  define Plan_Launcher_Base_Impl_Export
+#  define PLAN_LAUNCHER_BASE_IMPL_SINGLETON_DECLARATION(T)
+#  define PLAN_LAUNCHER_BASE_IMPL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* PLAN_LAUNCHER_BASE_IMPL_HAS_DLL == 1 */
+
+// Set PLAN_LAUNCHER_BASE_IMPL_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (PLAN_LAUNCHER_BASE_IMPL_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define PLAN_LAUNCHER_BASE_IMPL_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define PLAN_LAUNCHER_BASE_IMPL_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !PLAN_LAUNCHER_BASE_IMPL_NTRACE */
+
+#if (PLAN_LAUNCHER_BASE_IMPL_NTRACE == 1)
+#  define PLAN_LAUNCHER_BASE_IMPL_TRACE(X)
+#else /* (PLAN_LAUNCHER_BASE_IMPL_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define PLAN_LAUNCHER_BASE_IMPL_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (PLAN_LAUNCHER_BASE_IMPL_NTRACE == 1) */
+
+#endif /* PLAN_LAUNCHER_BASE_IMPL_EXPORT_H */
+
+// End of auto generated file.
diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Module.cpp b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Module.cpp
new file mode 100644
index 00000000000..7b1182eeadd
--- /dev/null
+++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Module.cpp
@@ -0,0 +1,47 @@
+// -*- C++ -*-
+// $Id$
+
+#include "Plan_Launcher_Base_Module.h"
+#include "tao/TAO_Singleton_Manager.h"
+#include "tao/StringSeqC.h"
+#include "ace/Get_Opt.h"
+#include "Plan_Launcher_Base_Impl.h"
+#include "DAnCE/Logger/Log_Macros.h"
+
+ACE_RCSID (DAnCE,
+           DAnCE_Plan_Launcher_Base_Module,
+           "$Id$")
+
+using namespace DAnCE::Plan_Launcher;
+
+DAnCE_Plan_Launcher_Base_Module::DAnCE_Plan_Launcher_Base_Module (void)
+{
+}
+
+CORBA::Object_ptr
+DAnCE_Plan_Launcher_Base_Module::create_object (CORBA::ORB_ptr orb,
+                                                int argc,
+                                                ACE_TCHAR *argv[])
+{
+  try
+    {
+      Plan_Launcher_Base_Impl pl (orb, argc, argv);
+      pl.execute();
+    }
+  catch (const Plan_Launcher_Base_Impl::Deployment_Failure& e)
+    {
+      DANCE_ERROR (1, (LM_ERROR, "PlanLauncher error : %C.\n", e.error_.c_str()));
+    }
+  catch (const CORBA::Exception& ex)
+    {
+      ex._tao_print_exception ("Plan_Launcher_Base_Module.cpp::run_main_implementation ");
+    }
+  catch (...)
+    {
+      DANCE_ERROR (1, (LM_ERROR, "Plan_Launcher_Base_Module.cpp::run_main_implementation Unknown exception.\n"));
+    }
+  return CORBA::Object::_nil ();
+}
+
+
+ACE_FACTORY_DEFINE (DAnCE_Plan_Launcher_Base_Module, DAnCE_Plan_Launcher_Base_Module)
diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Module.h b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Module.h
new file mode 100644
index 00000000000..92c6036aa9e
--- /dev/null
+++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Module.h
@@ -0,0 +1,58 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ * @file Plan_Launcher_Base_Module.h
+ *
+ * $Id$
+ *
+ * @brief  Uses to run PlanLauncher from starter
+ *
+ * @author Vinzenz Tornow <vt@prismtech.com>
+ */
+//=============================================================================
+
+#ifndef PLAN_LAUNCHER_MODULE_H
+#define PLAN_LAUNCHER_MODULE_H
+
+#include /**/ "ace/pre.h"
+
+#include "Plan_Launcher_Base_Module_Export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/Service_Config.h"
+#include "tao/Object_Loader.h"
+
+
+/**
+ * @class Plan_Launcher_Module
+ *
+ * @brief The shared object that is instantiated when the plan launcher
+ *        module/library is dynamically loaded.
+ *
+ * This class runs the plan launcher instance
+ */
+class DAnCE_Plan_Launcher_Base_Module_Export DAnCE_Plan_Launcher_Base_Module
+      : public TAO_Object_Loader
+  {
+  public:
+    /// Constructor.
+    DAnCE_Plan_Launcher_Base_Module (void);
+
+    /// Overload the base class method to create a new instance
+    /// of a DAnCE_NodeManager_Module object.
+    virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
+                                             int argc,
+                                             ACE_TCHAR *argv []);
+
+  private:
+  };
+
+ACE_FACTORY_DECLARE (DAnCE_Plan_Launcher_Base_Module, DAnCE_Plan_Launcher_Base_Module)
+
+#include /**/ "ace/post.h"
+
+#endif  /* PLAN_LAUNCHER_MODULE_H */
diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Module_Export.h b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Module_Export.h
new file mode 100644
index 00000000000..f9e3f7a7961
--- /dev/null
+++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Base_Module_Export.h
@@ -0,0 +1,58 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl DAnCE_Plan_Launcher_Base_Module
+// ------------------------------
+#ifndef DANCE_PLAN_LAUNCHER_BASE_MODULE_EXPORT_H
+#define DANCE_PLAN_LAUNCHER_BASE_MODULE_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (ACE_AS_STATIC_LIBS) && !defined (DANCE_PLAN_LAUNCHER_BASE_MODULE_HAS_DLL)
+#  define DANCE_PLAN_LAUNCHER_BASE_MODULE_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && DANCE_PLAN_LAUNCHER_BASE_MODULE_HAS_DLL */
+
+#if !defined (DANCE_PLAN_LAUNCHER_BASE_MODULE_HAS_DLL)
+#  define DANCE_PLAN_LAUNCHER_BASE_MODULE_HAS_DLL 1
+#endif /* ! DANCE_PLAN_LAUNCHER_BASE_MODULE_HAS_DLL */
+
+#if defined (DANCE_PLAN_LAUNCHER_BASE_MODULE_HAS_DLL) && (DANCE_PLAN_LAUNCHER_BASE_MODULE_HAS_DLL == 1)
+#  if defined (DANCE_PLAN_LAUNCHER_BASE_MODULE_BUILD_DLL)
+#    define DAnCE_Plan_Launcher_Base_Module_Export ACE_Proper_Export_Flag
+#    define DANCE_PLAN_LAUNCHER_BASE_MODULE_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define DANCE_PLAN_LAUNCHER_BASE_MODULE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* DANCE_PLAN_LAUNCHER_BASE_MODULE_BUILD_DLL */
+#    define DAnCE_Plan_Launcher_Base_Module_Export ACE_Proper_Import_Flag
+#    define DANCE_PLAN_LAUNCHER_BASE_MODULE_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define DANCE_PLAN_LAUNCHER_BASE_MODULE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* DANCE_PLAN_LAUNCHER_BASE_MODULE_BUILD_DLL */
+#else /* DANCE_PLAN_LAUNCHER_BASE_MODULE_HAS_DLL == 1 */
+#  define DAnCE_Plan_Launcher_Base_Module_Export
+#  define DANCE_PLAN_LAUNCHER_BASE_MODULE_SINGLETON_DECLARATION(T)
+#  define DANCE_PLAN_LAUNCHER_BASE_MODULE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* DANCE_PLAN_LAUNCHER_BASE_MODULE_HAS_DLL == 1 */
+
+// Set DANCE_PLAN_LAUNCHER_BASE_MODULE_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (DANCE_PLAN_LAUNCHER_BASE_MODULE_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define DANCE_PLAN_LAUNCHER_BASE_MODULE_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define DANCE_PLAN_LAUNCHER_BASE_MODULE_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !DANCE_PLAN_LAUNCHER_BASE_MODULE_NTRACE */
+
+#if (DANCE_PLAN_LAUNCHER_BASE_MODULE_NTRACE == 1)
+#  define DANCE_PLAN_LAUNCHER_BASE_MODULE_TRACE(X)
+#else /* (DANCE_PLAN_LAUNCHER_BASE_MODULE_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define DANCE_PLAN_LAUNCHER_BASE_MODULE_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (DANCE_PLAN_LAUNCHER_BASE_MODULE_NTRACE == 1) */
+
+#endif /* DANCE_PLAN_LAUNCHER_BASE_MODULE_EXPORT_H */
+
+// End of auto generated file.
diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Exec.cpp b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Exec.cpp
new file mode 100644
index 00000000000..bd832e3dd31
--- /dev/null
+++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Exec.cpp
@@ -0,0 +1,8 @@
+// $Id$
+#include "Plan_Launcher_Module.h"
+
+#define DANCE_MODULE_MAIN_SKIP_ORB_RUN
+#define DANCE_MODULE_MAIN_CLASS_NAME DAnCE_Plan_Launcher_Module
+#include "Deployment/Module_Main.h"
+
+
diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp
index a6835efce70..567d2f19c29 100644
--- a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp
+++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp
@@ -1,15 +1,19 @@
 // $Id$
-
 #include "Plan_Launcher_Impl.h"
-#include "DAnCE/Logger/Log_Macros.h"
+#include "orbsvcs/CosNamingC.h"
 #include "Config_Handlers/XML_File_Intf.h"
 #include "Config_Handlers/DnC_Dump.h"
+#include "ace/Sched_Params.h"
+#include "ccm/CCM_ObjectC.h"
+
 #include "ace/SString.h"
 #include "ace/Get_Opt.h"
+#include "DAnCE/Logger/Log_Macros.h"
 
-Plan_Launcher_Impl::~Plan_Launcher_Impl (void)
+namespace DAnCE
+{
+namespace Plan_Launcher
 {
-}
 
 ::Deployment::DeploymentPlan *
 Plan_Launcher_Impl::load_xml_plan(const ACE_TCHAR *deployment_plan_uri)
@@ -100,8 +104,7 @@ void Plan_Launcher_Impl::stop_plan()
         {
           DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("Plan_Launcher_Impl::stop_plan - ")
                        ACE_TEXT("Stopping plan by plan file: %C\n"), this->xml_plan_urls_[i].c_str()));
-          ::Deployment::DeploymentPlan_var plan =
-            this->load_xml_plan(ACE_TEXT_CHAR_TO_TCHAR (this->xml_plan_urls_[i].c_str()));
+          ::Deployment::DeploymentPlan_var plan = this->load_xml_plan(ACE_TEXT_CHAR_TO_TCHAR (this->xml_plan_urls_[i].c_str()));
           if (!this->teardown_plan(plan->UUID.in()))
             {
               DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("Plan_Launcher_Impl::stop_plan - ")
@@ -112,3 +115,5 @@ void Plan_Launcher_Impl::stop_plan()
   this->Plan_Launcher_Base_Impl::stop_plan();
 }
 
+} // Plan_Launcher
+} // DAnCE
diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.h b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.h
index 6fe7c43f027..bb4477f9b15 100644
--- a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.h
+++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.h
@@ -9,27 +9,35 @@
 #ifndef PLAN_LAUNCHER_IMPL_H
 #define PLAN_LAUNCHER_IMPL_H
 
+#include "Plan_Launcher_Impl_Export.h"
 #include "Plan_Launcher_Base_Impl.h"
 
-/**
-* @class Plan_Launcher_Impl
-* @brief This class launches and manages deployment plans.
-*/
-class Plan_Launcher_Impl : public Plan_Launcher_Base_Impl
+namespace DAnCE
   {
-  public:
-    Plan_Launcher_Impl (CORBA::ORB_ptr orb, int argc, ACE_TCHAR *argv[])
-        : Plan_Launcher_Base_Impl (orb, argc, argv) {};
+  namespace Plan_Launcher
+    {
+
+    /**
+    * @class Plan_Launcher_Impl
+    * @brief This class launches and manages deployment plans.
+    */
+    class Plan_Launcher_Impl_Export Plan_Launcher_Impl : public Plan_Launcher_Base_Impl
+      {
+      public:
+        Plan_Launcher_Impl (CORBA::ORB_ptr orb, int argc, ACE_TCHAR *argv[])
+            : Plan_Launcher_Base_Impl (orb, argc, argv) {};
+
+        virtual ~Plan_Launcher_Impl () {};
+
+        void execute();
+        static ::Deployment::DeploymentPlan* load_xml_plan (const ACE_TCHAR *deployment_plan_uri);
 
-    virtual ~Plan_Launcher_Impl(void);
-    
-    void execute(void);
+      protected:
+        virtual void stop_plan();
+      }; // class Plan_Launcher_Impl
 
-    static ::Deployment::DeploymentPlan* load_xml_plan (
-      const ACE_TCHAR *deployment_plan_uri);
+  } // Plan_Launcher
+} // DAnCE
 
-  protected:
-    virtual void stop_plan();
-  }; // class Plan_Launcher_Impl
 
 #endif /* PLAN_LAUNCHER_IMPL_H */
diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl_Export.h b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl_Export.h
new file mode 100644
index 00000000000..1c85d1b98c9
--- /dev/null
+++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl_Export.h
@@ -0,0 +1,58 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl -s Config_Handlers
+// ------------------------------
+#ifndef PLAN_LAUNCHER_IMPL_EXPORT_H
+#define PLAN_LAUNCHER_IMPL_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (ACE_AS_STATIC_LIBS) && !defined (PLAN_LAUNCHER_IMPL_HAS_DLL)
+#  define PLAN_LAUNCHER_IMPL_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && PLAN_LAUNCHER_IMPL_HAS_DLL */
+
+#if !defined (PLAN_LAUNCHER_IMPL_HAS_DLL)
+#  define PLAN_LAUNCHER_IMPL_HAS_DLL 1
+#endif /* ! PLAN_LAUNCHER_IMPL_HAS_DLL */
+
+#if defined (PLAN_LAUNCHER_IMPL_HAS_DLL) && (PLAN_LAUNCHER_IMPL_HAS_DLL == 1)
+#  if defined (PLAN_LAUNCHER_IMPL_BUILD_DLL)
+#    define Plan_Launcher_Impl_Export ACE_Proper_Export_Flag
+#    define PLAN_LAUNCHER_IMPL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define PLAN_LAUNCHER_IMPL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* PLAN_LAUNCHER_IMPL_BUILD_DLL */
+#    define Plan_Launcher_Impl_Export ACE_Proper_Import_Flag
+#    define PLAN_LAUNCHER_IMPL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define PLAN_LAUNCHER_IMPL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* PLAN_LAUNCHER_IMPL_BUILD_DLL */
+#else /* PLAN_LAUNCHER_IMPL_HAS_DLL == 1 */
+#  define Plan_Launcher_Impl_Export
+#  define PLAN_LAUNCHER_IMPL_SINGLETON_DECLARATION(T)
+#  define PLAN_LAUNCHER_IMPL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* PLAN_LAUNCHER_IMPL_HAS_DLL == 1 */
+
+// Set PLAN_LAUNCHER_IMPL_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (PLAN_LAUNCHER_IMPL_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define PLAN_LAUNCHER_IMPL_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define PLAN_LAUNCHER_IMPL_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !PLAN_LAUNCHER_IMPL_NTRACE */
+
+#if (PLAN_LAUNCHER_IMPL_NTRACE == 1)
+#  define PLAN_LAUNCHER_IMPL_TRACE(X)
+#else /* (PLAN_LAUNCHER_IMPL_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define PLAN_LAUNCHER_IMPL_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (PLAN_LAUNCHER_IMPL_NTRACE == 1) */
+
+#endif /* PLAN_LAUNCHER_IMPL_EXPORT_H */
+
+// End of auto generated file.
diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Module.cpp b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Module.cpp
new file mode 100644
index 00000000000..50dc7a0e421
--- /dev/null
+++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Module.cpp
@@ -0,0 +1,62 @@
+// -*- C++ -*-
+// $Id$
+
+#include "Plan_Launcher_Module.h"
+#include "Plan_Launcher_Impl.h"
+#include "ace/Get_Opt.h"
+#include "DAnCE/Logger/Log_Macros.h"
+
+ACE_RCSID (DAnCE,
+           DAnCE_Plan_Launcher_Module,
+           "$Id$")
+
+using namespace DAnCE::Plan_Launcher;
+
+DAnCE_Plan_Launcher_Module::DAnCE_Plan_Launcher_Module (void)
+{
+}
+
+CORBA::Object_ptr
+DAnCE_Plan_Launcher_Module::create_object (CORBA::ORB_ptr orb,
+                                           int argc,
+                                           ACE_TCHAR *argv[])
+{
+  try
+    {
+      DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_Plan_Launcher_Module::create_object - ")
+                    ACE_TEXT("Creating Plan Launcher object.\n")));
+
+      Plan_Launcher_Impl pl (orb, argc, argv);
+      pl.execute();
+    }
+  catch (const Plan_Launcher_Base_Impl::Help_Issued& )
+    {
+    }
+  catch (const Plan_Launcher_Base_Impl::Deployment_Failure& e)
+    {
+      DANCE_ERROR (1, (LM_ERROR, DLINFO
+                   ACE_TEXT("DAnCE_Plan_Launcher_Module::create_object - ")
+                   ACE_TEXT("Error : %C.\n"), e.error_.c_str()));
+      throw;
+    }
+  catch (const CORBA::Exception& ex)
+    {
+      DANCE_ERROR (1, (LM_ERROR, DLINFO
+                   ACE_TEXT("DAnCE_Plan_Launcher_Module::create_object - ")
+                   ACE_TEXT("Caught CORBA Exception %C\n"),
+                   ex._info ().c_str ()));
+      throw;
+    }
+  catch (...)
+    {
+      DANCE_ERROR (1, (LM_ERROR, DLINFO
+                   ACE_TEXT("DAnCE_Plan_Launcher_Module::create_object - ")
+                   ACE_TEXT("Unknown exception.\n")));
+      throw;
+    }
+  return CORBA::Object::_nil ();
+}
+
+ACE_FACTORY_DEFINE (DAnCE_Plan_Launcher_Module, DAnCE_Plan_Launcher_Module)
+
+
diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Module.h b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Module.h
new file mode 100644
index 00000000000..cc80534de9a
--- /dev/null
+++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Module.h
@@ -0,0 +1,56 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ * @file Plan_Launcher_Module.h
+ *
+ * $Id$
+ *
+ * @brief  Uses to run PlanLauncher from starter
+ *
+ * @author Vinzenz Tornow <vt@prismtech.com>
+ */
+//=============================================================================
+
+#ifndef PLAN_LAUNCHER_MODULE_H
+#define PLAN_LAUNCHER_MODULE_H
+
+#include /**/ "ace/pre.h"
+
+#include "Plan_Launcher_Module_Export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/Service_Config.h"
+#include "tao/Object_Loader.h"
+
+
+/**
+ * @class Plan_Launcher_Module
+ *
+ * @brief The shared object that is instantiated when the plan launcher
+ *        module/library is dynamically loaded.
+ *
+ * This class runs the plan launcher instance
+ */
+class DAnCE_Plan_Launcher_Module_Export DAnCE_Plan_Launcher_Module
+      : public TAO_Object_Loader
+  {
+  public:
+    /// Constructor.
+    DAnCE_Plan_Launcher_Module (void);
+
+    /// Overload the base class method to create a new instance
+    /// of a DAnCE_NodeManager_Module object.
+    virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
+                                             int argc,
+                                             ACE_TCHAR *argv []);
+  };
+
+ACE_FACTORY_DECLARE (DAnCE_Plan_Launcher_Module, DAnCE_Plan_Launcher_Module)
+
+#include /**/ "ace/post.h"
+
+#endif  /* PLAN_LAUNCHER_MODULE_H */
diff --git a/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Module_Export.h b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Module_Export.h
new file mode 100644
index 00000000000..cdeb11e8abf
--- /dev/null
+++ b/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Module_Export.h
@@ -0,0 +1,58 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl DAnCE_Plan_Launcher_Module
+// ------------------------------
+#ifndef DANCE_PLAN_LAUNCHER_MODULE_EXPORT_H
+#define DANCE_PLAN_LAUNCHER_MODULE_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (ACE_AS_STATIC_LIBS) && !defined (DANCE_PLAN_LAUNCHER_MODULE_HAS_DLL)
+#  define DANCE_PLAN_LAUNCHER_MODULE_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && DANCE_PLAN_LAUNCHER_MODULE_HAS_DLL */
+
+#if !defined (DANCE_PLAN_LAUNCHER_MODULE_HAS_DLL)
+#  define DANCE_PLAN_LAUNCHER_MODULE_HAS_DLL 1
+#endif /* ! DANCE_PLAN_LAUNCHER_MODULE_HAS_DLL */
+
+#if defined (DANCE_PLAN_LAUNCHER_MODULE_HAS_DLL) && (DANCE_PLAN_LAUNCHER_MODULE_HAS_DLL == 1)
+#  if defined (DANCE_PLAN_LAUNCHER_MODULE_BUILD_DLL)
+#    define DAnCE_Plan_Launcher_Module_Export ACE_Proper_Export_Flag
+#    define DANCE_PLAN_LAUNCHER_MODULE_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define DANCE_PLAN_LAUNCHER_MODULE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* DANCE_PLAN_LAUNCHER_MODULE_BUILD_DLL */
+#    define DAnCE_Plan_Launcher_Module_Export ACE_Proper_Import_Flag
+#    define DANCE_PLAN_LAUNCHER_MODULE_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define DANCE_PLAN_LAUNCHER_MODULE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* DANCE_PLAN_LAUNCHER_MODULE_BUILD_DLL */
+#else /* DANCE_PLAN_LAUNCHER_MODULE_HAS_DLL == 1 */
+#  define DAnCE_Plan_Launcher_Module_Export
+#  define DANCE_PLAN_LAUNCHER_MODULE_SINGLETON_DECLARATION(T)
+#  define DANCE_PLAN_LAUNCHER_MODULE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* DANCE_PLAN_LAUNCHER_MODULE_HAS_DLL == 1 */
+
+// Set DANCE_PLAN_LAUNCHER_MODULE_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (DANCE_PLAN_LAUNCHER_MODULE_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define DANCE_PLAN_LAUNCHER_MODULE_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define DANCE_PLAN_LAUNCHER_MODULE_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !DANCE_PLAN_LAUNCHER_MODULE_NTRACE */
+
+#if (DANCE_PLAN_LAUNCHER_MODULE_NTRACE == 1)
+#  define DANCE_PLAN_LAUNCHER_MODULE_TRACE(X)
+#else /* (DANCE_PLAN_LAUNCHER_MODULE_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define DANCE_PLAN_LAUNCHER_MODULE_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (DANCE_PLAN_LAUNCHER_MODULE_NTRACE == 1) */
+
+#endif /* DANCE_PLAN_LAUNCHER_MODULE_EXPORT_H */
+
+// End of auto generated file.
diff --git a/CIAO/DAnCE/Plan_Launcher/launcher.cpp b/CIAO/DAnCE/Plan_Launcher/launcher.cpp
new file mode 100644
index 00000000000..1de14bb9398
--- /dev/null
+++ b/CIAO/DAnCE/Plan_Launcher/launcher.cpp
@@ -0,0 +1,11 @@
+// $Id$
+
+#include "ace/OS_main.h"
+#include "Plan_Launcher.h"
+
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
+{
+  return DAnCE::Plan_Launcher::run_main_implementation (argc, argv);
+}
+
+
diff --git a/CIAO/DAnCE/RepositoryManager/DAnCE_RepositoryManager_Module_Export.h b/CIAO/DAnCE/RepositoryManager/DAnCE_RepositoryManager_Module_Export.h
new file mode 100644
index 00000000000..b94621bd39b
--- /dev/null
+++ b/CIAO/DAnCE/RepositoryManager/DAnCE_RepositoryManager_Module_Export.h
@@ -0,0 +1,58 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl DAnCE_RepositoryManager_Module
+// ------------------------------
+#ifndef DANCE_REPOSITORYMANAGER_MODULE_EXPORT_H
+#define DANCE_REPOSITORYMANAGER_MODULE_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (ACE_AS_STATIC_LIBS) && !defined (DANCE_REPOSITORYMANAGER_MODULE_HAS_DLL)
+#  define DANCE_REPOSITORYMANAGER_MODULE_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && DANCE_REPOSITORYMANAGER_MODULE_HAS_DLL */
+
+#if !defined (DANCE_REPOSITORYMANAGER_MODULE_HAS_DLL)
+#  define DANCE_REPOSITORYMANAGER_MODULE_HAS_DLL 1
+#endif /* ! DANCE_REPOSITORYMANAGER_MODULE_HAS_DLL */
+
+#if defined (DANCE_REPOSITORYMANAGER_MODULE_HAS_DLL) && (DANCE_REPOSITORYMANAGER_MODULE_HAS_DLL == 1)
+#  if defined (DANCE_REPOSITORYMANAGER_MODULE_BUILD_DLL)
+#    define DAnCE_RepositoryManager_Module_Export ACE_Proper_Export_Flag
+#    define DANCE_REPOSITORYMANAGER_MODULE_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define DANCE_REPOSITORYMANAGER_MODULE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* DANCE_REPOSITORYMANAGER_MODULE_BUILD_DLL */
+#    define DAnCE_RepositoryManager_Module_Export ACE_Proper_Import_Flag
+#    define DANCE_REPOSITORYMANAGER_MODULE_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define DANCE_REPOSITORYMANAGER_MODULE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* DANCE_REPOSITORYMANAGER_MODULE_BUILD_DLL */
+#else /* DANCE_REPOSITORYMANAGER_MODULE_HAS_DLL == 1 */
+#  define DAnCE_RepositoryManager_Module_Export
+#  define DANCE_REPOSITORYMANAGER_MODULE_SINGLETON_DECLARATION(T)
+#  define DANCE_REPOSITORYMANAGER_MODULE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* DANCE_REPOSITORYMANAGER_MODULE_HAS_DLL == 1 */
+
+// Set DANCE_REPOSITORYMANAGER_MODULE_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (DANCE_REPOSITORYMANAGER_MODULE_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define DANCE_REPOSITORYMANAGER_MODULE_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define DANCE_REPOSITORYMANAGER_MODULE_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !DANCE_REPOSITORYMANAGER_MODULE_NTRACE */
+
+#if (DANCE_REPOSITORYMANAGER_MODULE_NTRACE == 1)
+#  define DANCE_REPOSITORYMANAGER_MODULE_TRACE(X)
+#else /* (DANCE_REPOSITORYMANAGER_MODULE_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define DANCE_REPOSITORYMANAGER_MODULE_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (DANCE_REPOSITORYMANAGER_MODULE_NTRACE == 1) */
+
+#endif /* DANCE_REPOSITORYMANAGER_MODULE_EXPORT_H */
+
+// End of auto generated file.
diff --git a/CIAO/DAnCE/RepositoryManager/PC_Updater.cpp b/CIAO/DAnCE/RepositoryManager/PC_Updater.cpp
index 18cf23e96c8..6eec0c3506f 100644
--- a/CIAO/DAnCE/RepositoryManager/PC_Updater.cpp
+++ b/CIAO/DAnCE/RepositoryManager/PC_Updater.cpp
@@ -34,9 +34,10 @@ using namespace PC_Updater_T;
   //...
 
 
-/*
- *  PC_Updater Constructors
- */
+  /*
+   *  PC_Updater Constructors
+   */
+
 PC_Updater::PC_Updater (const char* server_path, const char* package)
 : server_path_ (server_path),
   file_list_ (),
@@ -54,9 +55,10 @@ PC_Updater::PC_Updater (ACE_CString& server_path, ACE_CString& package)
 {
 }
 
-/*
- *  PC_Updater - Destructor
- */
+  /*
+   *  PC_Updater - Destructor
+   */
+
 PC_Updater::~PC_Updater ()
 {
   this->clear_list ();
@@ -75,173 +77,180 @@ void PC_Updater::clear_list ()
 }
 
 
-/*
- *  PC_Updater - Object update methods
- */
+  /*
+   *  PC_Updater - Object update methods
+   */
 
 
-/// PackageConfiguration
-bool PC_Updater::update (::Deployment::PackageConfiguration &pc)
-{
-  //get the list of files in the package and figure out the names of all necessary files
-  if (!ZIP_Wrapper::file_list_info (const_cast <char*> (this->package_.c_str ()), this->file_list_))
-    return false;
+  // PackageConfiguration
 
-  update_sequence (pc.basePackage, this);
+  bool PC_Updater::update (::Deployment::PackageConfiguration &pc)
+  {
+    //get the list of files in the package and figure out the names of all necessary files
+    if (!ZIP_Wrapper::file_list_info (const_cast <char*> (this->package_.c_str ()), this->file_list_))
+      return false;
 
-  return this->success_;
-}
+    update_sequence (pc.basePackage, this);
 
+    return this->success_;
+  }
 
-/// ComponentInterfaceDescription
-void PC_Updater::update (::Deployment::ComponentInterfaceDescription &)
-{
-}
 
-/// Requirement
-void PC_Updater::update (::Deployment::Requirement &)
-{
-}
+  // ComponentInterfaceDescription
 
+  void PC_Updater::update (::Deployment::ComponentInterfaceDescription &)
+  {
+  }
 
-/// ComponentExternalPortEndpoint
-void PC_Updater::update (::Deployment::ComponentExternalPortEndpoint &)
-{
-}
+  // Requirement
 
-/// ImplementationDependency
-void PC_Updater::update (Deployment::ImplementationDependency &)
-{
-}
+  void PC_Updater::update (::Deployment::Requirement &)
+  {
+  }
 
-// ComponentPackageReference
 
-void PC_Updater::update (::Deployment::ComponentPackageReference &)
-{
-}
+  // ComponentExternalPortEndpoint
 
-// SubcomponentInstantiationDescription
+  void PC_Updater::update (::Deployment::ComponentExternalPortEndpoint &)
+  {
+  }
 
-void PC_Updater::update (::Deployment::SubcomponentInstantiationDescription &sid)
-{
-  update_sequence (sid.basePackage, this);
-}
 
-// SubcomponentPortEndpoint
 
-void PC_Updater::update (::Deployment::SubcomponentPortEndpoint& )
-{
-}
+  // ImplementationDependency
 
-// AssemblyConnectionDescription
+  void PC_Updater::update (Deployment::ImplementationDependency &)
+  {
+  }
 
-void PC_Updater::update (::Deployment::AssemblyConnectionDescription &)
-{
-}
+  // ComponentPackageReference
 
+  void PC_Updater::update (::Deployment::ComponentPackageReference &)
+  {
+  }
 
-// AssemblyPropertyMapping
+  // SubcomponentInstantiationDescription
 
-void
-PC_Updater::update (::Deployment::AssemblyPropertyMapping &)
-{
-}
+  void PC_Updater::update (::Deployment::SubcomponentInstantiationDescription &sid)
+  {
+    update_sequence (sid.basePackage, this);
+  }
 
-// ComponentAssemblyDescription
+  // SubcomponentPortEndpoint
 
-void PC_Updater::update (::Deployment::ComponentAssemblyDescription& cad)
-{
-  update_sequence (cad.instance, this);
-}
+  void PC_Updater::update (::Deployment::SubcomponentPortEndpoint& )
+  {
+  }
 
-// ImplementationArtifactDescription
+  // AssemblyConnectionDescription
 
-void PC_Updater::update (::Deployment::ImplementationArtifactDescription &iad)
-{
-  const char* location = CORBA::string_dup (iad.location[0]);
+  void PC_Updater::update (::Deployment::AssemblyConnectionDescription &)
+  {
+  }
 
-  //create an iterator
-  ACE_Double_Linked_List_Iterator<ZIP_File_Info> iter (this->file_list_);
 
-  //find the correct path and return
-  while (!iter.done ())
+  // AssemblyPropertyMapping
+
+  void
+  PC_Updater::update (::Deployment::AssemblyPropertyMapping &)
   {
-    const char* full_path = iter.next ()->name_.c_str ();
-    //weird. Need to call next to get current ?!?!
+  }
 
-    //is it an implementation artifact?
-    const char* name = ACE_OS::strstr (full_path, "implementations/");
-    if (name)
+  // ComponentAssemblyDescription
+
+  void PC_Updater::update (::Deployment::ComponentAssemblyDescription& cad)
+  {
+    update_sequence (cad.instance, this);
+  }
+
+  // ImplementationArtifactDescription
+
+  void PC_Updater::update (::Deployment::ImplementationArtifactDescription &iad)
+  {
+    const char* location = CORBA::string_dup (iad.location[0]);
+
+    //create an iterator
+    ACE_Double_Linked_List_Iterator<ZIP_File_Info> iter (this->file_list_);
+
+    //find the correct path and return
+    while (!iter.done ())
     {
-      //now check if the name matches
-      name = ACE_OS::strstr (full_path, iad.location[0]);
+      const char* full_path = iter.next ()->name_.c_str ();
+      //weird. Need to call next to get current ?!?!
 
+      //is it an implementation artifact?
+      const char* name = ACE_OS::strstr (full_path, "implementations/");
       if (name)
       {
-        ACE_CString loc (this->server_path_);
-        loc += "/implementations/";
-        loc += location;
+        //now check if the name matches
+        name = ACE_OS::strstr (full_path, iad.location[0]);
+
+        if (name)
+        {
+          ACE_CString loc (this->server_path_);
+          loc += "/implementations/";
+          loc += location;
 
-        iad.location[0] = CORBA::string_dup (loc.c_str ());
+          iad.location[0] = CORBA::string_dup (loc.c_str ());
 
-        //cout << "Location after update: " << iad.location[0] << endl << endl;
-        return;
+          //cout << "Location after update: " << iad.location[0] << endl << endl;
+          return;
+        }
       }
+      iter++;
     }
-    iter++;
-  }
 
-  DANCE_ERROR (1, (LM_ERROR,
-             "[PC_Updater::update] Unable to update: %s!\n",
-             location));
+    DANCE_ERROR (1, (LM_ERROR,
+               "[PC_Updater::update] Unable to update: %s!\n",
+               location));
 
-  this->success_ = false;
-}
+    this->success_ = false;
+  }
 
-// NamedImplementationArtifact
+  // NamedImplementationArtifact
 
-void PC_Updater::update (::Deployment::NamedImplementationArtifact &nia)
-{
-  update (nia.referencedArtifact);
-}
+  void PC_Updater::update (::Deployment::NamedImplementationArtifact &nia)
+  {
+    update (nia.referencedArtifact);
+  }
 
-// ImplementationRequirement
-void PC_Updater::update (::Deployment::ImplementationRequirement &)
-{
-}
+  // ImplementationRequirement
+  void PC_Updater::update (::Deployment::ImplementationRequirement &)
+  {
+  }
 
-// MonolithicImplementationDescription
-void PC_Updater::update (::Deployment::MonolithicImplementationDescription &mid)
-{
-  update_sequence (mid.primaryArtifact, this);
-}
+  // MonolithicImplementationDescription
+  void PC_Updater::update (::Deployment::MonolithicImplementationDescription &mid)
+  {
+    update_sequence (mid.primaryArtifact, this);
+  }
 
-// Capability
-void PC_Updater::update (::Deployment::Capability &)
-{
-}
+  // Capability
+  void PC_Updater::update (::Deployment::Capability &)
+  {
+  }
 
-// ComponentImplementationDescription
-void PC_Updater::update (::Deployment::ComponentImplementationDescription &cid)
-{
-  update_sequence (cid.assemblyImpl, this);
-  update_sequence (cid.monolithicImpl, this);
-}
+  // ComponentImplementationDescription
+  void PC_Updater::update (::Deployment::ComponentImplementationDescription &cid)
+  {
+    update_sequence (cid.assemblyImpl, this);
+    update_sequence (cid.monolithicImpl, this);
+  }
 
-// PackagedComponentImplementation
-void PC_Updater::update (::Deployment::PackagedComponentImplementation &pci)
-{
-  PC_Updater::update (pci.referencedImplementation);
-}
+  // PackagedComponentImplementation
+  void PC_Updater::update (::Deployment::PackagedComponentImplementation &pci)
+  {
+    PC_Updater::update (pci.referencedImplementation);
+  }
 
-// ComponentPackageDescription
-void PC_Updater::update (::Deployment::ComponentPackageDescription &comppkgdesc)
-{
-  update_sequence (comppkgdesc.implementation, this);
-}
+  // ComponentPackageDescription
+  void PC_Updater::update (::Deployment::ComponentPackageDescription &comppkgdesc)
+  {
+    update_sequence (comppkgdesc.implementation, this);
+  }
 
 
-// Property
-void PC_Updater::update (Deployment::Property& )
-{
-}
+  // Property
+  void PC_Updater::update (Deployment::Property& )
+  {
+  }
diff --git a/CIAO/DAnCE/RepositoryManager/PC_Updater.h b/CIAO/DAnCE/RepositoryManager/PC_Updater.h
index 87cd4b2249e..fd5b41db555 100644
--- a/CIAO/DAnCE/RepositoryManager/PC_Updater.h
+++ b/CIAO/DAnCE/RepositoryManager/PC_Updater.h
@@ -39,11 +39,12 @@
   * goes through the PackageConfiguration and updates the locations of the
   * artifacts, wrt to their location on the HTTP server.
   */
-class PC_Updater
+class  PC_Updater
 {
 public:
 
   /// Constructors
+
   PC_Updater (const char* server_path, const char* package);
   PC_Updater (ACE_CString& server_path, ACE_CString& package);
 
@@ -100,7 +101,8 @@ private:
 
   ACE_CString server_path_;
 
-  /// Create a doubly link list
+  /// create a doubly link list
+  //ACE_New_Allocator allocator_;
   ACE_Double_Linked_List<ZIP_File_Info> file_list_;
 
   ACE_CString package_;
diff --git a/CIAO/DAnCE/RepositoryManager/RM_Helper.cpp b/CIAO/DAnCE/RepositoryManager/RM_Helper.cpp
index 8610547a828..bbf047321d8 100644
--- a/CIAO/DAnCE/RepositoryManager/RM_Helper.cpp
+++ b/CIAO/DAnCE/RepositoryManager/RM_Helper.cpp
@@ -21,6 +21,7 @@ RM_Helper::cdr_to_pc (Deployment::PackageConfiguration& pc, TAO_InputCDR& cdr)
   cdr >> pc;
 }
 
+
 bool
 RM_Helper::externalize (const Deployment::PackageConfiguration& pc, const char* path)
 {
diff --git a/CIAO/DAnCE/RepositoryManager/RM_Helper.h b/CIAO/DAnCE/RepositoryManager/RM_Helper.h
index bf234440a30..47e46d35a6f 100644
--- a/CIAO/DAnCE/RepositoryManager/RM_Helper.h
+++ b/CIAO/DAnCE/RepositoryManager/RM_Helper.h
@@ -10,6 +10,7 @@
  *  This class aggregates a number of helper functions used by the
  *  CIAO RepositoryManager
  *
+ *
  *  @author Stoyan Paunov
  */
 //=============================================================================
@@ -17,6 +18,7 @@
 #ifndef RM_HELPER_H_
 #define RM_HELPER_H_
 
+
 #include "DAnCE/Deployment/Deployment_Packaging_DataC.h"
 #include "tao/CDR.h"
 #include "ace/Message_Block.h"
@@ -50,7 +52,8 @@ public:
    */
   static bool write_to_disk (const char* full_path,
                  ACE_Message_Block& mb,
-                 bool replace = true);
+                 bool replace = true
+                 );
 
   /**
    * Function that writes out a file to a specified location on the hard disk
@@ -69,6 +72,7 @@ public:
    * the lenght on success
    * @retval 0 on failure
    */
+
   static ACE_Message_Block* read_pc_from_disk (const char* full_path,
                                                size_t &length);
 
diff --git a/CIAO/DAnCE/RepositoryManager/RepositoryManager.cpp b/CIAO/DAnCE/RepositoryManager/RepositoryManager.cpp
index 32fb869049b..aecf94960af 100644
--- a/CIAO/DAnCE/RepositoryManager/RepositoryManager.cpp
+++ b/CIAO/DAnCE/RepositoryManager/RepositoryManager.cpp
@@ -77,7 +77,7 @@ write_ior_file (CORBA::ORB_ptr orb,
 {
   CORBA::String_var ior = orb->object_to_string (obj);
 
-  FILE* RMior_file = ACE_OS::fopen (DAnCE::RepositoryManager::RMior, "w");
+  FILE* RMior_file = ACE_OS::fopen (CIAO::RepositoryManager::RMior, "w");
 
   if (RMior_file)
     {
@@ -98,10 +98,10 @@ bool
 register_with_ns (CORBA::ORB_ptr orb,
                   CIAO::RepositoryManagerDaemon_ptr obj)
 {
-  if (ACE_OS::strlen (DAnCE::RepositoryManager::repoman_name_) > 0)
+  if (ACE_OS::strlen (CIAO::RepositoryManager::repoman_name_) > 0)
     {
-      DAnCE::RepositoryManager::RMname_service =
-        DAnCE::RepositoryManager::repoman_name_;
+      CIAO::RepositoryManager::RMname_service =
+        CIAO::RepositoryManager::repoman_name_;
     }
 
   // Naming Service related operations
@@ -116,7 +116,7 @@ register_with_ns (CORBA::ORB_ptr orb,
   name.length (1);
 
   // String dup required for MSVC6
-  name[0].id = CORBA::string_dup (DAnCE::RepositoryManager::RMname_service);
+  name[0].id = CORBA::string_dup (CIAO::RepositoryManager::RMname_service);
 
   // Register the servant with the Naming Service
   naming_context->rebind (name, obj);
@@ -131,7 +131,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
   {
-    // Init the ORB
+    //init the ORB
     CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
 
     if (!parse_args (argc, argv))
@@ -143,7 +143,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     // Downcast to POA type
     PortableServer::POA_var root_poa = PortableServer::POA::_narrow (obj.in ());
 
-    // Activate the POA manager
+    //activate the POA manager
     PortableServer::POAManager_var mgr = root_poa->the_POAManager ();
     mgr->activate ();
 
@@ -152,11 +152,11 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
     ACE_NEW_RETURN (repo,
                     CIAO_RepositoryManagerDaemon_i (
                           orb.in (),
-                          DAnCE::RepositoryManager::HTTPserver.c_str (),
-                          DAnCE::RepositoryManager::repoman_name_),
+                          CIAO::RepositoryManager::HTTPserver.c_str (),
+                          CIAO::RepositoryManager::repoman_name_),
                     1);
 
-    // Transfer ownership to the POA
+    //transfer ownership to the POA
     PortableServer::ServantBase_var owner_transfer(repo);
     PortableServer::ObjectId_var id =
       root_poa->activate_object (ci_srv);
@@ -166,23 +166,26 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
     bool retval = false;
 
-    if (DAnCE::RepositoryManager::write_to_ior_)
-      {
-        retval = write_ior_file (orb.in (), RepositoryManagerDaemon.in ());
-      }
-    if (retval && DAnCE::RepositoryManager::register_with_ns_)
-      {
-        retval = register_with_ns (orb.in (), RepositoryManagerDaemon.in ());
-      }
+    if (CIAO::RepositoryManager::write_to_ior_)
+    {
+      retval =
+        write_ior_file (orb.in (),
+        RepositoryManagerDaemon.in ());
+    }
+    else if (CIAO::RepositoryManager::register_with_ns_)
+    {
+      retval =
+        register_with_ns (orb.in (),
+        RepositoryManagerDaemon.in ());
+    }
 
     if (!retval)
-      {
-        return -1;
-      }
+      return -1;
+
 
     Worker worker (orb.in ());
     if (worker.activate (THR_NEW_LWP | THR_JOINABLE,
-                         DAnCE::RepositoryManager::nthreads) != 0)
+                         CIAO::RepositoryManager::nthreads) != 0)
         DANCE_ERROR_RETURN (1, (LM_ERROR,
                            "Cannot activate worker threads\n"),
                            1);
@@ -191,14 +194,18 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 
     DANCE_DEBUG (6, (LM_DEBUG, "event loop finished\n"));
 
-    orb->destroy ();
+    // done
+    return 0;
+
+    // todo shutdown orb
   }
-  catch (const CORBA::Exception &ex) {
+  catch (CORBA::Exception &ex) {
     cerr << "CORBA Exception: " << ex << endl;
 
     return 1;
   }
 
+
   return 0;
 }
 
@@ -216,27 +223,27 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
         switch (c)
           {
           case 'o':
-            DAnCE::RepositoryManager::write_to_ior_ = true;
-            DAnCE::RepositoryManager::register_with_ns_ = false;
+            CIAO::RepositoryManager::write_to_ior_ = true;
+            CIAO::RepositoryManager::register_with_ns_ = false;
             break;
           case 'v':
-            DAnCE::RepositoryManager::write_to_ior_ = false;
-            DAnCE::RepositoryManager::register_with_ns_ = true;
-            DAnCE::RepositoryManager::repoman_name_ = get_opts.opt_arg ();
+            CIAO::RepositoryManager::write_to_ior_ = false;
+            CIAO::RepositoryManager::register_with_ns_ = true;
+            CIAO::RepositoryManager::repoman_name_ = get_opts.opt_arg ();
             break;
           case 's':
-            DAnCE::RepositoryManager::HTTPserver = get_opts.opt_arg ();
+            CIAO::RepositoryManager::HTTPserver = get_opts.opt_arg ();
             break;
           case 'n':
-            DAnCE::RepositoryManager::nthreads = ACE_OS::atoi (get_opts.opt_arg ());
+            CIAO::RepositoryManager::nthreads = ACE_OS::atoi (get_opts.opt_arg ());
             break;
           case '?':  // display help for use of the server.
             DANCE_DEBUG (8, (LM_INFO,
-                        ACE_TEXT("usage: %s\n")
-                        ACE_TEXT("-o <using ior file>\n")
-                        ACE_TEXT("-v <name of naming service>\n")
-                        ACE_TEXT("-s <IP:PORT for HTTP server>\n")
-                        ACE_TEXT("-n <number of threads>\n"),
+                        "usage:  %s\n"
+                        "-o <using ior file>\n"
+                        "-v <name of naming service>\n"
+                        "-s <IP:PORT for HTTP server>\n"
+                        "-n <number of threads>\n",
                         argv [0]));
             return false;
             break;
diff --git a/CIAO/DAnCE/RepositoryManager/RepositoryManager.mpc b/CIAO/DAnCE/RepositoryManager/RepositoryManager.mpc
index beaef6efe88..c403b7a7803 100644
--- a/CIAO/DAnCE/RepositoryManager/RepositoryManager.mpc
+++ b/CIAO/DAnCE/RepositoryManager/RepositoryManager.mpc
@@ -1,17 +1,20 @@
 // -*- MPC -*-
 // $Id$
 
-project (DAnCE_RepositoryManagerDaemon_IDL) : taoidldefaults {
+project (DAnCE_RepositoryManagerDaemon_IDL) : ciaoidldefaults {
   custom_only = 1
   IDL_Files {
     RepositoryManagerDaemon.idl
   }
 }
 
-project (DAnCE_RepositoryManager_Exec) : dance_logger, dance_config_handlers, dance_repositorymanagerbase, dance_repositorymanager_skel, naming, iortable, utils, zlib, minizip, dance_exe {
-  exename = dance_repository_manager
-  after += DAnCE_RepositoryManagerDaemon_IDL
+project (DAnCE_RepositoryManager) : dance_repositorymanager_skel, ciao_config_handlers, ccm_stub, dance_repositorymanagerbase, naming, iortable, utils, minizip, zlib, dance_lib, dance_logger {
   requires += zlib
+  libs += Package_Config_Handlers
+  after += DAnCE_RepositoryManagerDaemon_IDL
+  dynamicflags = DANCE_REPOSITORYMANAGER_MODULE_BUILD_DLL
+  IDL_Files {
+  }
 
   Source_Files {
     RepositoryManagerDaemonC.cpp
@@ -20,20 +23,25 @@ project (DAnCE_RepositoryManager_Exec) : dance_logger, dance_config_handlers, da
     RepositoryManager_Impl.cpp
     RM_Helper.cpp
     URL_Parser.cpp
+    PC_Updater_T.cpp
     PC_Updater.cpp
     Repository_Manager_Module.cpp
-    Repository_Manager.cpp
   }
-  Template_Files {
-    PC_Updater_T.cpp
+}
+
+project (DAnCE_RepositoryManager_Exec) : dance_repositorymanager, dance_exe {
+  exename = dance_repository_manager
+
+  Source_Files {
+    Repository_Manager_Exec.cpp
   }
   IDL_Files {
   }
 }
 
-project (DAnCE_RepositoryManager_Admin_Exec) : dance_repositorymanager_stub, dance_config_handlers, naming, dance_exe, dance_logger {
-  exename = dance_rm_admin
 
+project (DAnCE_RepositoryManager_Admin) : dance_repositorymanager_stub, ciao_config_handlers, naming, dance_lib, dance_logger {
+  dynamicflags = DANCE_REPOSITORYMANAGER_ADMIN_BUILD_DLL
   after += DAnCE_RepositoryManagerDaemon_IDL
 
   IDL_Files {
@@ -42,6 +50,19 @@ project (DAnCE_RepositoryManager_Admin_Exec) : dance_repositorymanager_stub, dan
   Source_Files {
     repository_manager_admin.cpp
     RepositoryManagerDaemonC.cpp
+  }
+}
+
+project (DAnCE_RepositoryManager_Admin_Exec) : dance_repositorymanager, ciao_config_handlers, naming, dance_exe, dance_logger {
+  exename = dance_rm_admin
+
+  libs += DAnCE_RepositoryManager_Admin
+  after += DAnCE_RepositoryManager_Admin
+
+  IDL_Files {
+  }
+
+  Source_Files {
     repository_manager_admin_exec.cpp
   }
 }
diff --git a/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.h b/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.h
index 51648fbe588..051c6577514 100644
--- a/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.h
+++ b/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.h
@@ -22,6 +22,7 @@
 #ifndef REPOSITORYMANAGERI_H_
 #define REPOSITORYMANAGERI_H_
 
+
 //-----------------------------NOTE---------------------------------
 //I need to disable all the code which has to do with interface
 //type information because we currently do not support assembly
@@ -29,6 +30,7 @@
 //hash tables because the specificType field in assembly interfaces
 //is empty, so two unrelated intefaces appear to be related.
 
+
 #include "RepositoryManagerDaemonS.h"
 
 #include "ace/Hash_Map_Manager_T.h"      //for the ACE_Hash_Map_Manager
@@ -49,7 +51,7 @@ namespace
 
 namespace DAnCE
 {
-  class RepositoryManagerDaemon_i :
+  class  RepositoryManagerDaemon_i :
     public virtual POA_CIAO::RepositoryManagerDaemon
   {
   public:
diff --git a/CIAO/DAnCE/RepositoryManager/Repository_Manager.cpp b/CIAO/DAnCE/RepositoryManager/Repository_Manager.cpp
deleted file mode 100644
index 7f28328a406..00000000000
--- a/CIAO/DAnCE/RepositoryManager/Repository_Manager.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-// $Id$
-
-#include "ace/Dynamic_Service.h"
-#include "tao/ORB.h"
-#include "tao/Object.h"
-#include "DAnCE/Logger/Log_Macros.h"
-#include "DAnCE/Logger/Logger_Service.h"
-#include "Repository_Manager_Module.h"
-
-int
-ACE_TMAIN (int argc, ACE_TCHAR *argv[])
-{
-  DANCE_DISABLE_TRACE ();
-
-  int retval = 0;
-
-  try
-    {
-      DAnCE::Logger_Service
-        * dlf = ACE_Dynamic_Service<DAnCE::Logger_Service>::instance ("DAnCE_Logger");
-
-      if (dlf)
-        {
-          dlf->init (argc, argv);
-        }
-
-      DANCE_DEBUG (6, (LM_TRACE, DLINFO
-                    ACE_TEXT("RepositoryManager - initializing ORB\n")));
-
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
-
-      DANCE_DEBUG (6, (LM_TRACE, DLINFO
-                   ACE_TEXT("RepositoryManager - initializing module instance\n")));
-
-      DAnCE_RepositoryManager_Module rm;
-      CORBA::Object_var obj = rm.init (orb.in (), argc, argv);
-
-      if (!CORBA::is_nil (obj.in ()))
-        {
-          DANCE_DEBUG (6, (LM_TRACE, DLINFO
-                    ACE_TEXT("RepositoryManager - running ORB\n")));
-          orb->run ();
-        }
-
-      DANCE_DEBUG (6, (LM_TRACE, DLINFO
-                    ACE_TEXT("RepositoryManager - destroying ORB\n")));
-
-      orb->destroy ();
-    }
-  catch (const CORBA::Exception& ex)
-    {
-      ex._tao_print_exception ("RepositoryManager");
-      retval = -1;
-    }
-  catch (...)
-    {
-      DANCE_ERROR (1, (LM_ERROR, "RepositoryManager - Error: Unknown exception.\n"));
-      retval = -1;
-    }
-
-  return retval;
-}
-
diff --git a/CIAO/DAnCE/RepositoryManager/Repository_Manager_Admin_Export.h b/CIAO/DAnCE/RepositoryManager/Repository_Manager_Admin_Export.h
new file mode 100644
index 00000000000..a705cd0c2b7
--- /dev/null
+++ b/CIAO/DAnCE/RepositoryManager/Repository_Manager_Admin_Export.h
@@ -0,0 +1,58 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl DAnCE_RepositoryManager_Admin
+// ------------------------------
+#ifndef DANCE_REPOSITORYMANAGER_ADMIN_EXPORT_H
+#define DANCE_REPOSITORYMANAGER_ADMIN_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (ACE_AS_STATIC_LIBS) && !defined (DANCE_REPOSITORYMANAGER_ADMIN_HAS_DLL)
+#  define DANCE_REPOSITORYMANAGER_ADMIN_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && DANCE_REPOSITORYMANAGER_ADMIN_HAS_DLL */
+
+#if !defined (DANCE_REPOSITORYMANAGER_ADMIN_HAS_DLL)
+#  define DANCE_REPOSITORYMANAGER_ADMIN_HAS_DLL 1
+#endif /* ! DANCE_REPOSITORYMANAGER_ADMIN_HAS_DLL */
+
+#if defined (DANCE_REPOSITORYMANAGER_ADMIN_HAS_DLL) && (DANCE_REPOSITORYMANAGER_ADMIN_HAS_DLL == 1)
+#  if defined (DANCE_REPOSITORYMANAGER_ADMIN_BUILD_DLL)
+#    define DAnCE_RepositoryManager_Admin_Export ACE_Proper_Export_Flag
+#    define DANCE_REPOSITORYMANAGER_ADMIN_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define DANCE_REPOSITORYMANAGER_ADMIN_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* DANCE_REPOSITORYMANAGER_ADMIN_BUILD_DLL */
+#    define DAnCE_RepositoryManager_Admin_Export ACE_Proper_Import_Flag
+#    define DANCE_REPOSITORYMANAGER_ADMIN_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define DANCE_REPOSITORYMANAGER_ADMIN_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* DANCE_REPOSITORYMANAGER_ADMIN_BUILD_DLL */
+#else /* DANCE_REPOSITORYMANAGER_ADMIN_HAS_DLL == 1 */
+#  define DAnCE_RepositoryManager_Admin_Export
+#  define DANCE_REPOSITORYMANAGER_ADMIN_SINGLETON_DECLARATION(T)
+#  define DANCE_REPOSITORYMANAGER_ADMIN_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* DANCE_REPOSITORYMANAGER_ADMIN_HAS_DLL == 1 */
+
+// Set DANCE_REPOSITORYMANAGER_ADMIN_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (DANCE_REPOSITORYMANAGER_ADMIN_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define DANCE_REPOSITORYMANAGER_ADMIN_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define DANCE_REPOSITORYMANAGER_ADMIN_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !DANCE_REPOSITORYMANAGER_ADMIN_NTRACE */
+
+#if (DANCE_REPOSITORYMANAGER_ADMIN_NTRACE == 1)
+#  define DANCE_REPOSITORYMANAGER_ADMIN_TRACE(X)
+#else /* (DANCE_REPOSITORYMANAGER_ADMIN_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define DANCE_REPOSITORYMANAGER_ADMIN_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (DANCE_REPOSITORYMANAGER_ADMIN_NTRACE == 1) */
+
+#endif /* DANCE_REPOSITORYMANAGER_ADMIN_EXPORT_H */
+
+// End of auto generated file.
diff --git a/CIAO/DAnCE/RepositoryManager/Repository_Manager_Exec.cpp b/CIAO/DAnCE/RepositoryManager/Repository_Manager_Exec.cpp
new file mode 100644
index 00000000000..371fabf1406
--- /dev/null
+++ b/CIAO/DAnCE/RepositoryManager/Repository_Manager_Exec.cpp
@@ -0,0 +1,6 @@
+// $Id$
+#include "Repository_Manager_Module.h"
+
+#define DANCE_MODULE_MAIN_CLASS_NAME DAnCE_RepositoryManager_Module
+#include "Deployment/Module_Main.h"
+
diff --git a/CIAO/DAnCE/RepositoryManager/Repository_Manager_Module.cpp b/CIAO/DAnCE/RepositoryManager/Repository_Manager_Module.cpp
index 676d937df3d..0bfc0f5e6f1 100644
--- a/CIAO/DAnCE/RepositoryManager/Repository_Manager_Module.cpp
+++ b/CIAO/DAnCE/RepositoryManager/Repository_Manager_Module.cpp
@@ -9,8 +9,9 @@
 #include "tao/IORTable/IORTable.h"
 #include "tao/Utils/PolicyList_Destroyer.h"
 #include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Loader.h"
 #include "DAnCE/Logger/Log_Macros.h"
-#include "DAnCE/DAnCE/DAnCE_PropertiesC.h"
+#include "DAnCE/Deployment/DAnCE_PropertiesC.h"
 
 #ifdef DANCE_RM_USES_JAWS
 #include "JAWS/server/HTTP_Server.h"
@@ -98,6 +99,13 @@ DAnCE_RepositoryManager_Module::DAnCE_RepositoryManager_Module (void)
 DAnCE_RepositoryManager_Module::~DAnCE_RepositoryManager_Module (void)
 {
   DANCE_TRACE ("DAnCE_RepositoryManager_Module::~DAnCE_RepositoryManager_Module");
+
+  for (Servant_Map::iterator it = this->rm_map_.begin ();
+       it != this->rm_map_.end ();
+       ++it)
+    {
+      delete (*it).int_id_;
+    }
 }
 
 const char *
@@ -280,17 +288,17 @@ DAnCE_RepositoryManager_Module::parse_args (int argc, ACE_TCHAR * argv[])
 }
 
 CORBA::Object_ptr
-DAnCE_RepositoryManager_Module::init (CORBA::ORB_ptr orb,
+DAnCE_RepositoryManager_Module::create_object (CORBA::ORB_ptr orb,
                                                int argc,
                                                ACE_TCHAR *argv[])
 {
-  DANCE_TRACE ("DAnCE_RepositoryManager_Module::init");
+  DANCE_TRACE ("DAnCE_RepositoryManager_Module::create_object");
 
   try
     {
       if (CORBA::is_nil(orb))
         {
-          DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::init - ")
+          DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::create_object - ")
                        ACE_TEXT("Attempted to create Repository Manager with a nil orb.\n")));
           return CORBA::Object::_nil();
         }
@@ -301,7 +309,7 @@ DAnCE_RepositoryManager_Module::init (CORBA::ORB_ptr orb,
 
       if (ACE_OS::strcmp(orb->id(), this->orb_->id()) != 0)
         {
-          DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::init - ")
+          DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::create_object - ")
                        ACE_TEXT("Resetting NM's orb.\n")));
           this->orb_ = CORBA::ORB::_duplicate (orb);
           this->domain_nc_ = CosNaming::NamingContext::_nil();
@@ -321,7 +329,7 @@ DAnCE_RepositoryManager_Module::init (CORBA::ORB_ptr orb,
         {
           try
             {
-              DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::init - ")
+              DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::create_object - ")
                            ACE_TEXT("Resolving DomainNC.\n")));
               CORBA::Object_var domain_obj = this->orb_->string_to_object (this->options_.domain_nc_);
               if (!CORBA::is_nil (domain_obj.in ()))
@@ -329,7 +337,7 @@ DAnCE_RepositoryManager_Module::init (CORBA::ORB_ptr orb,
                   this->domain_nc_ = CosNaming::NamingContext::_narrow (domain_obj.in());
                   if (CORBA::is_nil (this->domain_nc_.in ()))
                     {
-                      DANCE_ERROR (1, (LM_ERROR,DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::init - ")
+                      DANCE_ERROR (1, (LM_ERROR,DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::create_object - ")
                                     ACE_TEXT("Narrow to NamingContext return nil for DomainNC.\n")));
                       return CORBA::Object::_nil ();
                     }
@@ -337,13 +345,13 @@ DAnCE_RepositoryManager_Module::init (CORBA::ORB_ptr orb,
             }
           catch (const CORBA::Exception&)
             {
-              DANCE_DEBUG (6, (LM_WARNING, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::init - ")
+              DANCE_DEBUG (6, (LM_WARNING, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::create_object - ")
                              ACE_TEXT("DomainNC context not found!\n")));
             }
         }
 
 
-      DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::init - ")
+      DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::create_object - ")
                     ACE_TEXT("Initializing the IOR Table\n")));
       // Initialize IOR table
       CORBA::Object_var table_object = orb->resolve_initial_references ("IORTable");
@@ -352,7 +360,7 @@ DAnCE_RepositoryManager_Module::init (CORBA::ORB_ptr orb,
 
       if (CORBA::is_nil (adapter.in ()))
         {
-          DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::init - ")
+          DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::create_object - ")
                          ACE_TEXT("Unable to RIR the IORTable.\n")));
           return CORBA::Object::_nil ();
         }
@@ -386,7 +394,7 @@ DAnCE_RepositoryManager_Module::init (CORBA::ORB_ptr orb,
       // Binding ior to IOR Table
       adapter->bind (repository_manager_oid.c_str (), ior.in ());
 
-      // Binding repository manager to DomainNC
+      // Binding repository menager to DomainNC
       if (!CORBA::is_nil (this->domain_nc_.in ()))
         {
           ACE_CString ns_name;
@@ -394,7 +402,7 @@ DAnCE_RepositoryManager_Module::init (CORBA::ORB_ptr orb,
             ns_name = "RepositoryManager";
           else ns_name = this->options_.name_;
 
-          DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::init - ")
+          DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::create_object - ")
                        ACE_TEXT("Registering NM in NC as \"%C\".\n"), ns_name.c_str ()));
           CosNaming::Name name (1);
           name.length (1);
@@ -406,10 +414,10 @@ DAnCE_RepositoryManager_Module::init (CORBA::ORB_ptr orb,
       // Writing ior to file
       if (0 != this->options_.ior_file_)
         {
-          DANCE_DEBUG (9, (LM_TRACE,  DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::init - ")
+          DANCE_DEBUG (9, (LM_TRACE,  DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::create_object - ")
                         ACE_TEXT("Writing RM IOR %C to file %C.\n"), this->options_.ior_file_, ior.in ()));
           if (!DAnCE::Repository_Manager::write_IOR (this->options_.ior_file_, ior.in ()))
-            DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::init - ")
+            DANCE_ERROR (1, (LM_ERROR, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::create_object - ")
                           ACE_TEXT("Error: Unable to write IOR to file %C\n"),
                           this->options_.ior_file_));
         }
@@ -419,10 +427,10 @@ DAnCE_RepositoryManager_Module::init (CORBA::ORB_ptr orb,
       mgr->activate ();
 
       // Finishing Deployment part
-      DANCE_DEBUG (6, (LM_NOTICE, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::init - ")
+      DANCE_DEBUG (6, (LM_NOTICE, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::create_object - ")
                     ACE_TEXT("DAnCE_RepositoryManager is running...\n")));
 
-      DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::init - ")
+      DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT("DAnCE_RepositoryManager_Module::create_object - ")
                     ACE_TEXT("RepositoryManager IOR: %C\n"), ior.in ()));
 
       return nm_obj._retn ();
@@ -507,3 +515,6 @@ DAnCE_RepositoryManager_Module::spawn_http (void)
   ACE_Service_Config::current ()->process_directive (directive.c_str ());
 }
 
+#ifndef BUILD_REPOSITORY_MANAGER_EXE
+ACE_FACTORY_DEFINE (DAnCE_RepositoryManager_Module, DAnCE_RepositoryManager_Module)
+#endif /*BUILD_REPOSITORY_MANAGER_EXE */
diff --git a/CIAO/DAnCE/RepositoryManager/Repository_Manager_Module.h b/CIAO/DAnCE/RepositoryManager/Repository_Manager_Module.h
index 2f284c2e8b3..5374ad6f00f 100644
--- a/CIAO/DAnCE/RepositoryManager/Repository_Manager_Module.h
+++ b/CIAO/DAnCE/RepositoryManager/Repository_Manager_Module.h
@@ -18,28 +18,72 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/Service_Config.h"
+#include "DAnCE_RepositoryManager_Module_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Service_Config.h"
 #include "ace/Vector_T.h"
 #include "ace/Map_Manager.h"
 #include "ace/Null_Mutex.h"
 #include "tao/ORB.h"
-#include "tao/PortableServer/PortableServer.h"
+#include "tao/PortableServer/POAC.h"
 #include "orbsvcs/CosNamingC.h"
-#include "DAnCE/Deployment_common.h"
+#include "tao/Object_Loader.h"
+#include "Deployment/DAnCE_Loader.h"
+#include "DAnCE/Deployment/Deployment_common.h"
+
+namespace DAnCE
+{
+  class RepositoryManagerDaemon_i;
+}
 
 /**
  * @class Repository_Manager_Module
  *
+ * @brief The shared object that is instantiated when the node manager
+ *        module/library is dynamically loaded.
+ *
  * This class runs the node manager instance
  */
-class DAnCE_RepositoryManager_Module
+class DAnCE_RepositoryManager_Module_Export DAnCE_RepositoryManager_Module
+  : public DAnCE::DAnCE_Object_Loader
 {
  public:
+      struct SOptions
+      {
+        const ACE_TCHAR * domain_nc_;
+        const ACE_TCHAR * ior_file_;
+        size_t threads_;
+        const ACE_TCHAR * package_dir_;
+        const ACE_TCHAR * name_;
+        const ACE_TCHAR * server_address_;
+
+        bool spawn_http_;
+        const ACE_TCHAR *http_port_;
+        const ACE_TCHAR *http_threads_;
+        const ACE_TCHAR *http_threading_;
+        const ACE_TCHAR *http_io_;
+        const ACE_TCHAR *http_caching_;
+
+        SOptions() :
+          domain_nc_ (0),
+          ior_file_ (0),
+          threads_ (1),
+          package_dir_ (ACE_TEXT("RepositoryManager_Packages")),
+          server_address_ (0),
+          spawn_http_ (false),
+          http_port_ (ACE_TEXT("5432")),
+          http_threads_ (ACE_TEXT("1")),
+          http_threading_ (ACE_TEXT("POOL")),
+          http_io_ (ACE_TEXT("SYNCH")),
+          http_caching_ (ACE_TEXT("NO_CACHE"))
+        {
+        }
+      };
+
   /// Constructor.
   DAnCE_RepositoryManager_Module (void);
 
@@ -48,51 +92,26 @@ class DAnCE_RepositoryManager_Module
 
   /// Overload the base class method to create a new instance
   /// of a DAnCE_RepositoryManager_Module object.
-  CORBA::Object_ptr init (CORBA::ORB_ptr orb,
-                          int argc,
-                          ACE_TCHAR *argv []);
+  virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
+                                           int argc,
+                                           ACE_TCHAR *argv []);
 
- private:
-  struct SOptions
-  {
-    const ACE_TCHAR * domain_nc_;
-    const ACE_TCHAR * ior_file_;
-    size_t threads_;
-    const ACE_TCHAR * package_dir_;
-    const ACE_TCHAR * name_;
-    const ACE_TCHAR * server_address_;
-
-    bool spawn_http_;
-    const ACE_TCHAR *http_port_;
-    const ACE_TCHAR *http_threads_;
-    const ACE_TCHAR *http_threading_;
-    const ACE_TCHAR *http_io_;
-    const ACE_TCHAR *http_caching_;
-
-    SOptions() :
-      domain_nc_ (0),
-      ior_file_ (0),
-      threads_ (1),
-      package_dir_ (ACE_TEXT("RepositoryManager_Packages")),
-      server_address_ (0),
-      spawn_http_ (false),
-      http_port_ (ACE_TEXT("5432")),
-      http_threads_ (ACE_TEXT("1")),
-      http_threading_ (ACE_TEXT("POOL")),
-      http_io_ (ACE_TEXT("SYNCH")),
-      http_caching_ (ACE_TEXT("NO_CACHE"))
-    {
-    }
-  };
-
-  const char * usage (void);
-
-  bool parse_args (int argc, ACE_TCHAR *argv []);
+  virtual const char * usage (void);
+
+  virtual bool parse_args (int argc, ACE_TCHAR *argv []);
 
+ private:
   void create_poas (void);
 
   void spawn_http (void);
 
+  /// Here we store the servants.
+  typedef ACE_Map_Manager < ACE_CString,
+                            DAnCE::RepositoryManagerDaemon_i *,
+                            ACE_Null_Mutex > Servant_Map;
+
+  Servant_Map rm_map_;
+
   CORBA::ORB_var orb_;
   CosNaming::NamingContext_var domain_nc_;
 
@@ -102,6 +121,8 @@ class DAnCE_RepositoryManager_Module
   PortableServer::POA_var rm_poa_;
 };
 
+ACE_FACTORY_DECLARE (DAnCE_RepositoryManager_Module, DAnCE_RepositoryManager_Module)
+
 #include /**/ "ace/post.h"
 
 #endif  /* NODE_MANAGER_MODULE_H */
diff --git a/CIAO/DAnCE/RepositoryManager/URL_Parser.h b/CIAO/DAnCE/RepositoryManager/URL_Parser.h
index ed2cad8ad88..c75d2f7bc1a 100644
--- a/CIAO/DAnCE/RepositoryManager/URL_Parser.h
+++ b/CIAO/DAnCE/RepositoryManager/URL_Parser.h
@@ -1,3 +1,4 @@
+
 /* -*- C++ -*- */
 
 //=============================================================================
diff --git a/CIAO/DAnCE/RepositoryManager/repository_manager_admin.cpp b/CIAO/DAnCE/RepositoryManager/repository_manager_admin.cpp
index 5e5ee249538..fd1243f861f 100644
--- a/CIAO/DAnCE/RepositoryManager/repository_manager_admin.cpp
+++ b/CIAO/DAnCE/RepositoryManager/repository_manager_admin.cpp
@@ -25,7 +25,7 @@ namespace DAnCE
       try
         {
           DANCE_DEBUG (9, (LM_TRACE, DLINFO "Admin::install_package - "
-                        "Installing package with URI: %s, name: %s\n",
+                        "Installing package with URI: %C, name: %C\n",
                         uri, name));
           this->rm_->installPackage (ACE_TEXT_ALWAYS_CHAR (name),
                                      ACE_TEXT_ALWAYS_CHAR (uri),
@@ -36,21 +36,21 @@ namespace DAnCE
       catch (Deployment::NameExists &)
         {
           DANCE_ERROR (1, (LM_ERROR, DLINFO "Admin::install_package - "
-                        "Package with name %s already installed.\n",
+                        "Package with name %C already installed.\n",
                         name));
           return false;
         }
       catch (Deployment::PackageError &ex)
         {
           DANCE_ERROR (1, (LM_ERROR, DLINFO "Admin::install_package - "
-                        "Internal error while installing package with name %s: %C - %C\n",
+                        "Internal error while installing package with name %C: %C - %C\n",
                         name, ex.source.in (), ex.reason.in ()));
           return false;
         }
       catch (CORBA::Exception &ex)
         {
           DANCE_ERROR (1, (LM_ERROR, DLINFO "Admin::install_package - "
-                        "Unexpected CORBA Exception while installing package with name: %s.  Reason: %C\n",
+                        "Unexpected CORBA Exception while installing package with name: %C.  Reason: %C\n",
                         name,
                         ex._info ().c_str ()));
           return false;
@@ -58,7 +58,7 @@ namespace DAnCE
       catch (...)
         {
           DANCE_ERROR (1, (LM_ERROR, DLINFO "Admin::install_package - "
-                        "Unexpected C++ exception while installing package with name: %s\n",
+                        "Unexpected C++ exception while installing package with name: %C\n",
                         name));
           return false;
         }
@@ -98,14 +98,14 @@ namespace DAnCE
       catch (Deployment::NoSuchName &)
         {
           DANCE_ERROR (1, (LM_ERROR, DLINFO "Admin::uninstall_package - "
-                        "No package with the given UUID found: %s\n",
+                        "No package with the given UUID found: %C\n",
                         uuid));
           return false;
         }
       catch (CORBA::Exception &ex)
         {
           DANCE_ERROR (1, (LM_ERROR, DLINFO "Admin::uninstall_package - "
-                        "Unexpected CORBA Exception while uninstalling package with uuid: %s. Reason: %C\n",
+                        "Unexpected CORBA Exception while uninstalling package with uuid: %C.  Reason: %C\n",
                         uuid,
                         ex._info ().c_str ()));
           return false;
diff --git a/CIAO/DAnCE/RepositoryManager/repository_manager_admin.h b/CIAO/DAnCE/RepositoryManager/repository_manager_admin.h
index 20f068a58f3..867b4b0a18a 100644
--- a/CIAO/DAnCE/RepositoryManager/repository_manager_admin.h
+++ b/CIAO/DAnCE/RepositoryManager/repository_manager_admin.h
@@ -14,6 +14,8 @@
 #include /**/ "ace/pre.h"
 #include "Deployment/Deployment_RepositoryManagerC.h"
 
+#include "Repository_Manager_Admin_Export.h"
+
 namespace DAnCE
 {
   namespace RepositoryManager
@@ -22,7 +24,7 @@ namespace DAnCE
      * @class Admin
      * @brief Implements administrative functions for the Repository Manager.
      */
-    class Admin
+    class DAnCE_RepositoryManager_Admin_Export Admin
     {
     public:
       Admin (Deployment::RepositoryManager_ptr rm);
@@ -56,6 +58,7 @@ namespace DAnCE
 
     private:
       Deployment::RepositoryManager_var rm_;
+
     };
   }
 }
diff --git a/CIAO/DAnCE/RepositoryManager/repository_manager_admin_exec.cpp b/CIAO/DAnCE/RepositoryManager/repository_manager_admin_exec.cpp
index adea0525518..8c9a5214045 100644
--- a/CIAO/DAnCE/RepositoryManager/repository_manager_admin_exec.cpp
+++ b/CIAO/DAnCE/RepositoryManager/repository_manager_admin_exec.cpp
@@ -432,8 +432,6 @@ int ACE_TMAIN (int argc, ACE_TCHAR **argv)
           if (!admin.shutdown ())
             retval = -1;
         }
-
-      orb->destroy ();
     }
   catch (CORBA::Exception &ex)
     {
diff --git a/CIAO/DAnCE/tests/TargetManager/CmpClient.cpp b/CIAO/DAnCE/TargetManager/CmpClient.cpp
index 9d42e928a53..9d42e928a53 100644
--- a/CIAO/DAnCE/tests/TargetManager/CmpClient.cpp
+++ b/CIAO/DAnCE/TargetManager/CmpClient.cpp
diff --git a/CIAO/DAnCE/TargetManager/DAnCE_TargetManagerDaemon.idl b/CIAO/DAnCE/TargetManager/DAnCE_TargetManagerDaemon.idl
new file mode 100644
index 00000000000..fef488a487b
--- /dev/null
+++ b/CIAO/DAnCE/TargetManager/DAnCE_TargetManagerDaemon.idl
@@ -0,0 +1,12 @@
+// $Id$
+
+#include "DAnCE/Deployment/Deployment_TargetManager.idl"
+
+module DAnCE
+{
+  interface TargetManagerDaemon : Deployment::TargetManager
+  {
+    oneway void shutdown ();
+  };
+};
+
diff --git a/CIAO/DAnCE/TargetManager/DomainDataManager.cpp b/CIAO/DAnCE/TargetManager/DomainDataManager.cpp
index 8f0583dc3f2..570db1911d9 100644
--- a/CIAO/DAnCE/TargetManager/DomainDataManager.cpp
+++ b/CIAO/DAnCE/TargetManager/DomainDataManager.cpp
@@ -1,8 +1,8 @@
 // $Id$
 #include "DomainDataManager.h"
-#include "Deployment/Deployment_NodeManagerC.h"
 
 #include "Config_Handlers/DD_Handler.h"
+#include "Config_Handlers/DnC_Dump.h"
 #include "DAnCE/Logger/Log_Macros.h"
 
 #ifdef GEN_OSTREAM_OPS
@@ -34,7 +34,7 @@ DAnCE::DomainDataManager::init (CORBA::ORB_ptr orb,
   _stream << *dmn << std::endl;
 
   DANCE_DEBUG (9, (LM_TRACE, DLINFO "DAnCE::DomainDataManager::init - "
-                "Contents of Domain: %C\n",
+                "Contents of Domain:%s\n",
                 _stream.str ().c_str ()));
 #endif
 
@@ -58,7 +58,9 @@ int DAnCE::DomainDataManager::update_domain (const ::CORBA::StringSeq &,
   // Update the subset of the domain which the above
   // parameter corresponds to
 
-  // Check the type of update ..
+
+  //check the type of update ..
+
   switch (update_kind)
     {
       case ::Deployment::UpdateAll:
@@ -401,6 +403,48 @@ void DAnCE::DomainDataManager::commit_release_resource (
     }
 }
 
+void DAnCE::DomainDataManager::stop_monitors ()
+{
+  DANCE_TRACE ("DAnCE::DomainDataManager::stop_monitors");
+
+  CORBA::ULong const length = initial_domain_.node.length ();
+
+  for (CORBA::ULong i=0;i < length;i++)
+    {
+      ::Deployment::NodeManager_var node_manager;
+
+      try
+        {
+//          node_manager =
+            //deployment_config_.get_node_manager
+//            (initial_domain_.node[i].name.in ());
+        }
+      catch (const CORBA::Exception&)
+        {
+          DANCE_ERROR (1, (LM_ERROR, "DANCE::TM (%P|%t) DomainDataManager.cpp: "
+                      "Error in get Node Manager from Deployment Config %s\n",
+                      initial_domain_.node[i].name.in ()));
+          continue;
+        }
+
+      if (!CORBA::is_nil (node_manager.in ()))
+        {
+          try
+            {
+              node_manager->leaveDomain ();
+            }
+          catch (CORBA::Exception& ex)
+            {
+              DANCE_ERROR (1, (LM_ERROR , "TM::Error in calling Leave Domain\n"));
+              ex._tao_print_exception (
+                "Exception caught in ""DomainDataManager::leaveDomain");
+            }
+        }
+    }
+  return;
+
+}
+
 int DAnCE::DomainDataManager::add_to_domain (
     const ::Deployment::Domain& domain)
 {
@@ -450,10 +494,10 @@ bool DAnCE::DomainDataManager::find_in_initial_domain (const char* node_name,
       i++)
   {
     if (ACE_OS::strcmp (node_name, this->initial_domain_.node[i].name.in ()) == 0)
-      {
-        node = this->initial_domain_.node[i];
-        return true;
-      }
+    {
+      node = this->initial_domain_.node[i];
+      return true;
+    }
   }
 
   // not found the node , return a node with an empty name
@@ -471,10 +515,10 @@ bool DAnCE::DomainDataManager::find_in_provisioned_domain (const char* node_name
       i++)
   {
     if (ACE_OS::strcmp (node_name, this->provisioned_data_.node[i].name.in ()) == 0)
-      {
-        node = this->provisioned_data_.node[i];
-        return true;
-      }
+    {
+      node = this->provisioned_data_.node[i];
+      return true;
+    }
   }
 
   // not found the node , return a node with an empty name
diff --git a/CIAO/DAnCE/TargetManager/DomainDataManager.h b/CIAO/DAnCE/TargetManager/DomainDataManager.h
index 42986d94a80..32ed5c9b70c 100644
--- a/CIAO/DAnCE/TargetManager/DomainDataManager.h
+++ b/CIAO/DAnCE/TargetManager/DomainDataManager.h
@@ -14,8 +14,9 @@
 #ifndef DOMAIN_DATA_MGRH
 #define DOMAIN_DATA_MGRH
 
+//#include "TargetManagerC.h"
 #include "Deployment/Deployment_TargetDataC.h"
-#include "Deployment/Deployment_TargetManagerC.h"
+#include "DAnCE/DomainApplicationManager/Node_Locator.h"
 
 namespace DAnCE
 {
@@ -47,15 +48,16 @@ namespace DAnCE
      * @brief        This function is called from the Executor code
      *               to get the Original Domain data.
      * @return       Domain* The Initial Domain
+     *
      */
-    ::Deployment::Domain* get_initial_domain (void);
+    ::Deployment::Domain* get_initial_domain ();
 
     /**
      * @brief       This function is called from the Executor code
      *              to get the Current Domain data.
      * @return      Domain* The Current Domain
      */
-    ::Deployment::Domain* get_current_domain (void);
+    ::Deployment::Domain* get_current_domain ();
 
     /**
      * @brief returns the sequence of node managers
@@ -70,6 +72,13 @@ namespace DAnCE
     void releaseResources (const ::Deployment::ResourceCommitmentManager_ptr manager);
 
     /**
+     * The node manager in turn stops the monitor
+     * @brief The function makes a call on the leaveDomain on the
+     *        NodeManager
+     */
+    void stop_monitors ();
+
+    /**
      * @brief The function allocates resources specified in the
      * parameter
      *
@@ -100,14 +109,12 @@ namespace DAnCE
                const ACE_TCHAR *domain_name);
 
   private:
-    /// The different action that can take place
-    enum  Action {commit , release};
 
     /**
      * @brief   It will read the initial Domain data from
      *          XML files.
      */
-    int readin_domain_data (void);
+    int readin_domain_data ();
 
     /**
      * @brief Match the deployed resources to the
@@ -115,7 +122,8 @@ namespace DAnCE
      */
     void match_requirement_resource (
                                      ::Deployment::InstanceResourceDeploymentDescriptions deployed,
-                                     ::Deployment::Resources& available);
+                                     ::Deployment::Resources& available
+                                     );
 
     /**
      * @brief Match the properties of a Requirement to the
@@ -128,6 +136,9 @@ namespace DAnCE
                            ::Deployment::SatisfierProperties& available);
 
 
+    /// The different actiona that can take place
+    enum  Action {commit , release};
+
     /**
      * @brief Either commits or releases the given resource
      * based on the current Action set.
@@ -146,7 +157,7 @@ namespace DAnCE
      * @brief This function calls all NM and gives them
      * the sub-domain
      */
-    int call_all_node_managers (void);
+    int call_all_node_managers ();
 
     /**
      * @brief This function add new elements to the
@@ -216,7 +227,9 @@ namespace DAnCE
     /// at total capacity
     ::Deployment::Domain initial_domain_;
 
-    /// The Current Domain - contains resources at current capacity
+
+    /// The Current Domain - contains resources
+    /// at current capacity
     ::Deployment::Domain current_domain_;
 
     /// The Target Manager Context
@@ -234,8 +247,8 @@ namespace DAnCE
     /// The current action
     Action current_action_;
   };
-
-  typedef ACE_Singleton <DomainDataManager, ACE_SYNCH_RECURSIVE_MUTEX>
+  
+  typedef ACE_Singleton <DomainDataManager, ACE_SYNCH_RECURSIVE_MUTEX> 
   DomainDataManager_Singleton;
 #define DOMAIN_DATA_MANAGER DomainDataManager_Singleton::instance ()
 } // CIAO
diff --git a/CIAO/DAnCE/TargetManager/ResourceCommitmentManager.cpp b/CIAO/DAnCE/TargetManager/ResourceCommitmentManager.cpp
index dbef7942d93..1b43b6e22bd 100644
--- a/CIAO/DAnCE/TargetManager/ResourceCommitmentManager.cpp
+++ b/CIAO/DAnCE/TargetManager/ResourceCommitmentManager.cpp
@@ -1,61 +1,61 @@
 // $Id$
 //
-#include "ResourceCommitmentManager.h"
 #include "DomainDataManager.h"
+#include "ResourceCommitmentManager.h"
 #include "DAnCE/Logger/Log_Macros.h"
 
+// Implementation skeleton constructor
 DAnCE::ResourceCommitmentManager_i::ResourceCommitmentManager_i (void)
 {
   DANCE_TRACE ("DAnCE::ResourceCommitmentManager_i");
 }
 
+// Implementation skeleton destructor
 DAnCE::ResourceCommitmentManager_i::~ResourceCommitmentManager_i (void)
 {
   DANCE_TRACE ("DAnCE::~ResourceCommitmentManager_i");
 }
 
-void
-DAnCE::ResourceCommitmentManager_i::commitResources (
+void DAnCE::ResourceCommitmentManager_i::commitResources (
     const ::Deployment::ResourceAllocations& resources)
 {
   DANCE_TRACE ("DAnCE::ResourceCommitmentManager_i::commitResources");
-
+  
   DOMAIN_DATA_MANAGER->commitResourceAllocation (resources);
 
-  // Commit succesful .. add to commited resource, we get an exception
-  // if the method above fails
-  this->add_to_committed_resource (resources);
+  // commit succesful .. add to commited resource
+  this->add_to_commited_resource (resources);
+  return;
 }
 
-void
-DAnCE::ResourceCommitmentManager_i::releaseResources (
+void DAnCE::ResourceCommitmentManager_i::releaseResources (
     const ::Deployment::ResourceAllocations & resources)
 {
   DANCE_TRACE ("DAnCE::ResourceCommitmentManager_i::releaseResources");
-
-  // If the resources set is null, use the already allocated resources ..
+  
+  ::Deployment::ResourceAllocations res;
+  
+  // if the resources set is null , use the already allocated resources ..
   if (resources.length () == 0)
-    {
-      DOMAIN_DATA_MANAGER->releaseResourceAllocation (this->resources_);
-    }
+    res = this->resources_;
   else
-    {
-      DOMAIN_DATA_MANAGER->releaseResourceAllocation (resources);
-    }
+    res = resources;
+
+  DOMAIN_DATA_MANAGER->releaseResourceAllocation (res);
+  return;
 }
 
-void
-DAnCE::ResourceCommitmentManager_i::add_to_committed_resource (
+int DAnCE::ResourceCommitmentManager_i::add_to_commited_resource (
     ::Deployment::ResourceAllocations res)
 {
   DANCE_TRACE ("DAnCE::ResourceCommitmentManager_i::add_to_commited_resource");
-
+  
   CORBA::ULong const current_length = this->resources_.length ();
 
   this->resources_.length (current_length + res.length ());
 
   for (CORBA::ULong i = 0;i < res.length ();i++)
-    {
-      this->resources_[current_length + i] = res[i];
-    }
+    this->resources_[current_length + i] = res[i];
+
+  return 0;
 }
diff --git a/CIAO/DAnCE/TargetManager/ResourceCommitmentManager.h b/CIAO/DAnCE/TargetManager/ResourceCommitmentManager.h
index d7c4a81cff4..813dcd65bd8 100644
--- a/CIAO/DAnCE/TargetManager/ResourceCommitmentManager.h
+++ b/CIAO/DAnCE/TargetManager/ResourceCommitmentManager.h
@@ -24,10 +24,10 @@ namespace DAnCE
    : public virtual POA_Deployment::ResourceCommitmentManager
     {
       public:
-        /// Constructor
+        // Constructor
         ResourceCommitmentManager_i (void);
 
-        /// Destructor
+        // Destructor
         virtual ~ResourceCommitmentManager_i (void);
 
         /**
@@ -38,22 +38,26 @@ namespace DAnCE
          * sequence. If the resource cannot be allocated throws a
          * ResourceCommitmentFailed exception
          */
-        virtual void commitResources (
+        virtual
+          void commitResources (
               const ::Deployment::ResourceAllocations& resources);
 
-        virtual void releaseResources (
+        virtual
+          void releaseResources (
               const ::Deployment::ResourceAllocations & resources);
 
       private:
+
         /**
          * @brief This function adds the res to already commited resources.
          *        This is to be called from within commitResources
          */
-        void add_to_committed_resource (::Deployment::ResourceAllocations res);
+        int add_to_commited_resource (::Deployment::ResourceAllocations res);
 
         /// The commited resource
         ::Deployment::ResourceAllocations resources_;
     };
+
 }
 
 #endif /* DEPLOYMENT_RESOURCECOMMITMENTMANAGERI_H_  */
diff --git a/CIAO/DAnCE/tests/TargetManager/TM_Client.mpc b/CIAO/DAnCE/TargetManager/TM_Client.mpc
index b38f3c36986..97b3b760ce9 100644
--- a/CIAO/DAnCE/tests/TargetManager/TM_Client.mpc
+++ b/CIAO/DAnCE/TargetManager/TM_Client.mpc
@@ -2,7 +2,7 @@
 
 // Client.mpc,v 1.6 2005/02/18 09:07:06 jwillemsen Exp
 
-project(TMClient): ccm_stub, dance_deployment_stub, dance_targetmanager_stub, dance_config_handlers {
+project(TMClient): ccm_stub, dance_deployment_stub, ciao_targetmanager_stub, ciao_config_handlers {
   requires += dummy_label
   IDL_Files {
   }
diff --git a/CIAO/DAnCE/TargetManager/TargetManager.mpc b/CIAO/DAnCE/TargetManager/TargetManager.mpc
index 63d6498db82..abc35992943 100644
--- a/CIAO/DAnCE/TargetManager/TargetManager.mpc
+++ b/CIAO/DAnCE/TargetManager/TargetManager.mpc
@@ -1,15 +1,71 @@
 // $Id$
 
-project (DAnCE_TargetManager_Exec) : iortable, utils, naming, dance_logger, dance_nodemanager_stub, dance_exe, dance_config_handlers, dance_targetmanager_skel {
-  exename = dance_target_manager
+project (DAnCE_TargetManagerDaemon_IDL) : ciaoidldefaults {
+  custom_only = 1
+
+  idlflags += -Gxhst -Gxhsk
+  idlflags += -Wb,stub_export_macro=TARGETMANAGERDAEMON_STUB_Export \
+              -Wb,stub_export_include=TargetManagerDaemon_stub_export.h \
+              -Wb,skel_export_macro=TARGETMANAGERDAEMON_SVNT_Export \
+              -Wb,skel_export_include=TargetManagerDaemon_svnt_export.h
+
+  IDL_Files {
+    DAnCE_TargetManagerDaemon.idl
+  }
+}
+
+project(DAnCE_TargetManagerDaemon_stub) : dance_lib, dance_targetmanager_stub {
+  sharedname = DAnCE_TargetManagerDaemon_stub
+  dynamicflags = TARGETMANAGERDAEMON_STUB_BUILD_DLL
+  after += DAnCE_TargetManagerDaemon_IDL
   IDL_Files {
   }
 
   Source_Files {
+    DAnCE_TargetManagerDaemonC.cpp
+  }
+}
+
+project(DAnCE_TargetManager_Impl) : dance_lib, ciao_config_handlers, naming, iortable, utils, dance_nodemanager_stub, dance_targetmanager_skel, dance_logger {
+  sharedname = DAnCE_TargetManager_Impl
+  libs += DAnCE_TargetManagerDaemon_stub DAnCE_TargetManagerDaemon_svnt
+  after += DAnCE_TargetManagerDaemon_stub DAnCE_TargetManagerDaemon_svnt
+  dynamicflags = DANCE_TARGETMANAGER_IMPL_BUILD_DLL TARGETMANAGER_MODULE_BUILD_DLL
+
+  Source_Files {
     DomainDataManager.cpp
     ResourceCommitmentManager.cpp
     TargetManager_Impl.cpp
     Target_Manager_Module.cpp
-    Target_Manager.cpp
+  }
+
+  IDL_Files {
+  }
+}
+
+project(DAnCE_TargetManagerDaemon_svnt) : dance_lib, dance_deployment_svnt, \
+    dance_targetmanager_stub, dance_targetmanager_skel, ciao_config_handlers {
+  sharedname  = DAnCE_TargetManagerDaemon_svnt
+
+  libs += DAnCE_TargetManagerDaemon_stub
+  after += DAnCE_TargetManagerDaemon_stub
+
+  dynamicflags = TARGETMANAGERDAEMON_SVNT_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    DAnCE_TargetManagerDaemonS.cpp
+  }
+}
+
+project (DAnCE_TargetManager_Exec) : iortable, utils, naming, dance_logger, dance_tm_daemon, dance_nodemanager_stub, dance_targetmanager, dance_exe {
+  exename = dance_target_manager
+  IDL_Files {
+  }
+
+  Source_Files {
+     Target_Manager_Exec.cpp
   }
 }
diff --git a/CIAO/DAnCE/TargetManager/TargetManager_Impl.cpp b/CIAO/DAnCE/TargetManager/TargetManager_Impl.cpp
index 1f8c342a584..d70b6c85a55 100644
--- a/CIAO/DAnCE/TargetManager/TargetManager_Impl.cpp
+++ b/CIAO/DAnCE/TargetManager/TargetManager_Impl.cpp
@@ -12,6 +12,7 @@ TargetManagerDaemon_i::TargetManagerDaemon_i (CORBA::ORB_ptr orb)
 {
 }
 
+// Implementation skeleton destructor
 TargetManagerDaemon_i::~TargetManagerDaemon_i (void)
 {
 }
@@ -23,19 +24,21 @@ void TargetManagerDaemon_i::init (const ACE_TCHAR *file)
                                     file);
 }
 
+void TargetManagerDaemon_i::shutdown (void)
+{
+}
+
 ::Deployment::Domain * TargetManagerDaemon_i::getAllResources (void)
 {
   return DAnCE::DOMAIN_DATA_MANAGER->get_initial_domain ();
 }
 
-::Deployment::Domain *
-TargetManagerDaemon_i::getAvailableResources (void)
+::Deployment::Domain * TargetManagerDaemon_i::getAvailableResources (void)
 {
   return DAnCE::DOMAIN_DATA_MANAGER->get_current_domain ();
 }
 
-::Deployment::ResourceCommitmentManager_ptr
-TargetManagerDaemon_i::createResourceCommitment (
+::Deployment::ResourceCommitmentManager_ptr TargetManagerDaemon_i::createResourceCommitment (
   const ::Deployment::ResourceAllocations & resources)
 {
   return DAnCE::DOMAIN_DATA_MANAGER->commitResources (resources);
diff --git a/CIAO/DAnCE/TargetManager/TargetManager_Impl.h b/CIAO/DAnCE/TargetManager/TargetManager_Impl.h
index 29746211584..248801b45b9 100644
--- a/CIAO/DAnCE/TargetManager/TargetManager_Impl.h
+++ b/CIAO/DAnCE/TargetManager/TargetManager_Impl.h
@@ -6,16 +6,18 @@
 #ifndef TARGETMANAGERDAEMONI_H_
 #define TARGETMANAGERDAEMONI_H_
 
-#include "Deployment/Deployment_TargetManagerS.h"
+#include "DAnCE_TargetManagerDaemonS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "TargetManager_Impl_export.h"
+
 namespace DAnCE
 {
-class TargetManagerDaemon_i
-  : public virtual POA_Deployment::TargetManager
+class DAnCE_TargetManager_Impl_Export TargetManagerDaemon_i
+  : public virtual POA_DAnCE::TargetManagerDaemon
 {
 public:
   /// Constructor
@@ -26,9 +28,13 @@ public:
 
   void init (const ACE_TCHAR *file);
 
-  virtual ::Deployment::Domain * getAllResources (void);
+  virtual void shutdown (void);
+
+  virtual
+  ::Deployment::Domain * getAllResources (void);
 
-  virtual ::Deployment::Domain * getAvailableResources (void);
+  virtual
+  ::Deployment::Domain * getAvailableResources (void);
 
   virtual
   ::Deployment::ResourceCommitmentManager_ptr createResourceCommitment (
diff --git a/CIAO/DAnCE/TargetManager/TargetManager_Impl_export.h b/CIAO/DAnCE/TargetManager/TargetManager_Impl_export.h
new file mode 100644
index 00000000000..ab728ccc8bd
--- /dev/null
+++ b/CIAO/DAnCE/TargetManager/TargetManager_Impl_export.h
@@ -0,0 +1,58 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl DAnCE_TargetManager_Impl
+// ------------------------------
+#ifndef DANCE_TARGETMANAGER_IMPL_EXPORT_H
+#define DANCE_TARGETMANAGER_IMPL_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (ACE_AS_STATIC_LIBS) && !defined (DANCE_TARGETMANAGER_IMPL_HAS_DLL)
+#  define DANCE_TARGETMANAGER_IMPL_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && DANCE_TARGETMANAGER_IMPL_HAS_DLL */
+
+#if !defined (DANCE_TARGETMANAGER_IMPL_HAS_DLL)
+#  define DANCE_TARGETMANAGER_IMPL_HAS_DLL 1
+#endif /* ! DANCE_TARGETMANAGER_IMPL_HAS_DLL */
+
+#if defined (DANCE_TARGETMANAGER_IMPL_HAS_DLL) && (DANCE_TARGETMANAGER_IMPL_HAS_DLL == 1)
+#  if defined (DANCE_TARGETMANAGER_IMPL_BUILD_DLL)
+#    define DAnCE_TargetManager_Impl_Export ACE_Proper_Export_Flag
+#    define DANCE_TARGETMANAGER_IMPL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define DANCE_TARGETMANAGER_IMPL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* DANCE_TARGETMANAGER_IMPL_BUILD_DLL */
+#    define DAnCE_TargetManager_Impl_Export ACE_Proper_Import_Flag
+#    define DANCE_TARGETMANAGER_IMPL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define DANCE_TARGETMANAGER_IMPL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* DANCE_TARGETMANAGER_IMPL_BUILD_DLL */
+#else /* DANCE_TARGETMANAGER_IMPL_HAS_DLL == 1 */
+#  define DAnCE_TargetManager_Impl_Export
+#  define DANCE_TARGETMANAGER_IMPL_SINGLETON_DECLARATION(T)
+#  define DANCE_TARGETMANAGER_IMPL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* DANCE_TARGETMANAGER_IMPL_HAS_DLL == 1 */
+
+// Set DANCE_TARGETMANAGER_IMPL_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (DANCE_TARGETMANAGER_IMPL_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define DANCE_TARGETMANAGER_IMPL_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define DANCE_TARGETMANAGER_IMPL_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !DANCE_TARGETMANAGER_IMPL_NTRACE */
+
+#if (DANCE_TARGETMANAGER_IMPL_NTRACE == 1)
+#  define DANCE_TARGETMANAGER_IMPL_TRACE(X)
+#else /* (DANCE_TARGETMANAGER_IMPL_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define DANCE_TARGETMANAGER_IMPL_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (DANCE_TARGETMANAGER_IMPL_NTRACE == 1) */
+
+#endif /* DANCE_TARGETMANAGER_IMPL_EXPORT_H */
+
+// End of auto generated file.
diff --git a/CIAO/DAnCE/TargetManager/TargetManager_exec.cpp b/CIAO/DAnCE/TargetManager/TargetManager_exec.cpp
new file mode 100644
index 00000000000..728bbfb3744
--- /dev/null
+++ b/CIAO/DAnCE/TargetManager/TargetManager_exec.cpp
@@ -0,0 +1,251 @@
+// $Id$
+#include "TargetManager_exec.h"
+#include "Config_Handlers/DD_Handler.h"
+#include "Config_Handlers/DnC_Dump.h"
+
+#include "DomainEventsC.h"
+
+#include "ResourceCommitmentManager.h"
+
+namespace CIAO_CIAO_TargetManagerImpl_Impl
+{
+  //==================================================================
+  // Facet Executor Implementation Class:   TargetManager_exec_i
+  //==================================================================
+
+  TargetManager_exec_i::
+  TargetManager_exec_i (TargetManagerImpl_exec_i* exec ,
+                        CORBA::ORB_ptr orb)
+    : exec_ (exec),
+      orb_ (::CORBA::ORB::_duplicate (orb))
+  {
+    // The DomainDataManager created here ...
+
+    // get its own obj ref , then call
+    ::Deployment::TargetManager_var target = this->exec_->get_targetMgr ();
+
+    // Create Domain Data here
+
+    CIAO::DOMAIN_DATA_MANAGER->init (orb_.in (), target.in ());
+  }
+
+  TargetManager_exec_i::~TargetManager_exec_i (void)
+  {
+  }
+
+  // Operations from ::Deployment::TargetManager
+
+  ::Deployment::Domain *
+  TargetManager_exec_i::getAllResources ()
+  {
+    return CIAO::DOMAIN_DATA_MANAGER->get_initial_domain ();
+  }
+
+  ::Deployment::Domain *
+  TargetManager_exec_i::getAvailableResources ()
+  {
+    return CIAO::DOMAIN_DATA_MANAGER->get_current_domain ();
+  }
+
+  ::Deployment::ResourceCommitmentManager_ptr
+  TargetManager_exec_i::commitResources (
+  const ::Deployment::ResourceAllocations & resources)
+  {
+    return CIAO::DOMAIN_DATA_MANAGER->commitResources (resources);
+  }
+
+  void
+  TargetManager_exec_i::releaseResources (
+  ::Deployment::ResourceCommitmentManager_ptr manager)
+  {
+    return CIAO::DOMAIN_DATA_MANAGER->releaseResources (manager);
+  }
+
+  void
+  TargetManager_exec_i::updateDomain (
+  const ::CORBA::StringSeq &  elements ,
+  const ::Deployment::Domain &  domainSubset ,
+  ::Deployment::DomainUpdateKind  updateKind)
+  {
+    // Your code here.
+    CIAO::DOMAIN_DATA_MANAGER->update_domain (
+                                  elements,
+                                  domainSubset,
+                                  updateKind);
+
+    // here tell the planner about the changes
+
+    // first get the node names which have failed ...
+    // assuming nodes to only fail , for now
+
+    if (updateKind == ::Deployment::Delete ||
+        updateKind == ::Deployment::Add)
+      {
+        CIAO::Domain_Changed_Event_var changed_event =
+          new OBV_CIAO::Domain_Changed_Event ();
+
+        ::Deployment::Domain_var temp_domain =
+          new ::Deployment::Domain (domainSubset);
+
+        changed_event->changes (temp_domain);
+        changed_event->change_kind (updateKind);
+        this->exec_->context_->push_changes (changed_event);
+      }
+
+  }
+
+  ::Deployment::ResourceCommitmentManager_ptr
+  TargetManager_exec_i::createResourceCommitment (
+  const ::Deployment::ResourceAllocations& manager)
+  {
+
+    CIAO::ResourceCommitmentManager_i *commit_servant =
+      new CIAO::ResourceCommitmentManager_i ();
+
+    // Standard owner transfer mechanisms.
+    //
+    PortableServer::ServantBase_var safe_daemon (commit_servant);
+
+    commit_servant->commitResources (manager);
+
+    Deployment::ResourceCommitmentManager_var mgrv =
+      commit_servant->_this ();
+
+    return mgrv._retn ();
+  }
+
+  void
+  TargetManager_exec_i::destroyResourceCommitment (
+  ::Deployment::ResourceCommitmentManager_ptr manager)
+  {
+    ::Deployment::ResourceAllocations res;
+    res.length (0);
+    manager->releaseResources (res);
+    return;
+  }
+  //==================================================================
+  // Component Executor Implementation Class:   TargetManagerImpl_exec_i
+  //==================================================================
+
+  TargetManagerImpl_exec_i::TargetManagerImpl_exec_i (void)
+  : exec_object_ (0)
+  {
+  }
+
+  TargetManagerImpl_exec_i::~TargetManagerImpl_exec_i (void)
+  {
+  }
+
+  // Supported or inherited operations.
+
+  // Attribute operations.
+
+  // Port operations.
+
+  ::Deployment::CCM_TargetManager_ptr
+  TargetManagerImpl_exec_i::get_targetMgr ()
+  {
+    // Your code here.
+
+    if (CORBA::is_nil (this->exec_object_.in ()))
+      {
+        this->exec_object_ = new TargetManager_exec_i(this,
+                                     context_->_get_orb());
+      }
+
+    return ::Deployment::CCM_TargetManager::_duplicate (this->exec_object_.in ());
+  }
+
+  // Operations from Components::SessionComponent
+
+  void
+  TargetManagerImpl_exec_i::set_session_context (
+  ::Components::SessionContext_ptr ctx)
+  {
+    this->context_ = ::CIAO::CCM_TargetManagerImpl_Context::_narrow (ctx);
+    if (CORBA::is_nil (this->context_.in ()))
+    {
+      throw CORBA::INTERNAL ();
+    }
+  }
+
+  void
+  TargetManagerImpl_exec_i::configuration_complete ()
+  {
+    // Your code here.
+  }
+
+  void
+  TargetManagerImpl_exec_i::ccm_activate ()
+  {
+    // Your code here.
+    this->get_targetMgr ();
+  }
+
+  void
+  TargetManagerImpl_exec_i::ccm_passivate ()
+  {
+    // Your code here.
+  }
+
+  void
+  TargetManagerImpl_exec_i::ccm_remove ()
+  {
+    // Your code here.
+
+    //CIAO::DomainDataManager::get_data_manager ()->stop_monitors ();
+
+    return;
+  }
+
+
+  //==================================================================
+  // Home Executor Implementation Class:   TargetManagerHome_exec_i
+  //==================================================================
+
+  TargetManagerHome_exec_i::TargetManagerHome_exec_i (void)
+  {
+  }
+
+  TargetManagerHome_exec_i::~TargetManagerHome_exec_i (void)
+  {
+  }
+
+  // Supported or inherited operations.
+
+  // Home operations.
+
+  // Factory and finder operations.
+
+  // Attribute operations.
+
+  // Implicit operations.
+
+  ::Components::EnterpriseComponent_ptr
+  TargetManagerHome_exec_i::create ()
+  {
+    ::Components::EnterpriseComponent_ptr retval =
+      ::Components::EnterpriseComponent::_nil ();
+
+    ACE_NEW_THROW_EX (
+    retval,
+    TargetManagerImpl_exec_i,
+    CORBA::NO_MEMORY ());
+
+    return retval;
+  }
+
+  extern "C" TARGETMANAGER_EXEC_Export ::Components::HomeExecutorBase_ptr
+  create_CIAO_TargetManagerHome_Impl (void)
+  {
+    ::Components::HomeExecutorBase_ptr retval =
+      ::Components::HomeExecutorBase::_nil ();
+
+    ACE_NEW_RETURN (
+    retval,
+    TargetManagerHome_exec_i,
+    ::Components::HomeExecutorBase::_nil ());
+
+    return retval;
+  }
+}
diff --git a/CIAO/DAnCE/TargetManager/TargetManager_exec.h b/CIAO/DAnCE/TargetManager/TargetManager_exec.h
new file mode 100644
index 00000000000..cc3190d1427
--- /dev/null
+++ b/CIAO/DAnCE/TargetManager/TargetManager_exec.h
@@ -0,0 +1,140 @@
+// $Id$
+//===============================================================
+/**
+ * @file TargetManager_exec.h
+ *
+ * @brief TargetManager Executor code
+ *
+ * @author Nilabja Roy nilabjar@dre.vanderbilt.edu
+ */
+//===============================================================
+
+#ifndef CIAO_TARGETMANAGER_EXEC_H
+#define CIAO_TARGETMANAGER_EXEC_H
+
+#include /**/ "ace/pre.h"
+
+#include "TargetManager_svnt.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "TargetManager_exec_export.h"
+#include "tao/LocalObject.h"
+#include "DomainDataManager.h"
+#include "TargetManagerEC.h"
+
+/**
+ * TargetManager Executor namespace
+ */
+namespace CIAO_CIAO_TargetManagerImpl_Impl
+{
+  class TARGETMANAGER_EXEC_Export TargetManagerImpl_exec_i
+  : public virtual TargetManagerImpl_Exec,
+    public virtual ::CORBA::LocalObject
+  {
+    public:
+    TargetManagerImpl_exec_i (void);
+    virtual ~TargetManagerImpl_exec_i (void);
+
+    // Supported or inherited operations.
+
+    // Attribute operations.
+
+    // Port operations.
+
+    virtual ::Deployment::CCM_TargetManager_ptr
+    get_targetMgr ();
+
+    // Operations from Components::SessionComponent
+
+    virtual void
+    set_session_context (
+    ::Components::SessionContext_ptr ctx);
+
+    virtual void ccm_activate ();
+
+    virtual void ccm_passivate ();
+
+    virtual void ccm_remove ();
+
+    virtual void configuration_complete ();
+
+  public:
+    /// The service context pointer
+    ::CIAO::CCM_TargetManagerImpl_Context_var context_;
+
+    /// The exec Object
+    ::Deployment::CCM_TargetManager_var exec_object_;
+  };
+
+  class TARGETMANAGER_EXEC_Export TargetManager_exec_i
+  : public virtual ::Deployment::CCM_TargetManager,
+    public virtual ::CORBA::LocalObject
+  {
+    public:
+    TargetManager_exec_i (TargetManagerImpl_exec_i* exec,
+                          CORBA::ORB_ptr orb);
+    virtual ~TargetManager_exec_i (void);
+
+    // Operations from ::Deployment::TargetManager
+
+    virtual ::Deployment::Domain * getAllResources ();
+
+    virtual ::Deployment::Domain * getAvailableResources ();
+
+    virtual ::Deployment::ResourceCommitmentManager_ptr
+      commitResources (const ::Deployment::ResourceAllocations & resources);
+
+    virtual void releaseResources (::Deployment::ResourceCommitmentManager_ptr manager);
+
+    virtual void
+    updateDomain (
+    const ::CORBA::StringSeq & elements,
+    const ::Deployment::Domain & domainSubset,
+    ::Deployment::DomainUpdateKind updateKind);
+
+    virtual ::Deployment::ResourceCommitmentManager_ptr
+    createResourceCommitment (const ::Deployment::ResourceAllocations& manager);
+
+    virtual void
+    destroyResourceCommitment (
+    ::Deployment::ResourceCommitmentManager_ptr resources);
+
+  private:
+    TargetManagerImpl_exec_i * exec_;
+
+    /// The CORBA ORB ...
+    CORBA::ORB_var orb_;
+  };
+
+  class TARGETMANAGER_EXEC_Export TargetManagerHome_exec_i
+  : public virtual TargetManagerHome_Exec,
+    public virtual ::CORBA::LocalObject
+  {
+    public:
+    TargetManagerHome_exec_i (void);
+    virtual ~TargetManagerHome_exec_i (void);
+
+    // Supported or inherited operations.
+
+    // Home operations.
+
+    // Factory and finder operations.
+
+    // Attribute operations.
+
+    // Implicit operations.
+
+    virtual ::Components::EnterpriseComponent_ptr
+    create ();
+  };
+
+  extern "C" TARGETMANAGER_EXEC_Export ::Components::HomeExecutorBase_ptr
+    create_CIAO_TargetManagerHome_Impl (void);
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* CIAO_TARGETMANAGER_EXEC_H */
diff --git a/CIAO/DAnCE/TargetManager/Target_Manager.cpp b/CIAO/DAnCE/TargetManager/Target_Manager.cpp
deleted file mode 100644
index 76f45218764..00000000000
--- a/CIAO/DAnCE/TargetManager/Target_Manager.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-// $Id$
-
-#include "ace/Dynamic_Service.h"
-#include "tao/ORB.h"
-#include "tao/Object.h"
-#include "DAnCE/Logger/Log_Macros.h"
-#include "DAnCE/Logger/Logger_Service.h"
-#include "Target_Manager_Module.h"
-
-int
-ACE_TMAIN (int argc, ACE_TCHAR *argv[])
-{
-  DANCE_DISABLE_TRACE ();
-
-  int retval = 0;
-
-  try
-    {
-      DAnCE::Logger_Service
-        * dlf = ACE_Dynamic_Service<DAnCE::Logger_Service>::instance ("DAnCE_Logger");
-
-      if (dlf)
-        {
-          dlf->init (argc, argv);
-        }
-
-      DANCE_DEBUG (6, (LM_TRACE, DLINFO
-                    ACE_TEXT("TargetManager - initializing ORB\n")));
-
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
-
-      DANCE_DEBUG (6, (LM_TRACE, DLINFO
-                   ACE_TEXT("TargetManager - initializing module instance\n")));
-
-      DAnCE_TargetManager_Module tm;
-      CORBA::Object_var obj = tm.init (orb.in (), argc, argv);
-
-      if (!CORBA::is_nil (obj.in ()))
-        {
-          DANCE_DEBUG (6, (LM_TRACE, DLINFO
-                    ACE_TEXT("TargetManager - running ORB\n")));
-          orb->run ();
-        }
-
-      DANCE_DEBUG (6, (LM_TRACE, DLINFO
-                    ACE_TEXT("TargetManager - destroying ORB\n")));
-
-      orb->destroy ();
-    }
-  catch (const CORBA::Exception& ex)
-    {
-      ex._tao_print_exception ("TargetManager");
-      retval = -1;
-    }
-  catch (...)
-    {
-      DANCE_ERROR (1, (LM_ERROR, "TargetManager - Error: Unknown exception.\n"));
-      retval = -1;
-    }
-
-  return retval;
-}
-
diff --git a/CIAO/DAnCE/TargetManager/Target_Manager_Exec.cpp b/CIAO/DAnCE/TargetManager/Target_Manager_Exec.cpp
new file mode 100644
index 00000000000..347a0063483
--- /dev/null
+++ b/CIAO/DAnCE/TargetManager/Target_Manager_Exec.cpp
@@ -0,0 +1,6 @@
+// $Id$
+#include "Target_Manager_Module.h"
+
+#define DANCE_MODULE_MAIN_CLASS_NAME DAnCE_TargetManager_Module
+#include "Deployment/Module_Main.h"
+
diff --git a/CIAO/DAnCE/TargetManager/Target_Manager_Module.cpp b/CIAO/DAnCE/TargetManager/Target_Manager_Module.cpp
index 3fa9cfd0142..b60e4c890bb 100644
--- a/CIAO/DAnCE/TargetManager/Target_Manager_Module.cpp
+++ b/CIAO/DAnCE/TargetManager/Target_Manager_Module.cpp
@@ -5,16 +5,18 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/Task.h"
+#include "ace/Atomic_Op.h"
 #include "tao/IORTable/IORTable.h"
 #include "tao/Utils/PolicyList_Destroyer.h"
 #include "orbsvcs/CosNamingC.h"
+#include "orbsvcs/orbsvcs/Naming/Naming_Loader.h"
 #include "DAnCE/Logger/Log_Macros.h"
-#include "DAnCE/DAnCE/DAnCE_PropertiesC.h"
+#include "DAnCE/Deployment/DAnCE_PropertiesC.h"
 
 #include "TargetManager_Impl.h"
 
 ACE_RCSID (DAnCE,
-           Targer_Manager_Module,
+           Repository_Manager_Module,
            "$Id$")
 
 namespace DAnCE
@@ -143,17 +145,17 @@ DAnCE_TargetManager_Module::parse_args (int argc, ACE_TCHAR * argv[])
 }
 
 CORBA::Object_ptr
-DAnCE_TargetManager_Module::init (CORBA::ORB_ptr orb,
-                                  int argc,
-                                  ACE_TCHAR *argv[])
+DAnCE_TargetManager_Module::create_object (CORBA::ORB_ptr orb,
+                                               int argc,
+                                               ACE_TCHAR *argv[])
 {
-  DANCE_TRACE ("DAnCE_TargetManager_Module::init");
+  DANCE_TRACE ("DAnCE_TargetManager_Module::create_object");
 
   try
     {
       if (CORBA::is_nil(orb))
         {
-          DANCE_ERROR (1, (LM_ERROR, DLINFO "DAnCE_TargetManager_Module::init - "
+          DANCE_ERROR (1, (LM_ERROR, DLINFO "DAnCE_TargetManager_Module::create_object - "
                        "Attempted to create Target Manager with a nil orb.\n"));
           return CORBA::Object::_nil();
         }
@@ -164,7 +166,7 @@ DAnCE_TargetManager_Module::init (CORBA::ORB_ptr orb,
 
       if (ACE_OS::strcmp(orb->id(), this->orb_->id()) != 0)
         {
-          DANCE_DEBUG (9, (LM_TRACE, DLINFO "DAnCE_TargetManager_Module::init - "
+          DANCE_DEBUG (9, (LM_TRACE, DLINFO "DAnCE_TargetManager_Module::create_object - "
                        "Resetting TM's orb.\n"));
           this->orb_ = CORBA::ORB::_duplicate (orb);
           this->domain_nc_ = CosNaming::NamingContext::_nil();
@@ -181,7 +183,7 @@ DAnCE_TargetManager_Module::init (CORBA::ORB_ptr orb,
         {
           try
             {
-              DANCE_DEBUG (9, (LM_TRACE, DLINFO "DAnCE_TargetManager_Module::init - "
+              DANCE_DEBUG (9, (LM_TRACE, DLINFO "DAnCE_TargetManager_Module::create_object - "
                            "Resolving DomainNC.\n"));
               CORBA::Object_var domain_obj = this->orb_->string_to_object (this->options_.domain_nc_);
               if (!CORBA::is_nil (domain_obj.in ()))
@@ -189,7 +191,7 @@ DAnCE_TargetManager_Module::init (CORBA::ORB_ptr orb,
                   this->domain_nc_ = CosNaming::NamingContext::_narrow (domain_obj.in());
                   if (CORBA::is_nil (this->domain_nc_.in ()))
                     {
-                      DANCE_ERROR (1, (LM_ERROR,DLINFO "DAnCE_TargetManager_Module::init - "
+                      DANCE_ERROR (1, (LM_ERROR,DLINFO "DAnCE_TargetManager_Module::create_object - "
                                     "Narrow to NamingContext return nil for DomainNC.\n"));
                       return CORBA::Object::_nil ();
                     }
@@ -197,13 +199,13 @@ DAnCE_TargetManager_Module::init (CORBA::ORB_ptr orb,
             }
           catch (CORBA::Exception&)
             {
-              DANCE_DEBUG (6, (LM_WARNING, DLINFO "DAnCE_TargetManager_Module::init - "
+              DANCE_DEBUG (6, (LM_WARNING, DLINFO "DAnCE_TargetManager_Module::create_object - "
                              "DomainNC context not found!\n"));
             }
         }
 
 
-      DANCE_DEBUG (9, (LM_TRACE, DLINFO "DAnCE_TargetManager_Module::init - "
+      DANCE_DEBUG (9, (LM_TRACE, DLINFO "DAnCE_TargetManager_Module::create_object - "
                     "Initializing the IOR Table\n"));
       // Initialize IOR table
       CORBA::Object_var table_object = orb->resolve_initial_references ("IORTable");
@@ -212,7 +214,7 @@ DAnCE_TargetManager_Module::init (CORBA::ORB_ptr orb,
 
       if (CORBA::is_nil (adapter.in ()))
         {
-          DANCE_ERROR (1, (LM_ERROR, DLINFO "DAnCE_TargetManager_Module::init - "
+          DANCE_ERROR (1, (LM_ERROR, DLINFO "DAnCE_TargetManager_Module::create_object - "
                          "Unable to RIR the IORTable.\n"));
           return CORBA::Object::_nil ();
         }
@@ -247,7 +249,7 @@ DAnCE_TargetManager_Module::init (CORBA::ORB_ptr orb,
       // Binding ior to IOR Table
       adapter->bind (repository_manager_oid.c_str (), ior.in ());
 
-      // Binding repository manager to DomainNC
+      // Binding repository menager to DomainNC
       if (!CORBA::is_nil (this->domain_nc_.in ()))
         {
           ACE_CString ns_name;
@@ -260,7 +262,7 @@ DAnCE_TargetManager_Module::init (CORBA::ORB_ptr orb,
               ns_name = ACE_TEXT_ALWAYS_CHAR (this->options_.name_);
             }
 
-          DANCE_DEBUG (9, (LM_TRACE, DLINFO "DAnCE_TargetManager_Module::init - "
+          DANCE_DEBUG (9, (LM_TRACE, DLINFO "DAnCE_TargetManager_Module::create_object - "
                        "Registering NM in NC as \"%C\".\n", ns_name.c_str ()));
           CosNaming::Name name (1);
           name.length (1);
@@ -272,10 +274,10 @@ DAnCE_TargetManager_Module::init (CORBA::ORB_ptr orb,
       // Writing ior to file
       if (0 != this->options_.ior_file_)
         {
-          DANCE_DEBUG (9, (LM_TRACE,  DLINFO "DAnCE_TargetManager_Module::init - "
+          DANCE_DEBUG (9, (LM_TRACE,  DLINFO "DAnCE_TargetManager_Module::create_object - "
                         "Writing RM IOR %C to file %C.\n", this->options_.ior_file_, ior.in ()));
           if (!DAnCE::Target_Manager::write_IOR (this->options_.ior_file_, ior.in ()))
-            DANCE_ERROR (1, (LM_ERROR, DLINFO "DAnCE_TargetManager_Module::init - "
+            DANCE_ERROR (1, (LM_ERROR, DLINFO "DAnCE_TargetManager_Module::create_object - "
                           "Error: Unable to write IOR to file %C\n",
                           this->options_.ior_file_));
         }
@@ -285,10 +287,10 @@ DAnCE_TargetManager_Module::init (CORBA::ORB_ptr orb,
       mgr->activate ();
 
       // Finishing Deployment part
-      DANCE_DEBUG (6, (LM_NOTICE, DLINFO "DAnCE_TargetManager_Module::init - "
+      DANCE_DEBUG (6, (LM_NOTICE, DLINFO "DAnCE_TargetManager_Module::create_object - "
                     "DAnCE_TargetManager is running...\n"));
 
-      DANCE_DEBUG (6, (LM_DEBUG, DLINFO "DAnCE_TargetManager_Module::init - "
+      DANCE_DEBUG (6, (LM_DEBUG, DLINFO "DAnCE_TargetManager_Module::create_object - "
                     "TargetManager IOR: %s\n", ior.in ()));
 
       return nm_obj._retn ();
@@ -338,3 +340,6 @@ DAnCE_TargetManager_Module::create_poas (void)
     }
 }
 
+#ifndef DANCE_TARGETMANAGER_IMPL_BUILD_DLL
+ACE_FACTORY_DEFINE (DAnCE_TargetManager_Module, DAnCE_TargetManager_Module)
+#endif /* DANCE_TARGETMANAGER_IMPL_BUILD_DLL */
diff --git a/CIAO/DAnCE/TargetManager/Target_Manager_Module.h b/CIAO/DAnCE/TargetManager/Target_Manager_Module.h
index 17721120884..83a598c7934 100644
--- a/CIAO/DAnCE/TargetManager/Target_Manager_Module.h
+++ b/CIAO/DAnCE/TargetManager/Target_Manager_Module.h
@@ -17,58 +17,69 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/Service_Config.h"
+#include "Target_Manager_Module_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Service_Config.h"
+#include "ace/Vector_T.h"
 #include "ace/Map_Manager.h"
 #include "ace/Null_Mutex.h"
 #include "tao/ORB.h"
 #include "tao/PortableServer/POAC.h"
 #include "orbsvcs/CosNamingC.h"
+#include "tao/Object_Loader.h"
+#include "Deployment/DAnCE_Loader.h"
+#include "DAnCE/Deployment/Deployment_common.h"
 #include "TargetManager_Impl.h"
 
 /**
  * @class Target_Manager_Module
  *
+ * @brief The shared object that is instantiated when the target manager
+ *        module/library is dynamically loaded.
+ *
  * This class runs the node manager instance
  */
-class DAnCE_TargetManager_Module
+class DAnCE_TargetManager_Module_Export DAnCE_TargetManager_Module
+  : public DAnCE::DAnCE_Object_Loader
 {
  public:
+      struct SOptions
+      {
+        const ACE_TCHAR * domain_nc_;
+        const ACE_TCHAR * ior_file_;
+        const ACE_TCHAR * domain_descr_;
+        const ACE_TCHAR * name_;
+
+        SOptions() :
+          domain_nc_ (0),
+          ior_file_ (0),
+          domain_descr_ (0),
+          name_ (0)
+        {
+        }
+      };
+
   /// Constructor.
   DAnCE_TargetManager_Module (void);
 
   /// Destructor.
   ~DAnCE_TargetManager_Module (void);
 
-  CORBA::Object_ptr init (CORBA::ORB_ptr orb,
-                          int argc,
-                          ACE_TCHAR *argv []);
+  /// Overload the base class method to create a new instance
+  /// of a DAnCE_RepositoryManager_Module object.
+  virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
+                                           int argc,
+                                           ACE_TCHAR *argv []);
 
- private:
-  const char * usage (void);
-
-  bool parse_args (int argc, ACE_TCHAR *argv []);
-
-  struct SOptions
-  {
-    const ACE_TCHAR * domain_nc_;
-    const ACE_TCHAR * ior_file_;
-    const ACE_TCHAR * domain_descr_;
-    const ACE_TCHAR * name_;
-
-    SOptions() :
-      domain_nc_ (0),
-      ior_file_ (0),
-      domain_descr_ (0),
-      name_ (0)
-    {
-    }
-  };
+  virtual const char * usage (void);
+
+  virtual bool parse_args (int argc, ACE_TCHAR *argv []);
 
+ private:
   void create_poas (void);
 
   /// Here we store the servants.
@@ -87,6 +98,8 @@ class DAnCE_TargetManager_Module
   PortableServer::POA_var rm_poa_;
 };
 
+ACE_FACTORY_DECLARE (DAnCE_TargetManager_Module, DAnCE_TargetManager_Module)
+
 #include /**/ "ace/post.h"
 
 #endif  /* NODE_MANAGER_MODULE_H */
diff --git a/CIAO/DAnCE/TargetManager/Target_Manager_Module_export.h b/CIAO/DAnCE/TargetManager/Target_Manager_Module_export.h
new file mode 100644
index 00000000000..65f45970d0b
--- /dev/null
+++ b/CIAO/DAnCE/TargetManager/Target_Manager_Module_export.h
@@ -0,0 +1,58 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl TargetManager_Module
+// ------------------------------
+#ifndef TARGETMANAGER_MODULE_EXPORT_H
+#define TARGETMANAGER_MODULE_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (ACE_AS_STATIC_LIBS) && !defined (TARGETMANAGER_MODULE_HAS_DLL)
+#  define TARGETMANAGER_MODULE_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && TARGETMANAGER_MODULE_HAS_DLL */
+
+#if !defined (TARGETMANAGER_MODULE_HAS_DLL)
+#  define TARGETMANAGER_MODULE_HAS_DLL 1
+#endif /* ! TARGETMANAGER_MODULE_HAS_DLL */
+
+#if defined (TARGETMANAGER_MODULE_HAS_DLL) && (TARGETMANAGER_MODULE_HAS_DLL == 1)
+#  if defined (TARGETMANAGER_MODULE_BUILD_DLL)
+#    define DAnCE_TargetManager_Module_Export ACE_Proper_Export_Flag
+#    define TARGETMANAGER_MODULE_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define TARGETMANAGER_MODULE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* TARGETMANAGER_MODULE_BUILD_DLL */
+#    define DAnCE_TargetManager_Module_Export ACE_Proper_Import_Flag
+#    define TARGETMANAGER_MODULE_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define TARGETMANAGER_MODULE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* TARGETMANAGER_MODULE_BUILD_DLL */
+#else /* TARGETMANAGER_MODULE_HAS_DLL == 1 */
+#  define DAnCE_TargetManager_Module_Export
+#  define TARGETMANAGER_MODULE_SINGLETON_DECLARATION(T)
+#  define TARGETMANAGER_MODULE_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* TARGETMANAGER_MODULE_HAS_DLL == 1 */
+
+// Set TARGETMANAGER_MODULE_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (TARGETMANAGER_MODULE_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define TARGETMANAGER_MODULE_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define TARGETMANAGER_MODULE_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !TARGETMANAGER_MODULE_NTRACE */
+
+#if (TARGETMANAGER_MODULE_NTRACE == 1)
+#  define TARGETMANAGER_MODULE_TRACE(X)
+#else /* (TARGETMANAGER_MODULE_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define TARGETMANAGER_MODULE_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (TARGETMANAGER_MODULE_NTRACE == 1) */
+
+#endif /* TARGETMANAGER_MODULE_EXPORT_H */
+
+// End of auto generated file.
diff --git a/CIAO/DAnCE/Utils/DAnCE_Utils.mpc b/CIAO/DAnCE/Utils/DAnCE_Utils.mpc
new file mode 100644
index 00000000000..e38bf447dda
--- /dev/null
+++ b/CIAO/DAnCE/Utils/DAnCE_Utils.mpc
@@ -0,0 +1,16 @@
+// -*- MPC -*-
+// $Id$
+
+project (DAnCE_Utils): dance_lib, dance_deployment_svnt, naming, dance_logger {
+  sharedname = DAnCE_Utils
+  dynamicflags = DANCE_UTILS_BUILD_DLL
+
+  Source_Files {
+    Plan_Handler.cpp
+  }
+
+  Header_Files {
+    Plan_Handler.h
+  }
+}
+
diff --git a/CIAO/DAnCE/Utils/DAnCE_Utils_Export.h b/CIAO/DAnCE/Utils/DAnCE_Utils_Export.h
new file mode 100644
index 00000000000..636453478e8
--- /dev/null
+++ b/CIAO/DAnCE/Utils/DAnCE_Utils_Export.h
@@ -0,0 +1,58 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl -s DAnCE_Utils
+// ------------------------------
+#ifndef DANCE_UTILS_EXPORT_H
+#define DANCE_UTILS_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (ACE_AS_STATIC_LIBS) && !defined (DANCE_UTILS_HAS_DLL)
+#  define DANCE_UTILS_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && DANCE_UTILS_HAS_DLL */
+
+#if !defined (DANCE_UTILS_HAS_DLL)
+#  define DANCE_UTILS_HAS_DLL 1
+#endif /* ! DANCE_UTILS_HAS_DLL */
+
+#if defined (DANCE_UTILS_HAS_DLL) && (DANCE_UTILS_HAS_DLL == 1)
+#  if defined (DANCE_UTILS_BUILD_DLL)
+#    define DAnCE_Utils_Export ACE_Proper_Export_Flag
+#    define DANCE_UTILS_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define DANCE_UTILS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* DANCE_UTILS_BUILD_DLL */
+#    define DAnCE_Utils_Export ACE_Proper_Import_Flag
+#    define DANCE_UTILS_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define DANCE_UTILS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* DANCE_UTILS_BUILD_DLL */
+#else /* DANCE_UTILS_HAS_DLL == 1 */
+#  define DAnCE_Utils_Export
+#  define DANCE_UTILS_SINGLETON_DECLARATION(T)
+#  define DANCE_UTILS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* DANCE_UTILS_HAS_DLL == 1 */
+
+// Set DANCE_UTILS_NTRACE = 0 to turn on library specific tracing even if
+// tracing is turned off for ACE.
+#if !defined (DANCE_UTILS_NTRACE)
+#  if (ACE_NTRACE == 1)
+#    define DANCE_UTILS_NTRACE 1
+#  else /* (ACE_NTRACE == 1) */
+#    define DANCE_UTILS_NTRACE 0
+#  endif /* (ACE_NTRACE == 1) */
+#endif /* !DANCE_UTILS_NTRACE */
+
+#if (DANCE_UTILS_NTRACE == 1)
+#  define DANCE_UTILS_TRACE(X)
+#else /* (DANCE_UTILS_NTRACE == 1) */
+#  if !defined (ACE_HAS_TRACE)
+#    define ACE_HAS_TRACE
+#  endif /* ACE_HAS_TRACE */
+#  define DANCE_UTILS_TRACE(X) ACE_TRACE_IMPL(X)
+#  include "ace/Trace.h"
+#endif /* (DANCE_UTILS_NTRACE == 1) */
+
+#endif /* DANCE_UTILS_EXPORT_H */
+
+// End of auto generated file.
diff --git a/CIAO/DAnCE/Utils/Plan_Handler.cpp b/CIAO/DAnCE/Utils/Plan_Handler.cpp
new file mode 100644
index 00000000000..7dde515baa0
--- /dev/null
+++ b/CIAO/DAnCE/Utils/Plan_Handler.cpp
@@ -0,0 +1,182 @@
+// $Id$
+
+#include "Plan_Handler.h"
+#include "DAnCE/Logger/Log_Macros.h"
+
+namespace DAnCE
+{
+  void
+  DAnCE_Utils::add_instance (
+      ::Deployment::DeploymentPlan &deployment_plan,
+      const char *instance_name,
+      const char *node_name,
+      const char *impl_name,
+      const char *ns_name)
+  {
+    // Modifying the deployment plan in order to include the new instance ...
+    ::Deployment::InstanceDeploymentDescriptions instance =
+      deployment_plan.instance;
+
+    instance.length (instance.length()+1);
+
+    instance[instance.length()-1].name = CORBA::string_dup(instance_name); // Name of the instance
+    instance[instance.length()-1].node = CORBA::string_dup(node_name);
+    instance[instance.length()-1].source.length(0);
+
+    // Looking for implementation block with name equals to type ...
+    ::Deployment::MonolithicDeploymentDescriptions implementation =
+      deployment_plan.implementation;
+
+    CORBA::ULong i = 0;
+    for (i = 0; i < implementation.length(); ++i)
+      {
+        if (ACE_OS::strcmp (implementation[i].name.in(), impl_name) == 0)
+          {
+            break;
+          }
+      }
+
+    if (i < implementation.length())
+      {
+        instance[instance.length()-1].implementationRef = i;
+      }
+    else
+      {
+        throw ImplementationNotFound();
+      }
+
+    if (ns_name)
+      {
+        instance[instance.length()-1].configProperty.length(1);
+        instance[instance.length()-1].configProperty[0].name =
+          CORBA::string_dup ("RegisterNaming");
+        instance[instance.length()-1].configProperty[0].value <<=
+          CORBA::string_dup (ns_name);
+      }
+
+    // Re-assigning instances to deployment plan ...
+    deployment_plan.instance = instance;
+  }
+
+  void
+  DAnCE_Utils::print_instances (const ::Deployment::DeploymentPlan &deployment_plan)
+  {
+    const ::Deployment::InstanceDeploymentDescriptions instance =
+      deployment_plan.instance;
+
+    for (CORBA::ULong i = 0; i < instance.length(); ++i)
+    {
+      DANCE_DEBUG (6, (LM_DEBUG, "\nInstance no. %d\n", i));
+      DANCE_DEBUG (6, (LM_DEBUG, "\tName: %C\n", instance[i].name.in()));
+      DANCE_DEBUG (6, (LM_DEBUG, "\tNode: %C\n", instance[i].node.in()));
+
+      DANCE_DEBUG (6, (LM_DEBUG, "\tImplementationRef: %d\n", instance[i].implementationRef));
+      DANCE_DEBUG (6, (LM_DEBUG, "\tNumber of properties: %d\n", instance[i].configProperty.length()));
+
+      for (CORBA::ULong k = 0; k < instance[i].configProperty.length(); k++)
+        {
+          DANCE_DEBUG (6, (LM_DEBUG, "\t\tName: %C\n", instance[i].configProperty[k].name.in()));
+        }
+    }
+  }
+
+  void
+  DAnCE_Utils::print_connections (const ::Deployment::DeploymentPlan &deployment_plan)
+  {
+    const ::Deployment::PlanConnectionDescriptions connection =
+      deployment_plan.connection;
+
+    for (CORBA::ULong i = 0; i < connection.length(); ++i)
+      {
+        DANCE_DEBUG (6, (LM_DEBUG, "\nConnection no. %d\n", i));
+        DANCE_DEBUG (6, (LM_DEBUG, "\tName: %C\n", connection[i].name.in()));
+
+        DANCE_DEBUG (6, (LM_DEBUG, "\tNo of deployRequirements: %d\n",
+                    connection[i].deployRequirement.length()));
+
+        for (CORBA::ULong j = 0; j < connection[i].deployRequirement.length(); ++j)
+        {
+           DANCE_DEBUG (6, (LM_DEBUG,
+                       "\t\tDeploy Requirement %d:\n",
+                       j+1));
+           DANCE_DEBUG (6, (LM_DEBUG,
+                       "\t\t\tResource Type: %C\n",
+                       connection[i].deployRequirement[j].resourceType.in()));
+           DANCE_DEBUG (6, (LM_DEBUG,
+                       "\t\t\tName: %C\n",
+                       connection[i].deployRequirement[j].name.in()));
+           DANCE_DEBUG (6, (LM_DEBUG,
+                       "\t\t\tNo of Properties: %d\n",
+                       connection[i].deployRequirement[j].property.length()));
+           for (CORBA::ULong k = 0; k < connection[i].deployRequirement[j].property.length(); ++k)
+           {
+              DANCE_DEBUG (6, (LM_DEBUG, "\t\t\tProperty %d:\n", k+1));
+              DANCE_DEBUG (6, (LM_DEBUG,
+                          "\t\t\t\tName: %C\n",
+                          connection[i].deployRequirement[j].property[k].name.in()));
+           }
+        }
+
+        DANCE_DEBUG (6, (LM_DEBUG,
+                    "\tNo of externalEndpoints: %d\n",
+                    connection[i].externalEndpoint.length()));
+        for (CORBA::ULong j = 0; j < connection[i].externalEndpoint.length(); j++)
+          {
+            DANCE_DEBUG (6, (LM_DEBUG,
+                       "\t\tPortname %d: %C\n", j+1,
+                       connection[i].externalEndpoint[j].portName.in()));
+          }
+
+        DANCE_DEBUG (6, (LM_DEBUG,
+                    "\tNo of internalEndpoints: %d\n",
+                    connection[i].internalEndpoint.length()));
+        for (CORBA::ULong j = 0; j < connection[i].internalEndpoint.length(); j++)
+          {
+            DANCE_DEBUG (6, (LM_DEBUG, "\t\tInternalEndpoint %d:\n", j+1));
+            DANCE_DEBUG (6, (LM_DEBUG, "\t\t\tPortname: %C\n", connection[i].internalEndpoint[j].portName.in()));
+            DANCE_DEBUG (6, (LM_DEBUG,  "\t\t\tProvider: %d\n", connection[i].internalEndpoint[j].provider));
+
+              if (connection[i].internalEndpoint[j].kind == ::Deployment::Facet ||
+                connection[i].internalEndpoint[j].kind == ::Deployment::SimplexReceptacle)
+                DANCE_DEBUG (6, (LM_DEBUG,
+                            "\t\t\tKind: %C\n",
+                          (connection[i].internalEndpoint[j].kind == ::Deployment::Facet) ?
+                          "Facet" : "SimplexReceptacle"));
+            else
+                DANCE_DEBUG (6, (LM_DEBUG,
+                            "\t\t\tKind: %d\n",
+                            connection[i].internalEndpoint[j].kind));
+
+            DANCE_DEBUG (6, (LM_DEBUG,
+                        "\t\t\tInstanceRef: %ld",
+                        (long) connection[i].internalEndpoint[j].instanceRef));
+            DANCE_DEBUG (6, (LM_DEBUG, "\tInstanceName: %C\n",
+                        deployment_plan.instance[connection[i].internalEndpoint[j].instanceRef].name.in()));
+          }
+
+        DANCE_DEBUG (6, (LM_DEBUG,
+                    "\tNo of externalReferenceEndpoints: %d\n",
+                    connection[i].externalReference.length()));
+        for (CORBA::ULong  j = 0; j < connection[i].externalReference.length(); ++j)
+           DANCE_DEBUG (6, (LM_DEBUG,
+                       "\t\tLocation %d: %C\n",
+                       j+1,
+                       connection[i].externalReference[j].location.in()));
+
+        DANCE_DEBUG (6, (LM_DEBUG,
+                    "\tNo of deployedResources: %d\n",
+                    connection[i].deployedResource.length()));
+        for (CORBA::ULong j = 0; j < connection[i].deployedResource.length(); j++)
+          {
+            DANCE_DEBUG (6, (LM_DEBUG,
+                        "\t\tTargetName: %C\n",
+                        connection[i].deployedResource[j].targetName.in()));
+            DANCE_DEBUG (6, (LM_DEBUG, "\t\tRequirementName: %C\n",
+                        connection[i].deployedResource[j].requirementName.in()));
+            DANCE_DEBUG (6, (LM_DEBUG, "\t\tResourceName: %C\n",
+                        connection[i].deployedResource[j].resourceName.in()));
+          }
+      }
+  }
+}
+
diff --git a/CIAO/DAnCE/Utils/Plan_Handler.h b/CIAO/DAnCE/Utils/Plan_Handler.h
new file mode 100644
index 00000000000..591853b68a6
--- /dev/null
+++ b/CIAO/DAnCE/Utils/Plan_Handler.h
@@ -0,0 +1,75 @@
+//$Id$
+/*========================================================
+ *
+ * @file   Plan_Handler.h
+ *
+ * @brief  This file contains the implementation of
+ *         the Plan_Handler class.
+ *
+ * @author Gan Deng <gan.deng@vanderbilt.edu>
+ *========================================================*/
+
+#ifndef CIAO_DANCE_UTILS_H
+#define CIAO_DANCE_UTILS_H
+
+#include "DAnCE_Utils_Export.h"
+#include "Deployment/Deployment_DeploymentPlanC.h"
+
+namespace DAnCE
+{
+  class ImplementationNotFound {};
+  class InstanceNotFound {};
+  class ConnectionNotFound {};
+
+  /**
+   * @class Plan_Handler
+   *
+   * This class takes an existing deployment plan as input, and
+   * can modify the deployment plan internals.
+   *
+   * The main methods on this class are:
+   *
+   *  - Add a instance to the deployment plan;
+   *  - Add a connection to the deployment plan;
+   *  - Remove a connection from the deployment plan;
+   *  - Remove a instance (and, consequently all its connection) from the
+   *    deployment plan;
+   *  - Show all instances in the deployment plan;
+   *  - Show all connections in the deployment plan;
+   */
+
+  class DAnCE_Utils_Export DAnCE_Utils
+  {
+  public:
+    static void add_instance (
+        ::Deployment::DeploymentPlan &deployment_plan,
+        const char *instance_name,
+        const char *node_name,
+        const char *impl_name,
+        const char *ns_name = 0);
+
+    static void add_connection (
+        ::Deployment::DeploymentPlan &deployment_plan,
+        const char *connection_name,
+        const char *port_name,
+        const char *facet_instance,
+        const char *receptacle_instance);
+
+    static void remove_instance (
+        ::Deployment::DeploymentPlan &deployment_plan,
+        const char *instance_name);
+
+    static void remove_connection (
+        ::Deployment::DeploymentPlan &deployment_plan,
+        const char *connection_name);
+
+    static void print_instances (
+      const ::Deployment::DeploymentPlan &deployment_plan);
+
+    static void print_connections (
+      const ::Deployment::DeploymentPlan &deployment_plan);
+  };
+}
+
+#endif /* CIAO_DANCE_UTILS_H */
+
diff --git a/CIAO/DAnCE/bin/PythonDAnCE/generator/__init__.py b/CIAO/DAnCE/bin/PythonDAnCE/generator/__init__.py
index 6942635ce28..641e463cdaa 100755
--- a/CIAO/DAnCE/bin/PythonDAnCE/generator/__init__.py
+++ b/CIAO/DAnCE/bin/PythonDAnCE/generator/__init__.py
@@ -44,9 +44,3 @@ import homed_comp_inst
 import home_impl
 import home_inst
 import artifact
-import connection
-import external_reference
-import config_prop
-import internal_endpoint
-import deploy_requirement
-
diff --git a/CIAO/DAnCE/bin/PythonDAnCE/generator/comp_impl.py b/CIAO/DAnCE/bin/PythonDAnCE/generator/comp_impl.py
index b7dcfbf4a50..e807fc6f58a 100755
--- a/CIAO/DAnCE/bin/PythonDAnCE/generator/comp_impl.py
+++ b/CIAO/DAnCE/bin/PythonDAnCE/generator/comp_impl.py
@@ -55,4 +55,4 @@ def template (component_name, namespace) :
       </value>
     </execParameter>
   </implementation>
-"""
+  """
diff --git a/CIAO/DAnCE/bin/PythonDAnCE/generator/comp_inst.py b/CIAO/DAnCE/bin/PythonDAnCE/generator/comp_inst.py
index 9bcea751d30..7bacf681616 100755
--- a/CIAO/DAnCE/bin/PythonDAnCE/generator/comp_inst.py
+++ b/CIAO/DAnCE/bin/PythonDAnCE/generator/comp_inst.py
@@ -1,25 +1,13 @@
 from templet import stringfunction
 
 @stringfunction
-def template (component_name, config_values, impl, node) :
-    """ 
-    ${{
-    if impl == "": 
-       impl = component_name + "ComponentImplementation"
-       
-    if node == "":
-       node = "NodeOne"
-    
-    }}
-
+def template (component_name) :
+    """
   <instance xmi:id="${component_name}ComponentInstance">
     <name>${component_name}Component</name>
     <node>Node</node>
     <!-- hostname -->
     <source/>
-    <implementation xmi:idref="${impl}" />
-
-    ${config_values}
+    <implementation xmi:idref="${component_name}ComponentImplementation" />
   </instance>
-   
- """
+    """
diff --git a/CIAO/DAnCE/bin/PythonDAnCE/generator/config_prop.py b/CIAO/DAnCE/bin/PythonDAnCE/generator/config_prop.py
deleted file mode 100644
index 79c5b1199ee..00000000000
--- a/CIAO/DAnCE/bin/PythonDAnCE/generator/config_prop.py
+++ /dev/null
@@ -1,17 +0,0 @@
-from templet import stringfunction
-
-@stringfunction
-def template (name, typename, value) :
-    """
-    <configProperty>
-      <name>${name}</name>
-      <value>
-        <type>
-          <kind>tk_${typename}</kind>
-        </type>
-        <value>
-          <${typename}>${value}</${typename}>
-        </value>
-      </value>
-    </configProperty>
-    """
diff --git a/CIAO/DAnCE/bin/PythonDAnCE/generator/connection.py b/CIAO/DAnCE/bin/PythonDAnCE/generator/connection.py
deleted file mode 100644
index b1691f2cd27..00000000000
--- a/CIAO/DAnCE/bin/PythonDAnCE/generator/connection.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from templet import stringfunction
-
-@stringfunction
-def template (name, deployrequirement, endpoint_one, endpoint_two) :
-    """
-    <connection>
-      <name>${name}</name>
-      ${deployrequirement}
-      ${endpoint_one}
-      ${endpoint_two}
-    </connection>
-    """
diff --git a/CIAO/DAnCE/bin/PythonDAnCE/generator/deploy_requirement.py b/CIAO/DAnCE/bin/PythonDAnCE/generator/deploy_requirement.py
deleted file mode 100644
index 700b02958c2..00000000000
--- a/CIAO/DAnCE/bin/PythonDAnCE/generator/deploy_requirement.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from templet import stringfunction
-
-@stringfunction
-def template (requirement_name, requirement_type) :
-    """
-    <deployRequirement>
-      <name>${requirement_name}</name>
-      <resourceType>${requirement_type}</resourceType>
-    </deployRequirement>
-    """
-    
diff --git a/CIAO/DAnCE/bin/PythonDAnCE/generator/external_reference.py b/CIAO/DAnCE/bin/PythonDAnCE/generator/external_reference.py
deleted file mode 100644
index 3bb68174044..00000000000
--- a/CIAO/DAnCE/bin/PythonDAnCE/generator/external_reference.py
+++ /dev/null
@@ -1,13 +0,0 @@
-from templet import stringfunction
-
-@stringfunction
-def template (location, provider, name, supportedtype) :
-    """
-    <externalReference>
-      <location>${location}</location>
-      <provider>${provider}</provider>
-      <portName>${name}</portName>
-      <supportedType>${supportedtype}</supportedType>
-    <externalReference>
-    """
-
diff --git a/CIAO/DAnCE/bin/PythonDAnCE/generator/internal_endpoint.py b/CIAO/DAnCE/bin/PythonDAnCE/generator/internal_endpoint.py
deleted file mode 100644
index 594118c29fc..00000000000
--- a/CIAO/DAnCE/bin/PythonDAnCE/generator/internal_endpoint.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from templet import stringfunction
-
-@stringfunction
-def template (name, provider, kind, instance) :
-    """
-    <internalEndpoint>
-      <portName>${name}</portName>
-      <provider>${provider}</provider>
-      <kind>${kind}</kind>
-      <instance xmi:idref="${instance}" />
-    </internalEndpoint>
-    """
diff --git a/CIAO/DAnCE/bin/generate_plan.py b/CIAO/DAnCE/bin/generate_plan.py
index cdbc3bb3df1..15310877bec 100755
--- a/CIAO/DAnCE/bin/generate_plan.py
+++ b/CIAO/DAnCE/bin/generate_plan.py
@@ -69,7 +69,7 @@ def main ():
             
     if opts.components is not None:
         for item in opts.components:
-            retval += generator.comp_inst.template (item, "", "", "NodeOne")
+            retval += generator.comp_inst.template (item)
         
     #artifacts
     if artifacts is not None:
diff --git a/CIAO/DAnCE/tests/Bug_3832_Regression/run_test.pl b/CIAO/DAnCE/tests/Bug_3832_Regression/run_test.pl
deleted file mode 100755
index 54da4af1334..00000000000
--- a/CIAO/DAnCE/tests/Bug_3832_Regression/run_test.pl
+++ /dev/null
@@ -1,64 +0,0 @@
-
-# $Id$
-
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-     & eval 'exec perl -S $0 $argv:q'
-     if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{ACE_ROOT}/bin";
-use PerlACE::TestTarget;
-
-$status =0;
-
-my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
-
-# Generated code file names
-my $TestCaseC_i = "test.log";
-
-$server_TestCaseC_i = $server->LocalFile($TestCaseC_i);
-$server->DeleteFile($TestCaseC_i);
-
-$ENV {'DANCE_LOG_LEVEL'} = 10;
-$ENV {'DANCE_LOG_FILE'} = 'test.log';
-
-$SV = $server->CreateProcess ("../../bin/dance_node_manager", "");
-
-$server_status = $SV->Spawn ();
-
-if ($server_status != 0) {
-    print STDERR "ERROR: server returned $server_status\n";
-    $status = 1;
-}
-
-if ($server->WaitForFileTimed ($TestCaseC_i,
-                               $server->ProcessStartWaitInterval()) == -1) {
-    print STDERR "ERROR: cannot find file <$server_TestCaseC_i\n";
-    $SV->Kill (); $SV->TimedWait (1);
-    exit 1;
-}
-
-$server_status = $SV->TerminateWaitKill ($server->ProcessStopWaitInterval());
-
-# Test for the presence of LM_ERROR
-$found = 0 ;
-open (I_FILE, "$server_TestCaseC_i") ;
-while( <I_FILE> ){
-   chomp ;
-   if( $_ =~ /LM_ERROR/ ){
-       $found = 1 ;
-       last ;
-   }
-}
-
-if( $found != 1 ){
-  print STDERR "ERROR: No logging found\n";
-  $status = 1 ;
-} else {
-  print STDERR "Found logging\n";
-}
-
-$server->DeleteFile($TestCaseC_i);
-
-exit $status;
diff --git a/CIAO/DAnCE/tests/CIAO/CommandlinePassage/CommandlinePassage.mpc b/CIAO/DAnCE/tests/CIAO/CommandlinePassage/CommandlinePassage.mpc
index 25cd697c345..154b74b3904 100644
--- a/CIAO/DAnCE/tests/CIAO/CommandlinePassage/CommandlinePassage.mpc
+++ b/CIAO/DAnCE/tests/CIAO/CommandlinePassage/CommandlinePassage.mpc
@@ -28,7 +28,7 @@ project(CommandlinePassage_lem_gen) : ciaoidldefaults {
   }
 }
 
-project(CommandlinePassage_lem_stub) : ccm_svnt {
+project(CommandlinePassage_lem_stub) : ccm_svnt, dds4ccm_base   {
   after += CommandlinePassage_lem_gen CommandlinePassage_stub
   libs  += CommandlinePassage_stub
   sharedname = CommandlinePassage_lem_stub
@@ -51,7 +51,7 @@ project(CommandlinePassage_lem_stub) : ccm_svnt {
   }
 }
 
-project(CommandlinePassage_stub) : ccm_stub {
+project(CommandlinePassage_stub) : ccm_stub, dds4ccm_base   {
   after += CommandlinePassage_idl_gen
   libs  +=
   sharedname = CommandlinePassage_stub
@@ -74,7 +74,7 @@ project(CommandlinePassage_stub) : ccm_stub {
   }
 }
 
-project(CommandlinePassage_exec) : ciao_executor {
+project(CommandlinePassage_exec) : ciao_executor, dds4ccm_base   {
   after   += CommandlinePassage_lem_stub CommandlinePassage_stub
   sharedname = CommandlinePassage_exec
   libs += CommandlinePassage_stub CommandlinePassage_lem_stub
@@ -97,10 +97,11 @@ project(CommandlinePassage_exec) : ciao_executor {
 }
 
 
-project(CommandlinePassage_svnt) : ciao_servant {
-  after      += CommandlinePassage_lem_stub
+project(CommandlinePassage_svnt) : ciao_servant, dds4ccm_base, nddslib {
+  after      += CommandlinePassage_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
   sharedname  = CommandlinePassage_svnt
-  libs       += CommandlinePassage_stub CommandlinePassage_lem_stub
+  libs       += CommandlinePassage_stub CommandlinePassage_lem_stub  \
+                DDS4CCM_lem_stub DDS4CCM_skel
   dynamicflags = COMMANDLINEPASSAGE_SVNT_BUILD_DLL
 
   IDL_Files {
diff --git a/CIAO/DAnCE/tests/CIAO/CommandlinePassage/run_test.pl b/CIAO/DAnCE/tests/CIAO/CommandlinePassage/run_test.pl
index f9c967a3f99..b51bfd2c770 100755
--- a/CIAO/DAnCE/tests/CIAO/CommandlinePassage/run_test.pl
+++ b/CIAO/DAnCE/tests/CIAO/CommandlinePassage/run_test.pl
@@ -101,8 +101,6 @@ sub kill_open_processes {
     if ($ns_running == 1) {
         $NS->Kill (); $NS->TimedWait (1);
     }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
 }
 
 sub run_node_daemons {
diff --git a/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleProcessColocation.cdp b/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleProcessColocation.cdp
deleted file mode 100644
index f50259d17a6..00000000000
--- a/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleProcessColocation.cdp
+++ /dev/null
@@ -1,127 +0,0 @@
-<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">
-  <label>SimpleComponent_Home</label>
-  <UUID>SimpleComponent_Home</UUID>
-
-  <!-- Implementations declarations -->
-
-  <!-- Server Dance implementation-->
-  <implementation xmi:id="ProcessColocationComponentImplementation">
-    <name>ProcessColocationComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="ProcessColocation_ExecArtifact" />
-    <artifact xmi:idref="ProcessColocation_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see §10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Simple_ProcessColocation_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Simple_ProcessColocation_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ProcessColocation_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ProcessColocation_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="ProcessColocationComponentInstance_1">
-    <name>ProcessColocationComponent_One</name>
-    <node>NodeOne</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ProcessColocationComponentImplementation" />
-    
-    <configProperty>
-      <name>process_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Process One</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="ProcessColocationComponentInstance_2">
-    <name>ProcessColocationComponent_Two</name>
-    <node>NodeOne</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ProcessColocationComponentImplementation" />
-    <configProperty>
-      <name>process_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Process Two</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <!-- Artifacts declarations -->
-  <artifact xmi:id="ProcessColocation_ExecArtifact">
-    <name>ProcessColocation_exec</name>
-    <source/>
-    <node/>
-    <location>ProcessColocation_exec</location>
-  </artifact>
-  <artifact xmi:id="ProcessColocation_SvntArtifact">
-    <name>ProcessColocation_svnt</name>
-    <source/>
-    <node/>
-    <location>ProcessColocation_svnt</location>
-  </artifact>
-  
-  <localityConstraint>
-    <constraint>SameProcess</constraint>
-    <constrainedInstance xmi:idref="ProcessColocationComponentInstance_1" />
-  </localityConstraint>
-    
-  <localityConstraint>
-    <constraint>SameProcess</constraint>
-    <constrainedInstance xmi:idref="ProcessColocationComponentInstance_2" />
-  </localityConstraint>
-
-  </Deployment:DeploymentPlan>
diff --git a/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleProcessColocation_2.cdp b/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleProcessColocation_2.cdp
deleted file mode 100644
index bed7f909530..00000000000
--- a/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleProcessColocation_2.cdp
+++ /dev/null
@@ -1,168 +0,0 @@
-<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">
-  <label>SimpleComponent_Home</label>
-  <UUID>SimpleComponent_Home</UUID>
-
-  <!-- Implementations declarations -->
-
-  <!-- Server Dance implementation-->
-  <implementation xmi:id="ProcessColocationComponentImplementation">
-    <name>ProcessColocationComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="ProcessColocation_ExecArtifact" />
-    <artifact xmi:idref="ProcessColocation_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see §10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Simple_ProcessColocation_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Simple_ProcessColocation_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ProcessColocation_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ProcessColocation_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="ProcessColocationComponentInstance_1">
-    <name>ProcessColocationComponent_One</name>
-    <node>NodeOne</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ProcessColocationComponentImplementation" />
-    
-    <configProperty>
-      <name>process_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Process One</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="ProcessColocationComponentInstance_1_2">
-    <name>ProcessColocationComponent_One_Two</name>
-    <node>NodeOne</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ProcessColocationComponentImplementation" />
-    
-    <configProperty>
-      <name>process_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Process One</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="ProcessColocationComponentInstance_2">
-    <name>ProcessColocationComponent_Two</name>
-    <node>NodeOne</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ProcessColocationComponentImplementation" />
-    <configProperty>
-      <name>process_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Process Two</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="ProcessColocationComponentInstance_2_2">
-    <name>ProcessColocationComponent_Two_Two</name>
-    <node>NodeOne</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ProcessColocationComponentImplementation" />
-    <configProperty>
-      <name>process_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Process Two</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <!-- Artifacts declarations -->
-  <artifact xmi:id="ProcessColocation_ExecArtifact">
-    <name>ProcessColocation_exec</name>
-    <source/>
-    <node/>
-    <location>ProcessColocation_exec</location>
-  </artifact>
-  <artifact xmi:id="ProcessColocation_SvntArtifact">
-    <name>ProcessColocation_svnt</name>
-    <source/>
-    <node/>
-    <location>ProcessColocation_svnt</location>
-  </artifact>
-  
-  <localityConstraint>
-    <constraint>SameProcess</constraint>
-    <constrainedInstance xmi:idref="ProcessColocationComponentInstance_1" />
-    <constrainedInstance xmi:idref="ProcessColocationComponentInstance_1_2" />
-  </localityConstraint>
-    
-  <localityConstraint>
-    <constraint>SameProcess</constraint>
-    <constrainedInstance xmi:idref="ProcessColocationComponentInstance_2" />
-    <constrainedInstance xmi:idref="ProcessColocationComponentInstance_2_2" />
-  </localityConstraint>
-
-  </Deployment:DeploymentPlan>
diff --git a/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleProcessColocation_Default.cdp b/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleProcessColocation_Default.cdp
deleted file mode 100644
index b8aa525c2b2..00000000000
--- a/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleProcessColocation_Default.cdp
+++ /dev/null
@@ -1,208 +0,0 @@
-<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">
-  <label>SimpleComponent_Home</label>
-  <UUID>SimpleComponent_Home</UUID>
-
-  <!-- Implementations declarations -->
-
-  <!-- Server Dance implementation-->
-  <implementation xmi:id="ProcessColocationComponentImplementation">
-    <name>ProcessColocationComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="ProcessColocation_ExecArtifact" />
-    <artifact xmi:idref="ProcessColocation_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see §10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Simple_ProcessColocation_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Simple_ProcessColocation_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ProcessColocation_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>ProcessColocation_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="ProcessColocationComponentInstance_Default_1">
-    <name>ProcessColocationComponent_Default_One</name>
-    <node>NodeOne</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ProcessColocationComponentImplementation" />
-    
-    <configProperty>
-      <name>process_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Default Process</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="ProcessColocationComponentInstance_Default_2">
-    <name>ProcessColocationComponent_Default_Two</name>
-    <node>NodeOne</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ProcessColocationComponentImplementation" />
-    
-    <configProperty>
-      <name>process_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Default Process</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="ProcessColocationComponentInstance_1">
-    <name>ProcessColocationComponent_One</name>
-    <node>NodeOne</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ProcessColocationComponentImplementation" />
-    
-    <configProperty>
-      <name>process_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Process One</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="ProcessColocationComponentInstance_1_2">
-    <name>ProcessColocationComponent_One_Two</name>
-    <node>NodeOne</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ProcessColocationComponentImplementation" />
-    
-    <configProperty>
-      <name>process_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Process One</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="ProcessColocationComponentInstance_2">
-    <name>ProcessColocationComponent_Two</name>
-    <node>NodeOne</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ProcessColocationComponentImplementation" />
-    <configProperty>
-      <name>process_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Process Two</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="ProcessColocationComponentInstance_2_2">
-    <name>ProcessColocationComponent_Two_Two</name>
-    <node>NodeOne</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ProcessColocationComponentImplementation" />
-    <configProperty>
-      <name>process_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Process Two</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <!-- Artifacts declarations -->
-  <artifact xmi:id="ProcessColocation_ExecArtifact">
-    <name>ProcessColocation_exec</name>
-    <source/>
-    <node/>
-    <location>ProcessColocation_exec</location>
-  </artifact>
-  <artifact xmi:id="ProcessColocation_SvntArtifact">
-    <name>ProcessColocation_svnt</name>
-    <source/>
-    <node/>
-    <location>ProcessColocation_svnt</location>
-  </artifact>
-  
-  <localityConstraint>
-    <constraint>SameProcess</constraint>
-    <constrainedInstance xmi:idref="ProcessColocationComponentInstance_1" />
-    <constrainedInstance xmi:idref="ProcessColocationComponentInstance_1_2" />
-  </localityConstraint>
-    
-  <localityConstraint>
-    <constraint>SameProcess</constraint>
-    <constrainedInstance xmi:idref="ProcessColocationComponentInstance_2" />
-    <constrainedInstance xmi:idref="ProcessColocationComponentInstance_2_2" />
-  </localityConstraint>
-
-  </Deployment:DeploymentPlan>
diff --git a/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/em_launcher.mpc b/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/em_launcher.mpc
index 3d230fcb0b9..b46ae7df956 100644
--- a/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/em_launcher.mpc
+++ b/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/em_launcher.mpc
@@ -1,5 +1,5 @@
 // $Id$
-project(simple_em_launcher) : dance_config_handlers, dance_nodemanager_stub, dance_domainapplication_stub, dance_executionmanager_stub, dance_logger {
+project(simple_em_launcher) : ciao_config_handlers, dance_nodemanager_stub, dance_domainapplication_stub, dance_executionmanager_stub, dance_logger {
   Source_Files {
     simple_em_launcher.cpp
   }
diff --git a/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl b/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl
index 847b3192f3c..051813fd9ab 100755
--- a/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl
+++ b/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl
@@ -16,11 +16,11 @@ $daemons_running = 0;
 $em_running = 0;
 $ns_running = 0;
 
-$nr_daemon = 2;
-@ports = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
+$nr_daemon = 1;
+@ports = ( 60001 );
+@iorbases = ( "NodeApp1.ior" );
 @iorfiles = 0;
-@nodenames = ( "NodeOne", "NodeTwo" );
+@nodenames = ( "NodeOne" );
 
 # ior files other than daemon
 $ior_nsbase = "ns.ior";
@@ -52,7 +52,7 @@ sub create_targets {
     #   daemon
     for ($i = 0; $i < $nr_daemon; ++$i) {
         $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for deamon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('../Components');
+        $tg_daemons[$i]->AddLibPath ('..');
     }
     #   execution manager
     $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
@@ -101,8 +101,6 @@ sub kill_open_processes {
     if ($ns_running == 1) {
         $NS->Kill (); $NS->TimedWait (1);
     }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
 }
 
 
@@ -198,10 +196,9 @@ foreach $file (@files) {
     # Invoke executor - start the application -.
     print "Invoking executor - launch the application -\n";
     $E = $tg_executor->CreateProcess ("simple_em_launcher",
-				      "file://$ior_emfile $file");
-    
-    $E->SpawnWaitKill (120);
-    
+                               "file://$ior_emfile $file");
+
+
     print "Executor finished.\n";
 
     delete_ior_files ();
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/nm_launcher.mpc b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/nm_launcher.mpc
index 1b8b1b16fbc..818130bfbb4 100644
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/nm_launcher.mpc
+++ b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/nm_launcher.mpc
@@ -1,5 +1,5 @@
 // $Id$
-project(simple_nm_launcher) : dance_config_handlers, dance_nodemanager_stub, dance_nodeapplication_stub, dance_logger {
+project(simple_nm_launcher) : ciao_config_handlers, dance_nodemanager_stub, dance_nodeapplication_stub, dance_logger {
   Source_Files {
     simple_nm_launcher.cpp
   }
diff --git a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/run_test.pl b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/run_test.pl
index 3bed5e781d3..051813fd9ab 100755
--- a/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/run_test.pl
+++ b/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/run_test.pl
@@ -101,8 +101,6 @@ sub kill_open_processes {
     if ($ns_running == 1) {
         $NS->Kill (); $NS->TimedWait (1);
     }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
 }
 
 
diff --git a/CIAO/DAnCE/tests/Config_Handlers/Config_Handlers.mpc b/CIAO/DAnCE/tests/Config_Handlers/Config_Handlers.mpc
index 487183e9ff3..f762b2d8751 100644
--- a/CIAO/DAnCE/tests/Config_Handlers/Config_Handlers.mpc
+++ b/CIAO/DAnCE/tests/Config_Handlers/Config_Handlers.mpc
@@ -1,6 +1,6 @@
 //$Id$
 
-project (XSC_Config_Handlers_Tests) : dance_deployment_stub, dance_config_handlers, ifr_client {
+project (XSC_Config_Handlers_Tests) : dance_deployment_stub, ciao_config_handlers, ifr_client {
   requires += dummy_label
   includes += $(DANCE_ROOT)/Config_Handlers
   exename = test
diff --git a/CIAO/DAnCE/tests/Config_Handlers/DynAny_Handler/test.mpc b/CIAO/DAnCE/tests/Config_Handlers/DynAny_Handler/test.mpc
index 64b4f34251a..55ce7ca31ec 100644
--- a/CIAO/DAnCE/tests/Config_Handlers/DynAny_Handler/test.mpc
+++ b/CIAO/DAnCE/tests/Config_Handlers/DynAny_Handler/test.mpc
@@ -1,5 +1,5 @@
 // $Id$
-project (XSC_DynAny_Test) : dance_config_handlers, ifr_client, ciaoidldefaults {
+project (XSC_DynAny_Test) : ciao_config_handlers, ifr_client, ciaoidldefaults {
   requires += dummy_label
   exename = test
   macros   += XML_USE_PTHREADS
diff --git a/CIAO/DAnCE/tests/Config_Handlers/Package_Handlers/Package_Handlers.mpc b/CIAO/DAnCE/tests/Config_Handlers/Package_Handlers/Package_Handlers.mpc
index 323338fe6f6..4afe1ef4c93 100644
--- a/CIAO/DAnCE/tests/Config_Handlers/Package_Handlers/Package_Handlers.mpc
+++ b/CIAO/DAnCE/tests/Config_Handlers/Package_Handlers/Package_Handlers.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project (Package_Config_Handlers_Tests) : dance_deployment_stub, dance_config_handlers, ifr_client {
+project (Package_Config_Handlers_Tests) : dance_deployment_stub, ciao_config_handlers, ifr_client {
   exename = test
   macros   += XML_USE_PTHREADS
   requires += dummy_label
diff --git a/CIAO/DAnCE/tests/DeploymentPlanDump/DeploymentPlanDump.mpc b/CIAO/DAnCE/tests/DeploymentPlanDump/DeploymentPlanDump.mpc
index 8b65250d8bd..e87a25474f9 100644
--- a/CIAO/DAnCE/tests/DeploymentPlanDump/DeploymentPlanDump.mpc
+++ b/CIAO/DAnCE/tests/DeploymentPlanDump/DeploymentPlanDump.mpc
@@ -1,5 +1,5 @@
 // $Id$
-project : dance, taoexe, xerces, aceexe, dance_config_handlers, dance_logger {
+project : dance, taoexe, xerces, aceexe, ciao_config_handlers, dance_logger {
   exename   = DeploymentPlanDump
 
   Source_Files {
diff --git a/CIAO/DAnCE/tests/DeploymentPlanTestReferences/DeploymentPlanTestReferences.mpc b/CIAO/DAnCE/tests/DeploymentPlanTestReferences/DeploymentPlanTestReferences.mpc
index dbd8a175592..50d8831bfbd 100644
--- a/CIAO/DAnCE/tests/DeploymentPlanTestReferences/DeploymentPlanTestReferences.mpc
+++ b/CIAO/DAnCE/tests/DeploymentPlanTestReferences/DeploymentPlanTestReferences.mpc
@@ -1,5 +1,5 @@
 // $Id$
-project : dance, taolib, xerces, dance_config_handlers, dance_logger {
+project : dance, taolib, xerces, ciao_config_handlers, dance_logger {
   exename   = DeploymentPlanTestReferences
 
   Source_Files {
diff --git a/CIAO/DAnCE/tests/DeploymentTest1/DeploymentTest1.mpc b/CIAO/DAnCE/tests/DeploymentTest1/DeploymentTest1.mpc
index 5c4422714db..3f2c7da54bb 100644
--- a/CIAO/DAnCE/tests/DeploymentTest1/DeploymentTest1.mpc
+++ b/CIAO/DAnCE/tests/DeploymentTest1/DeploymentTest1.mpc
@@ -1,5 +1,5 @@
 // $Id$
-project : dance, xerces, dance_config_handlers, dance_logger, dance_domainapplication_stub, dance_executionmanager_stub {
+project : dance, xerces, ciao_config_handlers, dance_logger, dance_domainapplication_stub, dance_executionmanager_stub {
   exename   = DeploymentTest1
 
   Source_Files {
diff --git a/CIAO/DAnCE/tools/Convert_Plan/Convert_Plan.cpp b/CIAO/DAnCE/tools/Convert_Plan/Convert_Plan.cpp
deleted file mode 100644
index 7715a4b7657..00000000000
--- a/CIAO/DAnCE/tools/Convert_Plan/Convert_Plan.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-// $Id$
-
-#include "ace/Dynamic_Service.h"
-#include "ace/Get_Opt.h"
-#include "ace/Auto_Ptr.h"
-#include "tao/ORB.h"
-#include "DAnCE/Deployment/Deployment_DeploymentPlanC.h"
-#include "DAnCE/Logger/Log_Macros.h"
-#include "DAnCE/Logger/Logger_Service.h"
-#include "Convert_Plan_Impl.h"
-
-
-const char *input_filename = 0;
-const char *output_filename = 0;
-void
-usage (void)
-{
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("usage: dance_split_plan [options]\n")
-              ACE_TEXT ("Converts a provided plan to CDR.  If no output file is nominated, ")
-              ACE_TEXT ("the input XML plan will be validated against schema and the program will exit\n")
-              ACE_TEXT ("\t-x <plan>\t\tXML Encoded input plan\n")
-              ACE_TEXT ("\t-o <file>\t\tOutput destination for converted plan\n")
-              ));
-}
-
-bool
-parse_args (int argc, ACE_TCHAR *argv [])
-{
-  DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT ("dance_split_plan options: ")));
-  
-  for (int i = 0; i < argc; ++i)
-    {
-      DANCE_DEBUG (9, (LM_TRACE, ACE_TEXT("\t%s\n"), argv[i]));
-    }
-  
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("x:o:h"), 0);
-  
-  int c;
-  ACE_CString s;
-  while ((c = get_opt ()) != EOF)
-    {
-      switch (c)
-        {
-        case 'x':
-          input_filename = get_opt.opt_arg ();
-          break;
-          
-        case 'o':
-          output_filename = get_opt.opt_arg ();
-          break;
-
-        case 'h':
-          usage ();
-          return false;
-        default: 
-          usage ();
-          return false;
-        }
-    }
-  
-  return true;
-}
-
-int 
-ACE_TMAIN (int argc, ACE_TCHAR *argv [])
-{
-  DANCE_DISABLE_TRACE ();
-  
-  int retval = 0;
-
-  try
-    {
-      DAnCE::Logger_Service
-        * dlf = ACE_Dynamic_Service<DAnCE::Logger_Service>::instance ("DAnCE_Logger");
-      
-      if (dlf)
-        {
-          dlf->init (argc, argv);
-        }
-      
-      DANCE_DEBUG (6, (LM_TRACE, DLINFO
-                       ACE_TEXT("Convert_Plan - initializing ORB\n")));
-      
-      // Need an ORB for the Config handlers
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
-      
-      if (!parse_args (argc, argv))
-        {
-          return -1;
-        }
-      
-      if (!input_filename)
-        {
-          DANCE_ERROR (1, (LM_ERROR, DLINFO "Convert_Plan - " 
-                           "No input filename provided\n"));
-          return -1;
-        }
-
-      auto_ptr <Deployment::DeploymentPlan> plan (DAnCE::Convert_Plan::read_xml_plan (input_filename));
-      
-      if (!plan.get ())
-        {
-          DANCE_ERROR (1, (LM_ERROR, DLINFO "Convert_Plan - "
-                           "Unable to load an XML based plan\n"));
-          return -1;
-        }
-      
-      if (!output_filename)
-        {
-          DANCE_DEBUG (2, (LM_DEBUG, DLINFO "Convert_Plan - "
-                           "XML Input file validated correctly with no output file specifed, exiting\n"));
-          return 0;
-        }
-
-      DAnCE::Convert_Plan::write_cdr_plan (output_filename, *plan);
-    }
-  catch (const CORBA::Exception &ex)
-    {
-      ex._tao_print_exception ("Convert_Plan");
-      retval = -1;
-    }
-  catch (...)
-    {
-      DANCE_ERROR (1, (LM_ERROR, "Convert_Plan - error: unknown c++ exception\n"));
-      retval = -1;
-    }
-  
-  return retval;
-}
diff --git a/CIAO/DAnCE/tools/Convert_Plan/Convert_Plan.mpc b/CIAO/DAnCE/tools/Convert_Plan/Convert_Plan.mpc
deleted file mode 100644
index 5628fafdcaf..00000000000
--- a/CIAO/DAnCE/tools/Convert_Plan/Convert_Plan.mpc
+++ /dev/null
@@ -1,19 +0,0 @@
-// $Id$
-project (DAnCE_Convert_Plan) : dance_lib, dance_output, dance_deployment_stub, dance_config_handlers {
-
-  dynamicflags = DANCE_CONVERT_PLAN_BUILD_DLL
-  includes += $(DANCE_ROOT)/tools
-  
-  Source_Files {
-     Convert_Plan_Impl.cpp
-  }
-}
-
-
-project (DAnCE_Convert_Plan_Exec) : dance_exe, dance_output, dance_convert_plan {
-  exename = dance_convert_plan
-
-  Source_Files {
-    Convert_Plan.cpp
-  }
-}
diff --git a/CIAO/DAnCE/tools/Convert_Plan/Convert_Plan_Impl.cpp b/CIAO/DAnCE/tools/Convert_Plan/Convert_Plan_Impl.cpp
deleted file mode 100644
index 0acfc785dca..00000000000
--- a/CIAO/DAnCE/tools/Convert_Plan/Convert_Plan_Impl.cpp
+++ /dev/null
@@ -1,168 +0,0 @@
-// $Id$
-
-#include "Convert_Plan_Impl.h"
-#include "ace/FILE_Connector.h"
-#include "tao/CDR.h"
-#include "Config_Handlers/XML_File_Intf.h"
-#include "Logger/Log_Macros.h"
-
-namespace DAnCE
-{
-  Deployment::DeploymentPlan * 
-  Convert_Plan::read_xml_plan (const char *filename)
-  {
-    CIAO::Config_Handlers::XML_File_Intf xml_intf (filename);
-    xml_intf.add_search_path ("ACE_ROOT", "/docs/schema/");
-    xml_intf.add_search_path ("TAO_ROOT", "/docs/schema/");
-    xml_intf.add_search_path ("CIAO_ROOT", "/docs/schema/");
-    xml_intf.add_search_path ("DANCE_ROOT", "/docs/schema/");
-  
-    return xml_intf.release_plan ();  
-  }
-
-  Deployment::DeploymentPlan * 
-  Convert_Plan::read_cdr_plan (const char *filename)
-  {
-    ACE_FILE_Addr file_addr (ACE_sap_any_cast (ACE_FILE_Addr &));
-  
-    if (filename)
-      file_addr.set (filename);
-    else
-      {
-        DANCE_ERROR (1, (LM_ERROR, DLINFO "Convert_Plan_Impl::read_cdr_plan - passed nil file name\n"));
-        return 0;
-      }
-      
-    ACE_FILE_Connector conn;
-    ACE_FILE_IO file;
-  
-    if (conn.connect (file,
-                      file_addr,
-                      0,
-                      ACE_Addr::sap_any,
-                      0,
-                      O_RDONLY,
-                      ACE_DEFAULT_FILE_PERMS == -1))
-      {
-        DANCE_ERROR (1, (LM_ERROR, DLINFO "Convert_Plan_Impl::read_cdr_plan - unable to read file %p\n",
-                         filename));
-        return 0;
-      }
-  
-    ACE_FILE_Info info;
-    if (file.get_info (info) == -1)
-      {
-        DANCE_ERROR (1, (LM_ERROR, DLINFO "Convert_Plan_Impl::read_cdr_plan - unable to determine file size %p\n",
-                         filename));
-        return 0;
-      }
-  
-    ACE_OFF_T bufsize = info.size_ - 1;
-  
-    char *buffer = 0;
-    ACE_NEW_RETURN (buffer,
-                    char[bufsize],
-                    0);
-  
-#if defined (ACE_INITIALIZE_MEMORY_BEFORE_USE)
-    ACE_OS::memset(buffer, 0, sizeof (buffer));
-#endif /* ACE_INITIALIZE_MEMORY_BEFORE_USE */
-  
-    // Make sure <buffer> is released automagically.
-    ACE_Auto_Basic_Array_Ptr<char> b (buffer);
-  
-    if (file.seek (0, SEEK_SET) == -1)
-      {
-        DANCE_ERROR (1, (LM_ERROR, DLINFO "Convert_Plan_Impl::read_cdr_plan - seek failed %p\n",
-                         filename));
-        return 0;
-      }
-  
-    char byte_order;
-    ssize_t size = file.recv (&byte_order, 1);
-    size = file.recv (buffer, bufsize);
-  
-    if (size != bufsize)
-      {
-        DANCE_ERROR (1, (LM_ERROR, DLINFO "Convert_Plan_Impl::read_cdr_plan - read %u bytes "
-                         "instead of %u bytes\n", size, bufsize));
-        return 0;
-      }
-  
-    ACE_Message_Block mb (ACE_CDR::MAX_ALIGNMENT + bufsize);
-    ACE_CDR::mb_align (&mb);
-    mb.copy (buffer, bufsize);
-  
-    TAO_InputCDR input_cdr (&mb);
-    input_cdr.reset_byte_order ((int) byte_order);
-  
-    DANCE_DEBUG (9, (LM_TRACE, DLINFO "Convert_Plan_Impl::read_cdr_plan - "
-                     "Reading file %C in %s endian format\n",
-                     filename, ACE_CDR_BYTE_ORDER ? ACE_TEXT("little") : ACE_TEXT("big")));
-  
-  
-    Deployment::DeploymentPlan *retval;
-  
-    ACE_NEW_RETURN (retval, Deployment::DeploymentPlan (), 0);
-  
-    input_cdr >> *retval;
-  
-    file.close ();
-  
-    return retval;
-  }
-
-  bool
-  Convert_Plan::write_cdr_plan (const char *output_filename, Deployment::DeploymentPlan &plan)
-  {
-    ACE_FILE_Addr file_addr (ACE_sap_any_cast (ACE_FILE_Addr &));
-  
-    if (output_filename)
-      file_addr.set (output_filename);
-    else
-      {
-        DANCE_ERROR (1, (LM_ERROR, DLINFO "Convert_Plan_Impl::write_cdr_plan - passed nil file name\n"));
-        return 0;
-      }
-      
-    ACE_FILE_Connector conn;
-    ACE_FILE_IO file;
-  
-    if (conn.connect (file,
-                      file_addr,
-                      0,
-                      ACE_Addr::sap_any,
-                      0,
-                      O_RDWR | O_CREAT,
-                      ACE_DEFAULT_FILE_PERMS == -1))
-      {
-        DANCE_ERROR (1, (LM_ERROR, DLINFO "Convert_Plan_Impl::write_cdr_plan - unable to write file %p\n",
-                         output_filename));
-        return 0;
-      }
-  
-    char byte_order = ACE_CDR_BYTE_ORDER;
-    size_t n = file.send (&byte_order, 1);
-  
-    TAO_OutputCDR output_cdr (0, ACE_CDR_BYTE_ORDER, 0, 0, 0, 
-                              ACE_DEFAULT_CDR_MEMCPY_TRADEOFF,
-                              ACE_CDR_GIOP_MAJOR_VERSION,
-                              ACE_CDR_GIOP_MINOR_VERSION);
-  
-    output_cdr << plan;
-  
-    const ACE_Message_Block *output_mb = output_cdr.begin ();
-  
-    DANCE_DEBUG (9, (LM_TRACE, DLINFO  "Convert_Plan_Impl::write_cdr_plan - "
-                     ACE_TEXT ("Writing plan to file %s in %s endian format\n"),
-                     output_filename,
-                     ACE_CDR_BYTE_ORDER ? ACE_TEXT("little") : ACE_TEXT("big")));
-  
-    n = file.send (output_mb->rd_ptr (),
-                   output_mb->length ());
-  
-    file.close ();
-  
-    return true;    
-  }
-}
diff --git a/CIAO/DAnCE/tools/Convert_Plan/Convert_Plan_Impl.h b/CIAO/DAnCE/tools/Convert_Plan/Convert_Plan_Impl.h
deleted file mode 100644
index 4065fc0eb2a..00000000000
--- a/CIAO/DAnCE/tools/Convert_Plan/Convert_Plan_Impl.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// $Id$
-
-/**
- * @file Convert_Plan_Impl.h
- *
- * @author William R. Otte <wotte@dre.vanderbilt.edu>
- */
-
-#ifndef DANCE_CONVERT_PLAN_H
-#define DANCE_CONVERT_PLAN_H
-
-#include "Convert_Plan/DAnCE_Convert_Plan_export.h"
-#include "Deployment/Deployment_DeploymentPlanC.h"
-
-namespace DAnCE
-{
-  class DAnCE_Convert_Plan_Export Convert_Plan
-  {
-  public:
-    static Deployment::DeploymentPlan * read_xml_plan (const char *filename);
-    static Deployment::DeploymentPlan * read_cdr_plan (const char *filename);
-    static bool write_cdr_plan (const char *filename, Deployment::DeploymentPlan &plan);
-  };
-};
-
-#endif
diff --git a/CIAO/DAnCE/tools/Convert_Plan/DAnCE_Convert_Plan_export.h b/CIAO/DAnCE/tools/Convert_Plan/DAnCE_Convert_Plan_export.h
deleted file mode 100644
index f41657d581e..00000000000
--- a/CIAO/DAnCE/tools/Convert_Plan/DAnCE_Convert_Plan_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl DAnCE_Convert_Plan
-// ------------------------------
-#ifndef DANCE_CONVERT_PLAN_EXPORT_H
-#define DANCE_CONVERT_PLAN_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (DANCE_CONVERT_PLAN_HAS_DLL)
-#  define DANCE_CONVERT_PLAN_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && DANCE_CONVERT_PLAN_HAS_DLL */
-
-#if !defined (DANCE_CONVERT_PLAN_HAS_DLL)
-#  define DANCE_CONVERT_PLAN_HAS_DLL 1
-#endif /* ! DANCE_CONVERT_PLAN_HAS_DLL */
-
-#if defined (DANCE_CONVERT_PLAN_HAS_DLL) && (DANCE_CONVERT_PLAN_HAS_DLL == 1)
-#  if defined (DANCE_CONVERT_PLAN_BUILD_DLL)
-#    define DAnCE_Convert_Plan_Export ACE_Proper_Export_Flag
-#    define DANCE_CONVERT_PLAN_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define DANCE_CONVERT_PLAN_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* DANCE_CONVERT_PLAN_BUILD_DLL */
-#    define DAnCE_Convert_Plan_Export ACE_Proper_Import_Flag
-#    define DANCE_CONVERT_PLAN_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define DANCE_CONVERT_PLAN_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* DANCE_CONVERT_PLAN_BUILD_DLL */
-#else /* DANCE_CONVERT_PLAN_HAS_DLL == 1 */
-#  define DAnCE_Convert_Plan_Export
-#  define DANCE_CONVERT_PLAN_SINGLETON_DECLARATION(T)
-#  define DANCE_CONVERT_PLAN_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* DANCE_CONVERT_PLAN_HAS_DLL == 1 */
-
-// Set DANCE_CONVERT_PLAN_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (DANCE_CONVERT_PLAN_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define DANCE_CONVERT_PLAN_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define DANCE_CONVERT_PLAN_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !DANCE_CONVERT_PLAN_NTRACE */
-
-#if (DANCE_CONVERT_PLAN_NTRACE == 1)
-#  define DANCE_CONVERT_PLAN_TRACE(X)
-#else /* (DANCE_CONVERT_PLAN_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define DANCE_CONVERT_PLAN_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (DANCE_CONVERT_PLAN_NTRACE == 1) */
-
-#endif /* DANCE_CONVERT_PLAN_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/DAnCE/tools/Split_Plan/DAnCE_Split_Plan_export.h b/CIAO/DAnCE/tools/Split_Plan/DAnCE_Split_Plan_export.h
deleted file mode 100644
index fd07498538a..00000000000
--- a/CIAO/DAnCE/tools/Split_Plan/DAnCE_Split_Plan_export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl DAnCE_Split_Plan
-// ------------------------------
-#ifndef DANCE_SPLIT_PLAN_EXPORT_H
-#define DANCE_SPLIT_PLAN_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (DANCE_SPLIT_PLAN_HAS_DLL)
-#  define DANCE_SPLIT_PLAN_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && DANCE_SPLIT_PLAN_HAS_DLL */
-
-#if !defined (DANCE_SPLIT_PLAN_HAS_DLL)
-#  define DANCE_SPLIT_PLAN_HAS_DLL 1
-#endif /* ! DANCE_SPLIT_PLAN_HAS_DLL */
-
-#if defined (DANCE_SPLIT_PLAN_HAS_DLL) && (DANCE_SPLIT_PLAN_HAS_DLL == 1)
-#  if defined (DANCE_SPLIT_PLAN_BUILD_DLL)
-#    define DAnCE_Split_Plan_Export ACE_Proper_Export_Flag
-#    define DANCE_SPLIT_PLAN_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define DANCE_SPLIT_PLAN_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* DANCE_SPLIT_PLAN_BUILD_DLL */
-#    define DAnCE_Split_Plan_Export ACE_Proper_Import_Flag
-#    define DANCE_SPLIT_PLAN_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define DANCE_SPLIT_PLAN_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* DANCE_SPLIT_PLAN_BUILD_DLL */
-#else /* DANCE_SPLIT_PLAN_HAS_DLL == 1 */
-#  define DAnCE_Split_Plan_Export
-#  define DANCE_SPLIT_PLAN_SINGLETON_DECLARATION(T)
-#  define DANCE_SPLIT_PLAN_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* DANCE_SPLIT_PLAN_HAS_DLL == 1 */
-
-// Set DANCE_SPLIT_PLAN_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (DANCE_SPLIT_PLAN_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define DANCE_SPLIT_PLAN_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define DANCE_SPLIT_PLAN_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !DANCE_SPLIT_PLAN_NTRACE */
-
-#if (DANCE_SPLIT_PLAN_NTRACE == 1)
-#  define DANCE_SPLIT_PLAN_TRACE(X)
-#else /* (DANCE_SPLIT_PLAN_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define DANCE_SPLIT_PLAN_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (DANCE_SPLIT_PLAN_NTRACE == 1) */
-
-#endif /* DANCE_SPLIT_PLAN_EXPORT_H */
-
-// End of auto generated file.
diff --git a/CIAO/DAnCE/tools/Split_Plan/Split_Plan.cpp b/CIAO/DAnCE/tools/Split_Plan/Split_Plan.cpp
deleted file mode 100644
index 5dcb053abdb..00000000000
--- a/CIAO/DAnCE/tools/Split_Plan/Split_Plan.cpp
+++ /dev/null
@@ -1,144 +0,0 @@
-// $Id$
-
-#include "ace/Dynamic_Service.h"
-#include "ace/Get_Opt.h"
-#include "ace/Auto_Ptr.h"
-#include "tao/ORB.h"
-#include "DAnCE/Deployment/Deployment_DeploymentPlanC.h"
-#include "DAnCE/Logger/Log_Macros.h"
-#include "DAnCE/Logger/Logger_Service.h"
-#include "DAnCE/Config_Handlers/XML_File_Intf.h"
-#include "DAnCE/tools/Convert_Plan/Convert_Plan_Impl.h"
-#include "Split_Plan_impl.h"
-
-
-bool cdr_encoded_ = false;
-const char *input_filename = 0;
-
-void
-usage (void)
-{
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("usage: dance_split_plan [options]\n")
-              ACE_TEXT ("Applies the split plan algorithm and saves the result to")
-              ACE_TEXT ("CDR encoded plans\n")
-              ACE_TEXT ("\t-c <plan>\t\tCDR Encoded input plan\n")
-              ACE_TEXT ("\t-x <plan>\t\tXML Encoded input plan\n")
-              ));
-}
-
-bool
-parse_args (int argc, ACE_TCHAR *argv [])
-{
-  DANCE_DEBUG (9, (LM_TRACE, DLINFO ACE_TEXT ("dance_split_plan options: ")));
-  
-  for (int i = 0; i < argc; ++i)
-    {
-      DANCE_DEBUG (9, (LM_TRACE, ACE_TEXT("\t%s\n"), argv[i]));
-    }
-  
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("c:x:h"), 0);
-  
-  int c;
-  ACE_CString s;
-  while ((c = get_opt ()) != EOF)
-    {
-      switch (c)
-        {
-        case 'c':
-          cdr_encoded_ = true;
-          input_filename = get_opt.opt_arg ();
-          break;
-          
-        case 'x':
-          cdr_encoded_ = false;
-          input_filename = get_opt.opt_arg ();
-          break;
-
-        case 'h':
-          usage ();
-          return false;
-        default: 
-          usage ();
-          return false;
-        }
-    }
-  
-  return true;
-}
-
-int 
-ACE_TMAIN (int argc, ACE_TCHAR *argv [])
-{
-  DANCE_DISABLE_TRACE ();
-  
-  int retval = 0;
-
-  try
-    {
-      DAnCE::Logger_Service
-        * dlf = ACE_Dynamic_Service<DAnCE::Logger_Service>::instance ("DAnCE_Logger");
-      
-      if (dlf)
-        {
-          dlf->init (argc, argv);
-        }
-      
-      DANCE_DEBUG (6, (LM_TRACE, DLINFO
-                       ACE_TEXT("PlanLauncher - initializing ORB\n")));
-      
-      // Need an ORB for the Config handlers
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
-      
-      if (!parse_args (argc, argv))
-        {
-          return -1;
-        }
-
-      auto_ptr<Deployment::DeploymentPlan> plan;
-      
-      if (!cdr_encoded_)
-        {
-          plan.reset (DAnCE::Convert_Plan::read_xml_plan (input_filename));
-        }
-      else 
-        {
-          plan.reset (DAnCE::Convert_Plan::read_cdr_plan (input_filename));
-        }
-      
-      if (plan.get () == 0)
-        {
-          DANCE_ERROR (1, (LM_ERROR, DLINFO "Split_Plan - "
-                           "Unable to convert provided plan into IDL representation\n"));
-          return 0;
-        }
-      
-      DAnCE::Split_Plan::TNodePlans plans;
-      DAnCE::Split_Plan split (*plan, plans);
-      split.split_plan ();
-      
-      for (DAnCE::Split_Plan::TNodePlans::iterator iter_plans = plans.begin();
-           iter_plans != plans.end();
-           ++iter_plans)
-        {
-          ACE_CString name ((*iter_plans).ext_id_);
-          DANCE_DEBUG (3, (LM_DEBUG, DLINFO "Split_Plan - "
-                           "Writing sub plan for node %C\n",
-                           name.c_str ()));
-
-          name += input_filename;
-          DAnCE::Convert_Plan::write_cdr_plan (name.c_str (), (*iter_plans).int_id_);
-        }
-    }
-  catch (const CORBA::Exception &ex)
-    {
-      ex._tao_print_exception ("PlanLauncher");
-      retval = -1;
-    }
-  catch (...)
-    {
-      DANCE_ERROR (1, (LM_ERROR, "Split_Plan - error: unknown c++ exception\n"));
-      retval = -1;
-    }
-  
-  return retval;
-}
diff --git a/CIAO/DAnCE/tools/Split_Plan/Split_Plan.mpc b/CIAO/DAnCE/tools/Split_Plan/Split_Plan.mpc
deleted file mode 100644
index de005ed5697..00000000000
--- a/CIAO/DAnCE/tools/Split_Plan/Split_Plan.mpc
+++ /dev/null
@@ -1,18 +0,0 @@
-// $Id$
-project (DAnCE_Split_Plan_Impl) : dance_lib, dance_deployment_stub, dance_output {
-
-   dynamicflags = DANCE_SPLIT_PLAN_BUILD_DLL
-   includes += $(DANCE_ROOT)/tools
-
-   Source_Files {
-      Split_Plan_impl.cpp
-   }
-}
-
-project (DAnCE_Split_Plan_Exec) : dance_exe, dance_output, dance_split_plan, dance_convert_plan {
-   exename = dance_split_plan
-
-   Source_Files {
-     Split_Plan.cpp
-   }
-}
diff --git a/CIAO/DAnCE/tools/Split_Plan/Split_Plan_impl.cpp b/CIAO/DAnCE/tools/Split_Plan/Split_Plan_impl.cpp
deleted file mode 100644
index 244bae298ce..00000000000
--- a/CIAO/DAnCE/tools/Split_Plan/Split_Plan_impl.cpp
+++ /dev/null
@@ -1,247 +0,0 @@
-// $Id$
-
-#include "Split_Plan_impl.h"
-#include "DAnCE/Logger/Log_Macros.h"
-
-namespace DAnCE
-{
-  Split_Plan::Split_Plan (const Deployment::DeploymentPlan &plan,
-                          TNodePlans &sub_plans)
-    : plan_ (plan),
-      sub_plans_ (sub_plans)
-  {
-  }
-  void
-  Split_Plan::split_plan ()
-  {
-    DANCE_TRACE ( "Split_Plan::split_plan");
-    
-    const Deployment::DeploymentPlan &plan = this->plan_;
-    TNodePlans &sub_plans = this->sub_plans_;
-
-    DANCE_DEBUG (9, (LM_TRACE, ACE_TEXT("Split_Plan::split_plan - ")
-                     ACE_TEXT("Creating sub-plans\n")));
-    // Create empty sub-plans
-    for (CORBA::ULong i = 0; i < plan.instance.length(); ++i)
-      {
-        ACE_CString node = plan.instance[i].node.in();
-        if (0 == sub_plans.find (node)) continue;
-
-        ::Deployment::DeploymentPlan tmp_plan;
-
-        // Construct the UUID for the child plan.
-        // Currently, this UUID consists of:
-        // The global UUID for the parent plan + the name of the node the
-        // child plan is to be installed on.
-        ACE_CString child_uuid (plan.UUID.in ());
-        //      child_uuid += "@"; CCM#61
-        //      child_uuid += node;
-
-        tmp_plan.UUID = CORBA::string_dup (child_uuid.c_str());
-        tmp_plan.implementation.length (0);
-        tmp_plan.instance.length (0);
-        tmp_plan.connection.length (0);
-        tmp_plan.externalProperty.length (0);
-        tmp_plan.dependsOn.length (0);
-        tmp_plan.artifact.length (0);
-
-        // @@ There is an optimization point here, since we really don't have to
-        // pass the entire CIAOServerResources into each individual child plan.
-        tmp_plan.infoProperty = plan.infoProperty;
-        
-        CORBA::ULong num_localities (plan.localityConstraint.length ());
-        Deployment::PlanLocalities default_loc (num_localities);
-        default_loc.length (num_localities);
-        
-        for (CORBA::ULong i = 0; i < num_localities; ++i)
-          {
-            default_loc[i].constraint = Deployment::PlanNoConstraint;
-          }
-                            
-        tmp_plan.localityConstraint = default_loc;
-
-        sub_plans.bind (node, tmp_plan);
-
-        DANCE_DEBUG (9, (LM_TRACE, DLINFO
-                         ACE_TEXT("Split_Plan::split_plan - ")
-                         ACE_TEXT("Created sub-plan for node %C with UUID %C\n"),
-                         node.c_str (), child_uuid.c_str ()));
-      }
-
-    DANCE_DEBUG (6, (LM_DEBUG, DLINFO
-                     ACE_TEXT("Split_Plan::split_plan - ")
-                     ACE_TEXT("First phase produced %u child plans, proceeding to second\n"),
-                     sub_plans.current_size ()));
-
-    // (1) Iterate over the <instance> field of the global DeploymentPlan
-    //     structure.
-    // (2) Retrieve the necessary information to contruct the node-level
-    //     plans one by one.
-    for (CORBA::ULong i = 0; i < plan.instance.length (); ++i)
-      {
-        DANCE_DEBUG (9, (LM_TRACE, DLINFO
-                         ACE_TEXT("Split_Plan::split_plan - ")
-                         ACE_TEXT("Processing instance: %C\n"), plan.instance[i].name.in()));
-        // @@TODO Fill in the child deployment plan in the map.
-        // If the component instance already exists in the child plan,
-        // then we overwrite the existing instance, since the new instance
-        // might have different resource usage requirements.
-
-        // Get the instance deployment description
-        const ::Deployment::InstanceDeploymentDescription & my_instance = plan.instance[i];
-
-        // Get the child plan.
-        ::Deployment::DeploymentPlan child_plan;
-
-        if (0 != sub_plans.find (my_instance.node.in(), child_plan))
-          {
-            DANCE_ERROR (1, (LM_ERROR, DLINFO
-                             ACE_TEXT("Split_Plan::split_plan - ")
-                             ACE_TEXT("ERROR: Unable to find sub-plan for instance %C\n"),
-                             my_instance.node.in ()));
-          }
-
-        // Fill in the contents of the child plan entry.
-
-        // Append the "MonolithicDeploymentDescriptions implementation"
-        // field with a new "implementation", which is specified by the
-        // <implementationRef> field of <my_instance> entry.  NOTE: The
-        // <artifactRef> field needs to be changed accordingly.
-        ::Deployment::MonolithicDeploymentDescription const & my_implementation
-            = plan.implementation[my_instance.implementationRef];
-
-        CORBA::ULong index_imp = child_plan.implementation.length ();
-        child_plan.implementation.length (++index_imp);
-        child_plan.implementation[index_imp-1] = my_implementation;
-
-        // Initialize with the correct sequence length.
-        CORBA::ULongSeq ulong_seq;
-        ulong_seq.length (my_implementation.artifactRef.length ());
-
-        // Append the "ArtifactDeploymentDescriptions artifact" field
-        // with some new "artifacts", which is specified by the
-        // <artifactRef> sequence of <my_implementation> entry.
-        CORBA::ULong const impl_length = my_implementation.artifactRef.length ();
-        for (CORBA::ULong iter = 0;
-             iter < impl_length;
-             iter ++)
-          {
-            CORBA::ULong artifact_ref = my_implementation.artifactRef[iter];
-
-            // Fill in the <artifact> field of the child plan
-            CORBA::ULong index_art = child_plan.artifact.length ();
-            child_plan.artifact.length (++index_art);
-            child_plan.artifact[index_art-1] = plan.artifact[artifact_ref];
-
-            // Fill in the artifactRef field of the MonolithicDeploymentDescription
-            ulong_seq[iter] = index_art - 1;
-          }
-
-        // Change the <artifactRef> field of the "implementation".
-        child_plan.implementation[index_imp-1].artifactRef = ulong_seq;
-
-        // Append the "InstanceDeploymentDescription instance" field with
-        // a new "instance", which is almost the same as the "instance" in
-        // the global plan except the <implementationRef> field.
-        // NOTE: The <implementationRef> field needs to be changed accordingly.
-        CORBA::ULong index_ins = child_plan.instance.length ();
-        child_plan.instance.length (++index_ins);
-        child_plan.instance[index_ins-1] = my_instance;
-
-        // Change the <implementationRef> field of the "instance".
-        // @@ The implementationRef starts from 0.
-        // @@TODO: Below logic needs to be changed once we want to avoid
-        // duplicate <implementation> for the optimization.
-        child_plan.instance[index_ins-1].implementationRef = index_imp - 1;
-
-        DANCE_DEBUG (9, (LM_TRACE, DLINFO
-                         ACE_TEXT("Split_Plan::split_plan - ")
-                         ACE_TEXT("Processing connections.\n")));
-        // Copy connections
-        for (CORBA::ULong j = 0; j < plan.connection.length(); ++j)
-          {
-            DANCE_DEBUG (9, (LM_TRACE, DLINFO
-                             ACE_TEXT("Split_Plan::split_plan - ")
-                             ACE_TEXT("For connection: %C\n"), plan.connection[j].name.in()));
-            for (CORBA::ULong k = 0; k < plan.connection[j].internalEndpoint.length(); ++k)
-              {
-                DANCE_DEBUG (9, (LM_TRACE, DLINFO
-                                 ACE_TEXT("Split_Plan::split_plan - ")
-                                 ACE_TEXT("For endpoint: %C(%C)\n"),
-                                 plan.connection[j].internalEndpoint[k].portName.in(),
-                                 plan.connection[j].internalEndpoint[k].provider ? "provider" : "client"));
-                if (i == plan.connection[j].internalEndpoint[k].instanceRef)   // the instance (i) is referenced by the connection
-                  {
-                    Deployment::PlanConnectionDescription * connection_copied = 0;
-                    for (CORBA::ULong m = 0; m < child_plan.connection.length(); ++m)
-                      {
-                        if (ACE_OS::strcmp (plan.connection[j].name.in (), child_plan.connection[m].name.in ()) == 0)
-                          {
-                            connection_copied = &child_plan.connection[m];
-                            break;
-                          }
-                      }
-
-                    if (!connection_copied)
-                      {
-                        // Copy the connection
-                        CORBA::ULong const index_con = child_plan.connection.length();
-                        child_plan.connection.length (index_con + 1);
-                        child_plan.connection[index_con] = plan.connection[j];
-                        connection_copied = &child_plan.connection[index_con];
-                        connection_copied->internalEndpoint.length (0);
-                      }
-
-                    // Copy the endpoint
-                    CORBA::ULong const index_ep = connection_copied->internalEndpoint.length();
-
-                    DANCE_DEBUG (9, (LM_TRACE, DLINFO
-                                     ACE_TEXT("Split_Plan::split_plan - ")
-                                     ACE_TEXT ("Copying endpoint %u from connection into endpoint %u\n"),
-                                     k, index_ep));
-
-                    connection_copied->internalEndpoint.length (index_ep + 1);
-                    connection_copied->internalEndpoint[index_ep] = plan.connection[j].internalEndpoint[k];
-                    connection_copied->internalEndpoint[index_ep].instanceRef = index_ins - 1;
-                  }
-              }
-          }
-        
-        for (CORBA::ULong j = 0; j < plan.localityConstraint.length (); ++j)
-          {
-            ::Deployment::PlanLocality loc = plan.localityConstraint[j];
-            for (CORBA::ULong k = 0; k < loc.constrainedInstanceRef.length (); ++k)
-              {
-                if (loc.constrainedInstanceRef[k] == i) // we are the same instance...
-                  {
-                    // add our new instance ref to the child plan's corresponding contraint.
-                    CORBA::ULong child_loc_len (child_plan.localityConstraint[j].constrainedInstanceRef.length ());
-
-                    DANCE_DEBUG (9, (LM_TRACE, DLINFO
-                                     ACE_TEXT("Split_Plan::split_plan - ")
-                                     ACE_TEXT ("Found matching locality constraint %u:%u, adding to %u:%u as %u\n"),
-                                     j, k, j, child_loc_len, index_ins - 1));
-                    child_plan.localityConstraint[j].constraint = loc.constraint;
-                    child_plan.localityConstraint[j].constrainedInstanceRef.length (child_loc_len + 1);
-                    child_plan.localityConstraint[j].constrainedInstanceRef[child_loc_len] = index_ins - 1;
-                  }
-              }
-          }
-                    
-                    
-        sub_plans.rebind (my_instance.node.in(), child_plan);
-      }
-
-    //Debug
-    DANCE_DEBUG (6, (LM_DEBUG, DLINFO
-                     ACE_TEXT("Split_Plan::split_plan - ")
-                     ACE_TEXT("Original plan connection count: %u\n"), plan.connection.length()));
-    CORBA::ULong cnt = 0;
-    for (TNodePlans::iterator it = sub_plans.begin(); it != sub_plans.end(); ++it)
-      {
-        cnt += (*it).int_id_.connection.length();
-      }
-    DANCE_DEBUG (6, (LM_DEBUG, DLINFO ACE_TEXT("Split_Plan::split_plan - ")
-                     ACE_TEXT("Child plans connection count: %u\n"), cnt)); 
-  }
-}
diff --git a/CIAO/DAnCE/tools/Split_Plan/Split_Plan_impl.h b/CIAO/DAnCE/tools/Split_Plan/Split_Plan_impl.h
deleted file mode 100644
index a9867eb086d..00000000000
--- a/CIAO/DAnCE/tools/Split_Plan/Split_Plan_impl.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// $Id$
-
-/**
- * @file Split_Plan_impl.h
- *
- * @author William R. Otte <wotte@dre.vanderbilt.edu>
- */
-
-#ifndef DANCE_SPLIT_PLAN_H
-#define DANCE_SPLIT_PLAN_H
-
-#include "ace/Map_Manager.h"
-#include "ace/SStringfwd.h"
-#include "Deployment/Deployment_DeploymentPlanC.h"
-#include "Split_Plan/DAnCE_Split_Plan_export.h"
-
-namespace DAnCE
-{
-  class DAnCE_Split_Plan_Export Split_Plan
-  {
-  public:
-    typedef ACE_Map_Manager<ACE_CString, Deployment::DeploymentPlan, ACE_Null_Mutex> TNodePlans;
-
-    Split_Plan (const Deployment::DeploymentPlan &plan,
-                TNodePlans &sub_plans);
-
-    void split_plan ();
-    
-  private:
-    const Deployment::DeploymentPlan &plan_;
-    TNodePlans &sub_plans_;
-  };
-}
-#endif
diff --git a/CIAO/MPC/config/ciao_dds4ccm_ndds_impl.mpb b/CIAO/MPC/config/ciao_dds4ccm_ndds_impl.mpb
new file mode 100644
index 00000000000..9969d99d565
--- /dev/null
+++ b/CIAO/MPC/config/ciao_dds4ccm_ndds_impl.mpb
@@ -0,0 +1,7 @@
+// -*- MPC -*-
+// $Id$
+
+project : dds4ccm_skel, nddslib {
+  libs += CIAO_DDS4CCM_NDDS_Impl
+  after += CIAO_DDS4CCM_NDDS_Impl
+}
diff --git a/CIAO/MPC/config/ciaoidldefaults.mpb b/CIAO/MPC/config/ciaoidldefaults.mpb
index fca16f5509b..dad74d13aa1 100644
--- a/CIAO/MPC/config/ciaoidldefaults.mpb
+++ b/CIAO/MPC/config/ciaoidldefaults.mpb
@@ -2,19 +2,5 @@
 // $Id$
 
 project : taoidldefaults {
-  idlflags += -I$(CIAO_ROOT) -I$(CIAO_ROOT)/ccm
-
-  Modify_Custom (IDL) {
-    optional(source_pre_extension) {
-      commandflags(-Gsv) += _svnt
-    }
-
-    optional(header_pre_extension) {
-      commandflags(-Gsv) += _svnt
-    }
-
-    optional(generic_outputext) {
-      commandflags(-Glem) += E.idl
-    }
-  }
+  idlflags += -I$(CIAO_ROOT) -I$(CIAO_ROOT)/ccm 
 }
diff --git a/CIAO/MPC/config/componentidldefaults.mpb b/CIAO/MPC/config/componentidldefaults.mpb
index 94601172797..666e7784b7a 100644
--- a/CIAO/MPC/config/componentidldefaults.mpb
+++ b/CIAO/MPC/config/componentidldefaults.mpb
@@ -3,5 +3,19 @@
 
 project : ciaoidldefaults, anytypecode {
   idlflags += -Gsv -Glem -Gxhst -Gxhsk -Gxhsv -Gxhex
+
+  Modify_Custom (IDL) {
+    optional(source_pre_extension) {
+      commandflags(-Gsv) += _svnt
+    }
+
+    optional(header_pre_extension) {
+      commandflags(-Gsv) += _svnt
+    }
+
+    optional(generic_outputext) {
+      commandflags(-Glem) += E.idl
+    }
+  }
 }
 
diff --git a/CIAO/MPC/config/connectoridldefaults.mpb b/CIAO/MPC/config/connectoridldefaults.mpb
index f4f2b22ed7a..f7a558fa159 100644
--- a/CIAO/MPC/config/connectoridldefaults.mpb
+++ b/CIAO/MPC/config/connectoridldefaults.mpb
@@ -2,16 +2,5 @@
 // $Id$
 
 project : componentidldefaults {
- idlflags += -Gcn -Gxhcn -I$(CIAO_ROOT)/connectors -Sa -St
- idlflags -= -Gxhex
-
-  Modify_Custom (IDL) {
-    optional(source_pre_extension) {
-      commandflags(-Gcn) += _conn
-    }
-
-    optional(header_pre_extension) {
-      commandflags(-Gcn) += _conn
-    }
-  }
-}
+   idlflags += -I$(CIAO_ROOT)/connectors
+}
\ No newline at end of file
diff --git a/CIAO/MPC/config/dds4ccm.mpb b/CIAO/MPC/config/dds4ccm.mpb
deleted file mode 100644
index ef000593b71..00000000000
--- a/CIAO/MPC/config/dds4ccm.mpb
+++ /dev/null
@@ -1,21 +0,0 @@
-// $Id$
-
-feature(dds4ccm_opendds) : taoidldefaults, dcps {
-  macros += CIAO_DDS4CCM_OPENDDS=1
-  idlflags += -DCIAO_DDS4CCM_OPENDDS=1
-}
-
-feature(dds4ccm_splice) : taoidldefaults {
-  macros += CIAO_DDS4CCM_SPLICE=1
-  idlflags += -DCIAO_DDS4CCM_SPLICE=1
-}
-
-feature(dds4ccm_ndds) : taoidldefaults {
-  macros += CIAO_DDS4CCM_NDDS=1
-  idlflags += -DCIAO_DDS4CCM_NDDS=1
-}
-
-feature(!dds4ccm_opendds, !dds4ccm_ndds, !dds4ccm_splice) {
-  requires += dummy_label
-}
-
diff --git a/CIAO/MPC/config/dds4ccm_base.mpb b/CIAO/MPC/config/dds4ccm_base.mpb
index 59c785fbe94..a2c15617235 100644
--- a/CIAO/MPC/config/dds4ccm_base.mpb
+++ b/CIAO/MPC/config/dds4ccm_base.mpb
@@ -1,18 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-feature(dds4ccm_opendds) : dds4ccm, ciao_connector_base, dcps {
+project : ciao_connector_base {
   after += DDS4CCM_stub DDS4CCM_lem_gen
   libs += DDS4CCM_stub
 }
-
-feature(dds4ccm_splice) : dds4ccm, ciao_connector_base {
-  after += DDS4CCM_stub DDS4CCM_lem_gen
-  libs += DDS4CCM_stub
-}
-
-feature(dds4ccm_ndds) : dds4ccm, ciao_connector_base, nddslib {
-  after += DDS4CCM_stub DDS4CCM_lem_gen
-  libs += DDS4CCM_stub
-}
-
diff --git a/CIAO/MPC/config/dds4ccm_impl.mpb b/CIAO/MPC/config/dds4ccm_impl.mpb
index 1cf83034121..6dd2505e6e6 100644
--- a/CIAO/MPC/config/dds4ccm_impl.mpb
+++ b/CIAO/MPC/config/dds4ccm_impl.mpb
@@ -1,18 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-feature(dds4ccm_opendds) : dds4ccm_skel, ciao_logger, dcps {
+project : nddslib, dds4ccm_skel, ciao_logger {
   after += CIAO_DDS4CCM_NDDS_Impl
   libs += CIAO_DDS4CCM_NDDS_Impl
 }
-
-feature(dds4ccm_splice) : dds4ccm_skel, ciao_logger {
-  after += CIAO_DDS4CCM_NDDS_Impl
-  libs += CIAO_DDS4CCM_NDDS_Impl
-}
-
-feature(dds4ccm_ndds) : dds4ccm_skel, ciao_logger, nddslib {
-  after += CIAO_DDS4CCM_NDDS_Impl
-  libs += CIAO_DDS4CCM_NDDS_Impl
-}
-
diff --git a/CIAO/MPC/config/dds4ccm_logger.mpb b/CIAO/MPC/config/dds4ccm_logger.mpb
deleted file mode 100644
index 323f487ccf6..00000000000
--- a/CIAO/MPC/config/dds4ccm_logger.mpb
+++ /dev/null
@@ -1,7 +0,0 @@
-// $Id$
-// -*- MPC -*-
-
-project : acelib {
-  after += DDS4CCM_Logger
-  libs  += DDS4CCM_Logger
-}
\ No newline at end of file
diff --git a/CIAO/MPC/config/dds4ccm_ts_default.mpb b/CIAO/MPC/config/dds4ccm_ts_default.mpb
deleted file mode 100644
index 6bece2e6b05..00000000000
--- a/CIAO/MPC/config/dds4ccm_ts_default.mpb
+++ /dev/null
@@ -1,39 +0,0 @@
-// $Id$
-
-feature(dds4ccm_opendds) : dds4ccm, dcps_ts_defaults, dcps {
-  Define_Custom(DDSGenerator) : TypeSupport {
-    keyword opendds_ts_flags = commandflags
-  }
-}
-
-feature(dds4ccm_splice) : dds4ccm, splice_ts_defaults {
-  Define_Custom(DDSGenerator) : SpliceTypeSupport {
-    keyword opendds_ts_flags = commandflags
-  }
-}
-
-feature(dds4ccm_ndds) : dds4ccm, ndds_ts_defaults, nddslib {
-  Define_Custom(DDSGenerator) : NDDSTypeSupport {
-  }
-
-  dynamicflags += NDDS_USER_DLL_EXPORT
-
-  verbatim(gnuace, macros) {
-    override no_hidden_visibility = 1
-    override no_strict_aliasing = 1
-  }
-}
-
-feature(!dds4ccm_opendds) {
-  // this allows the user's project to reference opendds_ts_flags,
-  // which will simply be ignored
-  Define_Custom(DummyTypeSupport) {
-    keyword opendds_ts_flags
-  }
-}
-
-feature(!dds4ccm_opendds, !dds4ccm_ndds, !dds4ccm_splice) {
-  Define_Custom(DDSGenerator) {
-  }
-}
-
diff --git a/CIAO/NEWS b/CIAO/NEWS
index 96eb8d87cc6..fc9c5fb24d8 100644
--- a/CIAO/NEWS
+++ b/CIAO/NEWS
@@ -62,9 +62,6 @@ replacement in the near term:
 . Implement a planner to query the TargetManager and RepositoryManager
   and generate deployment plans on the fly.
 
-USER VISIBLE CHANGES BETWEEN CIAO-0.7.6 and CIAO-0.7.7
-=======================================================
-
 USER VISIBLE CHANGES BETWEEN CIAO-0.7.5 and CIAO-0.7.6
 =======================================================
 
diff --git a/CIAO/bin/ciao_tests.lst b/CIAO/bin/ciao_tests.lst
index a86ac4761de..78c34141176 100644
--- a/CIAO/bin/ciao_tests.lst
+++ b/CIAO/bin/ciao_tests.lst
@@ -8,12 +8,8 @@
 # Example: TAO\examples\foo\run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST
 #
 TAO/CIAO/examples/Hello/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST !LabVIEW_RT !WinCE
-TAO/CIAO/examples/Hello/descriptors/run_test_PlanLocality_DifferentProcesses.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST !LabVIEW_RT !WinCE
-TAO/CIAO/examples/Hello/descriptors/run_test_PlanLocality_SameProcess.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST !LabVIEW_RT !WinCE
 TAO/CIAO/examples/BasicSP/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST !LabVIEW_RT !WinCE
 TAO/CIAO/examples/Null_Component/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST !LabVIEW_RT !WinCE
-TAO/CIAO/examples/Null_Component/descriptors/run_test_without_ns.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST !LabVIEW_RT !WinCE
-TAO/CIAO/examples/Null_Component_Glfa/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST !LabVIEW_RT !WinCE
 TAO/CIAO/examples/Hello/descriptors/run_test_without_ns.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST !LabVIEW_RT !WinCE
 #TAO/CIAO/examples/Hello/descriptors_RTCCM/rt_run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO RT_CAPABLE !ST !LabVIEW_RT !WinCE
 TAO/CIAO/tests/IDL3/Events/Any/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ACE_FOR_TAO !ST !LabVIEW_RT !WinCE
@@ -26,11 +22,9 @@ TAO/CIAO/tests/IDL3_to_XMI/XMI_For_Native/run_test.pl: !STATIC !MINIMUM !CORBA_E
 TAO/CIAO/tests/IDL3_to_XMI/XMI_For_Sequence/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST !LabVIEW_RT !WinCE !NO_IDL3_TO_XMI
 TAO/CIAO/tests/IDL3_to_XMI/IDL2XMI_Test/run_test.pl: !FIXED_BUGS_ONLY !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST !LabVIEW_RT !WinCE !NO_IDL3_TO_XMI
 TAO/CIAO/tests/IDL_Test/Double_Inherited_Component/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST
-TAO/CIAO/tests/Bug_3832_Regression/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST
 TAO/CIAO/DAnCE/tests/CIAO/NodeManager-Deployments/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST !LabVIEW_RT !WinCE
 TAO/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST !LabVIEW_RT !WinCE
 TAO/CIAO/DAnCE/tests/CIAO/CommandlinePassage/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST
-TAO/CIAO/DAnCE/tests/Bug_3832_Regression/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST
 TAO/CIAO/tests/CIAO_ComponentServer/Activator/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST
 TAO/CIAO/tests/CIAO_ComponentServer/Basic/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST
 TAO/CIAO/tests/CIAO_ComponentServer/SimpleComponent/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST
@@ -56,7 +50,7 @@ TAO/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl: !STATIC !
 TAO/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS
 TAO/CIAO/connectors/dds4ccm/tests/Reader/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS
 TAO/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS
-TAO/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl: !FIXED_BUGS_ONLY !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS
+TAO/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS
 TAO/CIAO/tests/Bug_3769_Regression/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST
 TAO/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS
 TAO/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS
@@ -71,8 +65,7 @@ TAO/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl: !STATIC
 TAO/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS
 TAO/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS
 TAO/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS
-TAO/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS
-TAO/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS
+TAO/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test.pl: !FIXED_BUGS_ONLY !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS
+TAO/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/run_test.pl: !FIXED_BUGS_ONLY !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS
 TAO/CIAO/connectors/dds4ccm/tests/QueryFilter/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS
 TAO/CIAO/connectors/dds4ccm/tests/InstanceHandle/descriptors/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS
-TAO/CIAO/connectors/dds4ccm/tests/TimeConversion/run_test.pl: !STATIC !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !NOXERCES !ACE_FOR_TAO !ST NDDS
diff --git a/CIAO/ciao/ComponentServer/CIAO_ComponentServer_Task.cpp b/CIAO/ciao/ComponentServer/CIAO_ComponentServer_Task.cpp
index 91bf004ad6d..3909a4f0b36 100644
--- a/CIAO/ciao/ComponentServer/CIAO_ComponentServer_Task.cpp
+++ b/CIAO/ciao/ComponentServer/CIAO_ComponentServer_Task.cpp
@@ -108,7 +108,7 @@ namespace CIAO
         {
           CIAO_DEBUG (9, (LM_TRACE, CLINFO "ComponentServer_Task::run - "
                       "Resolving callback IOR\n"));
-          CORBA::Object_var obj =
+          CORBA::Object_ptr obj =
             this->orb_->string_to_object (this->callback_ior_str_.c_str ());
           ServerActivator_var sa (ServerActivator::_narrow (obj));
 
diff --git a/CIAO/ciao/ComponentServer/CIAO_RTComponentServer_Task.cpp b/CIAO/ciao/ComponentServer/CIAO_RTComponentServer_Task.cpp
index bbbb8a4f748..4ce01c6c530 100644
--- a/CIAO/ciao/ComponentServer/CIAO_RTComponentServer_Task.cpp
+++ b/CIAO/ciao/ComponentServer/CIAO_RTComponentServer_Task.cpp
@@ -205,7 +205,7 @@ namespace CIAO
         {
           CIAO_DEBUG (9, (LM_TRACE, CLINFO "RTComponentServer_Task::run - "
                       "Resolving callback IOR\n"));
-          CORBA::Object_var obj =
+          CORBA::Object_ptr obj =
             this->orb_->string_to_object (this->callback_ior_str_.c_str ());
           ServerActivator_var sa (ServerActivator::_narrow (obj));
 
diff --git a/CIAO/ciao/Logger/Logger_Service.cpp b/CIAO/ciao/Logger/Logger_Service.cpp
index 83d5e45fdd5..12431a95d7e 100644
--- a/CIAO/ciao/Logger/Logger_Service.cpp
+++ b/CIAO/ciao/Logger/Logger_Service.cpp
@@ -125,14 +125,15 @@ CIAO::Logger_Service::parse_args (int argc, ACE_TCHAR **argv)
 int
 CIAO::Logger_Service::Initializer (void)
 {
-  return ACE_Service_Config::process_directive (ace_svc_desc_CIAO_LOGGER_SERVICE);
+  return ACE_Service_Config::process_directive (ace_svc_desc_Logger_Service);
 }
 
-ACE_STATIC_SVC_DEFINE (CIAO_LOGGER_SERVICE,
+using namespace CIAO;
+ACE_STATIC_SVC_DEFINE (Logger_Service,
                        ACE_TEXT ("CIAO_Logger"),
                        ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (CIAO_LOGGER_SERVICE),
+                       &ACE_SVC_NAME (Logger_Service),
                        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
                        0)
-ACE_FACTORY_DEFINE (CIAO_Logger, CIAO_LOGGER_SERVICE)
+ACE_FACTORY_DEFINE (CIAO_Logger, Logger_Service)
 
diff --git a/CIAO/ciao/Logger/Logger_Service.h b/CIAO/ciao/Logger/Logger_Service.h
index a97eea3e82f..890c9c07a93 100644
--- a/CIAO/ciao/Logger/Logger_Service.h
+++ b/CIAO/ciao/Logger/Logger_Service.h
@@ -26,9 +26,7 @@ namespace CIAO
 static int TAO_Requires_CIAO_Logger_Service_Initializer =
   CIAO::Logger_Service::Initializer ();
 
-typedef CIAO::Logger_Service CIAO_LOGGER_SERVICE;
-
-ACE_STATIC_SVC_DECLARE (CIAO_LOGGER_SERVICE)
-ACE_FACTORY_DECLARE (CIAO_Logger, CIAO_LOGGER_SERVICE)
+ACE_STATIC_SVC_DECLARE (Logger_Service)
+ACE_FACTORY_DECLARE (CIAO_Logger, Logger_Service)
 
 #endif /*LOGGER_SERVICE_H_*/
diff --git a/CIAO/ciao/Servants/Home_Servant_Impl_T.h b/CIAO/ciao/Servants/Home_Servant_Impl_T.h
index 2d980998ae9..80b57189ef1 100644
--- a/CIAO/ciao/Servants/Home_Servant_Impl_T.h
+++ b/CIAO/ciao/Servants/Home_Servant_Impl_T.h
@@ -33,6 +33,7 @@ namespace CIAO
   class Container;
   typedef Container *Container_ptr;
 
+
   /**
    * @class Home_Servant_Impl
    *
@@ -59,10 +60,10 @@ namespace CIAO
     virtual void remove_component (Components::CCMObject_ptr comp);
 
     // Operations for keyless home interface.
-    virtual ::Components::CCMObject_ptr create_component (void);
+    virtual ::Components::CCMObject_ptr create_component ();
 
     // Operations for implicit home interface.
-    virtual typename COMP_SVNT::_stub_ptr_type create (void);
+    virtual typename COMP_SVNT::_stub_ptr_type create ();
 
     virtual void update_component_map (PortableServer::ObjectId &oid);
 
diff --git a/CIAO/ciao/Valuetype_Factories/Cookies.h b/CIAO/ciao/Valuetype_Factories/Cookies.h
index 3ea1fcd4ddc..8fd92b348f8 100644
--- a/CIAO/ciao/Valuetype_Factories/Cookies.h
+++ b/CIAO/ciao/Valuetype_Factories/Cookies.h
@@ -42,7 +42,8 @@ namespace CIAO
     Cookie_Impl (ptrdiff_t const &key);
 
     /// Extract the @c CORBA::ULong
-    static bool extract (Components::Cookie const * const c, ptrdiff_t &key);
+    static bool extract (Components::Cookie const * const c,
+                         ptrdiff_t &key);
   };
 
   /**
diff --git a/CIAO/connectors/ami4ccm/docs/AMI4CCM-explanation.odt b/CIAO/connectors/ami4ccm/docs/AMI4CCM-explanation.odt
index fe474abf2d1..dbbe631d461 100644
--- a/CIAO/connectors/ami4ccm/docs/AMI4CCM-explanation.odt
+++ b/CIAO/connectors/ami4ccm/docs/AMI4CCM-explanation.odt
diff --git a/CIAO/connectors/ami4ccm/docs/AMI4CCM-spec.odt b/CIAO/connectors/ami4ccm/docs/AMI4CCM-spec.odt
index 1a944433525..9805b277765 100644
--- a/CIAO/connectors/ami4ccm/docs/AMI4CCM-spec.odt
+++ b/CIAO/connectors/ami4ccm/docs/AMI4CCM-spec.odt
diff --git a/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.mpc b/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.mpc
index ba249df6ccc..48063e16582 100644
--- a/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.mpc
+++ b/CIAO/connectors/ami4ccm/examples/Hello/Sender/Hello_Sender.mpc
@@ -105,7 +105,7 @@ project(AMI_Hello_Base_Hello_Sender_exec) : ciao_executor, ami, ami4ccm_stub {
 
 
 project(AMI_Hello_Base_Hello_Sender_svnt) : ciao_servant, ami   {
-  after      += AMI_Hello_Base_skel AMI_Hello_Base_Hello_Sender_lem_stub AMI_Hello_Base_exec AMI_Hello_exec AMI_Hello_skel
+  after      += AMI_Hello_Base_skel AMI_Hello_Base_Hello_Sender_lem_stub AMI_Hello_Base_exec AMI_Hello_exec
   sharedname  = Hello_Sender_svnt
   libs       += Hello_Sender_stub Hello_Sender_lem_stub  \
                 Hello_skel \
diff --git a/CIAO/connectors/ami4ccm/examples/Hello/descriptors/run_test.pl b/CIAO/connectors/ami4ccm/examples/Hello/descriptors/run_test.pl
index c524dbe0525..58e4eb77196 100755
--- a/CIAO/connectors/ami4ccm/examples/Hello/descriptors/run_test.pl
+++ b/CIAO/connectors/ami4ccm/examples/Hello/descriptors/run_test.pl
@@ -99,8 +99,6 @@ sub kill_open_processes {
     if ($ns_running == 1) {
         $NS->Kill (); $NS->TimedWait (1);
     }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
 }
 
 sub run_node_daemons {
diff --git a/CIAO/connectors/dds4ccm/docs/TestCoverage.ods b/CIAO/connectors/dds4ccm/docs/TestCoverage.ods
index 4fb08805318..8bd17bee14f 100644
--- a/CIAO/connectors/dds4ccm/docs/TestCoverage.ods
+++ b/CIAO/connectors/dds4ccm/docs/TestCoverage.ods
diff --git a/CIAO/connectors/dds4ccm/docs/ccm_dds.idl b/CIAO/connectors/dds4ccm/docs/ccm_dds.idl
index 24f9e088d98..99d192da231 100644
--- a/CIAO/connectors/dds4ccm/docs/ccm_dds.idl
+++ b/CIAO/connectors/dds4ccm/docs/ccm_dds.idl
@@ -363,7 +363,7 @@ module CCM_DDS {
                         };
 
                 porttype DDS_StateListen {
-                        uses Reader                     data;
+                        uses Reader                                     data;
                         uses StateListenerControl       data_control;
                         provides StateListener          data_listener;
                         uses DDS::DataReader            dds_entity;
@@ -377,15 +377,15 @@ module CCM_DDS {
 
                 connector DDS_State : DDS_TopicBase {
                         mirrorport DDS_Update                                   observable;
-                        mirrorport DDS_Read                                     passive_observer;
-                        mirrorport DDS_Get                                      pull_observer;
+                        mirrorport DDS_Read                                             passive_observer;
+                        mirrorport DDS_Get                                              pull_observer;
                         mirrorport DDS_Listen                                   push_observer;
                         mirrorport DDS_StateListen                              push_state_observer;
                         };
 
                 connector DDS_Event : DDS_TopicBase {
                         mirrorport DDS_Write                                    supplier;
-                        mirrorport DDS_Get                                      pull_consumer;
+                        mirrorport DDS_Get                                              pull_consumer;
                         mirrorport DDS_Listen                                   push_consumer;
                         };
                 };
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl b/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl
index 7dca5c65278..d24b377ddb1 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.idl
@@ -8,12 +8,6 @@
 #ifndef HELLO_BASE_IDL
 #define HELLO_BASE_IDL
 
-#pragma ndds typesupport "Base/Hello_BaseSupport.h"
-#pragma opendds typesupport "Base/Hello_BaseTypeSupportC.h"
-#pragma splice typesupport "Base/Hello_BaseDcpsC.h"
-
-#pragma DCPS_DATA_TYPE "DDSHello"
-
 struct DDSHello {
   string hello;
   short iterator;
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc b/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc
index 2b596949aad..f05f8d92225 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Base/Hello_Base.mpc
@@ -1,25 +1,79 @@
 // $Id$
 
-project (DDS_Hello_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
-  sharedname = DDS_Hello_Base_stub
-  dynamicflags += HELLO_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Gxhst -Sci \
+project(DDS_Hello_Base_idl_gen) : taoidldefaults, anytypecode {
+  avoids += ace_for_tao
+  custom_only = 1
+  idlflags -= -St -Sa
+  idlflags += -SS -Gxhst \
               -Wb,stub_export_macro=HELLO_BASE_STUB_Export \
               -Wb,stub_export_include=Hello_Base_stub_export.h
 
   IDL_Files {
     Hello_Base.idl
   }
+}
 
-  opendds_ts_flags += --export=HELLO_BASE_STUB_Export
+project(DDS_Hello_Base_ndds_ts_gen) : ndds_ts_defaults {
+  avoids += ace_for_tao
+  custom_only = 1
+  after += DDS_Hello_Base_idl_gen
 
-  DDSGenerator_Files {
+  NDDSTypeSupport_Files {
     Hello_Base.idl
   }
+}
+
+project(DDS_Hello_Base_NDDS_TS) : nddslib, taolib {
+  avoids += ace_for_tao
+  after  += DDS_Hello_Base_ndds_ts_gen DDS_Hello_Base_stub
+  libs   += DDS_Hello_Base_stub
+  libout = ../lib
+  libpaths    += ../lib
+  sharedname = DDS_Hello_Base_NDDS_TS
+  dynamicflags = NDDS_USER_DLL_EXPORT
+
+  verbatim(gnuace, macros) {
+    override no_hidden_visibility = 1
+  }
 
   Source_Files {
+    Hello_Base.cxx
+    Hello_BasePlugin.cxx
+    Hello_BaseSupport.cxx
+  }
+
+  Header_Files {
+    Hello_Base.h
+    Hello_BasePlugin.h
+    Hello_BaseSupport.h
+  }
+
+  Inline_Files {
+  }
+}
+
+project(DDS_Hello_Base_stub) : ccm_stub {
+  avoids += ace_for_tao
+  after  += DDS_Hello_Base_idl_gen
+  libs   +=
+  libout = ../lib
+  sharedname = DDS_Hello_Base_stub
+  dynamicflags   = HELLO_BASE_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    Hello_BaseC.cpp
+  }
+
+  Header_Files {
+    Hello_BaseC.h
+    Hello_Base_stub_export.h
+  }
+
+  Inline_Files {
+    Hello_BaseC.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.idl b/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.idl
index eb808868dc9..1490b81dd58 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.idl
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.idl
@@ -14,11 +14,14 @@
 
 #pragma ciao lem "Connector/Hello_ConnectorE.idl"
 
-module Hello
+module CCM_DDS
 {
-  module ::CCM_DDS::Typed <::DDSHello, ::DDSHello_Seq> HelloConn;
+  module ::CCM_DDS::Typed < ::DDSHello, ::DDSHello_Seq> Hello;
+};
 
-  connector Hello_Connector : HelloConn::DDS_Event
+module Hello
+{
+  connector Hello_Connector : ::CCM_DDS::Hello::DDS_Event
   {
   };
 };
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc b/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc
index 29cbfc5cbda..a6ea05beacb 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_Hello_Connector_idl_gen) : connectoridldefaults, dds4ccm {
+project(DDS_Hello_Connector_idl_gen) : connectoridldefaults {
   avoids += ace_for_tao
   after  += DDS4CCM_idl_gen
   custom_only = 1
@@ -10,8 +10,8 @@ project(DDS_Hello_Connector_idl_gen) : connectoridldefaults, dds4ccm {
               -Wb,skel_export_include=Hello_Connector_svnt_export.h \
               -Wb,svnt_export_macro=HELLO_CONNECTOR_SVNT_Export \
               -Wb,svnt_export_include=Hello_Connector_svnt_export.h \
-              -Wb,conn_export_macro=HELLO_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Hello_Connector_conn_export.h \
+              -Wb,exec_export_macro=HELLO_CONNECTOR_EXEC_Export \
+              -Wb,exec_export_include=Hello_Connector_exec_export.h \
               -I ..
 
   IDL_Files {
@@ -19,16 +19,14 @@ project(DDS_Hello_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   }
 }
 
-project(DDS_Hello_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_Hello_Connector_lem_gen) : ciaoidldefaults {
   avoids += ace_for_tao
   custom_only = 1
   after += DDS_Hello_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=HELLO_CONNECTOR_LEM_STUB_Export \
               -Wb,stub_export_include=Hello_Connector_lem_stub_export.h \
               -SS -Gxhst \
-              -I .. \
-              -I $(CIAO_ROOT)/connectors \
-              -I $(CIAO_ROOT)/connectors/dds4ccm/idl
+              -I .. -I $(CIAO_ROOT)/connectors -I $(CIAO_ROOT)/connectors/dds4ccm/idl
 
   IDL_Files {
     Hello_ConnectorE.idl
@@ -37,13 +35,8 @@ project(DDS_Hello_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
 
 project(DDS_Hello_Connector_lem_stub) : ccm_svnt, dds4ccm_base {
   avoids += ace_for_tao
-  after  += DDS_Hello_Connector_lem_gen \
-            DDS_Hello_Connector_stub \
-            DDS_Hello_Base_stub \
-            DDS4CCM_lem_stub
-  libs   += DDS_Hello_Base_stub \
-            DDS_Hello_Connector_stub \
-            DDS4CCM_lem_stub
+  after  += DDS_Hello_Connector_lem_gen DDS_Hello_Connector_stub DDS_Hello_Base_stub DDS4CCM_lem_stub
+  libs   += DDS_Hello_Base_stub DDS_Hello_Connector_stub DDS4CCM_lem_stub
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -96,30 +89,24 @@ project(DDS_Hello_Connector_stub) : ccm_stub, dds4ccm_base {
 
 project(DDS_Hello_Connector_exec) : ciao_executor, dds4ccm_impl {
   avoids += ace_for_tao
-  after  += DDS_Hello_Connector_lem_stub \
-            DDS_Hello_Connector_stub \
-            DDS4CCM_lem_stub \
-            DDS_Hello_Base_stub
+  after  += DDS_Hello_Connector_lem_stub DDS_Hello_Connector_stub DDS4CCM_lem_stub DDS_Hello_Base_NDDS_TS
   sharedname = DDS_Hello_Connector_exec
-  libs += DDS_Hello_Connector_stub \
-          DDS_Hello_Connector_lem_stub \
-          DDS_Hello_Base_stub \
-          DDS4CCM_lem_stub
+  libs += DDS_Hello_Connector_stub DDS_Hello_Connector_lem_stub DDS_Hello_Base_stub DDS4CCM_lem_stub DDS_Hello_Base_NDDS_TS
   libpaths += ../lib
   libout = ../lib
   includes += ..
-  dynamicflags   = HELLO_CONNECTOR_CONN_BUILD_DLL
+  dynamicflags   = HELLO_CONNECTOR_EXEC_BUILD_DLL
 
   IDL_Files {
   }
 
   Source_Files {
-    Hello_Connector_conn.cpp
+    Hello_Connector_exec.cpp
   }
 
   Header_Files {
-    Hello_Connector_conn.h
-    Hello_Connector_conn_export.h
+    Hello_Connector_exec.h
+    Hello_Connector_exec_export.h
   }
 
   Inline_Files {
@@ -129,10 +116,7 @@ project(DDS_Hello_Connector_exec) : ciao_executor, dds4ccm_impl {
 
 project(DDS_Hello_Connector_svnt) : ciao_servant, dds4ccm_impl {
   avoids     += ace_for_tao
-  after      += DDS_Hello_Connector_lem_stub \
-                DDS_Hello_Connector_exec \
-                DDS_Hello_Connector_stub \
-                DDS4CCM_lem_stub
+  after      += DDS_Hello_Connector_lem_stub DDS_Hello_Connector_exec DDS_Hello_Connector_stub DDS4CCM_lem_stub
   sharedname  = DDS_Hello_Connector_svnt
   libs       += DDS_Hello_Connector_stub \
                 DDS_Hello_Connector_lem_stub  \
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector_exec.cpp b/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector_exec.cpp
new file mode 100644
index 00000000000..011406cc1a2
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector_exec.cpp
@@ -0,0 +1,30 @@
+// -*- C++ -*-
+// $Id$
+
+#include "Hello_Connector_exec.h"
+
+namespace CIAO_Hello_Hello_Connector_Impl
+{
+  Hello_Connector_exec_i::Hello_Connector_exec_i (void)
+    : DDS_Event_Connector_T<DDSHello_DDS_Traits, DDSHello_Connector_Traits> ()
+  {
+  }
+
+  Hello_Connector_exec_i::~Hello_Connector_exec_i (void)
+  {
+  }
+
+  extern "C" HELLO_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_Hello_Hello_Connector_Impl (void)
+  {
+    ::Components::EnterpriseComponent_ptr retval =
+      ::Components::EnterpriseComponent::_nil ();
+
+    ACE_NEW_NORETURN (
+      retval,
+      Hello_Connector_exec_i ()); 
+
+    return retval;
+  }
+}
+
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector_exec.h b/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector_exec.h
new file mode 100644
index 00000000000..b5af71934ea
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Connector/Hello_Connector_exec.h
@@ -0,0 +1,61 @@
+// -*- C++ -*-
+// $Id$
+
+#ifndef HELLO_CONNECTOR_EXEC_H_
+#define HELLO_CONNECTOR_EXEC_H_
+
+#include /**/ "ace/pre.h"
+
+#include "Hello_ConnectorEC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "Hello_Connector_exec_export.h"
+#include "tao/LocalObject.h"
+
+#include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
+#include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
+
+#include "Base/Hello_BaseSupport.h"
+
+namespace CIAO_Hello_Hello_Connector_Impl
+{
+
+  // @from use of DDSHello as a parameter
+  typedef CIAO::DDS4CCM::RTI::Type_Traits <
+    DDSHello,
+    DDSHelloSeq,
+    DDSHelloTypeSupport,
+    DDSHelloDataWriter,
+    DDSHelloDataReader > DDSHello_DDS_Traits;
+
+  typedef CIAO::DDS4CCM::Connector_Traits <
+    ::CIAO_Hello_Hello_Connector_Impl::Hello_Connector_Exec,
+    DDSHello_Seq,
+    ::CCM_DDS::Hello::CCM_Writer,
+    ::CCM_DDS::Hello::CCM_Updater,
+    ::CCM_DDS::Hello::CCM_Getter,
+    ::CCM_DDS::Hello::CCM_Reader,
+    ::Hello::CCM_Hello_Connector_Context,
+    ::CCM_DDS::Hello::Listener,
+    ::CCM_DDS::Hello::StateListener,
+    ::CCM_DDS::ConnectorStatusListener> DDSHello_Connector_Traits;
+
+  class HELLO_CONNECTOR_EXEC_Export Hello_Connector_exec_i :
+    public DDS_Event_Connector_T <DDSHello_DDS_Traits, DDSHello_Connector_Traits>
+  {
+  public:
+    Hello_Connector_exec_i (void);
+    virtual ~Hello_Connector_exec_i (void);
+  };
+
+  extern "C" HELLO_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_Hello_Hello_Connector_Impl (void);
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.idl b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.idl
index b2cb9fc83d5..02a09f01156 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.idl
@@ -14,7 +14,7 @@ module Hello
 {
   component Receiver
   {
-    port HelloConn::DDS_Listen info_out;
+    port CCM_DDS::Hello::DDS_Listen info_out;
     provides CCM_DDS::ConnectorStatusListener info_out_connector_status;
 
     attribute string name;
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc
index 02de4b48707..034ff3e22c7 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_Hello_Receiver_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_Hello_Receiver_idl_gen) : componentidldefaults {
   avoids += ace_for_tao
   custom_only = 1
   after += DDS_Hello_Connector_idl_gen
@@ -18,7 +18,7 @@ project(DDS_Hello_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_Hello_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_Hello_Receiver_lem_gen) : ciaoidldefaults {
   avoids += ace_for_tao
   after += DDS_Hello_Receiver_idl_gen
   custom_only = 1
@@ -112,7 +112,7 @@ project(DDS_Hello_Receiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_Hello_Receiver_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_Hello_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
   avoids     += ace_for_tao
   after      +=   DDS_Hello_Receiver_lem_stub DDS_Hello_Base_stub DDS_Hello_Connector_stub DDS_Hello_Connector_svnt DDS_Hello_Receiver_exec DDS_Hello_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
   sharedname  = Receiver_svnt
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp
index eaa74e8af2f..bd16e019348 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.cpp
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+//
 // $Id$
 
 #include "Hello_Receiver_exec.h"
@@ -13,7 +14,7 @@ namespace CIAO_Hello_Receiver_Impl
   //============================================================
 
   DDSHello_Listener_exec_i::DDSHello_Listener_exec_i (Atomic_ULong &received,
-                                                      const ACE_CString &name)
+                                                            const ACE_CString &name)
       : received_ (received),
         name_ (name)
   {
@@ -208,7 +209,7 @@ namespace CIAO_Hello_Receiver_Impl
   }
 
   // Port operations.
-  ::Hello::HelloConn::CCM_Listener_ptr
+  ::CCM_DDS::Hello::CCM_Listener_ptr
   Receiver_exec_i::get_info_out_data_listener (void)
   {
     ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new DDSHello RAW listener\n")));
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h
index f85334f1c70..1a8889e2c3f 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Receiver/Hello_Receiver_exec.h
@@ -1,6 +1,35 @@
 // -*- C++ -*-
+//
 // $Id$
 
+/**
+ * Code generated by the The ACE ORB (TAO) IDL Compiler v1.7.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
+ *       http://doc.ece.uci.edu/
+ * and
+ *       Institute for Software Integrated Systems
+ *       Vanderbilt University
+ *       Nashville, TN
+ *       USA
+ *       http://www.isis.vanderbilt.edu/
+ *
+ * Information about TAO is available at:
+ *     http://www.cs.wustl.edu/~schmidt/TAO.html
+ **/
+
+// TAO_IDL - Generated from
+// be/be_codegen.cpp:1217
+
 #ifndef HELLO_RECEIVER_EXEC_H_
 #define HELLO_RECEIVER_EXEC_H_
 
@@ -20,7 +49,7 @@ namespace CIAO_Hello_Receiver_Impl
   typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::ULong > Atomic_ULong;
 
   class HELLO_RECEIVER_EXEC_Export DDSHello_Listener_exec_i
-    : public virtual ::Hello::HelloConn::CCM_Listener,
+    : public virtual ::CCM_DDS::Hello::CCM_Listener,
       public virtual ::CORBA::LocalObject
   {
   public:
@@ -120,7 +149,7 @@ namespace CIAO_Hello_Receiver_Impl
     virtual char * name (void);
     virtual void name (const char *name);
 
-    virtual ::Hello::HelloConn::CCM_Listener_ptr
+    virtual ::CCM_DDS::Hello::CCM_Listener_ptr
     get_info_out_data_listener (void);
 
     virtual ::CCM_DDS::CCM_PortStatusListener_ptr
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.idl b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.idl
index 7dbae7b2ce4..16994ac601c 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.idl
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.idl
@@ -16,7 +16,7 @@ module Hello
 {
   component Sender
   {
-    port HelloConn::DDS_Write info_in;
+    port CCM_DDS::Hello::DDS_Write info_in;
     attribute unsigned long rate;
     attribute unsigned long iterations;
     attribute string message;
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc
index 75ffd5ce6fa..808158c01f1 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_Hello_Sender_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_Hello_Sender_idl_gen) : componentidldefaults {
   avoids += ace_for_tao
   after  += DDS_Hello_Connector_idl_gen
   custom_only = 1
@@ -19,7 +19,7 @@ project(DDS_Hello_Sender_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_Hello_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_Hello_Sender_lem_gen) : ciaoidldefaults {
   avoids += ace_for_tao
   after  += DDS_Hello_Sender_idl_gen
   custom_only = 1
@@ -113,7 +113,7 @@ project(DDS_Hello_Sender_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_Hello_Sender_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_Hello_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
   avoids     += ace_for_tao
   after      += DDS_Hello_Base_stub  DDS_Hello_Sender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_Hello_Connector_stub DDS_Hello_Connector_svnt  DDS_Hello_Connector_lem_stub
   sharedname  = Sender_svnt
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp
index f9f2df4fa71..089a40db2e7 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.cpp
@@ -46,14 +46,17 @@ namespace CIAO_Hello_Sender_Impl
     }
 
   void ConnectorStatusListener_exec_i::on_unexpected_status(
-    ::DDS::Entity_ptr /*the_entity*/,
+    ::DDS::Entity_ptr the_entity,
     ::DDS::StatusKind  status_kind)
   {
+    CORBA::ULong kind = status_kind;
     if(!this->ready_to_start_.value())
       {
-        // be aware that when only the sender runs, ready_to_start will never
-        // be true.
-        this->ready_to_start_ = status_kind == DDS::PUBLICATION_MATCHED_STATUS;
+        if((!CORBA::is_nil(the_entity)) && (kind==DDS::PUBLICATION_MATCHED_STATUS))
+          {
+            //DataWriter find a DataReader that Matched the Topic
+            this->ready_to_start_ = true;
+          }
       }
   }
 
@@ -124,9 +127,13 @@ namespace CIAO_Hello_Sender_Impl
   void
   Sender_exec_i::tick ()
   {
+    if (this->iteration_ == 0)
+    ACE_OS::sleep (1);
+
     // Start writing after DataWriter find first DataReader that matched the Topic
     // It is stll possible that other Readers aren't yet ready to recieve data, for that case in the
     // profile the durability is set to TRANSIENT_DURABILITY_QOS, so each Raeder should receive each message.
+    //
     if(this->ready_to_start_.value())
       {
         if (this->iteration_ < this->iterations_)
@@ -136,16 +143,12 @@ namespace CIAO_Hello_Sender_Impl
             new_msg->hello = msg.c_str ();
             new_msg->iterator = ++this->iteration_;
             this->writer_->write_one (*new_msg, ::DDS::HANDLE_NIL);
-            ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::tick - "
-                                  "Written sample: <%C> - <%u>\n",
-                                  msg.c_str (),
-                                  new_msg->iterator));
           }
         else
           { //we're done
             this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->cancel_timer (this->ticker_);
           }
-       }
+      }
   }
 
   void
@@ -156,7 +159,7 @@ namespace CIAO_Hello_Sender_Impl
     if (this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->schedule_timer (
                 this->ticker_,
                 0,
-                ACE_Time_Value (3, usec),
+                ACE_Time_Value (5, usec),
                 ACE_Time_Value (0, usec)) == -1)
     {
       ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
@@ -217,14 +220,7 @@ namespace CIAO_Hello_Sender_Impl
   void
   Sender_exec_i::rate (::CORBA::ULong rate)
   {
-    if (rate == 0)
-      {
-        rate = 1;
-      }
-    else
-      {
-        this->rate_ = rate;
-      }
+    this->rate_ = rate;
   }
 
   // Port operations.
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h
index 8806da5da94..bfc3c75f7be 100644
--- a/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/examples/Hello/Sender/Hello_Sender_exec.h
@@ -34,28 +34,27 @@ namespace CIAO_Hello_Sender_Impl
     virtual ~ConnectorStatusListener_exec_i (void);
 
     virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
-                                const DDS::InconsistentTopicStatus & status);
+    void on_inconsistent_topic( ::DDS::Topic_ptr the_topic, 
+                               const DDS::InconsistentTopicStatus & status);
     virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
+    void on_requested_incompatible_qos( ::DDS::DataReader_ptr the_reader,
+                                       const DDS::RequestedIncompatibleQosStatus & status);
     virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
+    void on_sample_rejected( ::DDS::DataReader_ptr the_reader, 
                              const DDS::SampleRejectedStatus & status);
     virtual
-    void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
+    void on_offered_deadline_missed( ::DDS::DataWriter_ptr the_writer,
                                      const DDS::OfferedDeadlineMissedStatus & status);
     virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
+    void on_offered_incompatible_qos( ::DDS::DataWriter_ptr the_writer, 
                                       const DDS::OfferedIncompatibleQosStatus & status);
     virtual
-    void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                               ::DDS::StatusKind  status_kind);
+    void on_unexpected_status( ::DDS::Entity_ptr the_entity,
+       ::DDS::StatusKind  status_kind);
     private:
     Atomic_Boolean &ready_to_start_;
-
+ 
   };
-
   class pulse_Generator : 
     public ACE_Event_Handler
   {
@@ -64,12 +63,14 @@ namespace CIAO_Hello_Sender_Impl
 
     ~pulse_Generator ();
 
+    /// Handle the timeout.
     virtual int handle_timeout (const ACE_Time_Value &tv,
                                 const void *arg);
   private:
+    /// Maintains a handle that actually process the event
     Sender_exec_i &pulse_callback_;
   };
-
+  
   class Sender_exec_i
     : public virtual Sender_Exec,
       public virtual ::CORBA::LocalObject
@@ -77,21 +78,21 @@ namespace CIAO_Hello_Sender_Impl
   public:
     Sender_exec_i (void);
     virtual ~Sender_exec_i (void);
-
+    
     // Supported operations and attributes.
-
+    
     // TAO_IDL - Generated from
     // be/be_visitor_operation/operation_ch.cpp:46
-
+    
     void start (void);
-
+    
     // TAO_IDL - Generated from
     // be/be_visitor_operation/operation_ch.cpp:46
-
+    
     void stop (void);
-
+    
     void tick ();
-
+    
     // Component attributes.
     virtual ::CORBA::ULong iterations (void);
 
@@ -106,40 +107,41 @@ namespace CIAO_Hello_Sender_Impl
     virtual void log_time (::CORBA::Boolean log_time);
 
     virtual ::CORBA::ULong rate (void);
-
+    
     virtual void rate (::CORBA::ULong rate);
 
-
+   
     // 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);
 
     // Port operations.
     virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_connector_status(void);
+      get_connector_status(void);
 
   private:
     ::Hello::CCM_Sender_Context_var context_;
-    Hello::HelloConn::Writer_var writer_;
+    CCM_DDS::Hello::Writer_var writer_;
     pulse_Generator * ticker_;
     CORBA::ULong rate_;
     CORBA::ULong iteration_, iterations_;
     CORBA::Boolean log_time_;
     ACE_CString msg_;
-
+    
     ACE_CString create_message (
           const ACE_CString &msg);
     Atomic_Boolean ready_to_start_;
 
   };
-
+  
   extern "C" HELLO_SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
   create_Hello_Sender_Impl (void);
 }
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl
index 15ec9b2e066..cb3fe92b80c 100755
--- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl
+++ b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_1_to_5.pl
@@ -100,8 +100,6 @@ sub kill_open_processes {
     if ($ns_running == 1) {
         $NS->Kill (); $NS->TimedWait (1);
     }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
 }
 
 sub run_node_daemons {
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl
index a5dbde388d2..cdfb23b9467 100755
--- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl
+++ b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_1.pl
@@ -100,8 +100,6 @@ sub kill_open_processes {
     if ($ns_running == 1) {
         $NS->Kill (); $NS->TimedWait (1);
     }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
 }
 
 sub run_node_daemons {
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl
index a0b6edda28f..a33aa440a7c 100755
--- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl
+++ b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_5_to_5.pl
@@ -102,8 +102,6 @@ sub kill_open_processes {
     if ($ns_running == 1) {
         $NS->Kill (); $NS->TimedWait (1);
     }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
 }
 
 sub run_node_daemons {
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl
index 2e12504c37d..c5e7ffd4855 100755
--- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl
+++ b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_receiver.pl
@@ -100,8 +100,6 @@ sub kill_open_processes {
     if ($ns_running == 1) {
         $NS->Kill (); $NS->TimedWait (1);
     }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
 }
 
 sub run_node_daemons {
@@ -218,8 +216,8 @@ for ($i = 0; $i < $nr_daemon; ++$i) {
     }
 }
 
-print "Sleeping 20 seconds to allow task to complete\n";
-sleep (20);
+print "Sleeping 5 seconds to allow task to complete\n";
+sleep (5);
 
 # Invoke executor - stop the application -.
 print "Invoking executor - stop the application -\n";
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl
index 48110e0fedb..9f1ebd63536 100755
--- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl
+++ b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_sender.pl
@@ -100,8 +100,6 @@ sub kill_open_processes {
     if ($ns_running == 1) {
         $NS->Kill (); $NS->TimedWait (1);
     }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
 }
 
 sub run_node_daemons {
@@ -218,8 +216,8 @@ for ($i = 0; $i < $nr_daemon; ++$i) {
     }
 }
 
-print "Sleeping 20 seconds to allow task to complete\n";
-sleep (20);
+print "Sleeping 5 seconds to allow task to complete\n";
+sleep (5);
 
 # Invoke executor - stop the application -.
 print "Invoking executor - stop the application -\n";
diff --git a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_test.pl
index 658125b4b68..764905498b6 100755
--- a/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/examples/Hello/descriptors/run_test.pl
@@ -100,8 +100,6 @@ sub kill_open_processes {
     if ($ns_running == 1) {
         $NS->Kill (); $NS->TimedWait (1);
     }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
 }
 
 sub run_node_daemons {
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl b/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl
index f3d1d89c76a..750908a015d 100644
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl
+++ b/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.idl
@@ -8,12 +8,6 @@
 #ifndef QUOTER_BASE_IDL
 #define QUOTER_BASE_IDL
 
-#pragma ndds typesupport "Base/Quoter_BaseSupport.h"
-#pragma opendds typesupport "Base/Quoter_BaseTypeSupportC.h"
-
-#pragma DCPS_DATA_TYPE "Quoter::Stock_Info"
-#pragma DCPS_DATA_KEY "Quoter::Stock_Info symbol"
-
 module Quoter
 {
   struct Stock_Info
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc b/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc
index 7b8a9589c44..c9607535646 100644
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Quoter/Base/Quoter_Base.mpc
@@ -1,25 +1,77 @@
 // $Id$
+// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n Quoter_Base"
 
-project (DDS_Quoter_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
-  sharedname = DDS_Quoter_Base_stub
-  dynamicflags += QUOTER_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Gxhst -Sci \
+project(DDS_Quoter_Base_idl_gen) : taoidldefaults, anytypecode {
+  custom_only = 1
+  idlflags -= -St -Sa
+  idlflags += -SS -Gxhst \
               -Wb,stub_export_macro=QUOTER_BASE_STUB_Export \
               -Wb,stub_export_include=Quoter_Base_stub_export.h
 
   IDL_Files {
     Quoter_Base.idl
   }
+}
 
-  opendds_ts_flags += --export=QUOTER_BASE_STUB_Export
+project(DDS_Quoter_Base_ndds_ts_gen) : ndds_ts_defaults {
+  custom_only = 1
+  after += DDS_Quoter_Base_idl_gen
 
-  DDSGenerator_Files {
+  NDDSTypeSupport_Files {
     Quoter_Base.idl
   }
+}
+
+project(DDS_Quoter_Base_NDDS_TS) : nddslib, taolib {
+  after += DDS_Quoter_Base_ndds_ts_gen DDS_Quoter_Base_stub
+  libs += DDS_Quoter_Base_stub
+  libout = ../lib
+  libpaths    += ../lib
+  sharedname = DDS_Quoter_Base_NDDS_TS
+  dynamicflags = NDDS_USER_DLL_EXPORT
+
+  verbatim(gnuace, macros) {
+    override no_hidden_visibility = 1
+  }
 
   Source_Files {
+    Quoter_Base.cxx
+    Quoter_BasePlugin.cxx
+    Quoter_BaseSupport.cxx
+  }
+
+  Header_Files {
+    Quoter_Base.h
+    Quoter_BasePlugin.h
+    Quoter_BaseSupport.h
+  }
+
+  Inline_Files {
+  }
+}
+
+project(DDS_Quoter_Base_stub) : ccm_stub {
+  after += DDS_Quoter_Base_idl_gen
+  libs  +=
+  libout = ../lib
+  libpaths    += ../lib
+  sharedname = DDS_Quoter_Base_stub
+  dynamicflags   = QUOTER_BASE_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    Quoter_BaseC.cpp
+  }
+
+  Header_Files {
+    Quoter_BaseC.h
+    Quoter_Base_stub_export.h
+  }
+
+  Inline_Files {
+    Quoter_BaseC.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker.mpc b/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker.mpc
index 53f355f5d7e..d6f1b5aa469 100644
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -l ../lib -o ../lib -u DDS -b dds4ccm_base Broker"
 
-project(DDS_Broker_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_Broker_idl_gen) : componentidldefaults {
   custom_only = 1
   after += DDS_Quoter_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=BROKER_STUB_Export \
@@ -18,7 +18,7 @@ project(DDS_Broker_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_Broker_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_Broker_lem_gen) : ciaoidldefaults {
   after += DDS_Broker_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=BROKER_LEM_STUB_Export \
@@ -108,7 +108,7 @@ project(DDS_Broker_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_Broker_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_Broker_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      +=   DDS_Broker_lem_stub DDS_Quoter_Base_stub DDS_Quoter_Connector_stub DDS_Quoter_Connector_svnt DDS_Broker_exec DDS_Quoter_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
   sharedname  = Broker_svnt
   libs       += Broker_stub Broker_lem_stub DDS_Quoter_Base_stub DDS_Quoter_Connector_stub DDS_Quoter_Connector_svnt Broker_exec DDS_Quoter_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.h b/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.h
index b771a70a5e8..75714128f5e 100644
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.h
+++ b/CIAO/connectors/dds4ccm/examples/Quoter/Broker/Broker_exec.h
@@ -1,6 +1,35 @@
 // -*- C++ -*-
+//
 // $Id$
 
+/**
+ * Code generated by the The ACE ORB (TAO) IDL Compiler v1.7.2
+ * TAO and the TAO IDL Compiler have been developed by:
+ *       Center for Distributed Object Computing
+ *       Washington University
+ *       St. Louis, MO
+ *       USA
+ *       http://www.cs.wustl.edu/~schmidt/doc-center.html
+ * and
+ *       Distributed Object Computing Laboratory
+ *       University of California at Irvine
+ *       Irvine, CA
+ *       USA
+ *       http://doc.ece.uci.edu/
+ * and
+ *       Institute for Software Integrated Systems
+ *       Vanderbilt University
+ *       Nashville, TN
+ *       USA
+ *       http://www.isis.vanderbilt.edu/
+ *
+ * Information about TAO is available at:
+ *     http://www.cs.wustl.edu/~schmidt/TAO.html
+ **/
+
+// TAO_IDL - Generated from
+// be/be_codegen.cpp:1217
+
 #ifndef CIAO_BROKER_EXEC_H_
 #define CIAO_BROKER_EXEC_H_
 
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc b/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc
index 67eadefb5ba..54940c0df43 100644
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_Quoter_Base -l .. -o ../lib -u DDS Quoter_Connector"
 
-project(DDS_Quoter_Connector_idl_gen) : connectoridldefaults, dds4ccm {
+project(DDS_Quoter_Connector_idl_gen) : connectoridldefaults {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=QUOTER_CONNECTOR_STUB_Export \
@@ -10,8 +10,8 @@ project(DDS_Quoter_Connector_idl_gen) : connectoridldefaults, dds4ccm {
               -Wb,skel_export_include=Quoter_Connector_svnt_export.h \
               -Wb,svnt_export_macro=QUOTER_CONNECTOR_SVNT_Export \
               -Wb,svnt_export_include=Quoter_Connector_svnt_export.h \
-              -Wb,conn_export_macro=QUOTER_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Quoter_Connector_conn_export.h \
+              -Wb,exec_export_macro=QUOTER_CONNECTOR_EXEC_Export \
+              -Wb,exec_export_include=Quoter_Connector_exec_export.h \
               -I ..
 
   IDL_Files {
@@ -19,7 +19,7 @@ project(DDS_Quoter_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   }
 }
 
-project(DDS_Quoter_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_Quoter_Connector_lem_gen) : ciaoidldefaults {
   custom_only = 1
   after += DDS_Quoter_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=QUOTER_CONNECTOR_LEM_STUB_Export \
@@ -85,24 +85,24 @@ project(DDS_Quoter_Connector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_Quoter_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_Quoter_Connector_lem_stub DDS_Quoter_Connector_stub DDS4CCM_lem_stub
+  after   += DDS_Quoter_Connector_lem_stub DDS_Quoter_Connector_stub DDS4CCM_lem_stub DDS_Quoter_Base_NDDS_TS
   sharedname = DDS_Quoter_Connector_exec
-  libs += DDS_Quoter_Connector_stub DDS_Quoter_Connector_lem_stub DDS_Quoter_Base_stub DDS4CCM_lem_stub
+  libs += DDS_Quoter_Connector_stub DDS_Quoter_Connector_lem_stub DDS_Quoter_Base_stub DDS4CCM_lem_stub DDS_Quoter_Base_NDDS_TS
   libpaths += ../lib
   libout = ../lib
   includes += ..
-  dynamicflags   = QUOTER_CONNECTOR_CONN_BUILD_DLL
+  dynamicflags   = QUOTER_CONNECTOR_EXEC_BUILD_DLL
 
   IDL_Files {
   }
 
   Source_Files {
-    Quoter_Connector_conn.cpp
+    Quoter_Connector_exec.cpp
   }
 
   Header_Files {
-    Quoter_Connector_conn.h
-    Quoter_Connector_conn_export.h
+    Quoter_Connector_exec.h
+    Quoter_Connector_exec_export.h
   }
 
   Inline_Files {
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector_exec.cpp b/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector_exec.cpp
new file mode 100644
index 00000000000..c7c1ab7d213
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector_exec.cpp
@@ -0,0 +1,30 @@
+// -*- C++ -*-
+// $Id$
+
+#include "Quoter_Connector_exec.h"
+
+namespace CIAO_Quoter_Quoter_Connector_Impl
+{
+  Quoter_Connector_exec_i::Quoter_Connector_exec_i (void)
+    : DDS_Event_Connector_T<Stock_Info_DDS_Traits, Stock_Info_Connector_Traits> ()
+  {
+  }
+
+  Quoter_Connector_exec_i::~Quoter_Connector_exec_i (void)
+  {
+  }
+
+  extern "C" QUOTER_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_Quoter_Quoter_Connector_Impl (void)
+  {
+    ::Components::EnterpriseComponent_ptr retval =
+      ::Components::EnterpriseComponent::_nil ();
+
+    ACE_NEW_NORETURN (
+      retval,
+      Quoter_Connector_exec_i ());
+
+    return retval;
+  }
+}
+
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector_exec.h b/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector_exec.h
new file mode 100644
index 00000000000..b3085ea6033
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/examples/Quoter/Connector/Quoter_Connector_exec.h
@@ -0,0 +1,61 @@
+// -*- C++ -*-
+// $Id$
+
+#ifndef CIAO_QUOTER_CONNECTOR_EXEC_H_
+#define CIAO_QUOTER_CONNECTOR_EXEC_H_
+
+#include /**/ "ace/pre.h"
+
+#include "Quoter_ConnectorEC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "Quoter_Connector_exec_export.h"
+#include "tao/LocalObject.h"
+
+#include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
+#include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
+
+#include "Base/Quoter_BaseSupport.h"
+
+namespace CIAO_Quoter_Quoter_Connector_Impl
+{
+
+  // @from use of Stock_Info as a parameter
+  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+    ::Quoter::Stock_Info,
+    ::Quoter::Stock_InfoSeq,
+    ::Quoter::Stock_InfoTypeSupport,
+    ::Quoter::Stock_InfoDataWriter,
+    ::Quoter::Stock_InfoDataReader > Stock_Info_DDS_Traits;
+
+  typedef CIAO::DDS4CCM::Connector_Traits <
+    ::CIAO_Quoter_Quoter_Connector_Impl::Quoter_Connector_Exec,
+    ::Quoter::Stock_Info_Seq,
+    ::CCM_DDS::Quoter::CCM_Writer,
+    ::CCM_DDS::Quoter::CCM_Updater,
+    ::CCM_DDS::Quoter::CCM_Getter,
+    ::CCM_DDS::Quoter::CCM_Reader,
+    ::Quoter::CCM_Quoter_Connector_Context,
+    ::CCM_DDS::Quoter::Listener,
+    ::CCM_DDS::Quoter::StateListener,
+    ::CCM_DDS::ConnectorStatusListener> Stock_Info_Connector_Traits;
+
+  class QUOTER_CONNECTOR_EXEC_Export Quoter_Connector_exec_i :
+    public DDS_Event_Connector_T <Stock_Info_DDS_Traits, Stock_Info_Connector_Traits>
+  {
+  public:
+    Quoter_Connector_exec_i (void);
+    virtual ~Quoter_Connector_exec_i (void);
+  };
+
+  extern "C" QUOTER_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_Quoter_Quoter_Connector_Impl (void);
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.idl b/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.idl
index 57dd4bd9e8e..01a120ca1d8 100644
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.idl
+++ b/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.idl
@@ -24,6 +24,7 @@ module Quoter
 
   component Distributor supports Trigger
   {
+    //port CCM_DDS::Quoter::DDS_Update info_update;
     port CCM_DDS::Quoter::DDS_Write info_in;
     provides CCM_DDS::ConnectorStatusListener info_out_connector_status;
     attribute unsigned long rate;
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc b/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc
index 6fcead8c9f9..e69c0d7cd96 100644
--- a/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Quoter/Distributor/Distributor.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_Quoter_Base -l ../lib -o ../lib -c controller -u DDS Distributor"
 
-project(DDS_Distributor_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_Distributor_idl_gen) : componentidldefaults {
   after += DDS_Quoter_Connector_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=DISTRIBUTOR_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_Distributor_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_Distributor_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_Distributor_lem_gen) : ciaoidldefaults {
   after += DDS_Distributor_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=DISTRIBUTOR_LEM_STUB_Export \
@@ -109,7 +109,7 @@ project(DDS_Distributor_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_Distributor_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_Distributor_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      += DDS_Quoter_Base_stub  DDS_Distributor_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_Quoter_Connector_stub DDS_Quoter_Connector_svnt  DDS_Quoter_Connector_lem_stub
   sharedname  = Distributor_svnt
   libs       += Distributor_stub Distributor_lem_stub  \
diff --git a/CIAO/connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl
index 0cee98f3263..d3ed3f32ef1 100755
--- a/CIAO/connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/examples/Quoter/descriptors/run_test.pl
@@ -100,8 +100,6 @@ sub kill_open_processes {
     if ($ns_running == 1) {
         $NS->Kill (); $NS->TimedWait (1);
     }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
 }
 
 sub run_node_daemons {
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl b/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl
index fff47bea45f..750a8e327e5 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.idl
@@ -8,12 +8,6 @@
 #ifndef SHAPES_BASE_IDL
 #define SHAPES_BASE_IDL
 
-#pragma ndds typesupport "Base/Shapes_BaseSupport.h"
-#pragma opendds typesupport "Base/Shapes_BaseTypeSupportC.h"
-
-#pragma DCPS_DATA_TYPE "ShapeType"
-#pragma DCPS_DATA_KEY "ShapeType color"
-
 struct ShapeType {
   string color; //@key
   long x;
@@ -21,10 +15,6 @@ struct ShapeType {
   long shapesize;
 };
 
-#pragma DCPS_DATA_TYPE "Attributes"
-#pragma DCPS_DATA_KEY "Attributes shape"
-#pragma DCPS_DATA_KEY "Attributes color"
-
 struct Attributes {
   string shape; //@key
   string color; //@key
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc b/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc
index 0a311bc0aff..9efcc2987c2 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Base/Shapes_Base.mpc
@@ -1,25 +1,76 @@
 // $Id$
+// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n Shapes_Base"
 
-project (DDS_Shapes_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
-  sharedname = DDS_Shapes_Base_stub
-  dynamicflags += SHAPES_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Gxhst -Sci \
+project(DDS_Shapes_Base_idl_gen) : taoidldefaults, anytypecode {
+  custom_only = 1
+  idlflags -= -St -Sa
+  idlflags += -SS -Gxhst \
               -Wb,stub_export_macro=SHAPES_BASE_STUB_Export \
               -Wb,stub_export_include=Shapes_Base_stub_export.h
 
   IDL_Files {
     Shapes_Base.idl
   }
+}
 
-  opendds_ts_flags += --export=SHAPES_BASE_STUB_Export
+project(DDS_Shapes_Base_ndds_ts_gen) : ndds_ts_defaults {
+  custom_only = 1
+  after += DDS_Shapes_Base_idl_gen
 
-  DDSGenerator_Files {
+  NDDSTypeSupport_Files {
     Shapes_Base.idl
   }
+}
+
+project(DDS_Shapes_Base_NDDS_TS) : nddslib, taolib {
+  after += DDS_Shapes_Base_ndds_ts_gen DDS_Shapes_Base_stub
+  libs += DDS_Shapes_Base_stub
+  libout = ../lib
+  libpaths    += ../lib
+  sharedname = DDS_Shapes_Base_NDDS_TS
+  dynamicflags = NDDS_USER_DLL_EXPORT
+
+  verbatim(gnuace, macros) {
+    override no_hidden_visibility = 1
+  }
 
   Source_Files {
+    Shapes_Base.cxx
+    Shapes_BasePlugin.cxx
+    Shapes_BaseSupport.cxx
+  }
+
+  Header_Files {
+    Shapes_Base.h
+    Shapes_BasePlugin.h
+    Shapes_BaseSupport.h
+  }
+
+  Inline_Files {
+  }
+}
+
+project(DDS_Shapes_Base_stub) : ccm_stub {
+  after += DDS_Shapes_Base_idl_gen
+  libout = ../lib
+  libpaths += ../lib
+  sharedname = DDS_Shapes_Base_stub
+  dynamicflags = SHAPES_BASE_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    Shapes_BaseC.cpp
+  }
+
+  Header_Files {
+    Shapes_BaseC.h
+    Shapes_Base_stub_export.h
+  }
+
+  Inline_Files {
+    Shapes_BaseC.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl b/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl
index 17ab6de4f4d..5b08ca2f189 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.idl
@@ -14,10 +14,14 @@
 
 #pragma ciao lem "Connector/Shapes_ConnectorE.idl"
 
+module CCM_DDS
+{
+  module ::CCM_DDS::Typed < ::ShapeType, ::ShapeType_Seq> ShapeType;
+};
+
 module Shapes
 {
-  module ::CCM_DDS::Typed < ::ShapeType, ::ShapeType_Seq> ShapeTypeConn;
-  connector Shapes_Connector : ShapeTypeConn::DDS_Event
+  connector Shapes_Connector : ::CCM_DDS::ShapeType::DDS_Event
   {
   };
 };
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc b/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc
index a91758a3efd..9fa3ee70555 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_Shapes_Base -l .. -o ../lib -u DDS Shapes_Connector"
 
-project(DDS_Shapes_Connector_idl_gen) : connectoridldefaults, dds4ccm {
+project(DDS_Shapes_Connector_idl_gen) : connectoridldefaults {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SHAPES_CONNECTOR_STUB_Export \
@@ -10,8 +10,8 @@ project(DDS_Shapes_Connector_idl_gen) : connectoridldefaults, dds4ccm {
               -Wb,skel_export_include=Shapes_Connector_svnt_export.h \
               -Wb,svnt_export_macro=SHAPES_CONNECTOR_SVNT_Export \
               -Wb,svnt_export_include=Shapes_Connector_svnt_export.h \
-              -Wb,conn_export_macro=SHAPES_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Shapes_Connector_conn_export.h \
+              -Wb,exec_export_macro=SHAPES_CONNECTOR_EXEC_Export \
+              -Wb,exec_export_include=Shapes_Connector_exec_export.h \
               -I ..
 
   IDL_Files {
@@ -19,7 +19,7 @@ project(DDS_Shapes_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   }
 }
 
-project(DDS_Shapes_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_Shapes_Connector_lem_gen) : ciaoidldefaults {
   custom_only = 1
   after += DDS_Shapes_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=SHAPES_CONNECTOR_LEM_STUB_Export \
@@ -85,24 +85,24 @@ project(DDS_Shapes_Connector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_Shapes_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_Shapes_Connector_lem_stub DDS_Shapes_Connector_stub DDS4CCM_lem_stub
+  after   += DDS_Shapes_Connector_lem_stub DDS_Shapes_Connector_stub DDS4CCM_lem_stub DDS_Shapes_Base_NDDS_TS
   sharedname = DDS_Shapes_Connector_exec
-  libs += DDS_Shapes_Connector_stub DDS_Shapes_Connector_lem_stub DDS_Shapes_Base_stub DDS4CCM_lem_stub
+  libs += DDS_Shapes_Connector_stub DDS_Shapes_Connector_lem_stub DDS_Shapes_Base_stub DDS4CCM_lem_stub DDS_Shapes_Base_NDDS_TS
   libpaths += ../lib
   libout = ../lib
   includes += ..
-  dynamicflags   = SHAPES_CONNECTOR_CONN_BUILD_DLL
+  dynamicflags   = SHAPES_CONNECTOR_EXEC_BUILD_DLL
 
   IDL_Files {
   }
 
   Source_Files {
-    Shapes_Connector_conn.cpp
+    Shapes_Connector_exec.cpp
   }
 
   Header_Files {
-    Shapes_Connector_conn.h
-    Shapes_Connector_conn_export.h
+    Shapes_Connector_exec.h
+    Shapes_Connector_exec_export.h
   }
 
   Inline_Files {
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector_exec.cpp b/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector_exec.cpp
new file mode 100644
index 00000000000..10e7ef3b0e7
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector_exec.cpp
@@ -0,0 +1,30 @@
+// -*- C++ -*-
+// $Id$
+
+#include "Shapes_Connector_exec.h"
+
+namespace CIAO_Shapes_Shapes_Connector_Impl
+{
+  Shapes_Connector_exec_i::Shapes_Connector_exec_i (void)
+    : DDS_Event_Connector_T<ShapeType_DDS_Traits, ShapeType_Connector_Traits> ()
+  {
+  }
+
+  Shapes_Connector_exec_i::~Shapes_Connector_exec_i (void)
+  {
+  }
+
+  extern "C" SHAPES_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_Shapes_Shapes_Connector_Impl (void)
+  {
+    ::Components::EnterpriseComponent_ptr retval =
+      ::Components::EnterpriseComponent::_nil ();
+
+    ACE_NEW_NORETURN (
+      retval,
+      Shapes_Connector_exec_i ());
+
+    return retval;
+  }
+}
+
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector_exec.h b/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector_exec.h
new file mode 100644
index 00000000000..36a073c34ef
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Connector/Shapes_Connector_exec.h
@@ -0,0 +1,61 @@
+// -*- C++ -*-
+// $Id$
+
+#ifndef SHAPES_CONNECTOR_EXEC_H_
+#define SHAPES_CONNECTOR_EXEC_H_
+
+#include /**/ "ace/pre.h"
+
+#include "Shapes_ConnectorEC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "Shapes_Connector_exec_export.h"
+#include "tao/LocalObject.h"
+
+#include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
+#include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
+
+#include "Base/Shapes_BaseSupport.h"
+
+namespace CIAO_Shapes_Shapes_Connector_Impl
+{
+
+  // @from use of ShapeType as a parameter
+  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+    ShapeType,
+    ShapeTypeSeq,
+    ShapeTypeTypeSupport,
+    ShapeTypeDataWriter,
+    ShapeTypeDataReader > ShapeType_DDS_Traits;
+
+  typedef CIAO::DDS4CCM::Connector_Traits <
+    ::CIAO_Shapes_Shapes_Connector_Impl::Shapes_Connector_Exec,
+    ShapeType_Seq,
+    ::CCM_DDS::ShapeType::CCM_Writer,
+    ::CCM_DDS::ShapeType::CCM_Updater,
+    ::CCM_DDS::ShapeType::CCM_Getter,
+    ::CCM_DDS::ShapeType::CCM_Reader,
+    ::Shapes::CCM_Shapes_Connector_Context,
+    ::CCM_DDS::ShapeType::Listener,
+    ::CCM_DDS::ShapeType::StateListener,
+    ::CCM_DDS::ConnectorStatusListener> ShapeType_Connector_Traits;
+
+  class SHAPES_CONNECTOR_EXEC_Export Shapes_Connector_exec_i :
+    public DDS_Event_Connector_T <ShapeType_DDS_Traits, ShapeType_Connector_Traits>
+  {
+  public:
+    Shapes_Connector_exec_i (void);
+    virtual ~Shapes_Connector_exec_i (void);
+  };
+
+  extern "C" SHAPES_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_Shapes_Shapes_Connector_Impl (void);
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.idl b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.idl
index 527ea2a356b..3f46da47dac 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.idl
@@ -14,8 +14,8 @@ module Shapes
 {
   component Receiver
   {
-    port ShapeTypeConn::DDS_Listen info_out;
-    port ShapeTypeConn::DDS_Get info_get;
+    port CCM_DDS::ShapeType::DDS_Listen info_out;
+    port CCM_DDS::ShapeType::DDS_Get info_get;
     attribute unsigned long rate;
     attribute boolean get_data; //if true, get_one and get_all are invoked
     attribute boolean read_data;//if true, read_one and read_all are invoked.
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc
index cb97f698b46..5fe29e9f015 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -l ../lib -o ../lib -u DDS -b dds4ccm_base Receiver"
 
-project(DDS_Shapes_Receiver_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_Shapes_Receiver_idl_gen) : componentidldefaults {
   custom_only = 1
   after += DDS_Shapes_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
@@ -18,7 +18,7 @@ project(DDS_Shapes_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_Shapes_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_Shapes_Receiver_lem_gen) : ciaoidldefaults {
   after += DDS_Shapes_Receiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
@@ -108,7 +108,7 @@ project(DDS_Shapes_Receiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_Shapes_Receiver_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_Shapes_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      +=   DDS_Shapes_Receiver_lem_stub DDS_Shapes_Base_stub DDS_Shapes_Connector_stub DDS_Shapes_Connector_svnt DDS_Shapes_Receiver_exec DDS_Shapes_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
   sharedname  = Receiver_svnt
   libs       += Receiver_stub Receiver_lem_stub DDS_Shapes_Base_stub DDS_Shapes_Connector_stub DDS_Shapes_Connector_svnt Receiver_exec DDS_Shapes_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp
index 329c1a99277..1c40e923e29 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.cpp
@@ -8,9 +8,6 @@
 
 namespace CIAO_Shapes_Receiver_Impl
 {
-  //============================================================
-  // read_action_Generator
-  //============================================================
   read_action_Generator::read_action_Generator (Receiver_exec_i &callback)
     : pulse_callback_ (callback)
   {
@@ -37,8 +34,9 @@ namespace CIAO_Shapes_Receiver_Impl
   }
 
   //============================================================
-  // ShapeType_Listener_exec_i
+  // Facet Executor Implementation Class: ShapeType_Listener_exec_i
   //============================================================
+
   ShapeType_Listener_exec_i::ShapeType_Listener_exec_i (void)
   {
   }
@@ -69,8 +67,9 @@ namespace CIAO_Shapes_Receiver_Impl
   }
 
   //============================================================
-  // PortStatusListener_exec_i
+  // Facet Executor Implementation Class: PortStatusListener_exec_i
   //============================================================
+
   PortStatusListener_exec_i::PortStatusListener_exec_i (void)
   {
   }
@@ -95,8 +94,9 @@ namespace CIAO_Shapes_Receiver_Impl
   }
 
   //============================================================
-  // Receiver_exec_i
+  // Component Executor Implementation Class: Receiver_exec_iShapeType_Listener_exec_i ();
   //============================================================
+
   Receiver_exec_i::Receiver_exec_i (void)
     : rate_ (0),
       get_data_ (true),
@@ -269,7 +269,7 @@ namespace CIAO_Shapes_Receiver_Impl
   }
 
   // Port operations.
-  ::Shapes::ShapeTypeConn::CCM_Listener_ptr
+  ::CCM_DDS::ShapeType::CCM_Listener_ptr
   Receiver_exec_i::get_info_out_data_listener (void)
   {
     ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new ShapeType RAW listener\n")));
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.h b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.h
index 6e88810f2bd..299c34d06ea 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Receiver/Shapes_Receiver_exec.h
@@ -33,19 +33,18 @@ namespace CIAO_Shapes_Receiver_Impl
 
     ~read_action_Generator ();
 
+    /// Handle the timeout.
     virtual int handle_timeout (const ACE_Time_Value &tv,
                                 const void *arg);
 
   private:
+    /// Maintains a handle that actually process the event
     Receiver_exec_i &pulse_callback_;
 
   };
 
-  //============================================================
-  // ShapeType_Listener_exec_i
-  //============================================================
   class RECEIVER_EXEC_Export ShapeType_Listener_exec_i
-    : public virtual ::Shapes::ShapeTypeConn::CCM_Listener,
+    : public virtual ::CCM_DDS::ShapeType::CCM_Listener,
       public virtual ::CORBA::LocalObject
   {
   public:
@@ -113,7 +112,7 @@ namespace CIAO_Shapes_Receiver_Impl
     virtual void raw_listen (::CORBA::Boolean raw_listen);
 
     // Port operations.
-    virtual ::Shapes::ShapeTypeConn::CCM_Listener_ptr
+    virtual ::CCM_DDS::ShapeType::CCM_Listener_ptr
     get_info_out_data_listener (void);
 
     virtual ::CCM_DDS::CCM_PortStatusListener_ptr
@@ -121,7 +120,7 @@ namespace CIAO_Shapes_Receiver_Impl
 
     virtual ::CCM_DDS::CCM_PortStatusListener_ptr
     get_info_get_status (void);
-
+    
     // Operations from Components::SessionComponent.
     virtual void
     set_session_context (
@@ -135,8 +134,8 @@ namespace CIAO_Shapes_Receiver_Impl
 
   private:
     ::Shapes::CCM_Receiver_Context_var context_;
-    ::Shapes::ShapeTypeConn::Reader_var reader_;
-    ::Shapes::ShapeTypeConn::Getter_var getter_;
+    ::CCM_DDS::ShapeType::Reader_var reader_;
+    ::CCM_DDS::ShapeType::Getter_var getter_;
 
     read_action_Generator * ticker_;
     CORBA::ULong rate_;
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.idl b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.idl
index f6b3622d888..69eb4701a1f 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.idl
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.idl
@@ -16,7 +16,7 @@ module Shapes
 {
   component Sender
   {
-    port ShapeTypeConn::DDS_Write info_write;
+    port CCM_DDS::ShapeType::DDS_Write info_write;
     attribute unsigned long rate;
     attribute unsigned short max_x;
     attribute unsigned short max_y;
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc
index c03bbe91e4a..2057e432c72 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_Shapes_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(DDS_Shapes_Sender_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_Shapes_Sender_idl_gen) : componentidldefaults {
   after += DDS_Shapes_Connector_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_Shapes_Sender_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_Shapes_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_Shapes_Sender_lem_gen) : ciaoidldefaults {
   after += DDS_Shapes_Sender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
@@ -109,7 +109,7 @@ project(DDS_Shapes_Sender_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_Shapes_Sender_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_Shapes_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      += DDS_Shapes_Base_stub  DDS_Shapes_Sender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_Shapes_Connector_stub DDS_Shapes_Connector_svnt  DDS_Shapes_Connector_lem_stub
   sharedname  = Sender_svnt
   libs       += Sender_stub Sender_lem_stub  \
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.cpp b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.cpp
index a1212c54be8..90a854d9037 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.cpp
@@ -9,8 +9,9 @@
 namespace CIAO_Shapes_Sender_Impl
 {
   //============================================================
-  // pulse_Generator
+  // Pulse generator
   //============================================================
+
   pulse_Generator::pulse_Generator (Sender_exec_i &callback)
     : pulse_callback_ (callback)
   {
@@ -23,13 +24,15 @@ namespace CIAO_Shapes_Sender_Impl
   int
   pulse_Generator::handle_timeout (const ACE_Time_Value &, const void *)
   {
+    // Notify the subscribers
     this->pulse_callback_.tick ();
     return 0;
   }
 
   //============================================================
-  // Sender_exec_i
+  // Component Executor Implementation Class: Sender_exec_i
   //============================================================
+
   Sender_exec_i::Sender_exec_i (void)
     : rate_ (1),
       max_x_ (100),
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.h b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.h
index 9fa93f905a4..f79c7d0a2dc 100644
--- a/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/Sender/Shapes_Sender_exec.h
@@ -20,9 +20,6 @@ namespace CIAO_Shapes_Sender_Impl
 {
   class Sender_exec_i;
 
-  //============================================================
-  // pulse_Generator
-  //============================================================
   class pulse_Generator : public ACE_Event_Handler
   {
   public:
@@ -30,15 +27,14 @@ namespace CIAO_Shapes_Sender_Impl
 
     virtual ~pulse_Generator ();
 
+    /// Handle the timeout.
     virtual int handle_timeout (const ACE_Time_Value &tv,
                                 const void *arg);
   private:
+    /// Maintains a handle that actually process the event
     Sender_exec_i &pulse_callback_;
   };
 
-  //============================================================
-  // Sender_exec_i
-  //============================================================
   class Sender_exec_i
     : public virtual Sender_Exec,
       public virtual ::CORBA::LocalObject
@@ -81,7 +77,7 @@ namespace CIAO_Shapes_Sender_Impl
     void start (void);
     void stop (void);
 
-    Shapes::ShapeTypeConn::Writer_var writer_;
+    CCM_DDS::ShapeType::Writer_var writer_;
 
     pulse_Generator * ticker_;
     ::Shapes::CCM_Sender_Context_var context_;
diff --git a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl
index 91f09e912e2..66131f97fdb 100755
--- a/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/examples/Shapes/descriptors/run_test.pl
@@ -100,8 +100,6 @@ sub kill_open_processes {
     if ($ns_running == 1) {
         $NS->Kill (); $NS->TimedWait (1);
     }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
 }
 
 sub run_node_daemons {
diff --git a/CIAO/connectors/dds4ccm/id3p_test/Multiple_Reader_Ports/test.idl3p b/CIAO/connectors/dds4ccm/id3p_test/Multiple_Reader_Ports/test.idl3p
new file mode 100644
index 00000000000..5c131f20cd1
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/id3p_test/Multiple_Reader_Ports/test.idl3p
@@ -0,0 +1,17 @@
+// $Id$
+
+// IDL3+
+
+#ifndef TEST_IDL3P
+#define TEST_IDL3P
+
+module Hello_DDS
+{
+  component Sender
+  {
+    port DDS_Write<string> push_message;
+    port DDS_Write<int> push_state;
+  };
+};
+
+#endif /* TEST_IDL3P */
diff --git a/CIAO/connectors/dds4ccm/idl/ccm_dds.idl b/CIAO/connectors/dds4ccm/idl/ccm_dds.idl
index 2d7beaad068..61875d0aa5d 100644
--- a/CIAO/connectors/dds4ccm/idl/ccm_dds.idl
+++ b/CIAO/connectors/dds4ccm/idl/ccm_dds.idl
@@ -200,42 +200,42 @@ module CCM_DDS
         // ---------
 
         porttype DDS_Write {
-                uses Writer                     data;
+                uses Writer                                     data;
                 uses DDS::DataWriter            dds_entity;
                 };
 
         porttype DDS_Update {
-                uses Updater                    data;
+                uses Updater                            data;
                 uses DDS::DataWriter            dds_entity;
                 };
 
         porttype DDS_Read {
-                uses Reader                     data;
+                uses Reader                                     data;
                 uses DDS::DataReader            dds_entity;
                 provides PortStatusListener     status;
                 };
 
         porttype DDS_Get {
-                uses Reader                     data;
-                uses Getter                     fresh_data;
+                uses Reader                                     data;
+                uses Getter                                     fresh_data;
                 uses DDS::DataReader            dds_entity;
                 provides PortStatusListener     status;
                 };
 
         porttype DDS_Listen {
-                uses Reader                     data;
+                uses Reader                                     data;
                 uses DataListenerControl        data_control;
-                provides Listener               data_listener;
+                provides Listener                       data_listener;
                 uses DDS::DataReader            dds_entity;
-                provides PortStatusListener     status;
+                provides PortStatusListener status;
                 };
 
         porttype DDS_StateListen {
-                uses Reader                     data;
+                uses Reader                                     data;
                 uses StateListenerControl       data_control;
                 provides StateListener          data_listener;
                 uses DDS::DataReader            dds_entity;
-                provides PortStatusListener     status;
+                provides PortStatusListener status;
                 };
 
         // ----------------------------
@@ -244,17 +244,17 @@ module CCM_DDS
         // ----------------------------
 
         connector DDS_State : DDS_TopicBase {
-                mirrorport DDS_Update           observable;
-                mirrorport DDS_Read             passive_observer;
-                mirrorport DDS_Get              pull_observer;
-                mirrorport DDS_Listen           push_observer;
-                mirrorport DDS_StateListen      push_state_observer;
+                mirrorport DDS_Update                                   observable;
+                mirrorport DDS_Read                                             passive_observer;
+                mirrorport DDS_Get                                              pull_observer;
+                mirrorport DDS_Listen                                   push_observer;
+                mirrorport DDS_StateListen                              push_state_observer;
                 };
 
         connector DDS_Event : DDS_TopicBase {
-                mirrorport DDS_Write            supplier;
-                mirrorport DDS_Get              pull_consumer;
-                mirrorport DDS_Listen           push_consumer;
+                mirrorport DDS_Write                                    supplier;
+                mirrorport DDS_Get                                              pull_consumer;
+                mirrorport DDS_Listen                                   push_consumer;
                 };
         };
 };
diff --git a/CIAO/connectors/dds4ccm/idl/dds4ccm.mpc b/CIAO/connectors/dds4ccm/idl/dds4ccm.mpc
index d096ad43a24..7b4a3425cb8 100644
--- a/CIAO/connectors/dds4ccm/idl/dds4ccm.mpc
+++ b/CIAO/connectors/dds4ccm/idl/dds4ccm.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project (DDS4CCM_idl_gen) : dds4ccm, componentidldefaults {
+project (DDS4CCM_idl_gen) : ciaoidldefaults, anytypecode {
   custom_only = 1
   idlflags += -Wb,stub_export_macro=DDS4CCM_STUB_Export \
               -Wb,stub_export_include=dds4ccm_stub_export.h \
@@ -9,12 +9,11 @@ project (DDS4CCM_idl_gen) : dds4ccm, componentidldefaults {
               -I$(CIAO_ROOT)/connectors -Glem
 
   IDL_Files {
-    idlflags += -Gxhst -Gxhsk -SS
+    idlflags += -Gxhst -Gxhsk -Glem -Glfa -SS
     dds4ccm_Base.idl
   }
 
   IDL_Files {
-    idlflags -= -Gxhst -Gxhsk
     dds_rtf2_dcps.idl
     dds_rtf2_dcps_i_handle.idl
     dds4ccm_PortStatusListener.idl
@@ -25,7 +24,7 @@ project (DDS4CCM_idl_gen) : dds4ccm, componentidldefaults {
   }
 }
 
-project (DDS4CCM_lem_gen) : dds4ccm, ciaoidldefaults {
+project (DDS4CCM_lem_gen) : ciaoidldefaults, anytypecode {
   custom_only = 1
   after += DDS4CCM_idl_gen
   idlflags += -I$(CIAO_ROOT)/connectors \
@@ -48,7 +47,7 @@ project (DDS4CCM_lem_gen) : dds4ccm, ciaoidldefaults {
   }
 }
 
-project (DDS4CCM_stub) : dds4ccm, ccm_stub, ciaolib_with_idl, ciao_output, taolib {
+project (DDS4CCM_stub) : ccm_stub, ciaolib_with_idl, ciao_output, taolib, anytypecode {
 
   after += DDS4CCM_idl_gen
   includes += $(CIAO_ROOT)/connectors
@@ -79,7 +78,7 @@ project (DDS4CCM_stub) : dds4ccm, ccm_stub, ciaolib_with_idl, ciao_output, taoli
   }
 }
 
-project (DDS4CCM_lem_stub) : dds4ccm, ccm_svnt, ciaolib_with_idl, ciao_output, taolib, valuetype, ifr_client {
+project (DDS4CCM_lem_stub) : ccm_svnt, ciaolib_with_idl, ciao_output, taolib, valuetype, anytypecode, ifr_client {
   after += DDS4CCM_stub DDS4CCM_lem_gen
   libs  += DDS4CCM_stub
   includes += $(CIAO_ROOT)/connectors
@@ -111,7 +110,7 @@ project (DDS4CCM_lem_stub) : dds4ccm, ccm_svnt, ciaolib_with_idl, ciao_output, t
   }
 }
 
-project (DDS4CCM_skel) : dds4ccm, ciaolib_with_idl, ciao_output, taolib, portableserver, ciao_servant {
+project (DDS4CCM_skel) : ciaolib_with_idl, ciao_output, taolib, anytypecode, portableserver, ciao_servant {
   after += DDS4CCM_stub
   libs  += DDS4CCM_stub
   includes += $(CIAO_ROOT)/connectors
diff --git a/CIAO/connectors/dds4ccm/idl/dds4ccm_Base.idl b/CIAO/connectors/dds4ccm/idl/dds4ccm_Base.idl
index 0d6a40c3bfd..0a7359d0114 100644
--- a/CIAO/connectors/dds4ccm/idl/dds4ccm_Base.idl
+++ b/CIAO/connectors/dds4ccm/idl/dds4ccm_Base.idl
@@ -11,6 +11,8 @@
 
 #pragma ciao lem "connectors/dds4ccm/idl/dds4ccm_BaseE.idl"
 
+#define connector component
+
 module CCM_DDS
 {
   typedef unsigned long DataNumber_t;   // count or index of data
diff --git a/CIAO/connectors/dds4ccm/idl/dds4ccm_Connector.idl b/CIAO/connectors/dds4ccm/idl/dds4ccm_Connector.idl
index 54e27004051..bdf195acd62 100644
--- a/CIAO/connectors/dds4ccm/idl/dds4ccm_Connector.idl
+++ b/CIAO/connectors/dds4ccm/idl/dds4ccm_Connector.idl
@@ -9,6 +9,8 @@
 
 #pragma ciao lem "connectors/dds4ccm/idl/dds4ccm_ConnectorE.idl"
 
+#define connector component
+
 module CCM_DDS
 {
   connector DDS_Base {
diff --git a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps.idl b/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps.idl
index 3a98aaae951..5bafec41a4d 100644
--- a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps.idl
+++ b/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps.idl
@@ -5,12 +5,6 @@
 
 #pragma ciao lem "connectors/dds4ccm/idl/dds_rtf2_dcpsE.idl"
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-# include "dds/DdsDcps.idl"
-#endif
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-
 #define DOMAINID_TYPE_NATIVE    long
 #define HANDLE_TYPE_NATIVE      long
 #define HANDLE_NIL_NATIVE       0
@@ -88,20 +82,19 @@ module DDS {
     typedef unsigned long StatusKind;
     typedef unsigned long StatusMask;    // bit-mask StatusKind
 
-    const StatusKind INCONSISTENT_TOPIC_STATUS                = 0x0001 << 0;
-    const StatusKind OFFERED_DEADLINE_MISSED_STATUS           = 0x0001 << 1;
-    const StatusKind REQUESTED_DEADLINE_MISSED_STATUS         = 0x0001 << 2;
-    const StatusKind OFFERED_INCOMPATIBLE_QOS_STATUS          = 0x0001 << 5;
-    const StatusKind REQUESTED_INCOMPATIBLE_QOS_STATUS        = 0x0001 << 6;
-    const StatusKind SAMPLE_LOST_STATUS                       = 0x0001 << 7;
-    const StatusKind SAMPLE_REJECTED_STATUS                   = 0x0001 << 8;
-    const StatusKind DATA_ON_READERS_STATUS                   = 0x0001 << 9;
-    const StatusKind DATA_AVAILABLE_STATUS                    = 0x0001 << 10;
-    const StatusKind LIVELINESS_LOST_STATUS                   = 0x0001 << 11;
-    const StatusKind LIVELINESS_CHANGED_STATUS                = 0x0001 << 12;
-    const StatusKind PUBLICATION_MATCHED_STATUS               = 0x0001 << 13;
-    const StatusKind SUBSCRIPTION_MATCHED_STATUS              = 0x0001 << 14;
-    const StatusKind RELIABLE_READER_ACTIVITY_CHANGED_STATUS  = 0x00000001 << 25;
+    const StatusKind INCONSISTENT_TOPIC_STATUS            = 0x0001 << 0;
+    const StatusKind OFFERED_DEADLINE_MISSED_STATUS       = 0x0001 << 1;
+    const StatusKind REQUESTED_DEADLINE_MISSED_STATUS     = 0x0001 << 2;
+    const StatusKind OFFERED_INCOMPATIBLE_QOS_STATUS      = 0x0001 << 5;
+    const StatusKind REQUESTED_INCOMPATIBLE_QOS_STATUS    = 0x0001 << 6;
+    const StatusKind SAMPLE_LOST_STATUS                   = 0x0001 << 7;
+    const StatusKind SAMPLE_REJECTED_STATUS               = 0x0001 << 8;
+    const StatusKind DATA_ON_READERS_STATUS               = 0x0001 << 9;
+    const StatusKind DATA_AVAILABLE_STATUS                = 0x0001 << 10;
+    const StatusKind LIVELINESS_LOST_STATUS               = 0x0001 << 11;
+    const StatusKind LIVELINESS_CHANGED_STATUS            = 0x0001 << 12;
+    const StatusKind PUBLICATION_MATCHED_STATUS           = 0x0001 << 13;
+    const StatusKind SUBSCRIPTION_MATCHED_STATUS          = 0x0001 << 14;
 
     struct InconsistentTopicStatus {
         long total_count;
@@ -191,14 +184,6 @@ module DDS {
         InstanceHandle_t     last_publication_handle;
     };
 
-    struct ReliableReaderActivityChangedStatus {
-        long                 active_count;
-        long                 not_active_count;
-        long                 active_count_change;
-        long                 inactive_count_change;
-        InstanceHandle_t     last_instance_handle;
-    };
-
     // ----------------------------------------------------------------------
     // Listeners
     // ----------------------------------------------------------------------
@@ -236,9 +221,6 @@ module DDS {
         void on_publication_matched(
             in DataWriter writer,
             in PublicationMatchedStatus status);
-        void on_reliable_reader_activity_changed (
-            in DataWriter writer,
-            in ReliableReaderActivityChangedStatus status);
     };
 
     local interface PublisherListener : DataWriterListener {
@@ -1255,5 +1237,3 @@ module DDS {
 };
 
 #endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_i_handle.idl b/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_i_handle.idl
index 7bb3d3b6e47..02fd03e9bdd 100644
--- a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_i_handle.idl
+++ b/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_i_handle.idl
@@ -5,8 +5,6 @@
 
 #pragma ciao lem "connectors/dds4ccm/idl/dds_rtf2_dcps_i_handleE.idl"
 
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-
 module DDS {
     struct NativeInstanceHandle_t {
         octet value[16];
@@ -18,5 +16,3 @@ module DDS {
 };
 
 #endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handle.idl b/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handle.idl
index a80d5e75bea..45d9515937c 100644
--- a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handle.idl
+++ b/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handle.idl
@@ -3,8 +3,6 @@
 #ifndef DDS_RFT2_DCPS_INSTANCE_HANDLE_IDL
 #define DDS_RFT2_DCPS_INSTANCE_HANDLE_IDL
 
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-
 #include "dds_rtf2_dcps_i_handle.idl"
 
 module DDS {
@@ -12,5 +10,3 @@ module DDS {
 };
 
 #endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handleC.cpp b/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handleC.cpp
index 3fe4af04da8..bceb22e2770 100644
--- a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handleC.cpp
+++ b/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handleC.cpp
@@ -3,8 +3,6 @@
 
 #include "dds_rtf2_dcps_instance_handleC.h"
 
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-
 static ::DDS::InstanceHandle_t S_HANDLE = { {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 16, 0};
 
 namespace DDS
@@ -12,4 +10,3 @@ namespace DDS
   ::DDS::InstanceHandle_t const HANDLE_NIL = S_HANDLE;
 }
 
-#endif
diff --git a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handleC.h b/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handleC.h
index 9d8723910b7..fd777ae27ac 100644
--- a/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handleC.h
+++ b/CIAO/connectors/dds4ccm/idl/dds_rtf2_dcps_instance_handleC.h
@@ -21,15 +21,11 @@
 // TAO_IDL - Generated from
 // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_root/root_ch.cpp:62
 
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-
 namespace DDS
 {
   extern DDS4CCM_STUB_Export ::DDS::InstanceHandle_t const HANDLE_NIL;
 }
 
-#endif
-
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/impl/logger/Log_Macros.cpp b/CIAO/connectors/dds4ccm/impl/logger/Log_Macros.cpp
deleted file mode 100644
index f0ea78a160a..00000000000
--- a/CIAO/connectors/dds4ccm/impl/logger/Log_Macros.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// $Id$
-
-#include "Log_Macros.h"
-
-// For now, DDS4CCM is making use of the CIAO logging framework.
-// This file is there in preparation of the DDS4CCM logging framework.
-// For now, this should be empty because the CIAO_debug_level flag is
-// set in the Log_Macros.cpp of the CIAO logging framework.
diff --git a/CIAO/connectors/dds4ccm/impl/logger/Log_Macros.h b/CIAO/connectors/dds4ccm/impl/logger/Log_Macros.h
deleted file mode 100644
index e8d09689e90..00000000000
--- a/CIAO/connectors/dds4ccm/impl/logger/Log_Macros.h
+++ /dev/null
@@ -1,95 +0,0 @@
-// $Id$
-/**
- * @file Log_Macros.h
- * @author William R. Otte <wotte@dre.vanderbilt.edu>
- *
- * Macros used for logging in CIAO.
- */
-
-#ifndef DDS4CCM_LOG_MACROS_H_
-#define DDS4CCM_LOG_MACROS_H_
-
-// default information printed with CIAO logging messages.
-
-#include "ciao/Logger/Log_Macros.h"
-
-#if !defined (CLINFO)
-# define CLINFO "(%P|%t) [%M] - %T - "
-#endif
-
-#if (DDS4CCM_NTRACE == 1)
-#  if !defined (ACE_NTRACE)
-#    define DDS4CCM_TRACE(X) do {} while (0)
-#    define DDS4CCM_ENABLE_TRACE(X) do {} while (0)
-#    define DDS4CCM_DISABLE_TRACE(X) do {} while (0)
-#  else
-#    if (ACE_NTRACE == 0)
-#      error DDS4CCM_TRACE cannot be disabled if ACE_TRACE is enabled
-#    else
-#      define DDS4CCM_TRACE(X) do {} while (0)
-#      define DDS4CCM_ENABLE_TRACE(X) do {} while (0)
-#      define DDS4CCM_DISABLE_TRACE(X) do {} while (0)
-#    endif
-#  endif
-#else
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define DDS4CCM_TRACE(X) ACE_TRACE_IMPL(X)
-#  define DDS4CCM_ENABLE_TRACE() ACE_Trace::start_tracing ()
-#  define DDS4CCM_DISABLE_TRACE() ACE_Trace::stop_tracing ()
-#  undef CLINFO // Make log messages indent with tracing.
-#  define CLINFO "%I(%P|%t) [%M] - %T - "
-#  include "ace/Trace.h"
-#endif /* DDS4CCM_NTRACE */
-
-#if defined (DDS4CCM_NLOGGING)
-# define DDS4CCM_ERROR(L, X) do {} while (0)
-# define DDS4CCM_DEBUG(L, X) do {} while (0)
-#define DDS4CCM_ERROR_RETURN(L, X, Y) return (Y)
-#define DDS4CCM_ERROR_BREAK(L, X) { break; }
-#else
-# if !defined (DDS4CCM_ERROR)
-#  define DDS4CCM_ERROR(L, X) \
-  do { \
-    if (CIAO_debug_level >= L) \
-      { \
-        int const __ace_error = ACE_Log_Msg::last_error_adapter (); \
-        ACE_Log_Msg *ace___ = ACE_Log_Msg::instance ();               \
-        ace___->conditional_set (__FILE__, __LINE__, -1, __ace_error); \
-        ace___->log X; \
-      } \
-  } while (0)
-#  endif
-# if !defined (DDS4CCM_DEBUG)
-#  define DDS4CCM_DEBUG(L, X) \
-  do { \
-    if (CIAO_debug_level >= L) \
-      { \
-        int const __ace_error = ACE_Log_Msg::last_error_adapter (); \
-        ACE_Log_Msg *ace___ = ACE_Log_Msg::instance (); \
-        ace___->conditional_set (__FILE__, __LINE__, 0, __ace_error); \
-        ace___->log X; \
-      } \
-  } while (0)
-# endif
-# if !defined (DDS4CCM_ERROR_RETURN)
-#  define DDS4CCM_ERROR_RETURN(L, X, Y) \
-  do { \
-    if (CIAO_debug_level >= L) \
-      { \
-        int const __ace_error = ACE_Log_Msg::last_error_adapter (); \
-        ACE_Log_Msg *ace___ = ACE_Log_Msg::instance (); \
-        ace___->conditional_set (__FILE__, __LINE__, Y, __ace_error); \
-        ace___->log X; \
-      } \
-    return Y; \
-  } while (0)
-# endif
-# if !defined (DDS4CCM_ERROR_BREAK)
-#  define DDS4CCM_ERROR_BREAK(L, X) { DDS4CCM_ERROR (L, X); break; }
-# endif
-#endif
-
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/impl/logger/Logger.mpc b/CIAO/connectors/dds4ccm/impl/logger/Logger.mpc
deleted file mode 100644
index b5c6dba21e6..00000000000
--- a/CIAO/connectors/dds4ccm/impl/logger/Logger.mpc
+++ /dev/null
@@ -1,15 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(DDS4CCM_Logger): ciao_lib, taolib, acelib {
-  sharedname   = DDS4CCM_Logger
-  dynamicflags = DDS4CCM_LOGGER_BUILD_DLL
-
-  Source_Files {
-    Log_Macros.cpp
-  }
-}
-
-
-
-
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/BuiltinTopicKey_t.h b/CIAO/connectors/dds4ccm/impl/ndds/BuiltinTopicKey_t.h
deleted file mode 100644
index 3c12b7008f9..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/BuiltinTopicKey_t.h
+++ /dev/null
@@ -1,38 +0,0 @@
-                                      /**
- * @author Marcel Smit <msmit@dre.vanderbilt.edu>
- *
- * $Id$
- *
- */
-
-#ifndef BUILTINTOPICKEY_T_H
-#define BUILTINTOPICKEY_T_H
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-inline void
-operator<<= (::DDS::BuiltinTopicKey_t &ddsbuiltintopickey, const ::DDS_BuiltinTopicKey_t & builtintopickey)
-{
-  ACE_OS::memcpy (ddsbuiltintopickey.value, builtintopickey.value, sizeof (builtintopickey.value));
-}
-
-inline void
-operator<<= (::DDS_BuiltinTopicKey_t &ddsbuiltintopickey, const ::DDS::BuiltinTopicKey_t & builtintopickey)
-{
-  ACE_OS::memcpy (ddsbuiltintopickey.value, builtintopickey.value, sizeof (builtintopickey.value));
-}
-
-inline void
-operator>>= (const ::DDS_BuiltinTopicKey_t &builtintopickey, ::DDS::BuiltinTopicKey_t & ddsbuiltintopickey)
-{
-  ACE_OS::memcpy (ddsbuiltintopickey.value, builtintopickey.value, sizeof (builtintopickey.value));
-}
-
-inline void
-operator>>= (const ::DDS::BuiltinTopicKey_t &builtintopickey, ::DDS_BuiltinTopicKey_t & ddsbuiltintopickey)
-{
-  ACE_OS::memcpy (ddsbuiltintopickey.value, builtintopickey.value, sizeof (builtintopickey.value));
-}
-
-#endif
-
-#endif /* BUILTINTOPICKEY_T_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.cpp
index 9fd0fd752f2..93aef94fe30 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.cpp
@@ -1,7 +1,7 @@
 // $Id$
 #include "dds4ccm/impl/ndds/Coherent_Changes_Guard.h"
 
-CIAO::DDS4CCM::Coherent_Changes_Guard::Coherent_Changes_Guard (DDSPublisher* p, bool coherent_write) : p_ (p), coherent_write_ (coherent_write)
+CIAO::DDS4CCM::RTI::Coherent_Changes_Guard::Coherent_Changes_Guard (DDSPublisher* p, bool coherent_write) : p_ (p), coherent_write_ (coherent_write)
 {
   if (this->coherent_write_)
     {
@@ -9,7 +9,7 @@ CIAO::DDS4CCM::Coherent_Changes_Guard::Coherent_Changes_Guard (DDSPublisher* p,
     }
 }
 
-CIAO::DDS4CCM::Coherent_Changes_Guard::~Coherent_Changes_Guard ()
+CIAO::DDS4CCM::RTI::Coherent_Changes_Guard::~Coherent_Changes_Guard ()
 {
   if (this->coherent_write_)
     {
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.h b/CIAO/connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.h
index 8a02245aed1..e16f249f401 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Coherent_Changes_Guard.h
@@ -11,31 +11,26 @@
 #define _CIAO_COHERENT_CHANGES_GUARD
 
 #include "ace/Copy_Disabled.h"
+#include "ndds/ndds_cpp.h"
 #include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h"
 
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-# include "ndds/ndds_cpp.h"
-#endif
-
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-# include "dds/DdsDcpsC.h"
-typedef ::DDS::Publisher DDSPublisher;
-#endif
-
 namespace CIAO
 {
   namespace DDS4CCM
   {
-    class DDS4CCM_NDDS_IMPL_Export Coherent_Changes_Guard :
-      private ACE_Copy_Disabled
+    namespace RTI
     {
-      public:
-        Coherent_Changes_Guard (::DDSPublisher* p, bool coherent_write);
-        ~Coherent_Changes_Guard ();
-      private:
-        ::DDSPublisher* p_;
-        bool const coherent_write_;
-    };
+      class DDS4CCM_NDDS_IMPL_Export Coherent_Changes_Guard :
+        private ACE_Copy_Disabled
+      {
+        public:
+          Coherent_Changes_Guard (::DDSPublisher* p, bool coherent_write);
+          ~Coherent_Changes_Guard ();
+        private:
+          ::DDSPublisher* p_;
+          bool const coherent_write_;
+      };
+    }
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp b/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp
index 9bdfb36e72d..b3eaab27533 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.cpp
@@ -4,139 +4,111 @@
 #include "Topic.h"
 #include "StringSeq.h"
 
-#include "dds4ccm/impl/logger/Log_Macros.h"
+#include "ciao/Logger/Log_Macros.h"
 
 namespace CIAO
 {
   namespace DDS4CCM
   {
-    CCM_DDS_ContentFilteredTopic_i::CCM_DDS_ContentFilteredTopic_i (
-      DDSContentFilteredTopic * dw) : impl_ (dw)
+    namespace RTI
     {
-    }
-
-    CCM_DDS_ContentFilteredTopic_i::~CCM_DDS_ContentFilteredTopic_i (void)
-    {
-    }
-
-    char *
-    CCM_DDS_ContentFilteredTopic_i::get_filter_expression (void)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_ContentFilteredTopic_i::get_filter_expression");
-      return CORBA::string_dup (this->impl ()->get_filter_expression ());
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_ContentFilteredTopic_i::get_expression_parameters (
-      ::DDS::StringSeq & expression_parameters)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_ContentFilteredTopic_i::get_expression_parameters");
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      DDS_StringSeq parameters;
-      ::DDS::ReturnCode_t retval = this->impl ()->get_expression_parameters (
-                                                                  parameters);
-      expression_parameters <<= parameters;
-#else
-      ::DDS::ReturnCode_t retval = this->impl ()->get_expression_parameters (
-                                                                  expression_parameters);
-#endif
-      return retval;
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_ContentFilteredTopic_i::set_expression_parameters (
-      const ::DDS::StringSeq & expression_parameters)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_ContentFilteredTopic_i::set_expression_parameters");
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      DDS_StringSeq parameters;
-      parameters <<= expression_parameters;
-      return this->impl ()->set_expression_parameters (parameters);
-#else
-      return this->impl ()->set_expression_parameters (expression_parameters);
-#endif
-    }
-
-    ::DDS::Topic_ptr
-    CCM_DDS_ContentFilteredTopic_i::get_related_topic (void)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_ContentFilteredTopic_i::get_related_topic");
-
-      ::DDS::Topic_var retval = ::DDS::Topic::_nil ();
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      DDSTopic *topic = this->impl ()->get_related_topic ();
-      ACE_NEW_THROW_EX (retval,
-                        CCM_DDS_Topic_i (topic),
-                        CORBA::NO_MEMORY ());
-      return retval._retn ();
-#else
-      ::DDS::Topic_var topic = this->impl ()->get_related_topic ();
-      ACE_NEW_THROW_EX (retval,
-                        CCM_DDS_Topic_i (topic.in ()),
-                        CORBA::NO_MEMORY ());
-      return retval._retn ();
-#endif
-    }
+      // Implementation skeleton constructor
+      RTI_ContentFilteredTopic_i::RTI_ContentFilteredTopic_i (void)
+        : impl_ (0)
+      {
+      }
+
+      // Implementation skeleton destructor
+      RTI_ContentFilteredTopic_i::~RTI_ContentFilteredTopic_i (void)
+      {
+      }
+
+      char *
+      RTI_ContentFilteredTopic_i::get_filter_expression (void)
+      {
+        CIAO_TRACE ("RTI_ContentFilteredTopic_i::get_filter_expression");
+        return CORBA::string_dup (this->impl ()->get_filter_expression ());
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_ContentFilteredTopic_i::get_expression_parameters (
+        ::DDS::StringSeq & expression_parameters)
+      {
+        CIAO_TRACE ("RTI_ContentFilteredTopic_i::get_expression_parameters");
+        DDS_StringSeq parameters;
+        ::DDS::ReturnCode_t retval = this->impl ()->get_expression_parameters (
+                                                                    parameters);
+        expression_parameters <<= parameters;
+        return retval;
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_ContentFilteredTopic_i::set_expression_parameters (
+        const ::DDS::StringSeq & expression_parameters)
+      {
+        CIAO_TRACE ("RTI_ContentFilteredTopic_i::set_expression_parameters");
+
+        DDS_StringSeq parameters;
+        parameters <<= expression_parameters;
+
+        return this->impl ()->set_expression_parameters (parameters);
+      }
+
+      ::DDS::Topic_ptr
+      RTI_ContentFilteredTopic_i::get_related_topic (void)
+      {
+        CIAO_TRACE ("RTI_ContentFilteredTopic_i::get_related_topic");
+        DDSTopic *topic = this->impl ()->get_related_topic ();
+        ::DDS::Topic_var retval = new RTI_Topic_i ();
+        RTI_Topic_i *rti_topic = dynamic_cast < RTI_Topic_i *> (retval.in ());
+        rti_topic->set_impl (topic);
+        return retval._retn ();
+      }
+
+      char *
+      RTI_ContentFilteredTopic_i::get_type_name (void)
+      {
+        return CORBA::string_dup (this->impl ()->get_type_name ());
+      }
+
+      char *
+      RTI_ContentFilteredTopic_i::get_name (void)
+      {
+        return CORBA::string_dup (this->impl ()->get_name ());
+      }
+
+      ::DDS::DomainParticipant_ptr
+      RTI_ContentFilteredTopic_i::get_participant (void)
+      {
+        DDSDomainParticipant* p = this->impl ()->get_participant ();
+        ::DDS::DomainParticipant_var retval = new RTI_DomainParticipant_i ();
+        RTI_DomainParticipant_i *rti_dp = dynamic_cast < RTI_DomainParticipant_i *> (retval.in ());
+        rti_dp->set_impl (p);
+        return retval._retn ();
+      }
+
+      DDSContentFilteredTopic *
+      RTI_ContentFilteredTopic_i::get_impl (void)
+      {
+        return this->impl_;
+      }
+
+      void
+      RTI_ContentFilteredTopic_i::set_impl (DDSContentFilteredTopic * dw)
+      {
+        this->impl_ = dw;
+      }
+
+      DDSContentFilteredTopic *
+      RTI_ContentFilteredTopic_i::impl (void)
+      {
+        if (!this->impl_)
+          {
+            throw ::CORBA::BAD_INV_ORDER ();
+          }
+        return this->impl_;
+      }
 
-    char *
-    CCM_DDS_ContentFilteredTopic_i::get_type_name (void)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      return CORBA::string_dup (this->impl ()->get_type_name ());
-#else
-      return this->impl ()->get_type_name ();
-#endif
-    }
-
-    char *
-    CCM_DDS_ContentFilteredTopic_i::get_name (void)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      return CORBA::string_dup (this->impl ()->get_name ());
-#else
-      return this->impl ()->get_name ();
-#endif
-    }
-
-    ::DDS::DomainParticipant_ptr
-    CCM_DDS_ContentFilteredTopic_i::get_participant (void)
-    {
-      ::DDS::DomainParticipant_var retval = ::DDS::DomainParticipant::_nil ();
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      DDSDomainParticipant* p = this->impl ()->get_participant ();
-      ACE_NEW_THROW_EX (retval,
-                        CCM_DDS_DomainParticipant_i (p),
-                        CORBA::NO_MEMORY ());
-#else
-      ::DDS::DomainParticipant_var p = this->impl ()->get_participant ();
-      ACE_NEW_THROW_EX (retval,
-                        CCM_DDS_DomainParticipant_i (p.in ()),
-                        CORBA::NO_MEMORY ());
-#endif
-      return retval._retn ();
-    }
-
-    DDSContentFilteredTopic *
-    CCM_DDS_ContentFilteredTopic_i::get_impl (void)
-    {
-      return this->impl_;
-    }
-
-    void
-    CCM_DDS_ContentFilteredTopic_i::set_impl (DDSContentFilteredTopic * dw)
-    {
-      this->impl_ = dw;
-    }
-
-    DDSContentFilteredTopic *
-    CCM_DDS_ContentFilteredTopic_i::impl (void)
-    {
-      if (!this->impl_)
-        {
-          throw ::CORBA::BAD_INV_ORDER ();
-        }
-      return this->impl_;
     }
   }
 }
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.h b/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.h
index 13208ca50e4..9a7ebee2ceb 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/ContentFilteredTopic.h
@@ -11,60 +11,59 @@
 
 #include "DomainParticipant.h"
 
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h"
 #include "tao/LocalObject.h"
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::ContentFilteredTopic DDSContentFilteredTopic;
-#endif
-
 namespace CIAO
 {
   namespace DDS4CCM
   {
-    class DDS4CCM_NDDS_IMPL_Export CCM_DDS_ContentFilteredTopic_i :
-      public virtual ::DDS::CCM_ContentFilteredTopic,
-      public virtual ::CORBA::LocalObject
+    namespace RTI
     {
-    public:
-      /// Constructor
-      CCM_DDS_ContentFilteredTopic_i (DDSContentFilteredTopic * dw);
+      class DDS4CCM_NDDS_IMPL_Export RTI_ContentFilteredTopic_i :
+        public virtual ::DDS::CCM_ContentFilteredTopic,
+        public virtual ::CORBA::LocalObject
+      {
+      public:
+        // Constructor
+        RTI_ContentFilteredTopic_i (void);
 
-      /// Destructor
-      virtual ~CCM_DDS_ContentFilteredTopic_i (void);
+        // Destructor
+        virtual ~RTI_ContentFilteredTopic_i (void);
 
-      virtual char * get_filter_expression (void);
+        virtual
+        char * get_filter_expression (void);
 
-      virtual
-      ::DDS::ReturnCode_t get_expression_parameters (
-          ::DDS::StringSeq & expression_parameters);
+        virtual
+        ::DDS::ReturnCode_t get_expression_parameters (
+            ::DDS::StringSeq & expression_parameters);
 
-      virtual
-      ::DDS::ReturnCode_t set_expression_parameters (
-          const ::DDS::StringSeq & expression_parameters);
+        virtual
+        ::DDS::ReturnCode_t set_expression_parameters (
+            const ::DDS::StringSeq & expression_parameters);
 
-      virtual
-      ::DDS::Topic_ptr get_related_topic (void);
+        virtual
+        ::DDS::Topic_ptr get_related_topic (void);
 
-      virtual
-      char * get_type_name (void);
+        virtual
+        char * get_type_name (void);
 
-      virtual
-      char * get_name (void);
+        virtual
+        char * get_name (void);
 
-      virtual
-      ::DDS::DomainParticipant_ptr get_participant (void);
+        virtual
+        ::DDS::DomainParticipant_ptr get_participant (void);
 
-      DDSContentFilteredTopic * get_impl (void);
+        DDSContentFilteredTopic * get_impl (void);
 
-      void set_impl (DDSContentFilteredTopic * dw);
+        void set_impl (DDSContentFilteredTopic * dw);
 
-    private:
-      DDSContentFilteredTopic * impl_;
+      private:
+        DDSContentFilteredTopic * impl_;
 
-      DDSContentFilteredTopic * impl (void);
-    };
+        DDSContentFilteredTopic * impl (void);
+      };
+    }
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS4CCM_Traits.h b/CIAO/connectors/dds4ccm/impl/ndds/DDS4CCM_Traits.h
index 5e4fcb003a4..b86f48a8e5c 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DDS4CCM_Traits.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS4CCM_Traits.h
@@ -7,8 +7,10 @@
  * Traits necessary for various bits and pieces of the DDS4CCM infrastructure.
  */
 
-#ifndef DDS4CCM_TRAITS_H
-#define DDS4CCM_TRAITS_H
+#ifndef NDDS_TRAITS_H
+#define NDDS_TRAITS_H
+
+#include "ndds/ndds_cpp.h"
 
 namespace CIAO
 {
@@ -66,4 +68,4 @@ namespace CIAO
     }
   }
 }
-#endif /* DDS4CCM_TRAITS_H */
+#endif
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDSCallbackStatusHandler.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DDSCallbackStatusHandler.cpp
deleted file mode 100644
index 4cd20753f9f..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/DDSCallbackStatusHandler.cpp
+++ /dev/null
@@ -1,263 +0,0 @@
-// $Id$
-
-#include "dds4ccm/impl/ndds/Utils.h"
-#include "dds4ccm/impl/ndds/DDSCallbackStatusHandler.h"
-#include "dds4ccm/impl/logger/Log_Macros.h"
-
-//============================================================
-// On_Unexpected_Status_Handler
-//============================================================
-namespace CIAO
-{
-  namespace DDS4CCM
-  {
-    OnUnexpectedStatusHandler::OnUnexpectedStatusHandler (
-      ::CCM_DDS::ConnectorStatusListener_ptr error_listener,
-      ::DDS::Entity_ptr entity,
-      ::DDS::StatusKind status_kind) :
-        error_listener_ (::CCM_DDS::ConnectorStatusListener::_duplicate (error_listener)),
-        entity_ (::DDS::Entity::_duplicate (entity)),
-        status_kind_ (status_kind)
-    {
-      this->reference_counting_policy ().value
-        (ACE_Event_Handler::Reference_Counting_Policy::ENABLED);
-    }
-
-    OnUnexpectedStatusHandler::~OnUnexpectedStatusHandler (void)
-    {
-    }
-
-    int
-    OnUnexpectedStatusHandler::handle_exception (ACE_HANDLE)
-    {
-      try
-        {
-          this->error_listener_->on_unexpected_status (this->entity_, this->status_kind_);
-        }
-      catch (...)
-        {
-        }
-      return 0;
-    }
-
-    //============================================================
-    // OnRequestedOncompatibleQosHandler
-    //============================================================
-    OnRequestedOncompatibleQosHandler::OnRequestedOncompatibleQosHandler (
-      ::CCM_DDS::ConnectorStatusListener_ptr csl,
-      ::DDS::DataReader_ptr dr,
-      const ::DDS::RequestedIncompatibleQosStatus &status) :
-        csl_ (::CCM_DDS::ConnectorStatusListener::_duplicate (csl)),
-        dr_ (::DDS::DataReader::_duplicate (dr)),
-        status_ (status)
-    {
-      this->reference_counting_policy ().value
-        (ACE_Event_Handler::Reference_Counting_Policy::ENABLED);
-    }
-
-    OnRequestedOncompatibleQosHandler::~OnRequestedOncompatibleQosHandler (void)
-    {
-    }
-
-    int
-    OnRequestedOncompatibleQosHandler::handle_exception (ACE_HANDLE)
-    {
-      try
-        {
-          this->csl_->on_requested_incompatible_qos (this->dr_, this->status_);
-        }
-      catch (...)
-        {
-        }
-      return 0;
-    }
-
-    //============================================================
-    // OnSampleRejectedHandler
-    //============================================================
-    OnSampleRejectedHandler::OnSampleRejectedHandler (
-      ::CCM_DDS::ConnectorStatusListener_ptr csl,
-      ::DDS::DataReader_ptr dr,
-      const ::DDS::SampleRejectedStatus &status) :
-        csl_ (::CCM_DDS::ConnectorStatusListener::_duplicate (csl)),
-        dr_ (::DDS::DataReader::_duplicate (dr)),
-        status_ (status)
-    {
-      this->reference_counting_policy ().value
-        (ACE_Event_Handler::Reference_Counting_Policy::ENABLED);
-    }
-
-    OnSampleRejectedHandler::~OnSampleRejectedHandler (void)
-    {
-    }
-
-    int
-    OnSampleRejectedHandler::handle_exception (ACE_HANDLE)
-    {
-      try
-        {
-          this->csl_->on_sample_rejected (this->dr_, this->status_);
-        }
-      catch (...)
-        {
-        }
-      return 0;
-    }
-
-    //============================================================
-    // OnInconsistentTopicHandler
-    //============================================================
-    OnInconsistentTopicHandler::OnInconsistentTopicHandler (
-      ::CCM_DDS::ConnectorStatusListener_ptr csl,
-      ::DDS::Topic_ptr tp,
-      const ::DDS::InconsistentTopicStatus &status) :
-        csl_ (::CCM_DDS::ConnectorStatusListener::_duplicate (csl)),
-        tp_ (::DDS::Topic::_duplicate (tp)),
-        status_ (status)
-    {
-      this->reference_counting_policy ().value
-        (ACE_Event_Handler::Reference_Counting_Policy::ENABLED);
-    }
-
-    OnInconsistentTopicHandler::~OnInconsistentTopicHandler (void)
-    {
-    }
-
-    int
-    OnInconsistentTopicHandler::handle_exception (ACE_HANDLE)
-    {
-      try
-        {
-          this->csl_->on_inconsistent_topic (this->tp_, this->status_);
-        }
-      catch (...)
-        {
-        }
-      return 0;
-    }
-
-    //============================================================
-    // OnOfferedDeadlineMissedHandler
-    //============================================================
-    OnOfferedDeadlineMissedHandler::OnOfferedDeadlineMissedHandler (
-      ::CCM_DDS::ConnectorStatusListener_ptr csl,
-      ::DDS::DataWriter_ptr dw,
-      const ::DDS::OfferedDeadlineMissedStatus &status) :
-        csl_ (::CCM_DDS::ConnectorStatusListener::_duplicate (csl)),
-        dw_ (::DDS::DataWriter::_duplicate (dw)),
-        status_ (status)
-    {
-      this->reference_counting_policy ().value
-        (ACE_Event_Handler::Reference_Counting_Policy::ENABLED);
-    }
-
-    OnOfferedDeadlineMissedHandler::~OnOfferedDeadlineMissedHandler (void)
-    {
-    }
-
-    int
-    OnOfferedDeadlineMissedHandler::handle_exception (ACE_HANDLE)
-    {
-      try
-        {
-          this->csl_->on_offered_deadline_missed (this->dw_, this->status_);
-        }
-      catch (...)
-        {
-        }
-      return 0;
-    }
-
-    //============================================================
-    // OnOfferedIncompatibleQoSHandler
-    //============================================================
-    OnOfferedIncompatibleQoSHandler::OnOfferedIncompatibleQoSHandler (
-      ::CCM_DDS::ConnectorStatusListener_ptr csl,
-      ::DDS::DataWriter_ptr dw,
-      const ::DDS::OfferedIncompatibleQosStatus &status) :
-        csl_ (::CCM_DDS::ConnectorStatusListener::_duplicate (csl)),
-        dw_ (::DDS::DataWriter::_duplicate (dw)),
-        status_ (status)
-    {
-      this->reference_counting_policy ().value
-        (ACE_Event_Handler::Reference_Counting_Policy::ENABLED);
-    }
-
-    OnOfferedIncompatibleQoSHandler::~OnOfferedIncompatibleQoSHandler (void)
-    {
-    }
-
-    int
-    OnOfferedIncompatibleQoSHandler::handle_exception (ACE_HANDLE)
-    {
-      try
-        {
-          this->csl_->on_offered_incompatible_qos (this->dw_, this->status_);
-        }
-      catch (...)
-        {
-        }
-      return 0;
-    }
-
-    //============================================================
-    // OnRequestedDeadlineMissedHandler
-    //============================================================
-    OnRequestedDeadlineMissedHandler::OnRequestedDeadlineMissedHandler (
-      ::CCM_DDS::PortStatusListener_ptr psl,
-      ::DDS::DataReader_ptr dr,
-      const ::DDS::RequestedDeadlineMissedStatus & status) :
-        psl_ (::CCM_DDS::PortStatusListener::_duplicate (psl)),
-        dr_ (::DDS::DataReader::_duplicate (dr)),
-        status_ (status)
-    {
-    }
-
-    OnRequestedDeadlineMissedHandler::~OnRequestedDeadlineMissedHandler ()
-    {
-    }
-
-    int
-    OnRequestedDeadlineMissedHandler::handle_exception (ACE_HANDLE)
-    {
-      try
-        {
-          this->psl_->on_requested_deadline_missed (this->dr_, this->status_);
-        }
-      catch (...)
-        {
-        }
-      return 0;
-    }
-
-    //============================================================
-    // OnSampleLostHandler
-    //============================================================
-    OnSampleLostHandler::OnSampleLostHandler (
-      ::CCM_DDS::PortStatusListener_ptr psl,
-      ::DDS::DataReader_ptr dr,
-      const ::DDS::SampleLostStatus & status) :
-        psl_ (::CCM_DDS::PortStatusListener::_duplicate (psl)),
-        dr_ (::DDS::DataReader::_duplicate (dr)),
-        status_ (status)
-    {
-    }
-
-    OnSampleLostHandler::~OnSampleLostHandler ()
-    {
-    }
-
-    int
-    OnSampleLostHandler::handle_exception (ACE_HANDLE)
-    {
-      try
-        {
-          this->psl_->on_sample_lost (this->dr_, this->status_);
-        }
-      catch (...)
-        {
-        }
-      return 0;
-    }
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDSCallbackStatusHandler.h b/CIAO/connectors/dds4ccm/impl/ndds/DDSCallbackStatusHandler.h
deleted file mode 100644
index b2d7d525001..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/DDSCallbackStatusHandler.h
+++ /dev/null
@@ -1,155 +0,0 @@
-// $Id$
-/**
- * @author Johnny Willemsen  <jwillemsen@remedy.nl>
- *
- * $Id$
- *
- * Eventhandler on orb thread, handling the
- * received data from DDS.
- */
-
-#ifndef CIAO_DDS_CALLBACK_STATUS_HANDLER
-#define CIAO_DDS_CALLBACK_STATUS_HANDLER
-
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "dds4ccm/idl/dds4ccm_ConnectorStatusListenerC.h"
-#include "dds4ccm/idl/dds4ccm_PortStatusListenerC.h"
-#include "ace/Event_Handler.h"
-#include "dds4ccm_ndds_impl_export.h"
-
-namespace CIAO
-{
-  namespace DDS4CCM
-  {
-    class DDS4CCM_NDDS_IMPL_Export OnUnexpectedStatusHandler :
-      public ACE_Event_Handler
-    {
-      public:
-        OnUnexpectedStatusHandler (
-            ::CCM_DDS::ConnectorStatusListener_ptr error_listener,
-            ::DDS::Entity_ptr entity,
-            ::DDS::StatusKind status_kind);
-        virtual ~OnUnexpectedStatusHandler ();
-
-        virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
-      private:
-        ::CCM_DDS::ConnectorStatusListener_var error_listener_;
-        ::DDS::Entity_var entity_;
-        ::DDS::StatusKind status_kind_;
-    };
-
-    class DDS4CCM_NDDS_IMPL_Export OnRequestedOncompatibleQosHandler :
-      public ACE_Event_Handler
-    {
-      public:
-        OnRequestedOncompatibleQosHandler (
-            ::CCM_DDS::ConnectorStatusListener_ptr csl,
-            ::DDS::DataReader_ptr dr,
-            const ::DDS::RequestedIncompatibleQosStatus &status);
-        virtual ~OnRequestedOncompatibleQosHandler ();
-        virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
-      private:
-        ::CCM_DDS::ConnectorStatusListener_var csl_;
-        ::DDS::DataReader_var dr_;
-        ::DDS::RequestedIncompatibleQosStatus const status_;
-    };
-
-    class DDS4CCM_NDDS_IMPL_Export OnSampleRejectedHandler :
-      public ACE_Event_Handler
-    {
-      public:
-        OnSampleRejectedHandler (
-            ::CCM_DDS::ConnectorStatusListener_ptr csl,
-            ::DDS::DataReader_ptr dr,
-            const ::DDS::SampleRejectedStatus &status);
-        virtual ~OnSampleRejectedHandler ();
-        virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
-      private:
-        ::CCM_DDS::ConnectorStatusListener_var csl_;
-        ::DDS::DataReader_var dr_;
-        ::DDS::SampleRejectedStatus const status_;
-    };
-
-    class DDS4CCM_NDDS_IMPL_Export OnInconsistentTopicHandler :
-      public ACE_Event_Handler
-    {
-      public:
-        OnInconsistentTopicHandler (
-            ::CCM_DDS::ConnectorStatusListener_ptr csl,
-            ::DDS::Topic_ptr tp,
-            const ::DDS::InconsistentTopicStatus &status);
-        virtual ~OnInconsistentTopicHandler ();
-        virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
-      private:
-        ::CCM_DDS::ConnectorStatusListener_var csl_;
-        ::DDS::Topic_var tp_;
-        ::DDS::InconsistentTopicStatus const status_;
-    };
-
-    class DDS4CCM_NDDS_IMPL_Export OnOfferedDeadlineMissedHandler :
-      public ACE_Event_Handler
-    {
-      public:
-        OnOfferedDeadlineMissedHandler (
-            ::CCM_DDS::ConnectorStatusListener_ptr csl,
-            ::DDS::DataWriter_ptr dw,
-            const ::DDS::OfferedDeadlineMissedStatus &status);
-        virtual ~OnOfferedDeadlineMissedHandler ();
-        virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
-      private:
-        ::CCM_DDS::ConnectorStatusListener_var csl_;
-        ::DDS::DataWriter_var dw_;
-        ::DDS::OfferedDeadlineMissedStatus const status_;
-    };
-
-    class DDS4CCM_NDDS_IMPL_Export OnOfferedIncompatibleQoSHandler :
-      public ACE_Event_Handler
-    {
-      public:
-        OnOfferedIncompatibleQoSHandler (
-            ::CCM_DDS::ConnectorStatusListener_ptr csl,
-            ::DDS::DataWriter_ptr dw,
-            const ::DDS::OfferedIncompatibleQosStatus &status);
-        virtual ~OnOfferedIncompatibleQoSHandler ();
-        virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
-      private:
-        ::CCM_DDS::ConnectorStatusListener_var csl_;
-        ::DDS::DataWriter_var dw_;
-        ::DDS::OfferedIncompatibleQosStatus const status_;
-    };
-
-    class DDS4CCM_NDDS_IMPL_Export OnRequestedDeadlineMissedHandler :
-      public ACE_Event_Handler
-    {
-      public:
-        OnRequestedDeadlineMissedHandler (
-            ::CCM_DDS::PortStatusListener_ptr psl,
-            ::DDS::DataReader_ptr dr,
-            const ::DDS::RequestedDeadlineMissedStatus &status);
-        virtual ~OnRequestedDeadlineMissedHandler ();
-        virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
-      private:
-        ::CCM_DDS::PortStatusListener_var psl_;
-        ::DDS::DataReader_var dr_;
-        ::DDS::RequestedDeadlineMissedStatus const status_;
-    };
-
-    class DDS4CCM_NDDS_IMPL_Export OnSampleLostHandler :
-      public ACE_Event_Handler
-    {
-      public:
-        OnSampleLostHandler (
-            ::CCM_DDS::PortStatusListener_ptr psl,
-            ::DDS::DataReader_ptr dr,
-            const ::DDS::SampleLostStatus &status);
-        virtual ~OnSampleLostHandler ();
-        virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
-      private:
-        ::CCM_DDS::PortStatusListener_var psl_;
-        ::DDS::DataReader_var dr_;
-        ::DDS::SampleLostStatus const status_;
-    };
-  }
-}
-
-#endif /* CIAO_DDS_CALLBACK_STATUS_HANDLER */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp
index 2b28c2ac952..7c7d9034aa9 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp
@@ -1,9 +1,10 @@
 // -*- C++ -*-
 // $Id$
 
-#include "dds4ccm/impl/logger/Log_Macros.h"
+#include "ciao/Logger/Log_Macros.h"
 #include "dds4ccm/impl/ndds/DomainParticipantFactory.h"
 #include "dds4ccm/impl/ndds/DomainParticipant.h"
+#include "dds4ccm/impl/ndds/DomainParticipantListener_T.h"
 #include "ace/Tokenizer_T.h"
 #include "ace/Env_Value_T.h"
 
@@ -27,7 +28,7 @@ template <typename DDS_TYPE, typename CCM_TYPE>
 ::DDS::DomainId_t
 DDS_Base_Connector_T<DDS_TYPE, CCM_TYPE>::domain_id (void)
 {
-  DDS4CCM_TRACE ("DDS_Base_Connector_T<DDS_TYPE, CCM_TYPE>::domain_id");
+  CIAO_TRACE ("DDS_Base_Connector_T<DDS_TYPE, CCM_TYPE>::domain_id");
 
   return this->domain_id_;
 }
@@ -37,7 +38,7 @@ void
 DDS_Base_Connector_T<DDS_TYPE, CCM_TYPE>::domain_id (
   ::DDS::DomainId_t domain_id)
 {
-  DDS4CCM_TRACE ("DDS_Base_Connector_T<DDS_TYPE, CCM_TYPE>::domain_id");
+  CIAO_TRACE ("DDS_Base_Connector_T<DDS_TYPE, CCM_TYPE>::domain_id");
 
   if (this->configuration_complete_)
     {
@@ -53,7 +54,7 @@ template <typename DDS_TYPE, typename CCM_TYPE>
 char *
 DDS_Base_Connector_T<DDS_TYPE, CCM_TYPE>::qos_profile (void)
 {
-  DDS4CCM_TRACE ("DDS_Base_Connector_T<DDS_TYPE, CCM_TYPE>::qos_profile");
+  CIAO_TRACE ("DDS_Base_Connector_T<DDS_TYPE, CCM_TYPE>::qos_profile");
 
   return CORBA::string_dup (this->qos_profile_.in ());
 }
@@ -63,7 +64,7 @@ void
 DDS_Base_Connector_T<DDS_TYPE, CCM_TYPE>::qos_profile (
   const char * qos_profile)
 {
-  DDS4CCM_TRACE ("DDS_Base_Connector_T<DDS_TYPE, CCM_TYPE>::qos_profile");
+  CIAO_TRACE ("DDS_Base_Connector_T<DDS_TYPE, CCM_TYPE>::qos_profile");
 
   if (this->configuration_complete_)
     {
@@ -79,9 +80,8 @@ template <typename DDS_TYPE, typename CCM_TYPE>
 void
 DDS_Base_Connector_T<DDS_TYPE, CCM_TYPE>::init_default_domain (void)
 {
-  DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "DDS_Base_Connector_T::init_default_domain - "
-                "Configuring default domain <%d>\n",
-                this->domain_id_));
+  CIAO_DEBUG (9, (LM_TRACE, CLINFO "DDS_Base_Connector_T::init_default_domain - "
+                "Configuring default domain\n"));
   try
     {
       ACE_Env_Value<int> verbosity (ACE_TEXT("DDS4CCM_NDDS_LOG_VERBOSITY"),
@@ -135,9 +135,8 @@ DDS_Base_Connector_T<DDS_TYPE, CCM_TYPE>::init_default_domain (void)
     }
   catch (...)
     {
-      DDS4CCM_ERROR (1, (LM_ERROR, "DDS_Base_Connector_T::init_default_domain: "
-                                "Caught unknown C++ exception while configuring default domain <%d>\n",
-                                this->domain_id_));
+      CIAO_ERROR (1, (LM_ERROR, "DDS_Base_Connector_T::init_default_domain: "
+                                "Caught unknown C++ exception while configuring default domain\n"));
       throw CORBA::INTERNAL ();
     }
 }
@@ -147,7 +146,7 @@ void
 DDS_Base_Connector_T<DDS_TYPE, CCM_TYPE>::set_session_context (
   ::Components::SessionContext_ptr ctx)
 {
-  DDS4CCM_TRACE ("DDS_Base_Connector_T<DDS_TYPE, CCM_TYPE>::set_session_context");
+  CIAO_TRACE ("DDS_Base_Connector_T<DDS_TYPE, CCM_TYPE>::set_session_context");
 
   typename CCM_TYPE::context_type::_var_type lctx =
     CCM_TYPE::context_type::_narrow (ctx);
@@ -164,7 +163,7 @@ template <typename DDS_TYPE, typename CCM_TYPE>
 void
 DDS_Base_Connector_T<DDS_TYPE, CCM_TYPE>::configuration_complete (void)
 {
-  DDS4CCM_TRACE ("DDS_Base_Connector_T<DDS_TYPE, CCM_TYPE>::configuration_complete");
+  CIAO_TRACE ("DDS_Base_Connector_T<DDS_TYPE, CCM_TYPE>::configuration_complete");
   this->init_default_domain ();
   this->configuration_complete_ = true;
 }
@@ -173,16 +172,14 @@ template <typename DDS_TYPE, typename CCM_TYPE>
 void
 DDS_Base_Connector_T<DDS_TYPE, CCM_TYPE>::ccm_activate (void)
 {
-  DDS4CCM_TRACE ("DDS_Base_Connector_T<DDS_TYPE, CCM_TYPE>::ccm_activate");
+  CIAO_TRACE ("DDS_Base_Connector_T<DDS_TYPE, CCM_TYPE>::ccm_activate");
   try
     {
       if (CORBA::is_nil (this->domainparticipantlistener_.in ()))
         {
-          ACE_NEW_THROW_EX (this->domainparticipantlistener_,
-                            DomainParticipantListener(
-                              this->context_->
-                                get_connection_error_listener ()),
-                            CORBA::NO_MEMORY ());
+          this->domainparticipantlistener_ = new ::CIAO::DDS4CCM::DomainParticipantListener_T
+            <DDS_TYPE, CCM_TYPE> (
+              this->context_->get_connection_error_listener ());
         }
       this->domain_participant_->set_listener (
         this->domainparticipantlistener_.in (),
@@ -190,7 +187,7 @@ DDS_Base_Connector_T<DDS_TYPE, CCM_TYPE>::ccm_activate (void)
     }
   catch (...)
     {
-      DDS4CCM_ERROR (1, (LM_ERROR, "DDS_Base_Connector_T::ccm_activate: "
+      CIAO_ERROR (1, (LM_ERROR, "DDS_Base_Connector_T::ccm_activate: "
                                 "Caught unknown C++ exception while configuring default domain\n"));
       throw CORBA::INTERNAL ();
     }
@@ -200,7 +197,7 @@ template <typename DDS_TYPE, typename CCM_TYPE>
 void
 DDS_Base_Connector_T<DDS_TYPE, CCM_TYPE>::ccm_passivate (void)
 {
-  DDS4CCM_TRACE ("DDS_Base_Connector_T<DDS_TYPE, CCM_TYPE>::ccm_passivate");
+  CIAO_TRACE ("DDS_Base_Connector_T<DDS_TYPE, CCM_TYPE>::ccm_passivate");
   try
     {
       this->domain_participant_->set_listener (
@@ -210,7 +207,7 @@ DDS_Base_Connector_T<DDS_TYPE, CCM_TYPE>::ccm_passivate (void)
     }
   catch (...)
     {
-      DDS4CCM_ERROR (1, (LM_ERROR, "DDS_Base_Connector_T::ccm_passivate: "
+      CIAO_ERROR (1, (LM_ERROR, "DDS_Base_Connector_T::ccm_passivate: "
                                 "Caught unknown C++ exception while configuring default domain\n"));
       throw CORBA::INTERNAL ();
     }
@@ -220,7 +217,7 @@ template <typename DDS_TYPE, typename CCM_TYPE>
 void
 DDS_Base_Connector_T<DDS_TYPE, CCM_TYPE>::ccm_remove (void)
 {
-  DDS4CCM_TRACE ("DDS_Base_Connector_T<DDS_TYPE, CCM_TYPE>::ccm_remove");
+  CIAO_TRACE ("DDS_Base_Connector_T<DDS_TYPE, CCM_TYPE>::ccm_remove");
 
   DPFACTORY->delete_participant (
     this->domain_participant_.in ());
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.h
index cb798ddf337..aff1416dfee 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Base_Connector_T.h
@@ -8,8 +8,6 @@
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "ace/Copy_Disabled.h"
-#include "tao/LocalObject.h"
-#include "dds4ccm/impl/ndds/DomainParticipantListener_T.h"
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 class DDS_Base_Connector_T
@@ -50,8 +48,6 @@ protected:
   typename CCM_TYPE::context_type::_var_type context_;
 
   ::CCM_DDS::ConnectorStatusListener_var error_listener_;
-
-  typedef ::CIAO::DDS4CCM::DomainParticipantListener_T<DDS_TYPE, CCM_TYPE> DomainParticipantListener;
 };
 
 #include "dds4ccm/impl/ndds/DDS_Base_Connector_T.cpp"
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp
index a5cad0cbda6..54e3430133c 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.cpp
@@ -9,96 +9,96 @@
 #include "dds4ccm/impl/ndds/DataListenerControl_T.h"
 #include "dds4ccm/impl/ndds/PortStatusListener_T.h"
 
-#include "dds4ccm/impl/logger/Log_Macros.h"
+#include "ciao/Logger/Log_Macros.h"
 
-template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
-DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED>::DDS_Event_Connector_T (void) :
+template <typename DDS_TYPE, typename CCM_TYPE>
+DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE>::DDS_Event_Connector_T (void) :
     DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>()
 {
 }
 
-template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
-DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED>::~DDS_Event_Connector_T (void)
+template <typename DDS_TYPE, typename CCM_TYPE>
+DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE>::~DDS_Event_Connector_T (void)
 {
 }
 
-template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
+template <typename DDS_TYPE, typename CCM_TYPE>
 typename CCM_TYPE::writer_type::_ptr_type
-DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED>::get_supplier_data (void)
+DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE>::get_supplier_data (void)
 {
-  DDS4CCM_TRACE ("DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED>::get_supplier_data");
+  CIAO_TRACE ("DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE>::get_supplier_data");
 
   return this->supplier_.get_data ();
 }
 
-template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
+template <typename DDS_TYPE, typename CCM_TYPE>
 ::DDS::CCM_DataWriter_ptr
-DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED>::get_supplier_dds_entity (void)
+DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE>::get_supplier_dds_entity (void)
 {
-  DDS4CCM_TRACE ("DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED>::get_supplier_dds_entity");
+  CIAO_TRACE ("DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE>::get_supplier_dds_entity");
 
   return this->supplier_.get_dds_entity ();
 }
 
-template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
+template <typename DDS_TYPE, typename CCM_TYPE>
 typename CCM_TYPE::getter_type::_ptr_type
-DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED>::get_pull_consumer_fresh_data (void)
+DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE>::get_pull_consumer_fresh_data (void)
 {
-  DDS4CCM_TRACE ("DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED>::get_pull_consumer_fresh_data");
+  CIAO_TRACE ("DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE>::get_pull_consumer_fresh_data");
 
   return this->pull_consumer_.get_fresh_data ();
 }
 
-template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
+template <typename DDS_TYPE, typename CCM_TYPE>
 typename CCM_TYPE::reader_type::_ptr_type
-DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED>::get_push_consumer_data (void)
+DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE>::get_push_consumer_data (void)
 {
-  DDS4CCM_TRACE ("DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED>::get_push_consumer_data");
+  CIAO_TRACE ("DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE>::get_push_consumer_data");
 
   return this->push_consumer_.get_data ();
 }
 
-template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
+template <typename DDS_TYPE, typename CCM_TYPE>
 typename CCM_TYPE::reader_type::_ptr_type
-DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED>::get_pull_consumer_data (void)
+DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE>::get_pull_consumer_data (void)
 {
-  DDS4CCM_TRACE ("DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED>::get_pull_consumer_data");
+  CIAO_TRACE ("DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE>::get_pull_consumer_data");
 
   return this->pull_consumer_.get_data ();
 }
 
-template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
+template <typename DDS_TYPE, typename CCM_TYPE>
 ::CCM_DDS::CCM_DataListenerControl_ptr
-DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED>::get_push_consumer_data_control (void)
+DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE>::get_push_consumer_data_control (void)
 {
-  DDS4CCM_TRACE ("DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED>::get_push_consumer_data_control");
+  CIAO_TRACE ("DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE>::get_push_consumer_data_control");
 
   return this->push_consumer_.get_data_control ();
 }
 
-template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
+template <typename DDS_TYPE, typename CCM_TYPE>
 ::DDS::CCM_DataReader_ptr
-DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED>::get_pull_consumer_dds_entity (void)
+DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE>::get_pull_consumer_dds_entity (void)
 {
-  DDS4CCM_TRACE ("DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED>::get_pull_consumer_dds_entity");
+  CIAO_TRACE ("DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE>::get_pull_consumer_dds_entity");
 
   return this->pull_consumer_.get_dds_entity ();
 }
 
-template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
+template <typename DDS_TYPE, typename CCM_TYPE>
 ::DDS::CCM_DataReader_ptr
-DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED>::get_push_consumer_dds_entity (void)
+DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE>::get_push_consumer_dds_entity (void)
 {
-  DDS4CCM_TRACE ("DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED>::get_push_consumer_dds_entity");
+  CIAO_TRACE ("DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE>::get_push_consumer_dds_entity");
 
   return this->push_consumer_.get_dds_entity ();
 }
 
-template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
+template <typename DDS_TYPE, typename CCM_TYPE>
 void
-DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED>::configuration_complete (void)
+DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE>::configuration_complete (void)
 {
-  DDS4CCM_TRACE ("DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED>::configuration_complete");
+  CIAO_TRACE ("DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE>::configuration_complete");
 
   DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::configuration_complete ();
 
@@ -121,34 +121,28 @@ DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED>::configuration_complete (void)
     this->profile_name_);
 }
 
-template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
+template <typename DDS_TYPE, typename CCM_TYPE>
 void
-DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED>::ccm_activate (void)
+DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE>::ccm_activate (void)
 {
-  DDS4CCM_TRACE ("DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED>::ccm_activate");
-  ACE_Reactor* reactor = 0;
-#if defined (CIAO_DDS4CCM_CONTEXT_SWITCH) && (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-  reactor = this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ();
-#endif
-  DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::ccm_activate (reactor);
+  CIAO_TRACE ("DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE>::ccm_activate");
+  DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::ccm_activate ();
 
   this->push_consumer_.activate (
     this->context_->get_connection_push_consumer_data_listener (),
-    this->context_->get_connection_push_consumer_status (),
-    reactor);
+    this->context_->get_connection_push_consumer_status ());
 
   this->supplier_.activate ();
 
   this->pull_consumer_.activate (
-    this->context_->get_connection_pull_consumer_status (),
-    reactor);
+    this->context_->get_connection_pull_consumer_status ());
 }
 
-template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
+template <typename DDS_TYPE, typename CCM_TYPE>
 void
-DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED>::ccm_passivate (void)
+DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE>::ccm_passivate (void)
 {
-  DDS4CCM_TRACE ("DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED>::ccm_passivate");
+  CIAO_TRACE ("DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE>::ccm_passivate");
 
   this->push_consumer_.passivate ();
   this->supplier_.passivate ();
@@ -156,11 +150,11 @@ DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED>::ccm_passivate (void)
   DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::ccm_passivate ();
 }
 
-template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
+template <typename DDS_TYPE, typename CCM_TYPE>
 void
-DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED>::ccm_remove (void)
+DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE>::ccm_remove (void)
 {
-  DDS4CCM_TRACE ("DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE, FIXED>::ccm_remove");
+  CIAO_TRACE ("DDS_Event_Connector_T<DDS_TYPE, CCM_TYPE>::ccm_remove");
 
   this->push_consumer_.remove (this->subscriber_.in ());
   this->supplier_.remove (this->publisher_.in ());
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.h
index e58317060cb..8309a2e822e 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.h
@@ -13,7 +13,7 @@
 #include "dds4ccm/impl/ndds/DDS_Write_T.h"
 #include "dds4ccm/impl/ndds/DDS_Listen_T.h"
 
-template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
+template <typename DDS_TYPE, typename CCM_TYPE>
 class DDS_Event_Connector_T
   : public virtual DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>
 {
@@ -80,7 +80,7 @@ private:
    * DDS_Get pull_consumer
    */
   //@{
-  DDS_Get_T <DDS_TYPE, CCM_TYPE, FIXED> pull_consumer_;
+  DDS_Get_T <DDS_TYPE, CCM_TYPE> pull_consumer_;
   //@}
 };
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp
index 1840a778c4f..23651c1e3c8 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Get_T.cpp
@@ -5,28 +5,29 @@
 #include "dds4ccm/impl/ndds/DataWriterListener_T.h"
 #include "dds4ccm/impl/ndds/Reader_T.h"
 #include "dds4ccm/impl/ndds/DataListenerControl_T.h"
+#include "dds4ccm/impl/ndds/PortStatusListener_T.h"
 
-#include "dds4ccm/impl/logger/Log_Macros.h"
+#include "ciao/Logger/Log_Macros.h"
 
-template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
-DDS_Get_T<DDS_TYPE, CCM_TYPE, FIXED>::DDS_Get_T (void)
+template <typename DDS_TYPE, typename CCM_TYPE>
+DDS_Get_T<DDS_TYPE, CCM_TYPE>::DDS_Get_T (void)
 {
 }
 
-template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
-DDS_Get_T<DDS_TYPE, CCM_TYPE, FIXED>::~DDS_Get_T (void)
+template <typename DDS_TYPE, typename CCM_TYPE>
+DDS_Get_T<DDS_TYPE, CCM_TYPE>::~DDS_Get_T (void)
 {
 }
 
-template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
+template <typename DDS_TYPE, typename CCM_TYPE>
 void
-DDS_Get_T<DDS_TYPE, CCM_TYPE, FIXED>::configuration_complete (
+DDS_Get_T<DDS_TYPE, CCM_TYPE>::configuration_complete (
   ::DDS::Topic_ptr topic,
   ::DDS::Subscriber_ptr subscriber,
   const char* library_name,
   const char* profile_name)
 {
-  DDS4CCM_TRACE ("DDS_Get_T<DDS_TYPE, CCM_TYPE, FIXED>::configuration_complete");
+  CIAO_TRACE ("DDS_Get_T<DDS_TYPE, CCM_TYPE>::configuration_complete");
 
   try
     {
@@ -51,8 +52,8 @@ DDS_Get_T<DDS_TYPE, CCM_TYPE, FIXED>::configuration_complete (
                     ::DDS::DataReaderListener::_nil (),
                     0);
             }
-          ::CIAO::DDS4CCM::CCM_DDS_DataReader_i *rd =
-            dynamic_cast < ::CIAO::DDS4CCM::CCM_DDS_DataReader_i *> (reader.in ());
+          ::CIAO::DDS4CCM::RTI::RTI_DataReader_i *rd =
+            dynamic_cast < ::CIAO::DDS4CCM::RTI::RTI_DataReader_i *> (reader.in ());
           this->rti_reader_.set_impl (rd->get_impl ());
           this->data_reader_ = ::DDS::CCM_DataReader::_narrow (reader);
           this->dds_get_.set_impl (reader);
@@ -62,43 +63,40 @@ DDS_Get_T<DDS_TYPE, CCM_TYPE, FIXED>::configuration_complete (
     }
   catch (...)
     {
-      DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Get_T::configuration_complete: Caught unknown c++ exception.\n"));
+      CIAO_ERROR (1, (LM_EMERGENCY, "DDS_Get_T::configuration_complete: Caught unknown c++ exception.\n"));
       throw CORBA::INTERNAL ();
     }
 }
 
-template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
+template <typename DDS_TYPE, typename CCM_TYPE>
 void
-DDS_Get_T<DDS_TYPE, CCM_TYPE, FIXED>::activate (
-  ::CCM_DDS::PortStatusListener_ptr listener,
-  ACE_Reactor* reactor)
+DDS_Get_T<DDS_TYPE, CCM_TYPE>::activate (
+  ::CCM_DDS::PortStatusListener_ptr listener)
 {
-  DDS4CCM_TRACE ("DDS_Get_T<DDS_TYPE, CCM_TYPE, FIXED>::activate");
+  CIAO_TRACE ("DDS_Get_T<DDS_TYPE, CCM_TYPE>::activate");
   try
     {
       if (CORBA::is_nil (this->status_.in ()))
         {
-          ACE_NEW_THROW_EX (this->status_,
-                            PortStatusListener (listener, reactor),
-                            CORBA::NO_MEMORY ());
+          this->status_ = new ::CIAO::DDS4CCM::RTI::PortStatusListener_T
+            <DDS_TYPE, CCM_TYPE> (listener);
         }
       this->rti_reader_.set_listener (
           this->status_.in (),
-          ::CIAO::DDS4CCM::PortStatusListener_T<DDS_TYPE, CCM_TYPE>::get_mask (
-            listener));
+          ::CIAO::DDS4CCM::RTI::PortStatusListener_T<DDS_TYPE, CCM_TYPE>::get_mask ());
     }
   catch (...)
     {
-      DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Get_T::activate: Caught unknown c++ exception.\n"));
+      CIAO_ERROR (1, (LM_EMERGENCY, "DDS_Get_T::activate: Caught unknown c++ exception.\n"));
       throw CORBA::INTERNAL ();
     }
 }
 
-template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
+template <typename DDS_TYPE, typename CCM_TYPE>
 void
-DDS_Get_T<DDS_TYPE, CCM_TYPE, FIXED>::passivate (void)
+DDS_Get_T<DDS_TYPE, CCM_TYPE>::passivate (void)
 {
-  DDS4CCM_TRACE ("DDS_Get_T<DDS_TYPE, CCM_TYPE, FIXED>::passivate");
+  CIAO_TRACE ("DDS_Get_T<DDS_TYPE, CCM_TYPE>::passivate");
   try
     {
       this->dds_get_.passivate ();
@@ -109,17 +107,17 @@ DDS_Get_T<DDS_TYPE, CCM_TYPE, FIXED>::passivate (void)
     }
   catch (...)
     {
-      DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Get_T::passivate: Caught unknown c++ exception.\n"));
+      CIAO_ERROR (1, (LM_EMERGENCY, "DDS_Get_T::passivate: Caught unknown c++ exception.\n"));
       throw CORBA::INTERNAL ();
     }
 }
 
-template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
+template <typename DDS_TYPE, typename CCM_TYPE>
 void
-DDS_Get_T<DDS_TYPE, CCM_TYPE, FIXED>::remove (
+DDS_Get_T<DDS_TYPE, CCM_TYPE>::remove (
   ::DDS::Subscriber_ptr subscriber)
 {
-  DDS4CCM_TRACE ("DDS_Get_T<DDS_TYPE, CCM_TYPE, FIXED>::remove");
+  CIAO_TRACE ("DDS_Get_T<DDS_TYPE, CCM_TYPE>::remove");
   try
     {
       subscriber->delete_datareader (this->data_reader_.in ());
@@ -130,34 +128,34 @@ DDS_Get_T<DDS_TYPE, CCM_TYPE, FIXED>::remove (
     }
   catch (...)
     {
-      DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Get_T::remove: Caught unknown c++ exception.\n"));
+      CIAO_ERROR (1, (LM_EMERGENCY, "DDS_Get_T::remove: Caught unknown c++ exception.\n"));
       throw CORBA::INTERNAL ();
     }
 }
 
-template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
+template <typename DDS_TYPE, typename CCM_TYPE>
 typename CCM_TYPE::getter_type::_ptr_type
-DDS_Get_T<DDS_TYPE, CCM_TYPE, FIXED>::get_fresh_data (void)
+DDS_Get_T<DDS_TYPE, CCM_TYPE>::get_fresh_data (void)
 {
-  DDS4CCM_TRACE ("DDS_Get_T<DDS_TYPE, CCM_TYPE, FIXED>::get_fresh_data");
+  CIAO_TRACE ("DDS_Get_T<DDS_TYPE, CCM_TYPE>::get_fresh_data");
 
   return &this->dds_get_;
 }
 
-template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
+template <typename DDS_TYPE, typename CCM_TYPE>
 typename CCM_TYPE::reader_type::_ptr_type
-DDS_Get_T<DDS_TYPE, CCM_TYPE, FIXED>::get_data (void)
+DDS_Get_T<DDS_TYPE, CCM_TYPE>::get_data (void)
 {
-  DDS4CCM_TRACE ("DDS_Get_T<DDS_TYPE, CCM_TYPE, FIXED>::get_data");
+  CIAO_TRACE ("DDS_Get_T<DDS_TYPE, CCM_TYPE>::get_data");
 
   return &this->dds_read_;
 }
 
-template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
+template <typename DDS_TYPE, typename CCM_TYPE>
 ::DDS::CCM_DataReader_ptr
-DDS_Get_T<DDS_TYPE, CCM_TYPE, FIXED>::get_dds_entity (void)
+DDS_Get_T<DDS_TYPE, CCM_TYPE>::get_dds_entity (void)
 {
-  DDS4CCM_TRACE ("DDS_Get_T<DDS_TYPE, CCM_TYPE, FIXED>::get_dds_entity");
+  CIAO_TRACE ("DDS_Get_T<DDS_TYPE, CCM_TYPE>::get_dds_entity");
 
   return &this->rti_reader_;
 }
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Get_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Get_T.h
index 9c19c852365..79cf6cff0dc 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Get_T.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Get_T.h
@@ -11,9 +11,8 @@
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "dds4ccm/impl/ndds/Reader_T.h"
 #include "dds4ccm/impl/ndds/Getter_T.h"
-#include "dds4ccm/impl/ndds/PortStatusListener_T.h"
 
-template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
+template <typename DDS_TYPE, typename CCM_TYPE>
 class DDS_Get_T
 {
 public:
@@ -38,8 +37,7 @@ public:
     const char* profile_name);
 
   void activate (
-    ::CCM_DDS::PortStatusListener_ptr listener,
-    ACE_Reactor* reactor);
+    ::CCM_DDS::PortStatusListener_ptr listener);
 
   void passivate (void);
 
@@ -52,12 +50,10 @@ private:
   //@{
   ::DDS::CCM_DataReader_var data_reader_;
   ::DDS::DataReaderListener_var status_;
-  ::CIAO::DDS4CCM::RTI::Getter_T<DDS_TYPE, CCM_TYPE, FIXED> dds_get_;
+  ::CIAO::DDS4CCM::RTI::Getter_T<DDS_TYPE, CCM_TYPE> dds_get_;
   ::CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE> dds_read_;
-  ::CIAO::DDS4CCM::CCM_DDS_DataReader_i rti_reader_;
+  ::CIAO::DDS4CCM::RTI::RTI_DataReader_i rti_reader_;
   //@}
-
-  typedef ::CIAO::DDS4CCM::PortStatusListener_T<DDS_TYPE, CCM_TYPE> PortStatusListener;
 };
 
 #include "dds4ccm/impl/ndds/DDS_Get_T.cpp"
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp
index cb153a316ea..684e9feecff 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Listen_T.cpp
@@ -11,7 +11,7 @@
 #include "dds4ccm/impl/ndds/DataListenerControl_T.h"
 #include "dds4ccm/impl/ndds/PortStatusListener_T.h"
 
-#include "dds4ccm/impl/logger/Log_Macros.h"
+#include "ciao/Logger/Log_Macros.h"
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 DDS_Listen_T<DDS_TYPE, CCM_TYPE>::DDS_Listen_T (void) :
@@ -33,7 +33,7 @@ DDS_Listen_T<DDS_TYPE, CCM_TYPE>::configuration_complete (
   const char* library_name,
   const char* profile_name)
 {
-  DDS4CCM_TRACE ("DDS_Listen_T<DDS_TYPE, CCM_TYPE>::configuration_complete");
+  CIAO_TRACE ("DDS_Listen_T<DDS_TYPE, CCM_TYPE>::configuration_complete");
 
   try
     {
@@ -58,8 +58,8 @@ DDS_Listen_T<DDS_TYPE, CCM_TYPE>::configuration_complete (
                     ::DDS::DataReaderListener::_nil (),
                     0);
             }
-          ::CIAO::DDS4CCM::CCM_DDS_DataReader_i *rd =
-            dynamic_cast < ::CIAO::DDS4CCM::CCM_DDS_DataReader_i *> (reader.in ());
+          ::CIAO::DDS4CCM::RTI::RTI_DataReader_i *rd =
+            dynamic_cast < ::CIAO::DDS4CCM::RTI::RTI_DataReader_i *> (reader.in ());
           this->rti_reader_.set_impl (rd->get_impl ());
           this->data_reader_ = ::DDS::CCM_DataReader::_narrow (reader);
           this->dds_read_.set_impl (this->data_reader_.in ());
@@ -68,7 +68,7 @@ DDS_Listen_T<DDS_TYPE, CCM_TYPE>::configuration_complete (
     }
   catch (...)
     {
-      DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Listen_T::configuration_complete: Caught unknown c++ exception.\n"));
+      CIAO_ERROR (1, (LM_EMERGENCY, "DDS_Listen_T::configuration_complete: Caught unknown c++ exception.\n"));
       throw CORBA::INTERNAL ();
     }
 }
@@ -77,30 +77,26 @@ template <typename DDS_TYPE, typename CCM_TYPE>
 void
 DDS_Listen_T<DDS_TYPE, CCM_TYPE>::activate (
   typename CCM_TYPE::listener_type::_ptr_type listener,
-  ::CCM_DDS::PortStatusListener_ptr status,
-  ACE_Reactor* reactor)
+  ::CCM_DDS::PortStatusListener_ptr status)
 {
-  DDS4CCM_TRACE ("DDS_Listen_T<DDS_TYPE, CCM_TYPE>::activate");
+  CIAO_TRACE ("DDS_Listen_T<DDS_TYPE, CCM_TYPE>::activate");
   try
     {
       if (CORBA::is_nil (this->data_listener_.in ()))
         {
-          ACE_NEW_THROW_EX (this->data_listener_,
-                            DataReaderListener (
-                              listener,
-                              status,
-                              this->data_control_.in (),
-                              reactor),
-                            CORBA::NO_MEMORY ());
+          this->data_listener_ = new ::CIAO::DDS4CCM::RTI::DataReaderListener_T
+            <DDS_TYPE, CCM_TYPE> (
+              listener,
+              status,
+              this->data_control_.in ());
         }
       this->rti_reader_.set_listener (
         this->data_listener_.in (),
-        ::CIAO::DDS4CCM::DataReaderListener_T<DDS_TYPE, CCM_TYPE>::get_mask (
-          listener));
+        ::CIAO::DDS4CCM::RTI::DataReaderListener_T<DDS_TYPE, CCM_TYPE>::get_mask ());
     }
   catch (...)
     {
-      DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Listen_T::activate: Caught unknown c++ exception.\n"));
+      CIAO_ERROR (1, (LM_EMERGENCY, "DDS_Listen_T::activate: Caught unknown c++ exception.\n"));
       throw CORBA::INTERNAL ();
     }
 }
@@ -109,7 +105,7 @@ template <typename DDS_TYPE, typename CCM_TYPE>
 void
 DDS_Listen_T<DDS_TYPE, CCM_TYPE>::passivate ()
 {
-  DDS4CCM_TRACE ("DDS_Listen_T<DDS_TYPE, CCM_TYPE>::passivate");
+  CIAO_TRACE ("DDS_Listen_T<DDS_TYPE, CCM_TYPE>::passivate");
   try
     {
       this->rti_reader_.set_listener (
@@ -119,7 +115,7 @@ DDS_Listen_T<DDS_TYPE, CCM_TYPE>::passivate ()
     }
   catch (...)
     {
-      DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Listen_T::passivate: Caught unknown c++ exception.\n"));
+      CIAO_ERROR (1, (LM_EMERGENCY, "DDS_Listen_T::passivate: Caught unknown c++ exception.\n"));
       throw CORBA::INTERNAL ();
     }
 }
@@ -129,7 +125,7 @@ void
 DDS_Listen_T<DDS_TYPE, CCM_TYPE>::remove (
   ::DDS::Subscriber_ptr subscriber)
 {
-  DDS4CCM_TRACE ("DDS_Listen_T<DDS_TYPE, CCM_TYPE>::remove");
+  CIAO_TRACE ("DDS_Listen_T<DDS_TYPE, CCM_TYPE>::remove");
   try
     {
       subscriber->delete_datareader (this->data_reader_.in ());
@@ -139,7 +135,7 @@ DDS_Listen_T<DDS_TYPE, CCM_TYPE>::remove (
     }
   catch (...)
     {
-      DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Listen_T::remove: Caught unknown c++ exception.\n"));
+      CIAO_ERROR (1, (LM_EMERGENCY, "DDS_Listen_T::remove: Caught unknown c++ exception.\n"));
       throw CORBA::INTERNAL ();
     }
 }
@@ -149,7 +145,7 @@ template <typename DDS_TYPE, typename CCM_TYPE>
 typename CCM_TYPE::reader_type::_ptr_type
 DDS_Listen_T<DDS_TYPE, CCM_TYPE>::get_data (void)
 {
-  DDS4CCM_TRACE ("DDS_Listen_T<DDS_TYPE, CCM_TYPE>::get_data");
+  CIAO_TRACE ("DDS_Listen_T<DDS_TYPE, CCM_TYPE>::get_data");
 
   return &this->dds_read_;
 }
@@ -158,7 +154,7 @@ template <typename DDS_TYPE, typename CCM_TYPE>
 ::DDS::CCM_DataReader_ptr
 DDS_Listen_T<DDS_TYPE, CCM_TYPE>::get_dds_entity (void)
 {
-  DDS4CCM_TRACE ("DDS_Listen_T<DDS_TYPE, CCM_TYPE>::get_dds_entity");
+  CIAO_TRACE ("DDS_Listen_T<DDS_TYPE, CCM_TYPE>::get_dds_entity");
 
   return &this->rti_reader_;
 }
@@ -167,7 +163,7 @@ template <typename DDS_TYPE, typename CCM_TYPE>
 ::CCM_DDS::CCM_DataListenerControl_ptr
 DDS_Listen_T<DDS_TYPE, CCM_TYPE>::get_data_control (void)
 {
-  DDS4CCM_TRACE ("DDS_Listen_T<DDS_TYPE, CCM_TYPE>::get_data_control");
+  CIAO_TRACE ("DDS_Listen_T<DDS_TYPE, CCM_TYPE>::get_data_control");
 
   return ::CCM_DDS::CCM_DataListenerControl::_duplicate (this->data_control_.in ());
 }
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Listen_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Listen_T.h
index ad10499763d..c84e13f397c 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Listen_T.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Listen_T.h
@@ -8,8 +8,6 @@
 #ifndef DDS_LISTEN_T_H_
 #define DDS_LISTEN_T_H_
 
-class ACE_Reactor;
-
 template <typename DDS_TYPE, typename CCM_TYPE>
 class DDS_Listen_T
 {
@@ -37,8 +35,7 @@ public:
 
   void activate (
     typename CCM_TYPE::listener_type::_ptr_type listener,
-    ::CCM_DDS::PortStatusListener_ptr status,
-    ACE_Reactor* reactor);
+    ::CCM_DDS::PortStatusListener_ptr status);
 
   void passivate (void);
 
@@ -54,9 +51,8 @@ private:
   ::CCM_DDS::CCM_DataListenerControl_var data_control_;
   ::DDS::DataReaderListener_var data_listener_;
   ::CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE> dds_read_;
-  ::CIAO::DDS4CCM::CCM_DDS_DataReader_i rti_reader_;
+  ::CIAO::DDS4CCM::RTI::RTI_DataReader_i rti_reader_;
   //@}
-  typedef ::CIAO::DDS4CCM::DataReaderListener_T<DDS_TYPE, CCM_TYPE> DataReaderListener;
 };
 
 #include "dds4ccm/impl/ndds/DDS_Listen_T.cpp"
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp
index 477d51e4ad2..8dd7421bb30 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Read_T.cpp
@@ -8,7 +8,7 @@
 #include "dds4ccm/impl/ndds/DataListenerControl_T.h"
 #include "dds4ccm/impl/ndds/PortStatusListener_T.h"
 
-#include "dds4ccm/impl/logger/Log_Macros.h"
+#include "ciao/Logger/Log_Macros.h"
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 DDS_Read_T<DDS_TYPE, CCM_TYPE>::DDS_Read_T (void)
@@ -28,7 +28,7 @@ DDS_Read_T<DDS_TYPE, CCM_TYPE>::configuration_complete (
   const char* library_name,
   const char* profile_name)
 {
-  DDS4CCM_TRACE ("DDS_Read_T<DDS_TYPE, CCM_TYPE>::configuration_complete");
+  CIAO_TRACE ("DDS_Read_T<DDS_TYPE, CCM_TYPE>::configuration_complete");
 
   try
     {
@@ -53,8 +53,8 @@ DDS_Read_T<DDS_TYPE, CCM_TYPE>::configuration_complete (
                   ::DDS::DataReaderListener::_nil (),
                   0);
             }
-          ::CIAO::DDS4CCM::CCM_DDS_DataReader_i *rd =
-            dynamic_cast < ::CIAO::DDS4CCM::CCM_DDS_DataReader_i *> (reader.in ());
+          ::CIAO::DDS4CCM::RTI::RTI_DataReader_i *rd =
+            dynamic_cast < ::CIAO::DDS4CCM::RTI::RTI_DataReader_i *> (reader.in ());
           this->rti_reader_.set_impl (rd->get_impl ());
           this->data_ = ::DDS::CCM_DataReader::_narrow (reader);
           this->dds_read_.set_impl (reader);
@@ -63,7 +63,7 @@ DDS_Read_T<DDS_TYPE, CCM_TYPE>::configuration_complete (
     }
   catch (...)
     {
-      DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Read_T::configuration_complete: Caught unknown c++ exception.\n"));
+      CIAO_ERROR (1, (LM_EMERGENCY, "DDS_Read_T::configuration_complete: Caught unknown c++ exception.\n"));
       throw CORBA::INTERNAL ();
     }
 }
@@ -71,27 +71,24 @@ DDS_Read_T<DDS_TYPE, CCM_TYPE>::configuration_complete (
 template <typename DDS_TYPE, typename CCM_TYPE>
 void
 DDS_Read_T<DDS_TYPE, CCM_TYPE>::activate (
-  ::CCM_DDS::PortStatusListener_ptr listener,
-  ACE_Reactor* reactor)
+  ::CCM_DDS::PortStatusListener_ptr listener)
 {
-  DDS4CCM_TRACE ("DDS_Read_T<DDS_TYPE, CCM_TYPE>::activate");
+  CIAO_TRACE ("DDS_Read_T<DDS_TYPE, CCM_TYPE>::activate");
 
   try
     {
       if (CORBA::is_nil (this->status_.in ()))
         {
-          ACE_NEW_THROW_EX (this->status_,
-                            PortStatusListener (listener, reactor),
-                            CORBA::NO_MEMORY ());
+          this->status_ = new ::CIAO::DDS4CCM::RTI::PortStatusListener_T
+            <DDS_TYPE, CCM_TYPE> (listener);
         }
       this->rti_reader_.set_listener (
         this->status_.in (),
-        ::CIAO::DDS4CCM::PortStatusListener_T<DDS_TYPE, CCM_TYPE>::get_mask (
-          listener));
+        ::CIAO::DDS4CCM::RTI::PortStatusListener_T<DDS_TYPE, CCM_TYPE>::get_mask ());
     }
   catch (...)
     {
-      DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Read_T::activate: Caught unknown c++ exception.\n"));
+      CIAO_ERROR (1, (LM_EMERGENCY, "DDS_Read_T::activate: Caught unknown c++ exception.\n"));
       throw CORBA::INTERNAL ();
     }
 }
@@ -100,16 +97,18 @@ template <typename DDS_TYPE, typename CCM_TYPE>
 void
 DDS_Read_T<DDS_TYPE, CCM_TYPE>::passivate ()
 {
-  DDS4CCM_TRACE ("DDS_Read_T<DDS_TYPE, CCM_TYPE>::passivate");
+  CIAO_TRACE ("DDS_Read_T<DDS_TYPE, CCM_TYPE>::passivate");
 
   try
     {
-      this->rti_reader_.set_listener (::DDS::DataReaderListener::_nil (), 0);
+      this->rti_reader_.set_listener (
+              ::DDS::DataReaderListener::_nil (),
+              0);
       this->status_ = ::DDS::DataReaderListener::_nil ();
     }
   catch (...)
     {
-      DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Read_T::passivate: Caught unknown c++ exception.\n"));
+      CIAO_ERROR (1, (LM_EMERGENCY, "DDS_Read_T::passivate: Caught unknown c++ exception.\n"));
       throw CORBA::INTERNAL ();
     }
 }
@@ -119,7 +118,7 @@ void
 DDS_Read_T<DDS_TYPE, CCM_TYPE>::remove (
   ::DDS::Subscriber_ptr subscriber)
 {
-  DDS4CCM_TRACE ("DDS_Read_T<DDS_TYPE, CCM_TYPE>::remove");
+  CIAO_TRACE ("DDS_Read_T<DDS_TYPE, CCM_TYPE>::remove");
 
   try
     {
@@ -130,7 +129,7 @@ DDS_Read_T<DDS_TYPE, CCM_TYPE>::remove (
     }
   catch (...)
     {
-      DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Read_T::remove: Caught unknown c++ exception.\n"));
+      CIAO_ERROR (1, (LM_EMERGENCY, "DDS_Read_T::remove: Caught unknown c++ exception.\n"));
       throw CORBA::INTERNAL ();
     }
 }
@@ -139,7 +138,7 @@ template <typename DDS_TYPE, typename CCM_TYPE>
 typename CCM_TYPE::reader_type::_ptr_type
 DDS_Read_T<DDS_TYPE, CCM_TYPE>::get_data (void)
 {
-  DDS4CCM_TRACE ("DDS_Read_T<DDS_TYPE, CCM_TYPE>::get_data");
+  CIAO_TRACE ("DDS_Read_T<DDS_TYPE, CCM_TYPE>::get_data");
 
   return &this->dds_read_;
 }
@@ -148,7 +147,7 @@ template <typename DDS_TYPE, typename CCM_TYPE>
 ::DDS::CCM_DataReader_ptr
 DDS_Read_T<DDS_TYPE, CCM_TYPE>::get_dds_entity (void)
 {
-  DDS4CCM_TRACE ("DDS_Read_T<DDS_TYPE, CCM_TYPE>::get_dds_entity");
+  CIAO_TRACE ("DDS_Read_T<DDS_TYPE, CCM_TYPE>::get_dds_entity");
 
   return &this->rti_reader_;
 }
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Read_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Read_T.h
index 54ce6b30926..57fdd46ff6d 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Read_T.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Read_T.h
@@ -34,8 +34,7 @@ public:
     const char* profile_name);
 
   void activate (
-    ::CCM_DDS::PortStatusListener_ptr listener,
-    ACE_Reactor* reactor);
+    ::CCM_DDS::PortStatusListener_ptr listener);
 
   void passivate (void);
 
@@ -50,9 +49,8 @@ private:
   ::DDS::CCM_DataReader_var data_;
   ::DDS::DataReaderListener_var status_;
   ::CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE> dds_read_;
-  ::CIAO::DDS4CCM::CCM_DDS_DataReader_i rti_reader_;
+  ::CIAO::DDS4CCM::RTI::RTI_DataReader_i rti_reader_;
   //@}
-  typedef ::CIAO::DDS4CCM::PortStatusListener_T <DDS_TYPE, CCM_TYPE> PortStatusListener;
 };
 
 #include "dds4ccm/impl/ndds/DDS_Read_T.cpp"
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp
index d13048f4217..85f9c038478 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_StateListen_T.cpp
@@ -6,7 +6,7 @@
 #include "dds4ccm/impl/ndds/StateListenerControl_T.h"
 #include "dds4ccm/impl/ndds/PortStatusListener_T.h"
 
-#include "dds4ccm/impl/logger/Log_Macros.h"
+#include "ciao/Logger/Log_Macros.h"
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 DDS_StateListen_T<DDS_TYPE, CCM_TYPE>::DDS_StateListen_T (void) :
@@ -28,7 +28,7 @@ DDS_StateListen_T<DDS_TYPE, CCM_TYPE>::configuration_complete (
   const char* library_name,
   const char* profile_name)
 {
-  DDS4CCM_TRACE ("DDS_StateListen_T<DDS_TYPE, CCM_TYPE>::configuration_complete");
+  CIAO_TRACE ("DDS_StateListen_T<DDS_TYPE, CCM_TYPE>::configuration_complete");
 
   try
     {
@@ -53,8 +53,8 @@ DDS_StateListen_T<DDS_TYPE, CCM_TYPE>::configuration_complete (
                     ::DDS::DataReaderListener::_nil (),
                     0);
             }
-          ::CIAO::DDS4CCM::CCM_DDS_DataReader_i *rd =
-            dynamic_cast < ::CIAO::DDS4CCM::CCM_DDS_DataReader_i *> (reader.in ());
+          ::CIAO::DDS4CCM::RTI::RTI_DataReader_i *rd =
+            dynamic_cast < ::CIAO::DDS4CCM::RTI::RTI_DataReader_i *> (reader.in ());
           this->rti_reader_.set_impl (rd->get_impl ());
           this->data_reader_ = ::DDS::CCM_DataReader::_narrow (reader);
           this->dds_read_.set_impl (this->data_reader_.in ());
@@ -62,7 +62,7 @@ DDS_StateListen_T<DDS_TYPE, CCM_TYPE>::configuration_complete (
     }
   catch (...)
     {
-      DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_StateListen_T::configuration_complete: Caught unknown c++ exception.\n"));
+      CIAO_ERROR (1, (LM_EMERGENCY, "DDS_StateListen_T::configuration_complete: Caught unknown c++ exception.\n"));
       throw CORBA::INTERNAL ();
     }
 }
@@ -71,31 +71,27 @@ template <typename DDS_TYPE, typename CCM_TYPE>
 void
 DDS_StateListen_T<DDS_TYPE, CCM_TYPE>::activate (
   typename CCM_TYPE::statelistener_type::_ptr_type listener,
-  ::CCM_DDS::PortStatusListener_ptr status,
-  ACE_Reactor* reactor)
+  ::CCM_DDS::PortStatusListener_ptr status)
 {
-  DDS4CCM_TRACE ("DDS_StateListen_T<DDS_TYPE, CCM_TYPE>::activate");
+  CIAO_TRACE ("DDS_StateListen_T<DDS_TYPE, CCM_TYPE>::activate");
 
   try
     {
       if (CORBA::is_nil (this->data_listener_.in ()))
         {
-          ACE_NEW_THROW_EX (this->data_listener_,
-                            DataReaderStateListener (
-                              listener,
-                              status,
-                              data_control_.in (),
-                              reactor),
-                            CORBA::NO_MEMORY ());
+          this->data_listener_ = new ::CIAO::DDS4CCM::RTI::DataReaderStateListener_T
+            <DDS_TYPE, CCM_TYPE> (
+              listener,
+              status,
+              data_control_.in ());
         }
       this->rti_reader_.set_listener (
         this->data_listener_.in (),
-        ::CIAO::DDS4CCM::DataReaderStateListener_T<DDS_TYPE, CCM_TYPE>::get_mask (
-          listener));
+        ::CIAO::DDS4CCM::RTI::DataReaderStateListener_T<DDS_TYPE, CCM_TYPE>::get_mask ());
     }
   catch (...)
     {
-      DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_StateListen_T::activate: Caught unknown c++ exception.\n"));
+      CIAO_ERROR (1, (LM_EMERGENCY, "DDS_StateListen_T::activate: Caught unknown c++ exception.\n"));
       throw CORBA::INTERNAL ();
     }
 }
@@ -104,7 +100,7 @@ template <typename DDS_TYPE, typename CCM_TYPE>
 void
 DDS_StateListen_T<DDS_TYPE, CCM_TYPE>::passivate (void)
 {
-  DDS4CCM_TRACE ("DDS_StateListen_T<DDS_TYPE, CCM_TYPE>::passivate");
+  CIAO_TRACE ("DDS_StateListen_T<DDS_TYPE, CCM_TYPE>::passivate");
   try
     {
       this->rti_reader_.set_listener (
@@ -114,7 +110,7 @@ DDS_StateListen_T<DDS_TYPE, CCM_TYPE>::passivate (void)
     }
   catch (...)
     {
-      DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_StateListen_T::passivate: Caught unknown c++ exception.\n"));
+      CIAO_ERROR (1, (LM_EMERGENCY, "DDS_StateListen_T::passivate: Caught unknown c++ exception.\n"));
       throw CORBA::INTERNAL ();
     }
 }
@@ -124,7 +120,7 @@ void
 DDS_StateListen_T<DDS_TYPE, CCM_TYPE>::remove (
   ::DDS::Subscriber_ptr subscriber)
 {
-  DDS4CCM_TRACE ("DDS_StateListen_T<DDS_TYPE, CCM_TYPE>::remove");
+  CIAO_TRACE ("DDS_StateListen_T<DDS_TYPE, CCM_TYPE>::remove");
   try
     {
       subscriber->delete_datareader (this->data_reader_.in ());
@@ -134,7 +130,7 @@ DDS_StateListen_T<DDS_TYPE, CCM_TYPE>::remove (
     }
   catch (...)
     {
-      DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_StateListen_T::remove: Caught unknown c++ exception.\n"));
+      CIAO_ERROR (1, (LM_EMERGENCY, "DDS_StateListen_T::remove: Caught unknown c++ exception.\n"));
       throw CORBA::INTERNAL ();
     }
 }
@@ -143,7 +139,7 @@ template <typename DDS_TYPE, typename CCM_TYPE>
 typename CCM_TYPE::reader_type::_ptr_type
 DDS_StateListen_T<DDS_TYPE, CCM_TYPE>::get_data (void)
 {
-  DDS4CCM_TRACE ("DDS_StateListen_T<DDS_TYPE, CCM_TYPE>::get_data");
+  CIAO_TRACE ("DDS_StateListen_T<DDS_TYPE, CCM_TYPE>::get_data");
 
   return &this->dds_read_;
 }
@@ -152,7 +148,7 @@ template <typename DDS_TYPE, typename CCM_TYPE>
 ::DDS::CCM_DataReader_ptr
 DDS_StateListen_T<DDS_TYPE, CCM_TYPE>::get_dds_entity (void)
 {
-  DDS4CCM_TRACE ("DDS_StateListen_T<DDS_TYPE, CCM_TYPE>::get_dds_entity");
+  CIAO_TRACE ("DDS_StateListen_T<DDS_TYPE, CCM_TYPE>::get_dds_entity");
 
   return &this->rti_reader_;
 }
@@ -161,7 +157,7 @@ template <typename DDS_TYPE, typename CCM_TYPE>
 ::CCM_DDS::CCM_StateListenerControl_ptr
 DDS_StateListen_T<DDS_TYPE, CCM_TYPE>::get_data_control (void)
 {
-  DDS4CCM_TRACE ("DDS_StateListen_T<DDS_TYPE, CCM_TYPE>::get_data_control");
+  CIAO_TRACE ("DDS_StateListen_T<DDS_TYPE, CCM_TYPE>::get_data_control");
 
   return ::CCM_DDS::CCM_StateListenerControl::_duplicate (
     this->data_control_.in ());
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_StateListen_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DDS_StateListen_T.h
index 2692ccd3bf5..b1b6cd31a3e 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DDS_StateListen_T.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_StateListen_T.h
@@ -35,8 +35,7 @@ public:
 
   void activate (
     typename CCM_TYPE::statelistener_type::_ptr_type listener,
-    ::CCM_DDS::PortStatusListener_ptr status,
-    ACE_Reactor* reactor);
+    ::CCM_DDS::PortStatusListener_ptr status);
 
   void passivate (void);
 
@@ -53,9 +52,8 @@ private:
   ::CCM_DDS::CCM_StateListenerControl_var data_control_;
   ::DDS::DataReaderListener_var data_listener_;
   ::CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE> dds_read_;
-  ::CIAO::DDS4CCM::CCM_DDS_DataReader_i rti_reader_;
+  ::CIAO::DDS4CCM::RTI::RTI_DataReader_i rti_reader_;
   //@}
-  typedef ::CIAO::DDS4CCM::DataReaderStateListener_T<DDS_TYPE, CCM_TYPE> DataReaderStateListener;
 };
 
 #include "dds4ccm/impl/ndds/DDS_StateListen_T.cpp"
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp
index 7bd64199729..8fe090f2c09 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.cpp
@@ -11,113 +11,113 @@
 #include "dds4ccm/impl/ndds/StateListenerControl_T.h"
 #include "dds4ccm/impl/ndds/PortStatusListener_T.h"
 
-#include "dds4ccm/impl/logger/Log_Macros.h"
+#include "ciao/Logger/Log_Macros.h"
 
-template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
-DDS_State_Connector_T<DDS_TYPE, CCM_TYPE, FIXED>::DDS_State_Connector_T (void) :
-    DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE> ()
+template <typename DDS_TYPE, typename CCM_TYPE>
+DDS_State_Connector_T<DDS_TYPE, CCM_TYPE>::DDS_State_Connector_T (void) :
+    DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>()
 {
 }
 
-template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
-DDS_State_Connector_T<DDS_TYPE, CCM_TYPE, FIXED>::~DDS_State_Connector_T (void)
+template <typename DDS_TYPE, typename CCM_TYPE>
+DDS_State_Connector_T<DDS_TYPE, CCM_TYPE>::~DDS_State_Connector_T (void)
 {
 }
 
-template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
+template <typename DDS_TYPE, typename CCM_TYPE>
 typename CCM_TYPE::updater_type::_ptr_type
-DDS_State_Connector_T<DDS_TYPE, CCM_TYPE, FIXED>::get_observable_data (void)
+DDS_State_Connector_T<DDS_TYPE, CCM_TYPE>::get_observable_data (void)
 {
   return this->observable_.get_data ();
 }
 
-template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
+template <typename DDS_TYPE, typename CCM_TYPE>
 ::DDS::CCM_DataWriter_ptr
-DDS_State_Connector_T<DDS_TYPE, CCM_TYPE, FIXED>::get_observable_dds_entity (void)
+DDS_State_Connector_T<DDS_TYPE, CCM_TYPE>::get_observable_dds_entity (void)
 {
   return this->observable_.get_dds_entity ();
 }
 
-template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
+template <typename DDS_TYPE, typename CCM_TYPE>
 typename CCM_TYPE::reader_type::_ptr_type
-DDS_State_Connector_T<DDS_TYPE, CCM_TYPE, FIXED>::get_passive_observer_data (void)
+DDS_State_Connector_T<DDS_TYPE, CCM_TYPE>::get_passive_observer_data (void)
 {
   return this->passive_observer_.get_data ();
 }
 
-template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
+template <typename DDS_TYPE, typename CCM_TYPE>
 ::DDS::CCM_DataReader_ptr
-DDS_State_Connector_T<DDS_TYPE, CCM_TYPE, FIXED>::get_passive_observer_dds_entity (void)
+DDS_State_Connector_T<DDS_TYPE, CCM_TYPE>::get_passive_observer_dds_entity (void)
 {
   return this->passive_observer_.get_dds_entity ();
 }
 
-template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
+template <typename DDS_TYPE, typename CCM_TYPE>
 typename CCM_TYPE::reader_type::_ptr_type
-DDS_State_Connector_T<DDS_TYPE, CCM_TYPE, FIXED>::get_pull_observer_data (void)
+DDS_State_Connector_T<DDS_TYPE, CCM_TYPE>::get_pull_observer_data (void)
 {
   return this->pull_observer_.get_data ();
 }
 
-template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
+template <typename DDS_TYPE, typename CCM_TYPE>
 typename CCM_TYPE::getter_type::_ptr_type
-DDS_State_Connector_T<DDS_TYPE, CCM_TYPE, FIXED>::get_pull_observer_fresh_data (void)
+DDS_State_Connector_T<DDS_TYPE, CCM_TYPE>::get_pull_observer_fresh_data (void)
 {
   return this->pull_observer_.get_fresh_data ();
 }
 
-template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
+template <typename DDS_TYPE, typename CCM_TYPE>
 ::DDS::CCM_DataReader_ptr
-DDS_State_Connector_T<DDS_TYPE, CCM_TYPE, FIXED>::get_pull_observer_dds_entity (void)
+DDS_State_Connector_T<DDS_TYPE, CCM_TYPE>::get_pull_observer_dds_entity (void)
 {
   return this->pull_observer_.get_dds_entity ();
 }
 
-template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
+template <typename DDS_TYPE, typename CCM_TYPE>
 typename CCM_TYPE::reader_type::_ptr_type
-DDS_State_Connector_T<DDS_TYPE, CCM_TYPE, FIXED>::get_push_observer_data (void)
+DDS_State_Connector_T<DDS_TYPE, CCM_TYPE>::get_push_observer_data (void)
 {
   return this->push_observer_.get_data ();
 }
 
-template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
+template <typename DDS_TYPE, typename CCM_TYPE>
 ::CCM_DDS::CCM_DataListenerControl_ptr
-DDS_State_Connector_T<DDS_TYPE, CCM_TYPE, FIXED>::get_push_observer_data_control (void)
+DDS_State_Connector_T<DDS_TYPE, CCM_TYPE>::get_push_observer_data_control (void)
 {
   return this->push_observer_.get_data_control ();
 }
 
-template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
+template <typename DDS_TYPE, typename CCM_TYPE>
 ::DDS::CCM_DataReader_ptr
-DDS_State_Connector_T<DDS_TYPE, CCM_TYPE, FIXED>::get_push_observer_dds_entity (void)
+DDS_State_Connector_T<DDS_TYPE, CCM_TYPE>::get_push_observer_dds_entity (void)
 {
   return this->push_observer_.get_dds_entity ();
 }
 
-template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
+template <typename DDS_TYPE, typename CCM_TYPE>
 typename CCM_TYPE::reader_type::_ptr_type
-DDS_State_Connector_T<DDS_TYPE, CCM_TYPE, FIXED>::get_push_state_observer_data (void)
+DDS_State_Connector_T<DDS_TYPE, CCM_TYPE>::get_push_state_observer_data (void)
 {
   return this->push_state_observer_.get_data ();
 }
 
-template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
+template <typename DDS_TYPE, typename CCM_TYPE>
 ::CCM_DDS::CCM_StateListenerControl_ptr
-DDS_State_Connector_T<DDS_TYPE, CCM_TYPE, FIXED>::get_push_state_observer_data_control (void)
+DDS_State_Connector_T<DDS_TYPE, CCM_TYPE>::get_push_state_observer_data_control (void)
 {
   return this->push_state_observer_.get_data_control ();
 }
 
-template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
+template <typename DDS_TYPE, typename CCM_TYPE>
 ::DDS::CCM_DataReader_ptr
-DDS_State_Connector_T<DDS_TYPE, CCM_TYPE, FIXED>::get_push_state_observer_dds_entity (void)
+DDS_State_Connector_T<DDS_TYPE, CCM_TYPE>::get_push_state_observer_dds_entity (void)
 {
   return this->push_state_observer_.get_dds_entity ();
 }
 
-template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
+template <typename DDS_TYPE, typename CCM_TYPE>
 void
-DDS_State_Connector_T<DDS_TYPE, CCM_TYPE, FIXED>::configuration_complete (void)
+DDS_State_Connector_T<DDS_TYPE, CCM_TYPE>::configuration_complete (void)
 {
   DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::configuration_complete ();
   this->observable_.configuration_complete (
@@ -151,40 +151,31 @@ DDS_State_Connector_T<DDS_TYPE, CCM_TYPE, FIXED>::configuration_complete (void)
     this->profile_name_);
 }
 
-template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
+template <typename DDS_TYPE, typename CCM_TYPE>
 void
-DDS_State_Connector_T<DDS_TYPE, CCM_TYPE, FIXED>::ccm_activate (void)
+DDS_State_Connector_T<DDS_TYPE, CCM_TYPE>::ccm_activate (void)
 {
-  ACE_Reactor* reactor = 0;
-#if defined (CIAO_DDS4CCM_CONTEXT_SWITCH) && (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-  reactor = this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ();
-#endif
-  DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::ccm_activate (reactor);
-
+  DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::ccm_activate ();
   this->observable_.activate ();
 
   this->push_observer_.activate (
     this->context_->get_connection_push_observer_data_listener (),
-    this->context_->get_connection_push_observer_status (),
-    reactor);
+    this->context_->get_connection_push_observer_status ());
 
   this->push_state_observer_.activate (
     this->context_->get_connection_push_state_observer_data_listener (),
-    this->context_->get_connection_push_state_observer_status (),
-    reactor);
+    this->context_->get_connection_push_state_observer_status ());
 
   this->pull_observer_.activate (
-    this->context_->get_connection_pull_observer_status (),
-    reactor);
+    this->context_->get_connection_pull_observer_status ());
 
   this->passive_observer_.activate (
-    this->context_->get_connection_passive_observer_status (),
-    reactor);
+    this->context_->get_connection_passive_observer_status ());
 }
 
-template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
+template <typename DDS_TYPE, typename CCM_TYPE>
 void
-DDS_State_Connector_T<DDS_TYPE, CCM_TYPE, FIXED>::ccm_passivate (void)
+DDS_State_Connector_T<DDS_TYPE, CCM_TYPE>::ccm_passivate (void)
 {
   this->observable_.passivate ();
   this->push_observer_.passivate ();
@@ -194,9 +185,9 @@ DDS_State_Connector_T<DDS_TYPE, CCM_TYPE, FIXED>::ccm_passivate (void)
   DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::ccm_passivate ();
 }
 
-template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
+template <typename DDS_TYPE, typename CCM_TYPE>
 void
-DDS_State_Connector_T<DDS_TYPE, CCM_TYPE, FIXED>::ccm_remove (void)
+DDS_State_Connector_T<DDS_TYPE, CCM_TYPE>::ccm_remove (void)
 {
   this->observable_.remove (this->publisher_.in ());
   this->push_observer_.remove (this->subscriber_.in ());
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.h
index 89cacaf4a5b..b13b1953466 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.h
@@ -15,7 +15,7 @@
 #include "dds4ccm/impl/ndds/DDS_Update_T.h"
 #include "dds4ccm/impl/ndds/DDS_Read_T.h"
 
-template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
+template <typename DDS_TYPE, typename CCM_TYPE>
 class DDS_State_Connector_T
   : public virtual DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>
 {
@@ -87,7 +87,7 @@ private:
    * DDS_Get pull_observer
    */
   //@{
-  DDS_Get_T <DDS_TYPE, CCM_TYPE, FIXED> pull_observer_;
+  DDS_Get_T <DDS_TYPE, CCM_TYPE> pull_observer_;
   //@}
 
   /**
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp
index 5fb5b21411d..6522bbcb520 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp
@@ -1,7 +1,10 @@
 // -*- C++ -*-
 // $Id$
 
-#include "dds4ccm/impl/logger/Log_Macros.h"
+#include "ciao/Logger/Log_Macros.h"
+#include "dds4ccm/impl/ndds/TopicListener_T.h"
+#include "dds4ccm/impl/ndds/PublisherListener_T.h"
+#include "dds4ccm/impl/ndds/SubscriberListener_T.h"
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::DDS_TopicBase_Connector_T (void) :
@@ -18,7 +21,7 @@ template <typename DDS_TYPE, typename CCM_TYPE>
 void
 DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::configuration_complete (void)
 {
-  DDS4CCM_TRACE ("DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::configuration_complete");
+  CIAO_TRACE ("DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::configuration_complete");
   DDS_Base_Connector_T<DDS_TYPE, CCM_TYPE>::configuration_complete ();
   this->init_default_topic ();
   this->init_subscriber ();
@@ -27,20 +30,20 @@ DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::configuration_complete (void)
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 void
-DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::ccm_activate (ACE_Reactor* reactor)
+DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::ccm_activate (void)
 {
-  DDS4CCM_TRACE ("DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::ccm_activate");
+  CIAO_TRACE ("DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::ccm_activate");
   DDS_Base_Connector_T<DDS_TYPE, CCM_TYPE>::ccm_activate ();
-  this->activate_default_topic (reactor);
-  this->activate_subscriber (reactor);
-  this->activate_publisher (reactor);
+  this->activate_default_topic ();
+  this->activate_subscriber ();
+  this->activate_publisher ();
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 void
 DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::ccm_passivate (void)
 {
-  DDS4CCM_TRACE ("DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::ccm_passivate");
+  CIAO_TRACE ("DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::ccm_passivate");
   this->passivate_default_topic ();
   this->passivate_subscriber ();
   this->passivate_publisher ();
@@ -51,7 +54,7 @@ template <typename DDS_TYPE, typename CCM_TYPE>
 void
 DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::ccm_remove (void)
 {
-  DDS4CCM_TRACE ("DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::ccm_remove");
+  CIAO_TRACE ("DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::ccm_remove");
   this->remove_default_topic ();
   this->remove_subscriber ();
   this->remove_publisher ();
@@ -62,7 +65,7 @@ template <typename DDS_TYPE, typename CCM_TYPE>
 char *
 DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::topic_name (void)
 {
-  DDS4CCM_TRACE ("DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::topic_name");
+  CIAO_TRACE ("DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::topic_name");
   return CORBA::string_dup (this->topic_name_.in ());
 }
 
@@ -71,7 +74,7 @@ void
 DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::topic_name (
   const char * topic_name)
 {
-  DDS4CCM_TRACE ("DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::topic_name");
+  CIAO_TRACE ("DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::topic_name");
   if (this->configuration_complete_)
     {
       throw ::CCM_DDS::NonChangeable ();
@@ -87,7 +90,7 @@ void
 DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::key_fields (
   const ::DDS::StringSeq & key_fields)
 {
-  DDS4CCM_TRACE ("DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::key_fields");
+  CIAO_TRACE ("DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::key_fields");
   if (this->configuration_complete_)
     {
       throw ::CCM_DDS::NonChangeable ();
@@ -106,12 +109,12 @@ template <typename DDS_TYPE, typename CCM_TYPE>
 ::DDS::StringSeq *
 DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::key_fields (void)
 {
-  DDS4CCM_TRACE ("DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::key_fields");
+  CIAO_TRACE ("DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::key_fields");
 /*
     For future use, DDS_TYPE doesn't have get_typecode yet
-    ::DDS_TypeCode* ptr = ::DDS_TYPE::type_support::get_typecode ();
+    ::DDS_TypeCode* ptr = ::DDS_TYPE::get_typecode ();
     DDS_ExceptionCode_t ex;
-    DDS_UnsignedLong const number = ptr->member_count (ex);
+    DDS_UnsignedLong number = ptr->member_count (ex);
     for (DDS_UnsignedLong i = 0; i < number; i++)
     {
      if (ptr->is_member_key (i, ex))
@@ -121,10 +124,8 @@ DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::key_fields (void)
      }
     }
  */
-  ::DDS::StringSeq_var retval = 0;
-  ACE_NEW_THROW_EX (retval,
-                    ::DDS::StringSeq (this->key_fields_.length ()),
-                    CORBA::NO_MEMORY ());
+  ::DDS::StringSeq_var retval =
+    new ::DDS::StringSeq (this->key_fields_.length ());
   retval->length (this->key_fields_.length ());
 
   for (CORBA::ULong i = 0; i < this->key_fields_.length (); ++i)
@@ -138,14 +139,14 @@ template <typename DDS_TYPE, typename CCM_TYPE>
 void
 DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::init_default_topic (void)
 {
-  DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::init_default_topic");
+  CIAO_TRACE ("DDS_TopicBase_Connector_T::init_default_topic");
 
   if (CORBA::is_nil (this->topic_))
     {
       try
         {
-          CIAO::DDS4CCM::CCM_DDS_DomainParticipant_i *part =
-            dynamic_cast< CIAO::DDS4CCM::CCM_DDS_DomainParticipant_i * > (
+          CIAO::DDS4CCM::RTI::RTI_DomainParticipant_i *part =
+            dynamic_cast< CIAO::DDS4CCM::RTI::RTI_DomainParticipant_i * > (
               this->domain_participant_.in ());
           DDS_ReturnCode_t const retcode = DDS_TYPE::type_support::register_type(
             part->get_impl (), DDS_TYPE::type_support::get_type_name ());
@@ -154,6 +155,7 @@ DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::init_default_topic (void)
             {
               if (this->library_name_ && this->profile_name_)
                 {
+                  ::DDS::TopicQos tqos;
                   this->topic_ =
                     this->domain_participant_->create_topic_with_profile (
                       this->topic_name_.in (),
@@ -182,7 +184,7 @@ DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::init_default_topic (void)
         }
       catch (...)
         {
-          DDS4CCM_ERROR (1, (LM_ERROR, "DDS_TopicBase_Connector_T::init_default_topic: "
+          CIAO_ERROR (1, (LM_ERROR, "DDS_TopicBase_Connector_T::init_default_topic: "
                                     "Caught unknown C++ exception.\n"));
           throw CORBA::INTERNAL ();
         }
@@ -193,7 +195,7 @@ template <typename DDS_TYPE, typename CCM_TYPE>
 void
 DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::init_subscriber (void)
 {
-  DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::init_subscriber");
+  CIAO_TRACE ("DDS_TopicBase_Connector_T::init_subscriber");
 
   if (CORBA::is_nil (this->subscriber_.in ()))
     {
@@ -220,7 +222,7 @@ DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::init_subscriber (void)
         }
       catch (...)
         {
-          DDS4CCM_ERROR (1, (LM_ERROR, "DDS_TopicBase_Connector_T::init_subscriber: "
+          CIAO_ERROR (1, (LM_ERROR, "DDS_TopicBase_Connector_T::init_subscriber: "
                                     "Caught unknown C++ exception.\n"));
           throw CORBA::INTERNAL ();
         }
@@ -231,7 +233,7 @@ template <typename DDS_TYPE, typename CCM_TYPE>
 void
 DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::init_publisher (void)
 {
-  DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::init_publisher");
+  CIAO_TRACE ("DDS_TopicBase_Connector_T::init_publisher");
 
   if (CORBA::is_nil (this->publisher_.in ()))
     {
@@ -258,27 +260,24 @@ DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::init_publisher (void)
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 void
-DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::activate_default_topic (ACE_Reactor* reactor)
+DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::activate_default_topic (void)
 {
-  DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::activate_default_topic");
+  CIAO_TRACE ("DDS_TopicBase_Connector_T::activate_default_topic");
   try
     {
       if (CORBA::is_nil (this->topiclistener_.in ()))
         {
-          ACE_NEW_THROW_EX (this->topiclistener_,
-                            TopicListener (
-                              this->context_->get_connection_error_listener (),
-                              reactor),
-                            CORBA::NO_MEMORY ());
+          this->topiclistener_ = new ::CIAO::DDS4CCM::TopicListener_T
+            <DDS_TYPE, CCM_TYPE> (
+                this->context_->get_connection_error_listener ());
         }
       this->topic_->set_listener (
         this->topiclistener_.in (),
-        ::CIAO::DDS4CCM::TopicListener_T<DDS_TYPE, CCM_TYPE>::get_mask (
-          this->context_->get_connection_error_listener ()));
+        ::CIAO::DDS4CCM::TopicListener_T<DDS_TYPE, CCM_TYPE>::get_mask ());
     }
   catch (...)
     {
-      DDS4CCM_ERROR (1, (LM_ERROR, "DDS_TopicBase_Connector_T::activate_default_topic: "
+      CIAO_ERROR (1, (LM_ERROR, "DDS_TopicBase_Connector_T::activate_default_topic: "
                                 "Caught unknown C++ exception.\n"));
       throw CORBA::INTERNAL ();
     }
@@ -286,28 +285,26 @@ DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::activate_default_topic (ACE_React
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 void
-DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::activate_subscriber (ACE_Reactor* reactor)
+DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::activate_subscriber (void)
 {
-  DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::activate_subscriber");
+  CIAO_TRACE ("DDS_TopicBase_Connector_T::activate_subscriber");
 
   try
     {
       if (CORBA::is_nil (this->subscriber_listener_.in ()))
         {
-          ACE_NEW_THROW_EX (this->subscriber_listener_,
-                            SubscriberListener (
-                              this->context_->get_connection_error_listener (),
-                              reactor),
-                            CORBA::NO_MEMORY ());
+          this->subscriber_listener_ = new ::CIAO::DDS4CCM::SubscriberListener_T
+            <DDS_TYPE, CCM_TYPE> (
+              this->context_,
+              this->context_->get_connection_error_listener ());
         }
       this->subscriber_->set_listener (
         this->subscriber_listener_.in (),
-        ::CIAO::DDS4CCM::SubscriberListener_T<DDS_TYPE, CCM_TYPE>::get_mask (
-          this->context_->get_connection_error_listener ()));
+        ::CIAO::DDS4CCM::SubscriberListener_T<DDS_TYPE, CCM_TYPE>::get_mask ());
     }
   catch (...)
     {
-      DDS4CCM_ERROR (1, (LM_ERROR, "DDS_TopicBase_Connector_T::activate_subscriber: "
+      CIAO_ERROR (1, (LM_ERROR, "DDS_TopicBase_Connector_T::activate_subscriber: "
                                 "Caught unknown C++ exception.\n"));
       throw CORBA::INTERNAL ();
     }
@@ -315,28 +312,26 @@ DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::activate_subscriber (ACE_Reactor*
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 void
-DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::activate_publisher (ACE_Reactor* reactor)
+DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::activate_publisher (void)
 {
-  DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::activate_publisher");
+  CIAO_TRACE ("DDS_TopicBase_Connector_T::activate_publisher");
 
   try
     {
       if (CORBA::is_nil (this->publisher_listener_.in ()))
         {
-          ACE_NEW_THROW_EX (this->publisher_listener_,
-                            PublisherListener (
-                              this->context_->get_connection_error_listener (),
-                              reactor),
-                            CORBA::NO_MEMORY ());
+          this->publisher_listener_ = new ::CIAO::DDS4CCM::PublisherListener_T
+            <DDS_TYPE, CCM_TYPE> (
+              this->context_,
+              this->context_->get_connection_error_listener ());
         }
       this->publisher_->set_listener (
         this->publisher_listener_.in (),
-        ::CIAO::DDS4CCM::PublisherListener_T<DDS_TYPE, CCM_TYPE>::get_mask (
-          this->context_->get_connection_error_listener ()));
+        ::CIAO::DDS4CCM::PublisherListener_T<DDS_TYPE, CCM_TYPE>::get_mask ());
     }
   catch (...)
     {
-      DDS4CCM_ERROR (1, (LM_ERROR, "DDS_TopicBase_Connector_T::activate_publisher: "
+      CIAO_ERROR (1, (LM_ERROR, "DDS_TopicBase_Connector_T::activate_publisher: "
                                 "Caught unknown C++ exception.\n"));
       throw CORBA::INTERNAL ();
     }
@@ -346,7 +341,7 @@ template <typename DDS_TYPE, typename CCM_TYPE>
 void
 DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::passivate_default_topic (void)
 {
-  DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::passivate_default_topic");
+  CIAO_TRACE ("DDS_TopicBase_Connector_T::passivate_default_topic");
 
   try
     {
@@ -358,7 +353,7 @@ DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::passivate_default_topic (void)
     }
   catch (...)
     {
-      DDS4CCM_ERROR (1, (LM_ERROR, "DDS_TopicBase_Connector_T::passivate_default_topic: "
+      CIAO_ERROR (1, (LM_ERROR, "DDS_TopicBase_Connector_T::passivate_default_topic: "
                                 "Caught unknown C++ exception.\n"));
       throw CORBA::INTERNAL ();
     }
@@ -368,7 +363,7 @@ template <typename DDS_TYPE, typename CCM_TYPE>
 void
 DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::passivate_subscriber (void)
 {
-  DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::passivate_subscriber");
+  CIAO_TRACE ("DDS_TopicBase_Connector_T::passivate_subscriber");
 
   try
     {
@@ -379,7 +374,7 @@ DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::passivate_subscriber (void)
     }
   catch (...)
     {
-      DDS4CCM_ERROR (1, (LM_ERROR, "DDS_TopicBase_Connector_T::passivate_subscriber: "
+      CIAO_ERROR (1, (LM_ERROR, "DDS_TopicBase_Connector_T::passivate_subscriber: "
                                 "Caught unknown C++ exception.\n"));
       throw CORBA::INTERNAL ();
     }
@@ -389,7 +384,7 @@ template <typename DDS_TYPE, typename CCM_TYPE>
 void
 DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::passivate_publisher (void)
 {
-  DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::passivate_publisher");
+  CIAO_TRACE ("DDS_TopicBase_Connector_T::passivate_publisher");
 
   try
     {
@@ -400,7 +395,7 @@ DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::passivate_publisher (void)
     }
   catch (...)
     {
-      DDS4CCM_ERROR (1, (LM_ERROR, "DDS_TopicBase_Connector_T::passivate_default_topic: "
+      CIAO_ERROR (1, (LM_ERROR, "DDS_TopicBase_Connector_T::passivate_default_topic: "
                                 "Caught unknown C++ exception.\n"));
       throw CORBA::INTERNAL ();
     }
@@ -410,7 +405,7 @@ template <typename DDS_TYPE, typename CCM_TYPE>
 void
 DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::remove_default_topic (void)
 {
-  DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::remove_default_topic");
+  CIAO_TRACE ("DDS_TopicBase_Connector_T::remove_default_topic");
 
   try
     {
@@ -419,7 +414,7 @@ DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::remove_default_topic (void)
     }
   catch (...)
     {
-      DDS4CCM_ERROR (1, (LM_ERROR, "DDS_TopicBase_Connector_T::remove_default_topic: "
+      CIAO_ERROR (1, (LM_ERROR, "DDS_TopicBase_Connector_T::remove_default_topic: "
                                 "Caught unknown C++ exception.\n"));
       throw CORBA::INTERNAL ();
     }
@@ -429,7 +424,7 @@ template <typename DDS_TYPE, typename CCM_TYPE>
 void
 DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::remove_subscriber (void)
 {
-  DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::remove_subscriber");
+  CIAO_TRACE ("DDS_TopicBase_Connector_T::remove_subscriber");
 
   try
     {
@@ -438,7 +433,7 @@ DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::remove_subscriber (void)
     }
   catch (...)
     {
-      DDS4CCM_ERROR (1, (LM_ERROR, "DDS_TopicBase_Connector_T::remove_subscriber: "
+      CIAO_ERROR (1, (LM_ERROR, "DDS_TopicBase_Connector_T::remove_subscriber: "
                                 "Caught unknown C++ exception.\n"));
       throw CORBA::INTERNAL ();
     }
@@ -448,7 +443,7 @@ template <typename DDS_TYPE, typename CCM_TYPE>
 void
 DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::remove_publisher (void)
 {
-  DDS4CCM_TRACE ("DDS_TopicBase_Connector_T::remove_publisher");
+  CIAO_TRACE ("DDS_TopicBase_Connector_T::remove_publisher");
 
   try
     {
@@ -457,7 +452,7 @@ DDS_TopicBase_Connector_T<DDS_TYPE, CCM_TYPE>::remove_publisher (void)
     }
   catch (...)
     {
-      DDS4CCM_ERROR (1, (LM_ERROR, "DDS_TopicBase_Connector_T::remove_publisher: "
+      CIAO_ERROR (1, (LM_ERROR, "DDS_TopicBase_Connector_T::remove_publisher: "
                                 "Caught unknown C++ exception.\n"));
       throw CORBA::INTERNAL ();
     }
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.h
index 69af82224f6..af2333b7016 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.h
@@ -10,9 +10,6 @@
 
 #include "ace/Copy_Disabled.h"
 #include "dds4ccm/impl/ndds/DDS_Base_Connector_T.h"
-#include "dds4ccm/impl/ndds/TopicListener_T.h"
-#include "dds4ccm/impl/ndds/PublisherListener_T.h"
-#include "dds4ccm/impl/ndds/SubscriberListener_T.h"
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 class DDS_TopicBase_Connector_T
@@ -32,7 +29,7 @@ public:
 
   virtual void configuration_complete (void);
   virtual void ccm_remove (void);
-  virtual void ccm_activate (ACE_Reactor* reactor);
+  virtual void ccm_activate (void);
   virtual void ccm_passivate (void);
 
 protected:
@@ -40,9 +37,9 @@ protected:
   void init_publisher (void);
   void init_subscriber (void);
 
-  void activate_default_topic (ACE_Reactor* reactor);
-  void activate_publisher (ACE_Reactor* reactor);
-  void activate_subscriber (ACE_Reactor* reactor);
+  void activate_default_topic (void);
+  void activate_publisher (void);
+  void activate_subscriber (void);
 
   void passivate_default_topic (void);
   void passivate_publisher (void);
@@ -62,10 +59,6 @@ protected:
   ::DDS::PublisherListener_var publisher_listener_;
   ::DDS::Subscriber_var subscriber_;
   ::DDS::SubscriberListener_var subscriber_listener_;
-
-typedef ::CIAO::DDS4CCM::TopicListener_T<DDS_TYPE, CCM_TYPE> TopicListener;
-typedef ::CIAO::DDS4CCM::SubscriberListener_T<DDS_TYPE, CCM_TYPE> SubscriberListener;
-typedef ::CIAO::DDS4CCM::PublisherListener_T<DDS_TYPE, CCM_TYPE> PublisherListener;
 };
 
 #include "dds4ccm/impl/ndds/DDS_TopicBase_Connector_T.cpp"
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp
index 9d36a15099b..e53d99126e3 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Update_T.cpp
@@ -6,11 +6,10 @@
 #include "dds4ccm/impl/ndds/Updater_T.h"
 #include "dds4ccm/impl/ndds/DataWriter.h"
 
-#include "dds4ccm/impl/logger/Log_Macros.h"
+#include "ciao/Logger/Log_Macros.h"
 
 template <typename DDS_TYPE, typename CCM_TYPE>
-DDS_Update_T<DDS_TYPE, CCM_TYPE>::DDS_Update_T (void) :
-  rti_writer_ (0)
+DDS_Update_T<DDS_TYPE, CCM_TYPE>::DDS_Update_T (void)
 {
 }
 
@@ -27,10 +26,10 @@ DDS_Update_T<DDS_TYPE, CCM_TYPE>::configuration_complete (
   const char* library_name,
   const char* profile_name)
 {
-  DDS4CCM_TRACE ("DDS_Update_T<DDS_TYPE, CCM_TYPE>::configuration_complete");
-  if (CORBA::is_nil  (this->data_writer_.in ()))
+  CIAO_TRACE ("DDS_Update_T<DDS_TYPE, CCM_TYPE>::configuration_complete");
+  try
     {
-      try
+      if (CORBA::is_nil  (this->data_writer_.in ()))
         {
           ::DDS::DataWriter_var dwv_tmp;
           if (library_name && profile_name)
@@ -51,17 +50,17 @@ DDS_Update_T<DDS_TYPE, CCM_TYPE>::configuration_complete (
                   ::DDS::DataWriterListener::_nil (),
                   0);
             }
-          ::CIAO::DDS4CCM::CCM_DDS_DataWriter_i  *rw =
-            dynamic_cast < ::CIAO::DDS4CCM::CCM_DDS_DataWriter_i  *> (dwv_tmp.in ());
+          ::CIAO::DDS4CCM::RTI::RTI_DataWriter_i  *rw =
+            dynamic_cast < ::CIAO::DDS4CCM::RTI::RTI_DataWriter_i  *> (dwv_tmp.in ());
           this->rti_writer_.set_impl (rw->get_impl ());
           this->data_writer_ = ::DDS::CCM_DataWriter::_narrow (dwv_tmp);
           this->dds_update_.set_impl (dwv_tmp);
         }
-      catch (...)
-        {
-          DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Update_T::configuration_complete: Caught unknown c++ exception.\n"));
-          throw CORBA::INTERNAL ();
-        }
+    }
+  catch (...)
+    {
+      CIAO_ERROR (1, (LM_EMERGENCY, "DDS_Update_T::configuration_complete: Caught unknown c++ exception.\n"));
+      throw CORBA::INTERNAL ();
     }
 }
 
@@ -69,14 +68,13 @@ template <typename DDS_TYPE, typename CCM_TYPE>
 void
 DDS_Update_T<DDS_TYPE, CCM_TYPE>::activate ()
 {
-  DDS4CCM_TRACE ("DDS_Update_T<DDS_TYPE, CCM_TYPE>::activate");
+  CIAO_TRACE ("DDS_Update_T<DDS_TYPE, CCM_TYPE>::activate");
   try
     {
       if (CORBA::is_nil (this->data_listener_.in ()))
         {
-          ACE_NEW_THROW_EX (this->data_listener_,
-                            DataWriterListener (),
-                            CORBA::NO_MEMORY ());
+          this->data_listener_ = new ::CIAO::DDS4CCM::DataWriterListener_T
+            <DDS_TYPE, CCM_TYPE> ();
         }
       this->rti_writer_.set_listener (
         this->data_listener_.in (),
@@ -84,7 +82,7 @@ DDS_Update_T<DDS_TYPE, CCM_TYPE>::activate ()
     }
   catch (...)
     {
-      DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Update_T::activate: Caught unknown c++ exception.\n"));
+      CIAO_ERROR (1, (LM_EMERGENCY, "DDS_Update_T::activate: Caught unknown c++ exception.\n"));
       throw CORBA::INTERNAL ();
     }
 }
@@ -93,7 +91,7 @@ template <typename DDS_TYPE, typename CCM_TYPE>
 void
 DDS_Update_T<DDS_TYPE, CCM_TYPE>::passivate ()
 {
-  DDS4CCM_TRACE ("DDS_Update_T<DDS_TYPE, CCM_TYPE>::passivate");
+  CIAO_TRACE ("DDS_Update_T<DDS_TYPE, CCM_TYPE>::passivate");
   try
     {
       this->rti_writer_.set_listener (
@@ -103,7 +101,7 @@ DDS_Update_T<DDS_TYPE, CCM_TYPE>::passivate ()
     }
   catch (...)
     {
-      DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Update_T::passivate: Caught unknown c++ exception.\n"));
+      CIAO_ERROR (1, (LM_EMERGENCY, "DDS_Update_T::passivate: Caught unknown c++ exception.\n"));
       throw CORBA::INTERNAL ();
     }
 }
@@ -113,7 +111,7 @@ void
 DDS_Update_T<DDS_TYPE, CCM_TYPE>::remove (
   ::DDS::Publisher_ptr publisher)
 {
-  DDS4CCM_TRACE ("DDS_Update_T<DDS_TYPE, CCM_TYPE>::remove");
+  CIAO_TRACE ("DDS_Update_T<DDS_TYPE, CCM_TYPE>::remove");
   try
     {
       publisher->delete_datawriter (this->data_writer_.in ());
@@ -123,7 +121,7 @@ DDS_Update_T<DDS_TYPE, CCM_TYPE>::remove (
     }
   catch (...)
     {
-      DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Update_T::remove: Caught unknown c++ exception.\n"));
+      CIAO_ERROR (1, (LM_EMERGENCY, "DDS_Update_T::remove: Caught unknown c++ exception.\n"));
       throw CORBA::INTERNAL ();
     }
 }
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Update_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Update_T.h
index 0aa579e9446..1fd0ddd1653 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Update_T.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Update_T.h
@@ -41,10 +41,9 @@ private:
   //@{
   ::DDS::CCM_DataWriter_var data_writer_;
   ::DDS::DataWriterListener_var data_listener_;
-  ::CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE> dds_update_;
-  ::CIAO::DDS4CCM::CCM_DDS_DataWriter_i rti_writer_;
+  ::CIAO::DDS4CCM::RTI::Updater_T<DDS_TYPE, CCM_TYPE> dds_update_;
+  ::CIAO::DDS4CCM::RTI::RTI_DataWriter_i rti_writer_;
   //@}
-  typedef ::CIAO::DDS4CCM::DataWriterListener_T<DDS_TYPE, CCM_TYPE> DataWriterListener;
 };
 
 #include "dds4ccm/impl/ndds/DDS_Update_T.cpp"
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp
index 4f0b6fdf0bb..9fe0e098fcf 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Write_T.cpp
@@ -6,11 +6,10 @@
 #include "dds4ccm/impl/ndds/DataListenerControl_T.h"
 #include "dds4ccm/impl/ndds/PortStatusListener_T.h"
 
-#include "dds4ccm/impl/logger/Log_Macros.h"
+#include "ciao/Logger/Log_Macros.h"
 
 template <typename DDS_TYPE, typename CCM_TYPE>
-DDS_Write_T<DDS_TYPE, CCM_TYPE>::DDS_Write_T (void) :
-  ccm_dds_writer_i (0)
+DDS_Write_T<DDS_TYPE, CCM_TYPE>::DDS_Write_T (void)
 {
 }
 
@@ -27,7 +26,7 @@ DDS_Write_T<DDS_TYPE, CCM_TYPE>::configuration_complete (
   const char* library_name,
   const char* profile_name)
 {
-  DDS4CCM_TRACE ("DDS_Write_T<DDS_TYPE, CCM_TYPE>::configuration_complete");
+  CIAO_TRACE ("DDS_Write_T<DDS_TYPE, CCM_TYPE>::configuration_complete");
 
   try
     {
@@ -52,16 +51,16 @@ DDS_Write_T<DDS_TYPE, CCM_TYPE>::configuration_complete (
                   ::DDS::DataWriterListener::_nil (),
                   0);
             }
-          ::CIAO::DDS4CCM::CCM_DDS_DataWriter_i  *rw =
-            dynamic_cast < ::CIAO::DDS4CCM::CCM_DDS_DataWriter_i  *> (dwv_tmp.in ());
-          this->ccm_dds_writer_i.set_impl (rw->get_impl ());
+          ::CIAO::DDS4CCM::RTI::RTI_DataWriter_i  *rw =
+            dynamic_cast < ::CIAO::DDS4CCM::RTI::RTI_DataWriter_i  *> (dwv_tmp.in ());
+          this->rti_writer_.set_impl (rw->get_impl ());
           this->data_writer_ = ::DDS::CCM_DataWriter::_narrow (dwv_tmp);
           this->writer_t_.set_impl (dwv_tmp);
         }
     }
   catch (...)
     {
-      DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Write_T::configuration_complete: Caught unknown c++ exception.\n"));
+      CIAO_ERROR (1, (LM_EMERGENCY, "DDS_Write_T::configuration_complete: Caught unknown c++ exception.\n"));
       throw CORBA::INTERNAL ();
     }
 }
@@ -69,22 +68,21 @@ template <typename DDS_TYPE, typename CCM_TYPE>
 void
 DDS_Write_T<DDS_TYPE, CCM_TYPE>::activate ()
 {
-  DDS4CCM_TRACE ("DDS_Write_T<DDS_TYPE, CCM_TYPE>::activate");
+  CIAO_TRACE ("DDS_Write_T<DDS_TYPE, CCM_TYPE>::activate");
   try
     {
       if (CORBA::is_nil (this->data_listener_.in ()))
         {
-          ACE_NEW_THROW_EX (this->data_listener_,
-                            DataWriterListener (),
-                            CORBA::NO_MEMORY ());
+          this->data_listener_ = new ::CIAO::DDS4CCM::DataWriterListener_T
+            <DDS_TYPE, CCM_TYPE> ();
         }
-      this->ccm_dds_writer_i.set_listener (
+      this->rti_writer_.set_listener (
         this->data_listener_.in (),
         ::CIAO::DDS4CCM::DataWriterListener_T<DDS_TYPE, CCM_TYPE>::get_mask ());
     }
   catch (...)
     {
-      DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Write_T::activate: Caught unknown c++ exception.\n"));
+      CIAO_ERROR (1, (LM_EMERGENCY, "DDS_Write_T::activate: Caught unknown c++ exception.\n"));
       throw CORBA::INTERNAL ();
     }
 }
@@ -93,17 +91,17 @@ template <typename DDS_TYPE, typename CCM_TYPE>
 void
 DDS_Write_T<DDS_TYPE, CCM_TYPE>::passivate ()
 {
-  DDS4CCM_TRACE ("DDS_Write_T<DDS_TYPE, CCM_TYPE>::passivate");
+  CIAO_TRACE ("DDS_Write_T<DDS_TYPE, CCM_TYPE>::passivate");
   try
     {
-      this->ccm_dds_writer_i.set_listener (
+      this->rti_writer_.set_listener (
         ::DDS::DataWriterListener::_nil (),
         0);
       this->data_listener_ = ::DDS::DataWriterListener::_nil ();
     }
   catch (...)
     {
-      DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Write_T::passivate: Caught unknown c++ exception.\n"));
+      CIAO_ERROR (1, (LM_EMERGENCY, "DDS_Write_T::passivate: Caught unknown c++ exception.\n"));
       throw CORBA::INTERNAL ();
     }
 }
@@ -113,17 +111,17 @@ void
 DDS_Write_T<DDS_TYPE, CCM_TYPE>::remove (
   ::DDS::Publisher_ptr publisher)
 {
-  DDS4CCM_TRACE ("DDS_Write_T<DDS_TYPE, CCM_TYPE>::remove");
+  CIAO_TRACE ("DDS_Write_T<DDS_TYPE, CCM_TYPE>::remove");
   try
     {
       publisher->delete_datawriter (this->data_writer_.in ());
-      this->ccm_dds_writer_i.set_impl (0);
+      this->rti_writer_.set_impl (0);
       this->data_writer_ = ::DDS::CCM_DataWriter::_nil ();
       this->writer_t_.set_impl (0);
     }
   catch (...)
     {
-      DDS4CCM_ERROR (1, (LM_EMERGENCY, "DDS_Write_T::remove: Caught unknown c++ exception.\n"));
+      CIAO_ERROR (1, (LM_EMERGENCY, "DDS_Write_T::remove: Caught unknown c++ exception.\n"));
       throw CORBA::INTERNAL ();
     }
 }
@@ -133,7 +131,7 @@ template <typename DDS_TYPE, typename CCM_TYPE>
 typename CCM_TYPE::writer_type::_ptr_type
 DDS_Write_T<DDS_TYPE, CCM_TYPE>::get_data (void)
 {
-  DDS4CCM_TRACE ("DDS_Write_T<DDS_TYPE, CCM_TYPE>::get_data");
+  CIAO_TRACE ("DDS_Write_T<DDS_TYPE, CCM_TYPE>::get_data");
 
   return &this->writer_t_;
 }
@@ -142,8 +140,8 @@ template <typename DDS_TYPE, typename CCM_TYPE>
 ::DDS::CCM_DataWriter_ptr
 DDS_Write_T<DDS_TYPE, CCM_TYPE>::get_dds_entity (void)
 {
-  DDS4CCM_TRACE ("DDS_Write_T<DDS_TYPE, CCM_TYPE>::get_dds_entity");
+  CIAO_TRACE ("DDS_Write_T<DDS_TYPE, CCM_TYPE>::get_dds_entity");
 
-  return &this->ccm_dds_writer_i;
+  return &this->rti_writer_;
 }
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Write_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Write_T.h
index d42f824e608..6eef29555df 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DDS_Write_T.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DDS_Write_T.h
@@ -48,11 +48,9 @@ private:
   //@{
   ::DDS::CCM_DataWriter_var data_writer_;
   ::DDS::DataWriterListener_var data_listener_;
-  ::CIAO::DDS4CCM::Writer_T<DDS_TYPE, CCM_TYPE> writer_t_;
-  ::CIAO::DDS4CCM::CCM_DDS_DataWriter_i ccm_dds_writer_i;
+  ::CIAO::DDS4CCM::RTI::Writer_T<DDS_TYPE, CCM_TYPE> writer_t_;
+  ::CIAO::DDS4CCM::RTI::RTI_DataWriter_i rti_writer_;
   //@}
-
-  typedef ::CIAO::DDS4CCM::DataWriterListener_T<DDS_TYPE, CCM_TYPE> DataWriterListener;
 };
 
 #include "dds4ccm/impl/ndds/DDS_Write_T.cpp"
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataListenerControl_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataListenerControl_T.cpp
index 627cec340b4..e3c83f0359d 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataListenerControl_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataListenerControl_T.cpp
@@ -6,20 +6,20 @@ CCM_DDS_DataListenerControl_T<BASE_TYPE>::CCM_DDS_DataListenerControl_T (void) :
   mode_ (::CCM_DDS::NOT_ENABLED),
   max_delivered_data_ (0)
 {
-  DDS4CCM_TRACE ("CCM_DDS_DataListenerControl_T::CCM_DDS_DataListenerControl_T");
+  CIAO_TRACE ("CCM_DDS_DataListenerControl_T::CCM_DDS_DataListenerControl_T");
 }
 
 template <typename BASE_TYPE>
 CCM_DDS_DataListenerControl_T<BASE_TYPE>::~CCM_DDS_DataListenerControl_T (void)
 {
-  DDS4CCM_TRACE ("CCM_DDS_DataListenerControl_T::~CCM_DDS_DataListenerControl_T");
+  CIAO_TRACE ("CCM_DDS_DataListenerControl_T::~CCM_DDS_DataListenerControl_T");
 }
 
 template <typename BASE_TYPE>
 ::CCM_DDS::ListenerMode
 CCM_DDS_DataListenerControl_T<BASE_TYPE>::mode (void)
 {
-  DDS4CCM_TRACE ("CCM_DDS_DataListenerControl_T::mode");
+  CIAO_TRACE ("CCM_DDS_DataListenerControl_T::mode");
   return this->mode_.value ();
 }
 
@@ -27,7 +27,7 @@ template <typename BASE_TYPE>
 void
 CCM_DDS_DataListenerControl_T<BASE_TYPE>::mode (::CCM_DDS::ListenerMode mode)
 {
-  DDS4CCM_TRACE ("CCM_DDS_DataListenerControl_T::mode");
+  CIAO_TRACE ("CCM_DDS_DataListenerControl_T::mode");
   this->mode_ = mode;
 }
 
@@ -35,7 +35,7 @@ template <typename BASE_TYPE>
 ::CCM_DDS::DataNumber_t
 CCM_DDS_DataListenerControl_T<BASE_TYPE>::max_delivered_data (void)
 {
-  DDS4CCM_TRACE ("CCM_DDS_DataListenerControl_T::max_delivered_data");
+  CIAO_TRACE ("CCM_DDS_DataListenerControl_T::max_delivered_data");
   return this->max_delivered_data_.value ();
 }
 
@@ -44,7 +44,7 @@ void
 CCM_DDS_DataListenerControl_T<BASE_TYPE>::max_delivered_data (
   ::CCM_DDS::DataNumber_t max_delivered_data)
 {
-  DDS4CCM_TRACE ("CCM_DDS_DataListenerControl_T::max_delivered_data");
+  CIAO_TRACE ("CCM_DDS_DataListenerControl_T::max_delivered_data");
   this->max_delivered_data_ = max_delivered_data;
 }
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReader.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataReader.cpp
index d7eb807ca43..216e626ee40 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataReader.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReader.cpp
@@ -19,394 +19,283 @@
 #include "DataReaderQos.h"
 #include "StringSeq.h"
 
-#include "dds4ccm/impl/logger/Log_Macros.h"
+#include "ciao/Logger/Log_Macros.h"
 
 namespace CIAO
 {
   namespace DDS4CCM
   {
-    CCM_DDS_DataReader_i::CCM_DDS_DataReader_i (void)
-      : impl_ (0)
+    namespace RTI
     {
-    }
-
-    CCM_DDS_DataReader_i::~CCM_DDS_DataReader_i (void)
-    {
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_DataReader_i::enable (void)
-    {
-      return this->impl ()->enable ();
-    }
-
-    ::DDS::StatusCondition_ptr
-    CCM_DDS_DataReader_i::get_statuscondition (void)
-    {
-      ::DDS::StatusCondition_var retval = ::DDS::StatusCondition::_nil ();
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      DDSStatusCondition* sc = this->impl ()->get_statuscondition ();
-      ACE_NEW_THROW_EX (retval,
-                        CCM_DDS_StatusCondition_i (sc),
-                        CORBA::NO_MEMORY ());
-#else
-      ::DDS::StatusCondition_var sc = this->impl ()->get_statuscondition ();
-      ACE_NEW_THROW_EX (retval,
-                        CCM_DDS_StatusCondition_i (sc.in ()),
-                        CORBA::NO_MEMORY ());
-#endif
-      return retval._retn ();
-    }
-
-    ::DDS::StatusMask
-    CCM_DDS_DataReader_i::get_status_changes (void)
-    {
-      return this->impl ()->get_status_changes ();
-    }
-
-    DDS_INSTANCE_HANDLE_T_RETN
-    CCM_DDS_DataReader_i::get_instance_handle (void)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ::DDS_InstanceHandle_t const rtihandle = this->impl ()->get_instance_handle ();
-      ::DDS::InstanceHandle_t handle;
-      handle <<= rtihandle;
-      return handle;
-#else
-      return this->impl ()->get_instance_handle ();
-#endif
-    }
-
-    ::DDS::ReadCondition_ptr
-    CCM_DDS_DataReader_i::create_readcondition (
-      ::DDS::SampleStateMask sample_states,
-      ::DDS::ViewStateMask view_states,
-      ::DDS::InstanceStateMask instance_states)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ::DDS::ReadCondition_var retval = ::DDS::ReadCondition::_nil ();
-      ACE_NEW_THROW_EX (retval,
-                        CCM_DDS_ReadCondition_i (),
-                        CORBA::NO_MEMORY ());
-
-      DDSReadCondition* rc = this->impl ()->create_readcondition (sample_states, view_states, instance_states);
-      CCM_DDS_ReadCondition_i *rti_rc = dynamic_cast < CCM_DDS_ReadCondition_i *>(retval.in ());
-      rti_rc->set_impl (rc);
-      return retval._retn ();
-#else
-      return this->impl ()->create_readcondition (sample_states, view_states, instance_states);
-#endif
-    }
-
-    ::DDS::QueryCondition_ptr
-    CCM_DDS_DataReader_i::create_querycondition (
-      ::DDS::SampleStateMask sample_states,
-      ::DDS::ViewStateMask view_states,
-      ::DDS::InstanceStateMask instance_states,
-      const char * query_expression,
-      const ::DDS::StringSeq & query_parameters)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      DDS_StringSeq parameters;
-      parameters <<= query_parameters;
-
-      ::DDS::QueryCondition_var retval = ::DDS::QueryCondition::_nil ();
-      ACE_NEW_THROW_EX (retval,
-                        CCM_DDS_QueryCondition_i (),
-                        CORBA::NO_MEMORY ());
-
-      DDSQueryCondition* qc = this->impl ()->create_querycondition (
-                                     sample_states,
-                                     view_states,
-                                     instance_states,
-                                     query_expression,
-                                     parameters);
-
-      CCM_DDS_QueryCondition_i *rti_qc = dynamic_cast < CCM_DDS_QueryCondition_i *> (retval.in ());
-      rti_qc->set_impl (qc);
-      return retval._retn ();
-#else
-      return this->impl ()->create_querycondition (
-                                     sample_states,
-                                     view_states,
-                                     instance_states,
-                                     query_expression,
-                                     query_parameters);
-#endif
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_DataReader_i::delete_readcondition (
-      ::DDS::ReadCondition_ptr a_condition)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      CCM_DDS_ReadCondition_i *rc = dynamic_cast< CCM_DDS_ReadCondition_i *> (a_condition);
-      if (!rc)
-        {
-          return ::DDS::RETCODE_BAD_PARAMETER;
-        }
-      return this->impl ()->delete_readcondition (rc->get_impl ());
-#else
-      return this->impl ()->delete_readcondition (a_condition);
-#endif
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_DataReader_i::delete_contained_entities (void)
-    {
-      return this->impl ()->delete_contained_entities ();
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_DataReader_i::set_qos (
-      const ::DDS::DataReaderQos &qos)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ::DDS_DataReaderQos ddsqos;
-      ddsqos <<= qos;
-      return this->impl ()->set_qos (ddsqos);
-#else
-      return this->impl ()->set_qos (qos);
-#endif
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_DataReader_i::get_qos (
-      ::DDS::DataReaderQos &qos)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ::DDS_DataReaderQos ddsqos;
-      ::DDS_ReturnCode_t const retval = this->impl ()->get_qos (ddsqos);
-      qos <<= ddsqos;
-      return retval;
-#else
-      return this->impl ()->get_qos (qos);
-#endif
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_DataReader_i::set_listener (
-      ::DDS::DataReaderListener_ptr a_listener,
-      ::DDS::StatusMask mask)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_DataReader_i::set_listener");
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      CCM_DDS_DataReaderListener_i *rti_drl = 0;
-      if (!CORBA::is_nil (a_listener))
-        {
-          ACE_NEW_THROW_EX (rti_drl,
-                            CCM_DDS_DataReaderListener_i (a_listener),
-                            CORBA::NO_MEMORY ());
-        }
-      return this->impl ()->set_listener (rti_drl, mask);
-#else
-      return this->impl ()->set_listener (a_listener, mask);
-#endif
-    }
-
-    ::DDS::DataReaderListener_ptr
-    CCM_DDS_DataReader_i::get_listener (void)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_DataReader_i::get_listener");
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      DDSDataReaderListener *drl = this->impl ()->get_listener ();
-      CCM_DDS_DataReaderListener_i *rti_drl = dynamic_cast <CCM_DDS_DataReaderListener_i *> (drl);
-      if (!rti_drl)
-        {
-          DDS4CCM_DEBUG (6, (LM_DEBUG, "CCM_DDS_DataReader_i::get_listener - "
-                                    "DDS returned a NIL listener.\n"));
-          return ::DDS::DataReaderListener::_nil ();
-        }
-      return rti_drl->get_datareaderlistener ();
-#else
-      return this->impl ()->get_listener ();
-#endif
-    }
+      // Implementation skeleton constructor
+      RTI_DataReader_i::RTI_DataReader_i (void)
+        : impl_ (0)
+      {
+      }
+
+      // Implementation skeleton destructor
+      RTI_DataReader_i::~RTI_DataReader_i (void)
+      {
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_DataReader_i::enable (void)
+      {
+        return this->impl ()->enable ();
+      }
+
+      ::DDS::StatusCondition_ptr
+      RTI_DataReader_i::get_statuscondition (void)
+      {
+        DDSStatusCondition* sc = this->impl ()->get_statuscondition ();
+        ::DDS::StatusCondition_var retval = new RTI_StatusCondition_i ();
+        RTI_StatusCondition_i *rti_sc = dynamic_cast < RTI_StatusCondition_i *> (retval.in ());
+        rti_sc->set_impl (sc);
+        return retval._retn ();
+      }
+
+      ::DDS::StatusMask
+      RTI_DataReader_i::get_status_changes (void)
+      {
+        return this->impl ()->get_status_changes ();
+      }
+
+      ::DDS::InstanceHandle_t
+      RTI_DataReader_i::get_instance_handle (void)
+      {
+        ::DDS_InstanceHandle_t const rtihandle = this->impl ()->get_instance_handle ();
+        ::DDS::InstanceHandle_t handle;
+        handle <<= rtihandle;
+        return handle;
+      }
+
+      ::DDS::ReadCondition_ptr
+      RTI_DataReader_i::create_readcondition (
+        ::DDS::SampleStateMask sample_states,
+        ::DDS::ViewStateMask view_states,
+        ::DDS::InstanceStateMask instance_states)
+      {
+        DDSReadCondition* rc = this->impl ()->create_readcondition (sample_states, view_states, instance_states);
+        ::DDS::ReadCondition_var retval = new RTI_ReadCondition_i ();
+        RTI_ReadCondition_i *rti_rc = dynamic_cast < RTI_ReadCondition_i *>(retval.in ());
+        rti_rc->set_impl (rc);
+        return retval._retn ();
+      }
+
+      ::DDS::QueryCondition_ptr
+      RTI_DataReader_i::create_querycondition (
+        ::DDS::SampleStateMask sample_states,
+        ::DDS::ViewStateMask view_states,
+        ::DDS::InstanceStateMask instance_states,
+        const char * query_expression,
+        const ::DDS::StringSeq & query_parameters)
+      {
+        DDS_StringSeq parameters;
+        parameters <<= query_parameters;
+
+        DDSQueryCondition* qc = this->impl ()->create_querycondition (
+                                       sample_states,
+                                       view_states,
+                                       instance_states,
+                                       query_expression,
+                                       parameters);
+
+        ::DDS::QueryCondition_var retval = new RTI_QueryCondition_i ();
+        RTI_QueryCondition_i *rti_qc = dynamic_cast < RTI_QueryCondition_i *> (retval.in ());
+        rti_qc->set_impl (qc);
+        return retval._retn ();
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_DataReader_i::delete_readcondition (
+        ::DDS::ReadCondition_ptr a_condition)
+      {
+        RTI_ReadCondition_i *rc = dynamic_cast< RTI_ReadCondition_i *> (a_condition);
+        if (!rc)
+          {
+            return ::DDS::RETCODE_BAD_PARAMETER;
+          }
+        return this->impl ()->delete_readcondition (rc->get_impl ());
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_DataReader_i::delete_contained_entities (void)
+      {
+        return this->impl ()->delete_contained_entities ();
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_DataReader_i::set_qos (
+        const ::DDS::DataReaderQos &qos)
+      {
+        ::DDS_DataReaderQos ddsqos;
+        ddsqos <<= qos;
+        return this->impl ()->set_qos (ddsqos);
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_DataReader_i::get_qos (
+        ::DDS::DataReaderQos &qos)
+      {
+        ::DDS_DataReaderQos ddsqos;
+        ::DDS_ReturnCode_t const retval = this->impl ()->get_qos (ddsqos);
+        qos <<= ddsqos;
+        return retval;
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_DataReader_i::set_listener (
+        ::DDS::DataReaderListener_ptr a_listener,
+        ::DDS::StatusMask mask)
+      {
+        RTI_DataReaderListener_i* rti_drl = new RTI_DataReaderListener_i (a_listener);
+        return this->impl ()->set_listener (rti_drl, mask);
+      }
+
+      ::DDS::DataReaderListener_ptr
+      RTI_DataReader_i::get_listener (void)
+      {
+        DDSDataReaderListener * drl = this->impl ()->get_listener ();
+        RTI_DataReaderListener_i * rti_drl = dynamic_cast< RTI_DataReaderListener_i *> (drl);
+        if (!rti_drl)
+          {
+            CIAO_DEBUG (6, (LM_DEBUG, "RTI_DataReader_i::get_listener - "
+                                      "DDS returned a NIL listener.\n"));
+            return ::DDS::DataReaderListener::_nil ();
+          }
+        return rti_drl->get_datareaderlistener ();
+      }
+
+      ::DDS::TopicDescription_ptr
+      RTI_DataReader_i::get_topicdescription (void)
+      {
+        ::DDSTopicDescription* td = this->impl ()->get_topicdescription ();
+        ::DDS::TopicDescription_var dds_td = new RTI_TopicDescription_i ();
+        RTI_TopicDescription_i *rti_td = dynamic_cast < RTI_TopicDescription_i *>(dds_td.in ());
+        rti_td->set_impl (td);
+        return dds_td._retn ();
+      }
+
+      ::DDS::Subscriber_ptr
+      RTI_DataReader_i::get_subscriber (void)
+      {
+        ::DDSSubscriber* subscriber = this->impl ()->get_subscriber ();
+        ::DDS::Subscriber_var dds_td = new RTI_Subscriber_i ();
+        RTI_Subscriber_i *sub = dynamic_cast < RTI_Subscriber_i *>(dds_td.in ());
+        sub->set_impl (subscriber);
+        return dds_td._retn ();
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_DataReader_i::get_sample_rejected_status (
+        ::DDS::SampleRejectedStatus & status)
+      {
+        DDS_SampleRejectedStatus rtistatus;
+        ::DDS::ReturnCode_t const retval = this->impl ()->get_sample_rejected_status (rtistatus);
+        rtistatus >>= status;
+        return retval;
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_DataReader_i::get_liveliness_changed_status (
+        ::DDS::LivelinessChangedStatus & status)
+      {
+        DDS_LivelinessChangedStatus rtistatus;
+        ::DDS::ReturnCode_t const retval = this->impl ()->get_liveliness_changed_status (rtistatus);
+        rtistatus >>= status;
+        return retval;
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_DataReader_i::get_requested_deadline_missed_status (
+        ::DDS::RequestedDeadlineMissedStatus & status)
+      {
+        DDS_RequestedDeadlineMissedStatus rtistatus;
+        ::DDS::ReturnCode_t const retval = this->impl ()->get_requested_deadline_missed_status (rtistatus);
+        rtistatus >>= status;
+        return retval;
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_DataReader_i::get_requested_incompatible_qos_status (
+        ::DDS::RequestedIncompatibleQosStatus & status)
+      {
+        DDS_RequestedIncompatibleQosStatus rtistatus;
+        ::DDS::ReturnCode_t const retval = this->impl ()->get_requested_incompatible_qos_status (rtistatus);
+        rtistatus >>= status;
+        return retval;
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_DataReader_i::get_subscription_matched_status (
+        ::DDS::SubscriptionMatchedStatus & status)
+      {
+        ::DDS_SubscriptionMatchedStatus ddsstatus;
+        ::DDS::ReturnCode_t const retval = this->impl ()->get_subscription_matched_status (ddsstatus);
+        ddsstatus >>= status;
+        return retval;
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_DataReader_i::get_sample_lost_status (
+        ::DDS::SampleLostStatus & status)
+      {
+        DDS_SampleLostStatus rtistatus;
+        ::DDS::ReturnCode_t const retval = this->impl ()->get_sample_lost_status (rtistatus);
+        rtistatus >>= status;
+        return retval;
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_DataReader_i::wait_for_historical_data (
+        const ::DDS::Duration_t & max_wait)
+      {
+       ::DDS_Duration_t rtiduration;
+       rtiduration <<= max_wait;
+       return this->impl ()->wait_for_historical_data (rtiduration);
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_DataReader_i::get_matched_publications (
+        ::DDS::InstanceHandleSeq & publication_handles)
+      {
+        ::DDS_InstanceHandleSeq rtiseq;
+        ::DDS::ReturnCode_t const retval = this->impl ()->get_matched_publications (rtiseq);
+        rtiseq >>= publication_handles;
+        return retval;
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_DataReader_i::get_matched_publication_data (
+        ::DDS::PublicationBuiltinTopicData & /*publication_data*/,
+        const ::DDS::InstanceHandle_t & /*publication_handle*/)
+      {
+        throw CORBA::NO_IMPLEMENT ();
+        // Add your implementation here
+      }
+
+      DDSDataReader *
+      RTI_DataReader_i::get_impl (void)
+      {
+        return this->impl_;
+      }
+
+      void
+      RTI_DataReader_i::set_impl (DDSDataReader * dr)
+      {
+        this->impl_ = dr;
+      }
+
+      DDSDataReader *
+      RTI_DataReader_i::impl (void)
+      {
+        if (!this->impl_)
+          {
+            throw ::CORBA::BAD_INV_ORDER ();
+          }
+        return this->impl_;
+      }
 
-    ::DDS::TopicDescription_ptr
-    CCM_DDS_DataReader_i::get_topicdescription (void)
-    {
-      ::DDS::TopicDescription_var dds_td = ::DDS::TopicDescription::_nil ();
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ::DDSTopicDescription* td = this->impl ()->get_topicdescription ();
-      ACE_NEW_THROW_EX (dds_td,
-                        CCM_DDS_TopicDescription_i (td),
-                        CORBA::NO_MEMORY ());
-#else
-      ::DDS::TopicDescription_var td = this->impl ()->get_topicdescription ();
-      ACE_NEW_THROW_EX (dds_td,
-                        CCM_DDS_TopicDescription_i (td.in ()),
-                        CORBA::NO_MEMORY ());
-#endif
-      return dds_td._retn ();
-    }
-
-    ::DDS::Subscriber_ptr
-    CCM_DDS_DataReader_i::get_subscriber (void)
-    {
-      ::DDS::Subscriber_var dds_td = ::DDS::Subscriber::_nil ();
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ::DDSSubscriber* subscriber = this->impl ()->get_subscriber ();
-      ACE_NEW_THROW_EX (dds_td,
-                        CCM_DDS_Subscriber_i (subscriber),
-                        CORBA::NO_MEMORY ());
-#else
-      ::DDSSubscriber_var subscriber = this->impl ()->get_subscriber ();
-      ACE_NEW_THROW_EX (dds_td,
-                        CCM_DDS_Subscriber_i (subscriber.in ()),
-                        CORBA::NO_MEMORY ());
-#endif
-      return dds_td._retn ();
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_DataReader_i::get_sample_rejected_status (
-      ::DDS::SampleRejectedStatus & status)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      DDS_SampleRejectedStatus rtistatus;
-      ::DDS::ReturnCode_t const retval = this->impl ()->get_sample_rejected_status (rtistatus);
-      rtistatus >>= status;
-      return retval;
-#else
-      return this->impl ()->get_sample_rejected_status (status);
-#endif
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_DataReader_i::get_liveliness_changed_status (
-      ::DDS::LivelinessChangedStatus & status)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      DDS_LivelinessChangedStatus rtistatus;
-      ::DDS::ReturnCode_t const retval = this->impl ()->get_liveliness_changed_status (rtistatus);
-      rtistatus >>= status;
-      return retval;
-#else
-      return this->impl ()->get_liveliness_changed_status (status);
-#endif
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_DataReader_i::get_requested_deadline_missed_status (
-      ::DDS::RequestedDeadlineMissedStatus & status)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      DDS_RequestedDeadlineMissedStatus rtistatus;
-      ::DDS::ReturnCode_t const retval = this->impl ()->get_requested_deadline_missed_status (rtistatus);
-      rtistatus >>= status;
-      return retval;
-#else
-      return this->impl ()->get_requested_deadline_missed_status (status);
-#endif
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_DataReader_i::get_requested_incompatible_qos_status (
-      ::DDS::RequestedIncompatibleQosStatus & status)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      DDS_RequestedIncompatibleQosStatus rtistatus;
-      ::DDS::ReturnCode_t const retval = this->impl ()->get_requested_incompatible_qos_status (rtistatus);
-      rtistatus >>= status;
-      return retval;
-#else
-      return this->impl ()->get_requested_incompatible_qos_status (status);
-#endif
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_DataReader_i::get_subscription_matched_status (
-      ::DDS::SubscriptionMatchedStatus & status)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ::DDS_SubscriptionMatchedStatus ddsstatus;
-      ::DDS::ReturnCode_t const retval = this->impl ()->get_subscription_matched_status (ddsstatus);
-      ddsstatus >>= status;
-      return retval;
-#else
-      return this->impl ()->get_subscription_matched_status (status);
-#endif
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_DataReader_i::get_sample_lost_status (
-      ::DDS::SampleLostStatus & status)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      DDS_SampleLostStatus rtistatus;
-      ::DDS::ReturnCode_t const retval = this->impl ()->get_sample_lost_status (rtistatus);
-      rtistatus >>= status;
-      return retval;
-#else
-      return this->impl ()->get_sample_lost_status (status);
-#endif
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_DataReader_i::wait_for_historical_data (
-      const ::DDS::Duration_t & max_wait)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-     ::DDS_Duration_t rtiduration;
-     rtiduration <<= max_wait;
-     return this->impl ()->wait_for_historical_data (rtiduration);
-#else
-     return this->impl ()->wait_for_historical_data (max_wait);
-#endif
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_DataReader_i::get_matched_publications (
-      ::DDS::InstanceHandleSeq & publication_handles)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ::DDS_InstanceHandleSeq rtiseq;
-      ::DDS::ReturnCode_t const retval = this->impl ()->get_matched_publications (rtiseq);
-      rtiseq >>= publication_handles;
-      return retval;
-#else
-      return this->impl ()->get_matched_publications (publication_handles);
-#endif
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_DataReader_i::get_matched_publication_data (
-      ::DDS::PublicationBuiltinTopicData & publication_data,
-      DDS_INSTANCE_HANDLE_T_IN publication_handle)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ACE_UNUSED_ARG (publication_data);
-      ACE_UNUSED_ARG (publication_handle);
-      throw CORBA::NO_IMPLEMENT ();
-      // Add your implementation here
-#else
-      return this->impl ()->get_matched_publication_data (publication_data, publication_handle);
-#endif
-    }
-
-    DDSDataReader *
-    CCM_DDS_DataReader_i::get_impl (void)
-    {
-      return this->impl_;
-    }
-
-    void
-    CCM_DDS_DataReader_i::set_impl (DDSDataReader * dr)
-    {
-      this->impl_ = dr;
-    }
-
-    DDSDataReader *
-    CCM_DDS_DataReader_i::impl (void)
-    {
-      if (!this->impl_)
-        {
-          throw ::CORBA::BAD_INV_ORDER ();
-        }
-      return this->impl_;
     }
   }
 }
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReader.h b/CIAO/connectors/dds4ccm/impl/ndds/DataReader.h
index ace577ce6e3..cb40be6bcd5 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataReader.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReader.h
@@ -7,136 +7,137 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_DATAREADER_H
-#define DDS4CCM_DATAREADER_H
+#ifndef CIAO_RTI_DATAREADER_H
+#define CIAO_RTI_DATAREADER_H
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 
 #include "dds4ccm/idl/dds_rtf2_dcpsEC.h"
 
 #include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h"
-#include "dds4ccm/impl/ndds/InstanceHandle_t.h"
 #include "tao/LocalObject.h"
 
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-# include "ndds/ndds_cpp.h"
-#endif
-
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::DataReader DDSDataReader;
-#endif
+#include "ndds/ndds_cpp.h"
 
 namespace CIAO
 {
   namespace DDS4CCM
   {
-    class DDS4CCM_NDDS_IMPL_Export CCM_DDS_DataReader_i
-      : public virtual ::DDS::CCM_DataReader,
-        public virtual ::CORBA::LocalObject
+    namespace RTI
     {
-    public:
-      /// Constructor
-      CCM_DDS_DataReader_i (void);
+      class DDS4CCM_NDDS_IMPL_Export RTI_DataReader_i
+        : public virtual ::DDS::CCM_DataReader,
+          public virtual ::CORBA::LocalObject
+      {
+      public:
+        // Constructor
+        RTI_DataReader_i (void);
 
-      /// Destructor
-      virtual ~CCM_DDS_DataReader_i (void);
+        // Destructor
+        virtual ~RTI_DataReader_i (void);
 
-      virtual ::DDS::ReturnCode_t
-      enable (void);
+        virtual ::DDS::ReturnCode_t
+        enable (void);
 
-      virtual ::DDS::StatusCondition_ptr
-      get_statuscondition (void);
+        virtual ::DDS::StatusCondition_ptr
+        get_statuscondition (void);
 
-      virtual ::DDS::StatusMask
-      get_status_changes (void);
+        virtual ::DDS::StatusMask
+        get_status_changes (void);
 
-      virtual DDS_INSTANCE_HANDLE_T_RETN
-      get_instance_handle (void);
+        virtual ::DDS::InstanceHandle_t
+        get_instance_handle (void);
 
-      virtual ::DDS::ReadCondition_ptr
-      create_readcondition (
-        ::DDS::SampleStateMask sample_states,
-        ::DDS::ViewStateMask view_states,
-        ::DDS::InstanceStateMask instance_states);
+        virtual ::DDS::ReadCondition_ptr
+        create_readcondition (
+          ::DDS::SampleStateMask sample_states,
+          ::DDS::ViewStateMask view_states,
+          ::DDS::InstanceStateMask instance_states);
 
-      virtual ::DDS::QueryCondition_ptr
-      create_querycondition (
-        ::DDS::SampleStateMask sample_states,
-        ::DDS::ViewStateMask view_states,
-        ::DDS::InstanceStateMask instance_states,
-        const char * query_expression,
-        const ::DDS::StringSeq & query_parameters);
+        virtual ::DDS::QueryCondition_ptr
+        create_querycondition (
+          ::DDS::SampleStateMask sample_states,
+          ::DDS::ViewStateMask view_states,
+          ::DDS::InstanceStateMask instance_states,
+          const char * query_expression,
+          const ::DDS::StringSeq & query_parameters);
 
-      virtual ::DDS::ReturnCode_t
-      delete_readcondition (
-        ::DDS::ReadCondition_ptr a_condition);
+        virtual ::DDS::ReturnCode_t
+        delete_readcondition (
+          ::DDS::ReadCondition_ptr a_condition);
 
-      virtual ::DDS::ReturnCode_t
-      delete_contained_entities (void);
+        virtual ::DDS::ReturnCode_t
+        delete_contained_entities (void);
 
-      virtual ::DDS::ReturnCode_t
-      set_qos (const ::DDS::DataReaderQos & qos);
+        virtual ::DDS::ReturnCode_t
+        set_qos (
+          const ::DDS::DataReaderQos & qos);
 
-      virtual ::DDS::ReturnCode_t
-      get_qos (::DDS::DataReaderQos & qos);
+        virtual ::DDS::ReturnCode_t
+        get_qos (
+          ::DDS::DataReaderQos & qos);
 
-      virtual ::DDS::ReturnCode_t
-      set_listener (
-        ::DDS::DataReaderListener_ptr a_listener,
-        ::DDS::StatusMask mask);
+        virtual ::DDS::ReturnCode_t
+        set_listener (
+          ::DDS::DataReaderListener_ptr a_listener,
+          ::DDS::StatusMask mask);
 
-      virtual ::DDS::DataReaderListener_ptr
-      get_listener (void);
+        virtual ::DDS::DataReaderListener_ptr
+        get_listener (void);
 
-      virtual ::DDS::TopicDescription_ptr
-      get_topicdescription (void);
+        virtual ::DDS::TopicDescription_ptr
+        get_topicdescription (void);
 
-      virtual ::DDS::Subscriber_ptr
-      get_subscriber (void);
+        virtual ::DDS::Subscriber_ptr
+        get_subscriber (void);
 
-      virtual ::DDS::ReturnCode_t
-      get_sample_rejected_status (::DDS::SampleRejectedStatus & status);
+        virtual ::DDS::ReturnCode_t
+        get_sample_rejected_status (
+          ::DDS::SampleRejectedStatus & status);
 
-      virtual ::DDS::ReturnCode_t
-      get_liveliness_changed_status (
-        ::DDS::LivelinessChangedStatus & status);
+        virtual ::DDS::ReturnCode_t
+        get_liveliness_changed_status (
+          ::DDS::LivelinessChangedStatus & status);
 
-      virtual ::DDS::ReturnCode_t
-      get_requested_deadline_missed_status (
-        ::DDS::RequestedDeadlineMissedStatus & status);
+        virtual ::DDS::ReturnCode_t
+        get_requested_deadline_missed_status (
+          ::DDS::RequestedDeadlineMissedStatus & status);
 
-      virtual ::DDS::ReturnCode_t
-      get_requested_incompatible_qos_status (
-        ::DDS::RequestedIncompatibleQosStatus & status);
+        virtual ::DDS::ReturnCode_t
+        get_requested_incompatible_qos_status (
+          ::DDS::RequestedIncompatibleQosStatus & status);
 
-      virtual ::DDS::ReturnCode_t
-      get_subscription_matched_status (
-        ::DDS::SubscriptionMatchedStatus & status);
+        virtual ::DDS::ReturnCode_t
+        get_subscription_matched_status (
+          ::DDS::SubscriptionMatchedStatus & status);
 
-      virtual ::DDS::ReturnCode_t
-      get_sample_lost_status (::DDS::SampleLostStatus & status);
+        virtual ::DDS::ReturnCode_t
+        get_sample_lost_status (
+          ::DDS::SampleLostStatus & status);
 
-      virtual ::DDS::ReturnCode_t
-      wait_for_historical_data (const ::DDS::Duration_t & max_wait);
+        virtual ::DDS::ReturnCode_t
+        wait_for_historical_data (
+          const ::DDS::Duration_t & max_wait);
 
-      virtual ::DDS::ReturnCode_t
-      get_matched_publications (
-        ::DDS::InstanceHandleSeq & publication_handles);
+        virtual ::DDS::ReturnCode_t
+        get_matched_publications (
+          ::DDS::InstanceHandleSeq & publication_handles);
 
-      virtual ::DDS::ReturnCode_t
-      get_matched_publication_data (
-        ::DDS::PublicationBuiltinTopicData & publication_data,
-        DDS_INSTANCE_HANDLE_T_IN publication_handle);
+        virtual ::DDS::ReturnCode_t
+        get_matched_publication_data (
+          ::DDS::PublicationBuiltinTopicData & publication_data,
+          const ::DDS::InstanceHandle_t & publication_handle);
 
-      DDSDataReader * get_impl (void);
+        DDSDataReader * get_impl (void);
 
-      void set_impl (DDSDataReader * dr);
+        void set_impl (DDSDataReader * dr);
 
-    private:
-      DDSDataReader * impl_;
+      private:
+        DDSDataReader * impl_;
 
-      DDSDataReader * impl (void);
-    };
+        DDSDataReader * impl (void);
+      };
+    }
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp
index 5b4e276f614..a068e675c94 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderHandler_T.cpp
@@ -3,62 +3,51 @@
 #include "dds4ccm/impl/ndds/Utils.h"
 
 #include "dds4ccm/impl/ndds/DataReader.h"
-#include "dds4ccm/impl/logger/Log_Macros.h"
+#include "ciao/Logger/Log_Macros.h"
 
 
 template <typename DDS_TYPE, typename CCM_TYPE>
-CIAO::DDS4CCM::DataReaderHandler_T<DDS_TYPE, CCM_TYPE>::DataReaderHandler_T (
-            typename CIAO::DDS4CCM::DataReaderListener_T<DDS_TYPE, CCM_TYPE>* drl,
-            ::DDS::DataReader_ptr dr)
-      : drl_ (drl),
-        dr_ (::DDS::DataReader::_duplicate (dr))
+CIAO::DDS4CCM::RTI::DataReaderHandler_T<DDS_TYPE, CCM_TYPE>::DataReaderHandler_T (
+            typename CCM_TYPE::listener_type::_ptr_type listener,
+            typename DDS_TYPE::data_reader * reader)
+      : reader_ (reader),
+        listener_ (CCM_TYPE::listener_type::_duplicate (listener))
 {
-  this->reference_counting_policy ().value
-    (ACE_Event_Handler::Reference_Counting_Policy::ENABLED);
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE>
-CIAO::DDS4CCM::DataReaderHandler_T<DDS_TYPE, CCM_TYPE>::~DataReaderHandler_T (void)
+CIAO::DDS4CCM::RTI::DataReaderHandler_T<DDS_TYPE, CCM_TYPE>::~DataReaderHandler_T (void)
 {
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 int
-CIAO::DDS4CCM::DataReaderHandler_T<DDS_TYPE, CCM_TYPE>::handle_exception (ACE_HANDLE)
+CIAO::DDS4CCM::RTI::DataReaderHandler_T<DDS_TYPE, CCM_TYPE>::handle_exception (ACE_HANDLE)
 {
   try
     {
-      this->drl_->on_data_available_i (this->dr_.in ());
-    }
-  catch (...)
-    {
-    }
-  return 0;
-}
-
-template <typename DDS_TYPE, typename CCM_TYPE>
-CIAO::DDS4CCM::DataReaderStateHandler_T<DDS_TYPE, CCM_TYPE>::DataReaderStateHandler_T (
-            typename CIAO::DDS4CCM::DataReaderStateListener_T<DDS_TYPE, CCM_TYPE>* drl,
-            ::DDS::DataReader_ptr dr)
-      : drl_ (drl),
-        dr_ (::DDS::DataReader::_duplicate (dr))
-{
-  this->reference_counting_policy ().value
-    (ACE_Event_Handler::Reference_Counting_Policy::ENABLED);
-}
-
-template <typename DDS_TYPE, typename CCM_TYPE>
-CIAO::DDS4CCM::DataReaderStateHandler_T<DDS_TYPE, CCM_TYPE>::~DataReaderStateHandler_T (void)
-{
-}
-
-template <typename DDS_TYPE, typename CCM_TYPE>
-int
-CIAO::DDS4CCM::DataReaderStateHandler_T<DDS_TYPE, CCM_TYPE>::handle_exception (ACE_HANDLE)
-{
-  try
-    {
-      this->drl_->on_data_available_i (this->dr_.in ());
+      // Loop until there are messages available in the queue
+      for(;;)
+        {
+          typename DDS_TYPE::value_type instance;
+          ::DDS_SampleInfo sampleinfo;
+          ::DDS::ReturnCode_t const result = this->reader_->take_next_sample(instance,
+                                                                      sampleinfo);
+          if (result == DDS_RETCODE_NO_DATA)
+              break;
+          else if (result != DDS_RETCODE_OK)
+            {
+              CIAO_ERROR (1, (LM_ERROR, ACE_TEXT ("Unable to take data from data reader, error %d.\n"), result));
+              return 1;
+            }
+          if (sampleinfo.valid_data)
+            {
+              CIAO_DEBUG (6, (LM_DEBUG, ACE_TEXT ("DataReaderHandler_T : found valid data\n")));
+              ::CCM_DDS::ReadInfo readinfo;
+              readinfo <<= sampleinfo;
+              listener_->on_one_data (instance, readinfo);
+            }
+        }
     }
   catch (...)
     {
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderHandler_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderHandler_T.h
index 929f9cea0df..d4cfb988e54 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderHandler_T.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderHandler_T.h
@@ -8,53 +8,34 @@
  * received data from DDS.
  */
 
-#ifndef DDS4CCM_DATAREADERHANDLER_T_H
-#define DDS4CCM_DATAREADERHANDLER_T_H
+#ifndef CIAO_RTI_DATAREADERHANDLER_T_H
+#define CIAO_RTI_DATAREADERHANDLER_T_H
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-#include "ace/Event_Handler.h"
+#include "ace/Reactor.h"
 
 namespace CIAO
 {
   namespace DDS4CCM
   {
-    template <typename DDS_TYPE, typename CCM_TYPE>
-    class DataReaderListener_T;
-
-    template <typename DDS_TYPE, typename CCM_TYPE>
-    class DataReaderHandler_T :
-      public ACE_Event_Handler
-    {
-      public:
-        DataReaderHandler_T (
-            typename CIAO::DDS4CCM::DataReaderListener_T<DDS_TYPE, CCM_TYPE>* drl,
-            ::DDS::DataReader_ptr dr);
-        virtual ~DataReaderHandler_T ();
-
-        virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
-      private:
-        typename CIAO::DDS4CCM::DataReaderListener_T<DDS_TYPE, CCM_TYPE>* drl_;
-        ::DDS::DataReader_var dr_;
-    };
-
-    template <typename DDS_TYPE, typename CCM_TYPE>
-    class DataReaderStateListener_T;
-
-    template <typename DDS_TYPE, typename CCM_TYPE>
-    class DataReaderStateHandler_T :
-      public ACE_Event_Handler
+    namespace RTI
     {
-      public:
-        DataReaderStateHandler_T (
-            typename CIAO::DDS4CCM::DataReaderStateListener_T<DDS_TYPE, CCM_TYPE>* drl,
-            ::DDS::DataReader_ptr dr);
-        virtual ~DataReaderStateHandler_T ();
-
-        virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
-      private:
-        typename CIAO::DDS4CCM::DataReaderStateListener_T<DDS_TYPE, CCM_TYPE>* drl_;
-        ::DDS::DataReader_var dr_;
-    };
+      template <typename DDS_TYPE, typename CCM_TYPE>
+      class DataReaderHandler_T :
+        public ACE_Event_Handler
+      {
+        public:
+          DataReaderHandler_T (
+              typename CCM_TYPE::listener_type::_ptr_type listener,
+              typename DDS_TYPE::data_reader * reader);
+          virtual ~DataReaderHandler_T ();
+
+          virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
+        private:
+          typename DDS_TYPE::data_reader * reader_;
+          typename CCM_TYPE::listener_type::_var_type listener_;
+      };
+    }
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.cpp
index a36630d250e..5a837df224f 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.cpp
@@ -11,154 +11,124 @@
 
 #include "dds4ccm/idl/dds4ccm_BaseC.h"
 
-#include "dds4ccm/impl/logger/Log_Macros.h"
+#include "ciao/Logger/Log_Macros.h"
 
 namespace CIAO
 {
   namespace DDS4CCM
   {
-    CCM_DDS_DataReaderListener_i::CCM_DDS_DataReaderListener_i (::DDS::DataReaderListener_ptr p)
-      : impl_ (::DDS::DataReaderListener::_duplicate (p))
+    namespace RTI
     {
-    }
+      // Implementation skeleton constructor
+      RTI_DataReaderListener_i::RTI_DataReaderListener_i (::DDS::DataReaderListener_ptr p)
+        : impl_ (::DDS::DataReaderListener::_duplicate (p))
+      {
+      }
 
-    CCM_DDS_DataReaderListener_i::~CCM_DDS_DataReaderListener_i (void)
-    {
-    }
+      // Implementation skeleton destructor
+      RTI_DataReaderListener_i::~RTI_DataReaderListener_i (void)
+      {
+      }
 
-    void
-    CCM_DDS_DataReaderListener_i::on_requested_deadline_missed (
-      ::DDSDataReader* the_reader,
-      const ::DDS_RequestedDeadlineMissedStatus & status)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_DataReaderListener_i::on_requested_deadline_missed");
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ::DDS::RequestedDeadlineMissedStatus ddsstatus;
-      ddsstatus <<= status;
-      ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil ();
-      ACE_NEW (dds_reader, CCM_DDS_DataReader_i ());
-      CCM_DDS_DataReader_i *rti_dr = dynamic_cast < CCM_DDS_DataReader_i *>(dds_reader.in ());
-      rti_dr->set_impl (the_reader);
-      this->impl_->on_requested_deadline_missed (dds_reader.in (), ddsstatus);
-#else
-      this->impl_->on_requested_deadline_missed (the_reader, status);
-#endif
-    }
+      void
+      RTI_DataReaderListener_i::on_requested_deadline_missed (
+        ::DDSDataReader* the_reader,
+        const ::DDS_RequestedDeadlineMissedStatus & status)
+      {
+        CIAO_TRACE ("RTI_DataReaderListener_i::on_requested_deadline_missed");
+        ::DDS::RequestedDeadlineMissedStatus ddsstatus;
+        ddsstatus <<= status;
+        ::DDS::DataReader_var dds_reader = new RTI_DataReader_i ();
+        RTI_DataReader_i *rti_dr = dynamic_cast < RTI_DataReader_i *>(dds_reader.in ());
+        rti_dr->set_impl (the_reader);
+        this->impl_->on_requested_deadline_missed (dds_reader.in (), ddsstatus);
+      }
 
-    void
-    CCM_DDS_DataReaderListener_i::on_requested_incompatible_qos (
-      ::DDSDataReader* the_reader,
-      const ::DDS_RequestedIncompatibleQosStatus & status)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_DataReaderListener_i::on_requested_incompatible_qos");
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ::DDS::RequestedIncompatibleQosStatus ddsstatus;
-      ddsstatus <<= status;
-      ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil ();
-      ACE_NEW (dds_reader, CCM_DDS_DataReader_i ());
-      CCM_DDS_DataReader_i *rti_dr = dynamic_cast < CCM_DDS_DataReader_i *>(dds_reader.in ());
-      rti_dr->set_impl (the_reader);
-      this->impl_->on_requested_incompatible_qos (dds_reader.in (), ddsstatus);
-#else
-      this->impl_->on_requested_incompatible_qos (the_reader, status);
-#endif
-    }
+      void
+      RTI_DataReaderListener_i::on_requested_incompatible_qos (
+        ::DDSDataReader* the_reader,
+        const ::DDS_RequestedIncompatibleQosStatus & status)
+      {
+        CIAO_TRACE ("RTI_DataReaderListener_i::on_requested_incompatible_qos");
+        ::DDS::RequestedIncompatibleQosStatus ddsstatus;
+        ddsstatus <<= status;
+        ::DDS::DataReader_var dds_reader = new RTI_DataReader_i ();
+        RTI_DataReader_i *rti_dr = dynamic_cast < RTI_DataReader_i *>(dds_reader.in ());
+        rti_dr->set_impl (the_reader);
+        this->impl_->on_requested_incompatible_qos (dds_reader.in (), ddsstatus);
+      }
 
-    void
-    CCM_DDS_DataReaderListener_i::on_sample_rejected (
-      ::DDSDataReader* the_reader,
-      const ::DDS_SampleRejectedStatus & status)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_DataReaderListener_i::on_sample_rejected");
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ::DDS::SampleRejectedStatus ddsstatus;
-      ddsstatus <<= status;
-      ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil ();
-      ACE_NEW (dds_reader, CCM_DDS_DataReader_i ());
-      CCM_DDS_DataReader_i *rti_dr = dynamic_cast < CCM_DDS_DataReader_i *>(dds_reader.in ());
-      rti_dr->set_impl (the_reader);
-      this->impl_->on_sample_rejected (dds_reader.in (), ddsstatus);
-#else
-      this->impl_->on_sample_rejected (the_reader, status);
-#endif
-    }
+      void
+      RTI_DataReaderListener_i::on_sample_rejected (
+        ::DDSDataReader* the_reader,
+        const ::DDS_SampleRejectedStatus & status)
+      {
+        CIAO_TRACE ("RTI_DataReaderListener_i::on_sample_rejected");
+        ::DDS::SampleRejectedStatus ddsstatus;
+        ddsstatus <<= status;
+        ::DDS::DataReader_var dds_reader = new RTI_DataReader_i ();
+        RTI_DataReader_i *rti_dr = dynamic_cast < RTI_DataReader_i *>(dds_reader.in ());
+        rti_dr->set_impl (the_reader);
+        this->impl_->on_sample_rejected (dds_reader.in (), ddsstatus);
+      }
 
-    void
-    CCM_DDS_DataReaderListener_i::on_liveliness_changed (
-      ::DDSDataReader* the_reader,
-      const ::DDS_LivelinessChangedStatus & status)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_DataReaderListener_i::on_liveliness_changed");
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ::DDS::LivelinessChangedStatus ddsstatus;
-      ddsstatus <<= status;
-      ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil ();
-      ACE_NEW (dds_reader, CCM_DDS_DataReader_i ());
-      CCM_DDS_DataReader_i *rti_dr = dynamic_cast < CCM_DDS_DataReader_i *>(dds_reader.in ());
-      rti_dr->set_impl (the_reader);
-      this->impl_->on_liveliness_changed (dds_reader.in (), ddsstatus);
-#else
-      this->impl_->on_liveliness_changed (the_reader, status);
-#endif
-    }
+      void
+      RTI_DataReaderListener_i::on_liveliness_changed (
+        ::DDSDataReader* the_reader,
+        const ::DDS_LivelinessChangedStatus & status)
+      {
+        CIAO_TRACE ("RTI_DataReaderListener_i::on_liveliness_changed");
+        ::DDS::LivelinessChangedStatus ddsstatus;
+        ddsstatus <<= status;
+        ::DDS::DataReader_var dds_reader = new RTI_DataReader_i ();
+        RTI_DataReader_i *rti_dr = dynamic_cast < RTI_DataReader_i *>(dds_reader.in ());
+        rti_dr->set_impl (the_reader);
+        this->impl_->on_liveliness_changed (dds_reader.in (), ddsstatus);
+      }
 
-    void
-    CCM_DDS_DataReaderListener_i::on_data_available(::DDSDataReader *the_reader)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_DataReaderListener_i::on_data_available");
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil ();
-      ACE_NEW (dds_reader, CCM_DDS_DataReader_i ());
-      CCM_DDS_DataReader_i *rti_dr = dynamic_cast < CCM_DDS_DataReader_i *>(dds_reader.in ());
-      rti_dr->set_impl (the_reader);
-      this->impl_->on_data_available (dds_reader.in ());
-#else
-      this->impl_->on_data_available (the_reader);
-#endif
-    }
+      void
+      RTI_DataReaderListener_i::on_data_available(::DDSDataReader *the_reader)
+      {
+        CIAO_TRACE ("RTI_DataReaderListener_i::on_data_available");
+        ::DDS::DataReader_var dds_reader = new RTI_DataReader_i ();
+        RTI_DataReader_i *rti_dr = dynamic_cast < RTI_DataReader_i *>(dds_reader.in ());
+        rti_dr->set_impl (the_reader);
+        this->impl_->on_data_available (dds_reader.in ());
+      }
 
-    void
-    CCM_DDS_DataReaderListener_i::on_subscription_matched (
-      ::DDSDataReader* the_reader,
-      const ::DDS_SubscriptionMatchedStatus & status)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_DataReaderListener_i::on_subscription_matched");
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ::DDS::SubscriptionMatchedStatus ddsstatus;
-      ddsstatus <<= status;
-      ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil ();
-      ACE_NEW (dds_reader, CCM_DDS_DataReader_i ());
-      CCM_DDS_DataReader_i *rti_dr = dynamic_cast < CCM_DDS_DataReader_i *>(dds_reader.in ());
-      rti_dr->set_impl (the_reader);
-      this->impl_->on_subscription_matched (dds_reader.in (), ddsstatus);
-#else
-      this->impl_->on_subscription_matched (the_reader, status);
-#endif
-    }
+      void
+      RTI_DataReaderListener_i::on_subscription_matched (
+        ::DDSDataReader* the_reader,
+        const ::DDS_SubscriptionMatchedStatus & status)
+      {
+        CIAO_TRACE ("RTI_DataReaderListener_i::on_subscription_matched");
+        ::DDS::SubscriptionMatchedStatus ddsstatus;
+        ddsstatus <<= status;
+        ::DDS::DataReader_var dds_reader = new RTI_DataReader_i ();
+        RTI_DataReader_i *rti_dr = dynamic_cast < RTI_DataReader_i *>(dds_reader.in ());
+        rti_dr->set_impl (the_reader);
+        this->impl_->on_subscription_matched (dds_reader.in (), ddsstatus);
+      }
 
-    void
-    CCM_DDS_DataReaderListener_i::on_sample_lost (
-      ::DDSDataReader* the_reader,
-      const ::DDS_SampleLostStatus & status)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_DataReaderListener_i::on_sample_lost");
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ::DDS::SampleLostStatus ddsstatus;
-      ddsstatus <<= status;
-      ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil ();
-      ACE_NEW (dds_reader, CCM_DDS_DataReader_i ());
-      CCM_DDS_DataReader_i *rti_dr = dynamic_cast < CCM_DDS_DataReader_i *>(dds_reader.in ());
-      rti_dr->set_impl (the_reader);
-      this->impl_->on_sample_lost (dds_reader.in (), ddsstatus);
-#else
-      this->impl_->on_sample_lost (the_reader, status);
-#endif
-    }
+      void
+      RTI_DataReaderListener_i::on_sample_lost (
+        ::DDSDataReader* the_reader,
+        const ::DDS_SampleLostStatus & status)
+      {
+        CIAO_TRACE ("RTI_DataReaderListener_i::on_sample_lost");
+        ::DDS::SampleLostStatus ddsstatus;
+        ddsstatus <<= status;
+        ::DDS::DataReader_var dds_reader = new RTI_DataReader_i ();
+        RTI_DataReader_i *rti_dr = dynamic_cast < RTI_DataReader_i *>(dds_reader.in ());
+        rti_dr->set_impl (the_reader);
+        this->impl_->on_sample_lost (dds_reader.in (), ddsstatus);
+      }
 
-    ::DDS::DataReaderListener_ptr
-    CCM_DDS_DataReaderListener_i::get_datareaderlistener (void)
-    {
-      return ::DDS::DataReaderListener::_duplicate (this->impl_.in ());
+      ::DDS::DataReaderListener_ptr
+      RTI_DataReaderListener_i::get_datareaderlistener (void)
+      {
+        return ::DDS::DataReaderListener::_duplicate (this->impl_.in ());
+      }
     }
   }
 }
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.h b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.h
index a65d2e37931..373cd469f7a 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener.h
@@ -6,67 +6,57 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_DATAREADERLISTENER_H
-#define DDS4CCM_DATAREADERLISTENER_H
+#ifndef CIAO_RTI_DATAREADERLISTENER_H
+#define CIAO_RTI_DATAREADERLISTENER_H
 
 #include "tao/LocalObject.h"
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "dds4ccm_ndds_impl_export.h"
 
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-# include "ndds/ndds_cpp.h"
-#endif
-
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::DataReaderListener DDSDataReaderListener;
-typedef ::DDS::DataReader DDSDataReader;
-typedef ::DDS::RequestedDeadlineMissedStatus DDS_RequestedDeadlineMissedStatus;
-typedef ::DDS::LivelinessChangedStatus DDS_LivelinessChangedStatus;
-typedef ::DDS::RequestedIncompatibleQosStatus DDS_RequestedIncompatibleQosStatus;
-typedef ::DDS::SampleRejectedStatus DDS_SampleRejectedStatus;
-typedef ::DDS::SubscriptionMatchedStatus DDS_SubscriptionMatchedStatus;
-typedef ::DDS::SampleLostStatus DDS_SampleLostStatus;
-#endif
+#include "ndds/ndds_cpp.h"
 
 namespace CIAO
 {
   namespace DDS4CCM
   {
-    class DDS4CCM_NDDS_IMPL_Export CCM_DDS_DataReaderListener_i :
-      public virtual ::DDSDataReaderListener
+    namespace RTI
     {
-    public:
-      /// Constructor
-      CCM_DDS_DataReaderListener_i (::DDS::DataReaderListener_ptr p);
+      class DDS4CCM_NDDS_IMPL_Export RTI_DataReaderListener_i :
+        public virtual ::DDSDataReaderListener
+      {
+      public:
+        // Constructor
+        RTI_DataReaderListener_i (::DDS::DataReaderListener_ptr p);
 
-      /// Destructor
-      virtual ~CCM_DDS_DataReaderListener_i (void);
+        // Destructor
+        virtual ~RTI_DataReaderListener_i (void);
 
-      virtual void on_requested_deadline_missed(::DDSDataReader* reader,
-        const ::DDS_RequestedDeadlineMissedStatus& status);
+        virtual void on_requested_deadline_missed(::DDSDataReader* reader,
+          const ::DDS_RequestedDeadlineMissedStatus& status);
 
-      virtual void on_liveliness_changed(::DDSDataReader* reader,
-        const ::DDS_LivelinessChangedStatus& status);
+        virtual void on_liveliness_changed(::DDSDataReader* reader,
+          const ::DDS_LivelinessChangedStatus& status);
 
-      virtual void on_requested_incompatible_qos(::DDSDataReader* reader,
-        const ::DDS_RequestedIncompatibleQosStatus& status);
+        virtual void on_requested_incompatible_qos(::DDSDataReader* reader,
+          const ::DDS_RequestedIncompatibleQosStatus& status);
 
-      virtual void on_sample_rejected(::DDSDataReader* reader,
-        const ::DDS_SampleRejectedStatus& status);
+        virtual void on_sample_rejected(::DDSDataReader* reader,
+          const ::DDS_SampleRejectedStatus& status);
 
-      virtual void on_data_available(::DDSDataReader* reader);
+        virtual void on_data_available(::DDSDataReader* reader);
 
-      virtual void on_sample_lost(::DDSDataReader* reader,
-          const ::DDS_SampleLostStatus& status);
+        virtual void on_sample_lost(::DDSDataReader* reader,
+            const ::DDS_SampleLostStatus& status);
 
-      virtual void on_subscription_matched(::DDSDataReader* reader,
-          const ::DDS_SubscriptionMatchedStatus& status);
+        virtual void on_subscription_matched(::DDSDataReader* reader,
+            const ::DDS_SubscriptionMatchedStatus& status);
 
-      ::DDS::DataReaderListener_ptr get_datareaderlistener (void);
-    private:
-      ::DDS::DataReaderListener_var impl_;
-    };
+        ::DDS::DataReaderListener_ptr get_datareaderlistener (void);
+      private:
+        ::DDS::DataReaderListener_var impl_;
+      };
+    }
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp
index 103b226130b..2d359126189 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener_T.cpp
@@ -2,75 +2,45 @@
 #include "dds4ccm/impl/ndds/Utils.h"
 
 #include "dds4ccm/impl/ndds/DataReader.h"
-#include "dds4ccm/impl/logger/Log_Macros.h"
-#include "ace/Reactor.h"
+#include "ciao/Logger/Log_Macros.h"
+#include "dds4ccm/impl/ndds/DataReaderHandler_T.h"
+#include "tao/ORB_Core.h"
 
+// Implementation skeleton constructor
 template <typename DDS_TYPE, typename CCM_TYPE>
-CIAO::DDS4CCM::DataReaderListener_T<DDS_TYPE, CCM_TYPE>::DataReaderListener_T (
+CIAO::DDS4CCM::RTI::DataReaderListener_T<DDS_TYPE, CCM_TYPE>::DataReaderListener_T (
   typename CCM_TYPE::listener_type::_ptr_type listener,
   ::CCM_DDS::PortStatusListener_ptr port_status_listener,
-  ::CCM_DDS::DataListenerControl_ptr control,
-  ACE_Reactor* reactor)
-  : PortStatusListener_T <DDS_TYPE, CCM_TYPE> (port_status_listener, reactor) ,
+  ::CCM_DDS::DataListenerControl_ptr control)
+  : PortStatusListener_T <DDS_TYPE, CCM_TYPE> (port_status_listener) ,
     listener_ (CCM_TYPE::listener_type::_duplicate (listener)),
     control_ (::CCM_DDS::DataListenerControl::_duplicate (control))
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::DataReaderListener_T::DataReaderListener_T");
+  CIAO_TRACE ("CIAO::DDS4CCM::RTI::DataReaderListener_T::DataReaderListener_T");
 }
 
+// Implementation skeleton destructor
 template <typename DDS_TYPE, typename CCM_TYPE>
-CIAO::DDS4CCM::DataReaderListener_T<DDS_TYPE, CCM_TYPE>::~DataReaderListener_T (void)
+CIAO::DDS4CCM::RTI::DataReaderListener_T<DDS_TYPE, CCM_TYPE>::~DataReaderListener_T (void)
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::DataReaderListener_T::~DataReaderListener_T");
+  CIAO_TRACE ("CIAO::DDS4CCM::RTI::DataReaderListener_T::~DataReaderListener_T");
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 void
-CIAO::DDS4CCM::DataReaderListener_T<DDS_TYPE, CCM_TYPE>::on_data_available(::DDS::DataReader_ptr rdr)
+CIAO::DDS4CCM::RTI::DataReaderListener_T<DDS_TYPE, CCM_TYPE>::on_data_available(::DDS::DataReader *rdr)
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::DataReaderListener_T::on_data_available");
+  CIAO_TRACE ("CIAO::DDS4CCM::RTI::DataReaderListener_T::on_data_available");
 
   if (CORBA::is_nil (this->control_.in ()) || this->control_->mode () == ::CCM_DDS::NOT_ENABLED)
-    {
-      return;
-    }
-  else
-    {
-      if (this->reactor_)
-        {
-          drh* rh = 0;
-          ACE_NEW (rh, drh (this, rdr));
-
-          ACE_Event_Handler_var safe_handler (rh);
-          if (this->reactor_->notify (rh) != 0)
-            {
-              DDS4CCM_ERROR (1, (LM_ERROR, ACE_TEXT ("DataReaderListener_T::failed to use reactor.\n")));
-            }
-        }
-      else
-        {
-          this->on_data_available_i (rdr);
-        }
-    }
-}
+    return;
 
-template <typename DDS_TYPE, typename CCM_TYPE>
-void
-CIAO::DDS4CCM::DataReaderListener_T<DDS_TYPE, CCM_TYPE>::on_data_available_i (::DDS::DataReader_ptr rdr)
-{
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::DataReaderListener_T::on_data_available_i");
-
-  if (CORBA::is_nil (this->control_.in ()) || this->control_->mode () == ::CCM_DDS::NOT_ENABLED)
-    {
-      return;
-    }
-
-  ::CIAO::DDS4CCM::CCM_DDS_DataReader_i* rd =
-      dynamic_cast < ::CIAO::DDS4CCM::CCM_DDS_DataReader_i*>(rdr);
+  ::CIAO::DDS4CCM::RTI::RTI_DataReader_i* rd =
+      dynamic_cast < ::CIAO::DDS4CCM::RTI::RTI_DataReader_i*>(rdr);
   if (!rd)
     {
       /* In this specific case, this will never fail */
-      DDS4CCM_ERROR (1, (LM_ERROR, ACE_TEXT ("DataReaderListener_T::dynamic_cast failed.\n")));
+      ACE_ERROR ((LM_ERROR, ACE_TEXT ("DataReaderListener_T::dynamic_cast failed.\n")));
       return;
     }
 
@@ -80,10 +50,13 @@ CIAO::DDS4CCM::DataReaderListener_T<DDS_TYPE, CCM_TYPE>::on_data_available_i (::
   if (!reader)
     {
       /* In this specific case, this will never fail */
-      DDS4CCM_ERROR (1, (LM_ERROR, ACE_TEXT ("DataReaderListener_T::narrow failed.\n")));
+      ACE_ERROR ((LM_ERROR, ACE_TEXT ("DataReaderListener_T::narrow failed.\n")));
       return;
     }
-
+// for now, don't use a DataReaderHandler. Just perform inline.
+//  ::CIAO::DDS4CCM::RTI::DataReaderHandler_T<DDS_TYPE, CCM_TYPE>* rh =
+//      new  ::CIAO::DDS4CCM::RTI::DataReaderHandler_T<DDS_TYPE, CCM_TYPE>(this->listener_.in (), reader);
+//  this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->notify (rh);
   typename DDS_TYPE::dds_seq_type data;
   DDS_SampleInfoSeq sample_info;
   ::DDS::ReturnCode_t const result = reader->take (
@@ -94,12 +67,10 @@ CIAO::DDS4CCM::DataReaderListener_T<DDS_TYPE, CCM_TYPE>::on_data_available_i (::
               DDS_NEW_VIEW_STATE | DDS_NOT_NEW_VIEW_STATE,
               DDS_ANY_INSTANCE_STATE);
   if (result == DDS_RETCODE_NO_DATA)
-    {
       return;
-    }
   else if (result != DDS_RETCODE_OK)
     {
-      DDS4CCM_ERROR (1, (LM_ERROR, ACE_TEXT ("Unable to take data from data reader, error %C.\n"), translate_retcode (result)));
+      CIAO_ERROR (1, (LM_ERROR, ACE_TEXT ("Unable to take data from data reader, error %d.\n"), result));
       return;
     }
 
@@ -128,8 +99,8 @@ CIAO::DDS4CCM::DataReaderListener_T<DDS_TYPE, CCM_TYPE>::on_data_available_i (::
 
       if (nr_of_samples > 0)
         {
-          typename CCM_TYPE::seq_type::_var_type inst_seq = new typename CCM_TYPE::seq_type (nr_of_samples);
-          ::CCM_DDS::ReadInfoSeq_var infoseq = new ::CCM_DDS::ReadInfoSeq (nr_of_samples);
+          typename CCM_TYPE::seq_type::_var_type inst_seq = new typename CCM_TYPE::seq_type;
+          ::CCM_DDS::ReadInfoSeq_var infoseq = new ::CCM_DDS::ReadInfoSeq;
 
           infoseq->length (nr_of_samples);
           inst_seq->length (nr_of_samples);
@@ -154,17 +125,9 @@ CIAO::DDS4CCM::DataReaderListener_T<DDS_TYPE, CCM_TYPE>::on_data_available_i (::
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 ::DDS::StatusMask
-CIAO::DDS4CCM::DataReaderListener_T<DDS_TYPE, CCM_TYPE>::get_mask (
-  typename CCM_TYPE::listener_type::_ptr_type listener)
+CIAO::DDS4CCM::RTI::DataReaderListener_T<DDS_TYPE, CCM_TYPE>::get_mask (void)
 {
-  if (!CORBA::is_nil (listener) || CIAO_debug_level >= 10)
-    {
-      return ::DDS::DATA_AVAILABLE_STATUS |
-             ::DDS::REQUESTED_DEADLINE_MISSED_STATUS |
-             ::DDS::SAMPLE_LOST_STATUS;
-    }
-  else
-    {
-      return 0;
-    }
+  return DDS_DATA_AVAILABLE_STATUS |
+         DDS_REQUESTED_DEADLINE_MISSED_STATUS |
+         DDS_SAMPLE_LOST_STATUS;
 }
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener_T.h
index 7dbd4af959d..b6d650604c5 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener_T.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderListener_T.h
@@ -11,43 +11,36 @@
 #define DDS4CCM_DATAREADERLISTENER_T_H
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
-
 #include "dds4ccm/impl/ndds/PortStatusListener_T.h"
 
-class ACE_Reactor;
-
 namespace CIAO
 {
   namespace DDS4CCM
   {
-    template <typename DDS_TYPE, typename CCM_TYPE>
-    class DataReaderListener_T :
-      public PortStatusListener_T <DDS_TYPE, CCM_TYPE>
+    namespace RTI
     {
-    public:
-      /// Constructor
-      DataReaderListener_T (
-        typename CCM_TYPE::listener_type::_ptr_type listener,
-        ::CCM_DDS::PortStatusListener_ptr port_status_listener,
-        ::CCM_DDS::DataListenerControl_ptr control,
-        ACE_Reactor* reactor);
-
-      /// Destructor
-      virtual ~DataReaderListener_T (void);
-
-      virtual void on_data_available( ::DDS::DataReader *rdr);
-
-      static ::DDS::StatusMask get_mask (
-        typename CCM_TYPE::listener_type::_ptr_type listener);
-
-      void on_data_available_i ( ::DDS::DataReader *rdr);
-
-    private:
-      typename CCM_TYPE::listener_type::_var_type listener_;
-      ::CCM_DDS::DataListenerControl_var control_;
-
-      typedef ::CIAO::DDS4CCM::DataReaderHandler_T<DDS_TYPE, CCM_TYPE> drh;
-    };
+      template <typename DDS_TYPE, typename CCM_TYPE>
+      class DataReaderListener_T :
+        public PortStatusListener_T <DDS_TYPE, CCM_TYPE>
+      {
+      public:
+        /// Constructor
+        DataReaderListener_T (
+          typename CCM_TYPE::listener_type::_ptr_type listener,
+          ::CCM_DDS::PortStatusListener_ptr port_status_listener,
+          ::CCM_DDS::DataListenerControl_ptr control);
+
+        /// Destructor
+        virtual ~DataReaderListener_T (void);
+
+        virtual void on_data_available( ::DDS::DataReader *rdr);
+
+        static ::DDS::StatusMask get_mask (void);
+      private:
+        typename CCM_TYPE::listener_type::_var_type listener_;
+        ::CCM_DDS::DataListenerControl_var control_;
+      };
+    }
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderQos.h b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderQos.h
index 23df656a4f8..21b523b51cd 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderQos.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderQos.h
@@ -6,8 +6,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_DATAREADERQOS_H
-#define DDS4CCM_DATAREADERQOS_H
+#ifndef CIAO_RTI_DATAREADERQOS_H
+#define CIAO_RTI_DATAREADERQOS_H
 
 #include "DurabilityQosPolicy.h"
 #include "DeadlineQosPolicy.h"
@@ -22,11 +22,6 @@
 #include "TimeBasedFilterQosPolicy.h"
 #include "ReaderDataLifecycleQosPolicy.h"
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::DataReaderQos DDS_DataReaderQos;
-#endif
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::DataReaderQos &ddsqos, const ::DDS_DataReaderQos & qos)
 {
@@ -94,6 +89,5 @@ operator>>= (const ::DDS::DataReaderQos &qos, ::DDS_DataReaderQos & ddsqos)
   ddsqos.time_based_filter <<= qos.time_based_filter;
   ddsqos.reader_data_lifecycle <<= qos.reader_data_lifecycle;
 }
-#endif
 
-#endif /* DDS4CCM_DATAREADERQOS_H */
+#endif /* CIAO_RTI_DATAREADERQOS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp
index d3d09ec7ac8..515af1e08b7 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.cpp
@@ -2,73 +2,47 @@
 #include "dds4ccm/impl/ndds/Utils.h"
 
 #include "dds4ccm/impl/ndds/DataReader.h"
-#include "dds4ccm/impl/logger/Log_Macros.h"
+#include "ciao/Logger/Log_Macros.h"
 #include "dds4ccm/impl/ndds/DataReaderHandler_T.h"
 #include "tao/ORB_Core.h"
 
 #include <vector>
 
+// Implementation skeleton constructor
 template <typename DDS_TYPE, typename CCM_TYPE>
-CIAO::DDS4CCM::DataReaderStateListener_T<DDS_TYPE, CCM_TYPE>::DataReaderStateListener_T (
+CIAO::DDS4CCM::RTI::DataReaderStateListener_T<DDS_TYPE, CCM_TYPE>::DataReaderStateListener_T (
   typename CCM_TYPE::statelistener_type::_ptr_type listener,
   ::CCM_DDS::PortStatusListener_ptr port_status_listener,
-  ::CCM_DDS::StateListenerControl_ptr control,
-  ACE_Reactor* reactor)
-  : PortStatusListener_T <DDS_TYPE, CCM_TYPE> (port_status_listener, reactor) ,
+  ::CCM_DDS::StateListenerControl_ptr control)
+  : PortStatusListener_T <DDS_TYPE, CCM_TYPE> (port_status_listener) ,
     listener_ (CCM_TYPE::statelistener_type::_duplicate (listener)),
     control_ (::CCM_DDS::StateListenerControl::_duplicate (control))
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::DataReaderStateListener_T::DataReaderStateListener_T");
+  CIAO_TRACE ("CIAO::DDS4CCM::RTI::DataReaderStateListener_T::DataReaderStateListener_T");
 }
 
 // Implementation skeleton destructor
 template <typename DDS_TYPE, typename CCM_TYPE>
-CIAO::DDS4CCM::DataReaderStateListener_T<DDS_TYPE, CCM_TYPE>::~DataReaderStateListener_T (void)
+CIAO::DDS4CCM::RTI::DataReaderStateListener_T<DDS_TYPE, CCM_TYPE>::~DataReaderStateListener_T (void)
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::DataReaderStateListener_T::~DataReaderStateListener_T");
+  CIAO_TRACE ("CIAO::DDS4CCM::RTI::DataReaderStateListener_T::~DataReaderStateListener_T");
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 void
-CIAO::DDS4CCM::DataReaderStateListener_T<DDS_TYPE, CCM_TYPE>::on_data_available(::DDS::DataReader_ptr rdr)
+CIAO::DDS4CCM::RTI::DataReaderStateListener_T<DDS_TYPE, CCM_TYPE>::on_data_available(::DDS::DataReader *rdr)
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::DataReaderStateListener_T::on_data_available");
-  if (CORBA::is_nil (this->control_.in ()) || this->control_->mode () == ::CCM_DDS::NOT_ENABLED)
-      return;
-  else
-    {
-      if (this->reactor_)
-        {
-          drsh* rh = 0;
-          ACE_NEW (rh, drsh (this, rdr));
-          ACE_Event_Handler_var safe_handler (rh);
-          if (this->reactor_->notify (rh) != 0)
-            {
-              DDS4CCM_ERROR (1, (LM_ERROR, ACE_TEXT ("DataReaderStateHandler_T::failed to use reactor.\n")));
-            }
-        }
-      else
-        {
-          this->on_data_available_i (rdr);
-        }
-    }
-}
-
-template <typename DDS_TYPE, typename CCM_TYPE>
-void
-CIAO::DDS4CCM::DataReaderStateListener_T<DDS_TYPE, CCM_TYPE>::on_data_available_i (::DDS::DataReader_ptr rdr)
-{
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::DataReaderStateListener_T::on_data_available_i");
+  CIAO_TRACE ("CIAO::DDS4CCM::RTI::DataReaderStateListener_T::on_data_available");
 
-  if (CORBA::is_nil (this->control_.in ()) || this->control_->mode () == ::CCM_DDS::NOT_ENABLED)
+  if (this->control_->mode () == ::CCM_DDS::NOT_ENABLED)
     return;
 
-  ::CIAO::DDS4CCM::CCM_DDS_DataReader_i* rd =
-      dynamic_cast < ::CIAO::DDS4CCM::CCM_DDS_DataReader_i*>(rdr);
+  ::CIAO::DDS4CCM::RTI::RTI_DataReader_i* rd =
+      dynamic_cast < ::CIAO::DDS4CCM::RTI::RTI_DataReader_i*>(rdr);
   if (!rd)
     {
       /* In this specific case, this will never fail */
-      DDS4CCM_ERROR (1, (LM_ERROR, ACE_TEXT ("DataReaderStateListener_T::dynamic_cast failed.\n")));
+      ACE_ERROR ((LM_ERROR, ACE_TEXT ("DataReaderStateListener_T::dynamic_cast failed.\n")));
       return;
     }
 
@@ -78,7 +52,7 @@ CIAO::DDS4CCM::DataReaderStateListener_T<DDS_TYPE, CCM_TYPE>::on_data_available_
   if (!reader)
     {
       /* In this specific case, this will never fail */
-      DDS4CCM_ERROR (1, (LM_ERROR, ACE_TEXT ("DataReaderStateListener_T::narrow failed.\n")));
+      ACE_ERROR ((LM_ERROR, ACE_TEXT ("DataReaderStateListener_T::narrow failed.\n")));
       return;
     }
 
@@ -105,7 +79,7 @@ CIAO::DDS4CCM::DataReaderStateListener_T<DDS_TYPE, CCM_TYPE>::on_data_available_
           return;
       else if (result != DDS_RETCODE_OK)
         {
-          DDS4CCM_ERROR (1, (LM_ERROR, ACE_TEXT ("Unable to take data from data reader, error %d.\n"), result));
+          CIAO_ERROR (1, (LM_ERROR, ACE_TEXT ("Unable to take data from data reader, error %d.\n"), result));
         }
       if (this->control_->mode () == ::CCM_DDS::ONE_BY_ONE)
         {
@@ -152,7 +126,7 @@ CIAO::DDS4CCM::DataReaderStateListener_T<DDS_TYPE, CCM_TYPE>::on_data_available_
                    sample_info[i].view_state == ::DDS_NEW_VIEW_STATE) ||
                   sample_info[i].instance_state == ::DDS_NOT_ALIVE_DISPOSED_INSTANCE_STATE)
                 {
-                  // sample_new or sample_delete found -> first send out the updated
+                  // new or delete found -> first send out the updated
                   // samples in one go
                   typename CCM_TYPE::seq_type::_var_type  inst_seq = new typename CCM_TYPE::seq_type;
                   ::CCM_DDS::ReadInfoSeq_var infoseq = new ::CCM_DDS::ReadInfoSeq;
@@ -223,18 +197,10 @@ CIAO::DDS4CCM::DataReaderStateListener_T<DDS_TYPE, CCM_TYPE>::on_data_available_
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 ::DDS::StatusMask
-CIAO::DDS4CCM::DataReaderStateListener_T<DDS_TYPE, CCM_TYPE>::get_mask (
-  typename CCM_TYPE::statelistener_type::_ptr_type listener)
+CIAO::DDS4CCM::RTI::DataReaderStateListener_T<DDS_TYPE, CCM_TYPE>::get_mask (void)
 {
-  if (!CORBA::is_nil (listener) || CIAO_debug_level >= 10)
-    {
-      return ::DDS::DATA_AVAILABLE_STATUS |
-             ::DDS::REQUESTED_DEADLINE_MISSED_STATUS |
-             ::DDS::SAMPLE_LOST_STATUS;
-    }
-  else
-    {
-      return 0;
-    }
+  return DDS_DATA_AVAILABLE_STATUS |
+         DDS_REQUESTED_DEADLINE_MISSED_STATUS |
+         DDS_SAMPLE_LOST_STATUS;
 }
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h
index 637c79bdf38..24ca19a8310 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataReaderStateListener_T.h
@@ -17,34 +17,31 @@ namespace CIAO
 {
   namespace DDS4CCM
   {
-    template <typename DDS_TYPE, typename CCM_TYPE>
-    class DataReaderStateListener_T :
-      public PortStatusListener_T <DDS_TYPE, CCM_TYPE>
+    namespace RTI
     {
-    public:
-      /// Constructor
-      DataReaderStateListener_T (
-                    typename CCM_TYPE::statelistener_type::_ptr_type listener,
-                    ::CCM_DDS::PortStatusListener_ptr port_status_listener,
-                    ::CCM_DDS::StateListenerControl_ptr control,
-                    ACE_Reactor* reactor);
-
-      /// Destructor
-      virtual ~DataReaderStateListener_T (void);
-
-      virtual void on_data_available (::DDS::DataReader_ptr rdr);
-
-      static ::DDS::StatusMask get_mask (
-        typename CCM_TYPE::statelistener_type::_ptr_type listener);
-
-      void on_data_available_i (::DDS::DataReader_ptr rdr);
-
-    private:
-      typename CCM_TYPE::statelistener_type::_var_type listener_;
-      ::CCM_DDS::StateListenerControl_var control_;
-
-      typedef ::CIAO::DDS4CCM::DataReaderStateHandler_T<DDS_TYPE, CCM_TYPE> drsh;
-    };
+      template <typename DDS_TYPE, typename CCM_TYPE>
+      class DataReaderStateListener_T :
+        public PortStatusListener_T <DDS_TYPE, CCM_TYPE>
+      {
+      public:
+        /// Constructor
+        DataReaderStateListener_T (
+                      typename CCM_TYPE::statelistener_type::_ptr_type listener,
+                      ::CCM_DDS::PortStatusListener_ptr port_status_listener,
+                      ::CCM_DDS::StateListenerControl_ptr control);
+
+        /// Destructor
+        virtual ~DataReaderStateListener_T (void);
+
+        virtual void on_data_available( ::DDS::DataReader *rdr);
+
+        static ::DDS::StatusMask get_mask (void);
+
+      private:
+        typename CCM_TYPE::statelistener_type::_var_type listener_;
+        ::CCM_DDS::StateListenerControl_var control_;
+      };
+    }
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.cpp
index a9e746df4de..901a403d9e3 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.cpp
@@ -13,280 +13,198 @@
 #include "OfferedDeadlineMissedStatus.h"
 #include "InstanceHandleSeq.h"
 
-#include "dds4ccm/impl/logger/Log_Macros.h"
+#include "ciao/Logger/Log_Macros.h"
 
 namespace CIAO
 {
   namespace DDS4CCM
   {
-    CCM_DDS_DataWriter_i::CCM_DDS_DataWriter_i (DDSDataWriter * dw)
-      : impl_ (dw)
-    {
-    }
-
-    CCM_DDS_DataWriter_i::~CCM_DDS_DataWriter_i (void)
-    {
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_DataWriter_i::set_qos (const ::DDS::DataWriterQos & qos)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_DataWriter_i::set_qos");
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ACE_UNUSED_ARG (qos);
-      throw CORBA::NO_IMPLEMENT ();
-      // Add your implementation here
-#else
-      return this->impl ()->set_qos (qos);
-#endif
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_DataWriter_i::get_qos (::DDS::DataWriterQos & qos)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_DataWriter_i::get_qos");
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ACE_UNUSED_ARG (qos);
-      throw CORBA::NO_IMPLEMENT ();
-      // Add your implementation here
-#else
-      return this->impl ()->get_qos (qos);
-#endif
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_DataWriter_i::set_listener (::DDS::DataWriterListener_ptr a_listener,
-                                    ::DDS::StatusMask mask)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      CCM_DDS_DataWriterListener_i* rti_impl_list = 0;
-      if (!CORBA::is_nil (a_listener))
-        {
-          ACE_NEW_THROW_EX (rti_impl_list,
-                            CCM_DDS_DataWriterListener_i (a_listener),
-                            CORBA::NO_MEMORY ());
-        }
-      return this->impl ()->set_listener (rti_impl_list, mask);
-#else
-      return this->impl ()->set_listener (a_listener, mask);
-#endif
-    }
-
-    ::DDS::DataWriterListener_ptr
-    CCM_DDS_DataWriter_i::get_listener (void)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      DDSDataWriterListener *wr = this->impl ()->get_listener ();
-      CCM_DDS_DataWriterListener_i *list_proxy = dynamic_cast <CCM_DDS_DataWriterListener_i *> (wr);
-      if (!list_proxy)
-        {
-          DDS4CCM_DEBUG (6, (LM_DEBUG, "CCM_DDS_DataWriter_i::get_listener - "
-                                    "DDS returned a NIL listener.\n"));
-          return ::DDS::DataWriterListener::_nil ();
-        }
-      return list_proxy->get_datawriterlistener ();
-#else
-      return this->impl ()->get_listener ();
-#endif
-    }
-
-    ::DDS::Topic_ptr
-    CCM_DDS_DataWriter_i::get_topic (void)
-    {
-      ::DDS::Topic_var retval = ::DDS::Topic::_nil ();
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      DDSTopic* t = this->impl ()->get_topic ();
-      ACE_NEW_THROW_EX (retval,
-                        CCM_DDS_Topic_i (t),
-                        CORBA::NO_MEMORY ());
-#else
-      ::DDS::Topic_var t = this->impl ()->get_topic ();
-      ACE_NEW_THROW_EX (retval,
-                        CCM_DDS_Topic_i (t.in ()),
-                        CORBA::NO_MEMORY ());
-#endif
-      return retval._retn ();
-    }
-
-    ::DDS::Publisher_ptr
-    CCM_DDS_DataWriter_i::get_publisher (void)
-    {
-      ::DDS::Publisher_var retval = ::DDS::Publisher::_nil ();
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      DDSPublisher* p = this->impl ()->get_publisher ();
-      ACE_NEW_THROW_EX (retval,
-                        CCM_DDS_Publisher_i (p),
-                        CORBA::NO_MEMORY ());
-#else
-      ::DDS::Publisher_var p = this->impl ()->get_publisher ();
-      ACE_NEW_THROW_EX (retval,
-                        CCM_DDS_Publisher_i (p.in ()),
-                        CORBA::NO_MEMORY ());
-#endif
-      return retval._retn ();
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_DataWriter_i::wait_for_acknowledgments (const ::DDS::Duration_t & max_wait)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-     ::DDS_Duration_t rtiduration;
-     rtiduration <<= max_wait;
-     return this->impl ()->wait_for_acknowledgments (rtiduration);
-#else
-     return this->impl ()->wait_for_acknowledgments (max_wait);
-#endif
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_DataWriter_i::get_liveliness_lost_status (::DDS::LivelinessLostStatus & status)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ::DDS_LivelinessLostStatus rtistatus;
-      ::DDS::ReturnCode_t const retval = this->impl ()->get_liveliness_lost_status (rtistatus);
-      rtistatus >>= status;
-      return retval;
-#else
-      return this->impl ()->get_liveliness_lost_status (status);
-#endif
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_DataWriter_i::get_offered_deadline_missed_status (::DDS::OfferedDeadlineMissedStatus & status)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ::DDS_OfferedDeadlineMissedStatus rtistatus;
-      ::DDS::ReturnCode_t const retval = this->impl ()->get_offered_deadline_missed_status (rtistatus);
-      rtistatus >>= status;
-      return retval;
-#else
-      return this->impl ()->get_offered_deadline_missed_status (status);
-#endif
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_DataWriter_i::get_offered_incompatible_qos_status (::DDS::OfferedIncompatibleQosStatus & status)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ::DDS_OfferedIncompatibleQosStatus rtistatus;
-      ::DDS::ReturnCode_t const retval = this->impl ()->get_offered_incompatible_qos_status (rtistatus);
-      rtistatus >>= status;
-      return retval;
-#else
-      return this->impl ()->get_offered_incompatible_qos_status (status);
-#endif
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_DataWriter_i::get_publication_matched_status (::DDS::PublicationMatchedStatus & status)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ::DDS_PublicationMatchedStatus rtistatus;
-      ::DDS::ReturnCode_t const retval = this->impl ()->get_publication_matched_status (rtistatus);
-      rtistatus >>= status;
-      return retval;
-#else
-      return this->impl ()->get_publication_matched_status (status);
-#endif
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_DataWriter_i::assert_liveliness (void)
-    {
-      return this->impl ()->assert_liveliness ();
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_DataWriter_i::get_matched_subscriptions (::DDS::InstanceHandleSeq & subscription_handles)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ::DDS_InstanceHandleSeq rtiseq;
-      ::DDS::ReturnCode_t const retval = this->impl ()->get_matched_subscriptions (rtiseq);
-      rtiseq >>= subscription_handles;
-      return retval;
-#else
-      return this->impl ()->get_matched_subscriptions (subscription_handles);
-#endif
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_DataWriter_i::get_matched_subscription_data (::DDS::SubscriptionBuiltinTopicData & subscription_data,
-                                                     DDS_INSTANCE_HANDLE_T_IN subscription_handle)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_DataWriter_i::get_matched_subscription_data");
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ACE_UNUSED_ARG (subscription_data);
-      ACE_UNUSED_ARG (subscription_handle);
-      throw CORBA::NO_IMPLEMENT ();
-      // Add your implementation here
-#else
-      return this->impl ()->get_matched_subscription_data (subscription_data, subscription_handle);
-#endif
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_DataWriter_i::enable (void)
-    {
-      return this->impl ()->enable ();
-    }
+    namespace RTI
+    {
+      // Implementation skeleton constructor
+      RTI_DataWriter_i::RTI_DataWriter_i (void)
+        : impl_ (0)
+      {
+      }
+
+      // Implementation skeleton destructor
+      RTI_DataWriter_i::~RTI_DataWriter_i (void)
+      {
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_DataWriter_i::set_qos (const ::DDS::DataWriterQos & /*qos*/)
+      {
+        CIAO_TRACE ("RTI_DataWriter_i::set_qos");
+        throw CORBA::NO_IMPLEMENT ();
+        // Add your implementation here
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_DataWriter_i::get_qos (::DDS::DataWriterQos & /*qos*/)
+      {
+        CIAO_TRACE ("RTI_DataWriter_i::get_qos");
+        throw CORBA::NO_IMPLEMENT ();
+        // Add your implementation here
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_DataWriter_i::set_listener (::DDS::DataWriterListener_ptr a_listener,
+                                      ::DDS::StatusMask mask)
+      {
+        RTI_DataWriterListener_i* rti_impl_list = new RTI_DataWriterListener_i (a_listener);
+        return this->impl ()->set_listener (rti_impl_list, mask);
+      }
+
+      ::DDS::DataWriterListener_ptr
+      RTI_DataWriter_i::get_listener (void)
+      {
+        DDSDataWriterListener* wr = this->impl ()->get_listener ();
+        RTI_DataWriterListener_i *dwl = dynamic_cast< RTI_DataWriterListener_i *> (wr);
+        return dwl->get_datawriterlistener ();
+      }
+
+      ::DDS::Topic_ptr
+      RTI_DataWriter_i::get_topic (void)
+      {
+        DDSTopic* t = this->impl ()->get_topic ();
+        ::DDS::Topic_var retval = new RTI_Topic_i ();
+        RTI_Topic_i *tp = dynamic_cast < RTI_Topic_i *> (retval.in ());
+        tp->set_impl (t);
+        return retval._retn ();
+      }
+
+      ::DDS::Publisher_ptr
+      RTI_DataWriter_i::get_publisher (void)
+      {
+        DDSPublisher* p = this->impl ()->get_publisher ();
+        ::DDS::Publisher_var retval = new RTI_Publisher_i ();
+        RTI_Publisher_i *rti_p = dynamic_cast < RTI_Publisher_i *> (retval.in ());
+        rti_p->set_impl (p);
+        return retval._retn ();
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_DataWriter_i::wait_for_acknowledgments (const ::DDS::Duration_t & max_wait)
+      {
+       ::DDS_Duration_t rtiduration;
+       rtiduration <<= max_wait;
+       return this->impl ()->wait_for_acknowledgments (rtiduration);
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_DataWriter_i::get_liveliness_lost_status (::DDS::LivelinessLostStatus & status)
+      {
+        ::DDS_LivelinessLostStatus rtistatus;
+        ::DDS::ReturnCode_t const retval = this->impl ()->get_liveliness_lost_status (rtistatus);
+        rtistatus >>= status;
+        return retval;
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_DataWriter_i::get_offered_deadline_missed_status (::DDS::OfferedDeadlineMissedStatus & status)
+      {
+        ::DDS_OfferedDeadlineMissedStatus rtistatus;
+        ::DDS::ReturnCode_t const retval = this->impl ()->get_offered_deadline_missed_status (rtistatus);
+        rtistatus >>= status;
+        return retval;
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_DataWriter_i::get_offered_incompatible_qos_status (::DDS::OfferedIncompatibleQosStatus & status)
+      {
+        ::DDS_OfferedIncompatibleQosStatus rtistatus;
+        ::DDS::ReturnCode_t const retval = this->impl ()->get_offered_incompatible_qos_status (rtistatus);
+        rtistatus >>= status;
+        return retval;
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_DataWriter_i::get_publication_matched_status (::DDS::PublicationMatchedStatus & status)
+      {
+        ::DDS_PublicationMatchedStatus rtistatus;
+        ::DDS::ReturnCode_t const retval = this->impl ()->get_publication_matched_status (rtistatus);
+        rtistatus >>= status;
+        return retval;
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_DataWriter_i::assert_liveliness (void)
+      {
+        return this->impl ()->assert_liveliness ();
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_DataWriter_i::get_matched_subscriptions (::DDS::InstanceHandleSeq & subscription_handles)
+      {
+        ::DDS_InstanceHandleSeq rtiseq;
+        ::DDS::ReturnCode_t const retval = this->impl ()->get_matched_subscriptions (rtiseq);
+        rtiseq >>= subscription_handles;
+        return retval;
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_DataWriter_i::get_matched_subscription_data (::DDS::SubscriptionBuiltinTopicData & /*subscription_data*/,
+                                                       const ::DDS::InstanceHandle_t & /*subscription_handle*/)
+      {
+        CIAO_TRACE ("RTI_DataWriter_i::get_matched_subscription_data");
+        throw CORBA::NO_IMPLEMENT ();
+        // Add your implementation here
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_DataWriter_i::enable (void)
+      {
+        return this->impl ()->enable ();
+      }
+
+      ::DDS::StatusCondition_ptr
+      RTI_DataWriter_i::get_statuscondition (void)
+      {
+        DDSStatusCondition* sc = this->impl ()->get_statuscondition ();
+        ::DDS::StatusCondition_var retval = new RTI_StatusCondition_i ();
+        RTI_StatusCondition_i *rti_sc = dynamic_cast < RTI_StatusCondition_i *> (retval.in ());
+        rti_sc->set_impl (sc);
+        return retval._retn ();
+      }
+
+      ::DDS::StatusMask
+      RTI_DataWriter_i::get_status_changes (void)
+      {
+        return this->impl ()->get_status_changes ();
+      }
+
+      ::DDS::InstanceHandle_t
+      RTI_DataWriter_i::get_instance_handle (void)
+      {
+        ::DDS_InstanceHandle_t const rtihandle = this->impl ()->get_instance_handle ();
+        ::DDS::InstanceHandle_t handle;
+        handle <<= rtihandle;
+        return handle;
+      }
+
+      DDSDataWriter *
+      RTI_DataWriter_i::get_impl (void)
+      {
+        return this->impl_;
+      }
+
+      void
+      RTI_DataWriter_i::set_impl (DDSDataWriter * dw)
+      {
+        this->impl_ = dw;
+      }
+
+      DDSDataWriter *
+      RTI_DataWriter_i::impl (void)
+      {
+        if (!this->impl_)
+          {
+            throw ::CORBA::BAD_INV_ORDER ();
+          }
+        return this->impl_;
+      }
 
-    ::DDS::StatusCondition_ptr
-    CCM_DDS_DataWriter_i::get_statuscondition (void)
-    {
-      ::DDS::StatusCondition_var retval = ::DDS::StatusCondition::_nil ();
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      DDSStatusCondition* sc = this->impl ()->get_statuscondition ();
-      ACE_NEW_THROW_EX (retval,
-                        CCM_DDS_StatusCondition_i (sc),
-                        CORBA::NO_MEMORY ());
-#else
-      ::DDS::StatusCondition_var sc = this->impl ()->get_statuscondition ();
-      ACE_NEW_THROW_EX (retval,
-                        CCM_DDS_StatusCondition_i (sc.in ()),
-                        CORBA::NO_MEMORY ());
-#endif
-      return retval._retn ();
-    }
-
-    ::DDS::StatusMask
-    CCM_DDS_DataWriter_i::get_status_changes (void)
-    {
-      return this->impl ()->get_status_changes ();
-    }
-
-    DDS_INSTANCE_HANDLE_T_RETN
-    CCM_DDS_DataWriter_i::get_instance_handle (void)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ::DDS_InstanceHandle_t const rtihandle = this->impl ()->get_instance_handle ();
-      ::DDS::InstanceHandle_t handle;
-      handle <<= rtihandle;
-      return handle;
-#else
-      return this->impl ()->get_instance_handle ();
-#endif
-    }
-
-    DDSDataWriter *
-    CCM_DDS_DataWriter_i::get_impl (void)
-    {
-      return this->impl_;
-    }
-
-    void
-    CCM_DDS_DataWriter_i::set_impl (DDSDataWriter * dw)
-    {
-      this->impl_ = dw;
-    }
-
-    DDSDataWriter *
-    CCM_DDS_DataWriter_i::impl (void)
-    {
-      if (!this->impl_)
-        {
-          throw ::CORBA::BAD_INV_ORDER ();
-        }
-      return this->impl_;
     }
   }
 }
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.h b/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.h
index 30ee9a94b12..f7655cc7e37 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriter.h
@@ -7,105 +7,101 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_DATAWRITER_H
-#define DDS4CCM_DATAWRITER_H
+#ifndef CIAO_RTI_DATAWRITER_H
+#define CIAO_RTI_DATAWRITER_H
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 
 #include "dds4ccm/idl/dds_rtf2_dcpsEC.h"
 
 #include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h"
-#include "dds4ccm/impl/ndds/InstanceHandle_t.h"
 #include "tao/LocalObject.h"
 
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 #include "ndds/ndds_cpp.h"
-#endif
-
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::DataWriter DDSDataWriter;
-#endif
 
 namespace CIAO
 {
   namespace DDS4CCM
   {
-    class DDS4CCM_NDDS_IMPL_Export CCM_DDS_DataWriter_i
-      : public virtual ::DDS::CCM_DataWriter,
-        public virtual ::CORBA::LocalObject
+    namespace RTI
     {
-    public:
-      /// Constructor
-      CCM_DDS_DataWriter_i (DDSDataWriter * dw);
+      class DDS4CCM_NDDS_IMPL_Export RTI_DataWriter_i
+        : public virtual ::DDS::CCM_DataWriter,
+          public virtual ::CORBA::LocalObject
+      {
+      public:
+        // Constructor
+        RTI_DataWriter_i (void);
 
-      /// Destructor
-      virtual ~CCM_DDS_DataWriter_i (void);
+        // Destructor
+        virtual ~RTI_DataWriter_i (void);
 
-      virtual
-        ::DDS::ReturnCode_t set_qos (const ::DDS::DataWriterQos & qos);
+        virtual
+          ::DDS::ReturnCode_t set_qos (const ::DDS::DataWriterQos & qos);
 
-      virtual
-        ::DDS::ReturnCode_t get_qos (::DDS::DataWriterQos & qos);
+        virtual
+          ::DDS::ReturnCode_t get_qos (::DDS::DataWriterQos & qos);
 
-      virtual
-        ::DDS::ReturnCode_t set_listener (::DDS::DataWriterListener_ptr a_listener,
-                                          ::DDS::StatusMask mask);
+        virtual
+          ::DDS::ReturnCode_t set_listener (::DDS::DataWriterListener_ptr a_listener,
+                                            ::DDS::StatusMask mask);
 
-      virtual
-        ::DDS::DataWriterListener_ptr get_listener (void);
+        virtual
+          ::DDS::DataWriterListener_ptr get_listener (void);
 
-      virtual
-        ::DDS::Topic_ptr get_topic (void);
+        virtual
+          ::DDS::Topic_ptr get_topic (void);
 
-      virtual
-        ::DDS::Publisher_ptr get_publisher (void);
+        virtual
+          ::DDS::Publisher_ptr get_publisher (void);
 
-      virtual
-        ::DDS::ReturnCode_t wait_for_acknowledgments (const ::DDS::Duration_t & max_wait);
+        virtual
+          ::DDS::ReturnCode_t wait_for_acknowledgments (const ::DDS::Duration_t & max_wait);
 
-      virtual
-        ::DDS::ReturnCode_t get_liveliness_lost_status (::DDS::LivelinessLostStatus & status);
+        virtual
+          ::DDS::ReturnCode_t get_liveliness_lost_status (::DDS::LivelinessLostStatus & status);
 
-      virtual
-        ::DDS::ReturnCode_t get_offered_deadline_missed_status (::DDS::OfferedDeadlineMissedStatus & status);
+        virtual
+          ::DDS::ReturnCode_t get_offered_deadline_missed_status (::DDS::OfferedDeadlineMissedStatus & status);
 
-      virtual
-        ::DDS::ReturnCode_t get_offered_incompatible_qos_status (::DDS::OfferedIncompatibleQosStatus & status);
+        virtual
+          ::DDS::ReturnCode_t get_offered_incompatible_qos_status (::DDS::OfferedIncompatibleQosStatus & status);
 
-      virtual
-        ::DDS::ReturnCode_t get_publication_matched_status (::DDS::PublicationMatchedStatus & status);
+        virtual
+          ::DDS::ReturnCode_t get_publication_matched_status (::DDS::PublicationMatchedStatus & status);
 
-      virtual
-        ::DDS::ReturnCode_t assert_liveliness (void);
+        virtual
+          ::DDS::ReturnCode_t assert_liveliness (void);
 
-      virtual
-        ::DDS::ReturnCode_t get_matched_subscriptions (::DDS::InstanceHandleSeq & subscription_handles);
+        virtual
+          ::DDS::ReturnCode_t get_matched_subscriptions (::DDS::InstanceHandleSeq & subscription_handles);
 
-      virtual
-        ::DDS::ReturnCode_t get_matched_subscription_data (::DDS::SubscriptionBuiltinTopicData & subscription_data,
-                                                           DDS_INSTANCE_HANDLE_T_IN subscription_handle);
+        virtual
+          ::DDS::ReturnCode_t get_matched_subscription_data (::DDS::SubscriptionBuiltinTopicData & subscription_data,
+                                                             const ::DDS::InstanceHandle_t & subscription_handle);
 
-      virtual
-        ::DDS::ReturnCode_t enable (void);
+        virtual
+          ::DDS::ReturnCode_t enable (void);
 
-      virtual
-        ::DDS::StatusCondition_ptr get_statuscondition (void);
+        virtual
+          ::DDS::StatusCondition_ptr get_statuscondition (void);
 
-      virtual
-        ::DDS::StatusMask get_status_changes (void);
+        virtual
+          ::DDS::StatusMask get_status_changes (void);
 
-      virtual
-        DDS_INSTANCE_HANDLE_T_RETN get_instance_handle (void);
+        virtual
+          ::DDS::InstanceHandle_t get_instance_handle (void);
 
-      DDSDataWriter * get_impl (void);
+        DDSDataWriter * get_impl (void);
 
-      void set_impl (DDSDataWriter * dw);
+        void set_impl (DDSDataWriter * dw);
 
-    private:
-      DDSDataWriter * impl_;
+      private:
+        DDSDataWriter * impl_;
 
-      DDSDataWriter * impl (void);
-    };
+        DDSDataWriter * impl (void);
+      };
+    }
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.cpp
index 041092a4324..a4ab9432b3f 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.cpp
@@ -11,95 +11,76 @@ namespace CIAO
 {
   namespace DDS4CCM
   {
-    CCM_DDS_DataWriterListener_i::CCM_DDS_DataWriterListener_i (::DDS::DataWriterListener_ptr s)
-      : impl_ (::DDS::DataWriterListener::_duplicate (s))
+    namespace RTI
     {
-    }
+      // Implementation skeleton constructor
+      RTI_DataWriterListener_i::RTI_DataWriterListener_i (::DDS::DataWriterListener_ptr s)
+        : impl_ (::DDS::DataWriterListener::_duplicate (s))
+      {
+      }
 
-    CCM_DDS_DataWriterListener_i::~CCM_DDS_DataWriterListener_i (void)
-    {
-    }
+      // Implementation skeleton destructor
+      RTI_DataWriterListener_i::~RTI_DataWriterListener_i (void)
+      {
+      }
 
-    void
-    CCM_DDS_DataWriterListener_i::on_offered_deadline_missed (
-      ::DDSDataWriter *the_writer,
-      const ::DDS_OfferedDeadlineMissedStatus & status)
-    {
-      ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil ();
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ::DDS::OfferedDeadlineMissedStatus ddsstatus;
-      ddsstatus <<= status;
-      ACE_NEW (dds_writer, 
-               CCM_DDS_DataWriter_i (the_writer));
-      this->impl_->on_offered_deadline_missed (dds_writer.in (), ddsstatus);
-#else
-      ACE_NEW (dds_writer, 
-               CCM_DDS_DataWriter_i (the_writer));
-      this->impl_->on_offered_deadline_missed (dds_writer.in (), status);
-#endif
-    }
+      void
+      RTI_DataWriterListener_i::on_offered_deadline_missed (
+        ::DDSDataWriter *the_writer,
+        const ::DDS_OfferedDeadlineMissedStatus & status)
+      {
+        ::DDS::OfferedDeadlineMissedStatus ddsstatus;
+        ddsstatus <<= status;
+        ::DDS::DataWriter_var dds_writer = new RTI_DataWriter_i ();
+        RTI_DataWriter_i *dw = dynamic_cast< RTI_DataWriter_i * > (dds_writer.in ());
+        dw->set_impl (the_writer);
+        this->impl_->on_offered_deadline_missed (dds_writer.in (), ddsstatus);
+      }
 
-    void
-    CCM_DDS_DataWriterListener_i::on_offered_incompatible_qos (
-      ::DDSDataWriter *the_writer,
-      const ::DDS_OfferedIncompatibleQosStatus & status)
-    {
-      ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil ();
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ::DDS::OfferedIncompatibleQosStatus ddsstatus;
-      ddsstatus <<= status;
-      ACE_NEW (dds_writer, 
-               CCM_DDS_DataWriter_i (the_writer));
-      this->impl_->on_offered_incompatible_qos (dds_writer.in (), ddsstatus);
-#else
-      ACE_NEW (dds_writer, 
-               CCM_DDS_DataWriter_i (the_writer));
-      this->impl_->on_offered_incompatible_qos (dds_writer.in (), status);
-#endif
-    }
+      void
+      RTI_DataWriterListener_i::on_offered_incompatible_qos (
+        ::DDSDataWriter *the_writer,
+        const ::DDS_OfferedIncompatibleQosStatus & status)
+      {
+        ::DDS::OfferedIncompatibleQosStatus ddsstatus;
+        ddsstatus <<= status;
+        ::DDS::DataWriter_var dds_writer = new RTI_DataWriter_i ();
+        RTI_DataWriter_i *dw = dynamic_cast< RTI_DataWriter_i * > (dds_writer.in ());
+        dw->set_impl (the_writer);
+        this->impl_->on_offered_incompatible_qos (dds_writer.in (), ddsstatus);
+      }
 
-    void
-    CCM_DDS_DataWriterListener_i::on_liveliness_lost (
-      ::DDSDataWriter *the_writer,
-      const ::DDS_LivelinessLostStatus & status)
-    {
-      ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil ();
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ::DDS::LivelinessLostStatus ddsstatus;
-      ddsstatus <<= status;
-      ACE_NEW (dds_writer, 
-               CCM_DDS_DataWriter_i (the_writer));
-      this->impl_->on_liveliness_lost (dds_writer.in (), ddsstatus);
-#else
-      ACE_NEW (dds_writer, 
-               CCM_DDS_DataWriter_i (the_writer));
-      this->impl_->on_liveliness_lost (dds_writer.in (), status);
-#endif
-    }
+      void
+      RTI_DataWriterListener_i::on_liveliness_lost (
+        ::DDSDataWriter *the_writer,
+        const ::DDS_LivelinessLostStatus & status)
+      {
+        ::DDS::LivelinessLostStatus ddsstatus;
+        ddsstatus <<= status;
+        ::DDS::DataWriter_var dds_writer = new RTI_DataWriter_i ();
+        RTI_DataWriter_i *dw = dynamic_cast< RTI_DataWriter_i * > (dds_writer.in ());
+        dw->set_impl (the_writer);
+        this->impl_->on_liveliness_lost (dds_writer.in (), ddsstatus);
+      }
 
-    void
-    CCM_DDS_DataWriterListener_i::on_publication_matched (
-      ::DDSDataWriter *the_writer,
-      const ::DDS_PublicationMatchedStatus & status)
-    {
-      ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil ();
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ::DDS::PublicationMatchedStatus ddsstatus;
-      ddsstatus <<= status;
-      ACE_NEW (dds_writer, 
-               CCM_DDS_DataWriter_i (the_writer));
-      this->impl_->on_publication_matched (dds_writer.in (), ddsstatus);
-#else
-      ACE_NEW (dds_writer, 
-               CCM_DDS_DataWriter_i (the_writer));
-      this->impl_->on_publication_matched (dds_writer.in (), status);
-#endif
-    }
+      void
+      RTI_DataWriterListener_i::on_publication_matched (
+        ::DDSDataWriter *the_writer,
+        const ::DDS_PublicationMatchedStatus & status)
+      {
+        ::DDS::PublicationMatchedStatus ddsstatus;
+        ddsstatus <<= status;
+        ::DDS::DataWriter_var dds_writer = new RTI_DataWriter_i ();
+        RTI_DataWriter_i *dw = dynamic_cast< RTI_DataWriter_i * > (dds_writer.in ());
+        dw->set_impl (the_writer);
+        this->impl_->on_publication_matched (dds_writer.in (), ddsstatus);
+      }
 
-    ::DDS::DataWriterListener_ptr
-    CCM_DDS_DataWriterListener_i::get_datawriterlistener (void)
-    {
-      return ::DDS::DataWriterListener::_duplicate (this->impl_.in ());
+      ::DDS::DataWriterListener_ptr
+      RTI_DataWriterListener_i::get_datawriterlistener (void)
+      {
+        return ::DDS::DataWriterListener::_duplicate (this->impl_.in ());
+      }
     }
   }
 }
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.h b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.h
index fc0751bc1f2..29462493c48 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener.h
@@ -7,8 +7,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_DATAWRITERLISTENER_H
-#define DDS4CCM_DATAWRITERLISTENER_H
+#ifndef CIAO_RTI_DATAWRITERLISTENER_H
+#define CIAO_RTI_DATAWRITERLISTENER_H
 
 #include "tao/LocalObject.h"
 
@@ -17,53 +17,45 @@
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h"
 
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-# include "ndds/ndds_cpp.h"
-#endif
-
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::DataWriterListener DDSDataWriterListener;
-typedef ::DDS::DataWriter DDSDataWriter;
-typedef ::DDS::OfferedDeadlineMissedStatus DDS_OfferedDeadlineMissedStatus;
-typedef ::DDS::OfferedIncompatibleQosStatus DDS_OfferedIncompatibleQosStatus;
-typedef ::DDS::LivelinessLostStatus DDS_LivelinessLostStatus;
-typedef ::DDS::PublicationMatchedStatus DDS_PublicationMatchedStatus;
-#endif
+#include "ndds/ndds_cpp.h"
 
 namespace CIAO
 {
   namespace DDS4CCM
   {
-    class DDS4CCM_NDDS_IMPL_Export CCM_DDS_DataWriterListener_i :
-      public virtual ::DDSDataWriterListener
+    namespace RTI
     {
-    public:
-      /// Constructor
-      CCM_DDS_DataWriterListener_i (::DDS::DataWriterListener_ptr p);
-
-      /// Destructor
-      virtual ~CCM_DDS_DataWriterListener_i (void);
-
-      virtual void on_offered_deadline_missed (
-        ::DDSDataWriter *the_writer,
-        const ::DDS_OfferedDeadlineMissedStatus & status);
-
-      virtual void on_offered_incompatible_qos (
-        ::DDSDataWriter *the_writer,
-        const ::DDS_OfferedIncompatibleQosStatus & status);
-
-      virtual void on_liveliness_lost (
-        ::DDSDataWriter *the_writer,
-        const ::DDS_LivelinessLostStatus & status);
-
-      virtual void on_publication_matched (
-        ::DDSDataWriter *the_writer,
-        const ::DDS_PublicationMatchedStatus & status);
-
-      ::DDS::DataWriterListener_ptr get_datawriterlistener (void);
-    private:
-      ::DDS::DataWriterListener_var impl_;
-    };
+      class DDS4CCM_NDDS_IMPL_Export RTI_DataWriterListener_i :
+        public virtual ::DDSDataWriterListener
+      {
+      public:
+        // Constructor
+        RTI_DataWriterListener_i (::DDS::DataWriterListener_ptr p);
+
+        // Destructor
+        virtual ~RTI_DataWriterListener_i (void);
+
+        virtual void on_offered_deadline_missed (
+          ::DDSDataWriter *the_writer,
+          const ::DDS_OfferedDeadlineMissedStatus & status);
+
+        virtual void on_offered_incompatible_qos (
+          ::DDSDataWriter *the_writer,
+          const ::DDS_OfferedIncompatibleQosStatus & status);
+
+        virtual void on_liveliness_lost (
+          ::DDSDataWriter *the_writer,
+          const ::DDS_LivelinessLostStatus & status);
+
+        virtual void on_publication_matched (
+          ::DDSDataWriter *the_writer,
+          const ::DDS_PublicationMatchedStatus & status);
+
+        ::DDS::DataWriterListener_ptr get_datawriterlistener (void);
+      private:
+        ::DDS::DataWriterListener_var impl_;
+      };
+    }
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener_T.cpp
index 898390a5959..5bd4a39e1b7 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener_T.cpp
@@ -2,67 +2,25 @@
 #include "dds4ccm/impl/ndds/Utils.h"
 
 #include "dds4ccm/impl/ndds/DataWriter.h"
-#include "dds4ccm/impl/logger/Log_Macros.h"
+#include "ciao/Logger/Log_Macros.h"
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 CIAO::DDS4CCM::DataWriterListener_T<DDS_TYPE, CCM_TYPE>::DataWriterListener_T (void)
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::DataWriterListener_T::DataWriterListener_T");
+  CIAO_TRACE ("CIAO::DDS4CCM::DataWriterListener_T::DataWriterListener_T");
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 CIAO::DDS4CCM::DataWriterListener_T<DDS_TYPE, CCM_TYPE>::~DataWriterListener_T (void)
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::DataWriterListener_T::~DataWriterListener_T");
+  CIAO_TRACE ("CIAO::DDS4CCM::DataWriterListener_T::~DataWriterListener_T");
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE>
-void
-CIAO::DDS4CCM::DataWriterListener_T<DDS_TYPE, CCM_TYPE>::on_offered_deadline_missed (
-  ::DDS::DataWriter_ptr ,
-  const ::DDS::OfferedDeadlineMissedStatus & )
-{
-}
-
-template <typename DDS_TYPE, typename CCM_TYPE>
-void
-CIAO::DDS4CCM::DataWriterListener_T<DDS_TYPE, CCM_TYPE>::on_offered_incompatible_qos (
-  ::DDS::DataWriter_ptr ,
-  const ::DDS::OfferedIncompatibleQosStatus & )
-{
-}
-
-template <typename DDS_TYPE, typename CCM_TYPE>
-void
-CIAO::DDS4CCM::DataWriterListener_T<DDS_TYPE, CCM_TYPE>::on_liveliness_lost (
-  ::DDS::DataWriter_ptr ,
-  const ::DDS::LivelinessLostStatus & )
-{
-}
-
-template <typename DDS_TYPE, typename CCM_TYPE>
-void
-CIAO::DDS4CCM::DataWriterListener_T<DDS_TYPE, CCM_TYPE>::on_publication_matched (
-  ::DDS::DataWriter_ptr ,
-  const ::DDS::PublicationMatchedStatus & )
-{
-}
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-template <typename DDS_TYPE, typename CCM_TYPE>
-void
-CIAO::DDS4CCM::DataWriterListener_T<DDS_TYPE, CCM_TYPE>::on_reliable_reader_activity_changed (
-  ::DDS::DataWriter_ptr ,
-  const ::DDS::ReliableReaderActivityChangedStatus & )
-{
-}
-#endif
-
-template <typename DDS_TYPE, typename CCM_TYPE>
 ::DDS::StatusMask
 CIAO::DDS4CCM::DataWriterListener_T<DDS_TYPE, CCM_TYPE>::get_mask (void)
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::DataWriterListener_T::get_mask");
-  return 0;
+  CIAO_TRACE ("CIAO::DDS4CCM::DataWriterListener_T::get_mask");
+  return DDS_STATUS_MASK_NONE;
 }
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener_T.h
index 805499eac25..51ca4b0bd97 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener_T.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterListener_T.h
@@ -28,32 +28,22 @@ namespace CIAO
       /// Destructor
       virtual ~DataWriterListener_T (void);
 
-      virtual void
-      on_offered_deadline_missed (
-        ::DDS::DataWriter_ptr ,
-        const ::DDS::OfferedDeadlineMissedStatus & );
-
-      virtual void
-      on_offered_incompatible_qos (
-        ::DDS::DataWriter_ptr ,
-        const ::DDS::OfferedIncompatibleQosStatus & );
-
-      virtual void
-      on_liveliness_lost (
-        ::DDS::DataWriter_ptr ,
-        const ::DDS::LivelinessLostStatus & );
-
-      virtual void
-      on_publication_matched (
-        ::DDS::DataWriter_ptr ,
-        const ::DDS::PublicationMatchedStatus & );
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      virtual void
-      on_reliable_reader_activity_changed (
-        ::DDS::DataWriter_ptr ,
-        const ::DDS::ReliableReaderActivityChangedStatus & );
-#endif
+    virtual void
+    on_offered_deadline_missed (
+      ::DDS::DataWriter_ptr ,
+      const ::DDS::OfferedDeadlineMissedStatus & ) {}
+    virtual void
+    on_offered_incompatible_qos (
+      ::DDS::DataWriter_ptr ,
+      const ::DDS::OfferedIncompatibleQosStatus & ) {}
+    virtual void
+    on_liveliness_lost (
+      ::DDS::DataWriter_ptr ,
+      const ::DDS::LivelinessLostStatus & ) {}
+    virtual void
+    on_publication_matched (
+      ::DDS::DataWriter_ptr ,
+      const ::DDS::PublicationMatchedStatus & ) {}
 
       static ::DDS::StatusMask get_mask (void);
     };
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterQos.h b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterQos.h
index a12804a4789..6b24d40d494 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DataWriterQos.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DataWriterQos.h
@@ -6,8 +6,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_DATAWRITERQOS_H
-#define DDS4CCM_DATAWRITERQOS_H
+#ifndef CIAO_RTI_DATAWRITERQOS_H
+#define CIAO_RTI_DATAWRITERQOS_H
 
 #include "DurabilityQosPolicy.h"
 #include "DurabilityServiceQosPolicy.h"
@@ -25,11 +25,6 @@
 #include "OwnershipStrengthQosPolicy.h"
 #include "WriterDataLifecycleQosPolicy.h"
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::DataWriterQos DDS_DataWriterQos;
-#endif
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::DataWriterQos &ddsqos, const ::DDS_DataWriterQos & qos)
 {
@@ -109,6 +104,5 @@ operator>>= (const ::DDS::DataWriterQos &qos, ::DDS_DataWriterQos & ddsqos)
   ddsqos.ownership_strength <<= qos.ownership_strength;
   ddsqos.writer_data_lifecycle <<= qos.writer_data_lifecycle;
 }
-#endif
 
-#endif /* DDS4CCM_DATAWRITERQOS_H */
+#endif /* CIAO_RTI_DATAWRITERQOS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DeadlineQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/DeadlineQosPolicy.h
index 83e5298f9fd..45a24e0c3b0 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DeadlineQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DeadlineQosPolicy.h
@@ -6,16 +6,11 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_DEADLINEQOSPOLICY_H
-#define DDS4CCM_DEADLINEQOSPOLICY_H
+#ifndef CIAO_RTI_DEADLINEQOSPOLICY_H
+#define CIAO_RTI_DEADLINEQOSPOLICY_H
 
 #include "Duration_t.h"
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::DeadlineQosPolicy DDS_DeadlineQosPolicy;
-#endif
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::DeadlineQosPolicy &ddsqos, const ::DDS_DeadlineQosPolicy & qos)
 {
@@ -39,6 +34,5 @@ operator>>= (const ::DDS::DeadlineQosPolicy &qos, ::DDS_DeadlineQosPolicy & ddsq
 {
   ddsqos.period <<= qos.period;
 }
-#endif
 
-#endif /* DDS4CCM_DEADLINEQOSPOLICY_H */
+#endif /* CIAO_RTI_DEADLINEQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DestinationOrderQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/DestinationOrderQosPolicy.h
index 31dbeb1b32d..00b58fe57c7 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DestinationOrderQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DestinationOrderQosPolicy.h
@@ -6,16 +6,11 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_DESTINATIONORDERQOSPOLICY_H
-#define DDS4CCM_DESTINATIONORDERQOSPOLICY_H
+#ifndef CIAO_RTI_DESTINATIONORDERQOSPOLICY_H
+#define CIAO_RTI_DESTINATIONORDERQOSPOLICY_H
 
 #include "Duration_t.h"
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::DestinationOrderQosPolicy DDS_DestinationOrderQosPolicy;
-#endif
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::DestinationOrderQosPolicy &ddsqos, const ::DDS_DestinationOrderQosPolicy & qos)
 {
@@ -39,6 +34,5 @@ operator>>= (const ::DDS::DestinationOrderQosPolicy &qos, ::DDS_DestinationOrder
 {
   ddsqos.kind = static_cast < ::DDS_DestinationOrderQosPolicyKind> (qos.kind);
 }
-#endif
 
-#endif /* DDS4CCM_DESTINATIONORDERQOSPOLICY_H */
+#endif /* CIAO_RTI_DESTINATIONORDERQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.cpp
index 246f255f07f..edffda37416 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.cpp
@@ -20,945 +20,741 @@
 
 #include "dds4ccm/idl/dds4ccm_BaseC.h"
 
-#include "dds4ccm/impl/logger/Log_Macros.h"
+#include "ciao/Logger/Log_Macros.h"
 
 namespace CIAO
 {
   namespace DDS4CCM
   {
-    CCM_DDS_DomainParticipant_i::CCM_DDS_DomainParticipant_i (
-      DDSDomainParticipant * dp) : impl_ (dp)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_DomainParticipant_i::CCM_DDS_DomainParticipant_i");
-    }
-
-    CCM_DDS_DomainParticipant_i::~CCM_DDS_DomainParticipant_i (void)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_DomainParticipant_i::~CCM_DDS_DomainParticipant_i");
-    }
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-    ::DDS::Publisher_ptr
-    CCM_DDS_DomainParticipant_i::create_publisher_with_profile (
-      const char* library_name,
-      const char *profile_name,
-      ::DDS::PublisherListener_ptr a_listener,
-      ::DDS::StatusMask mask)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_publisher_with_profile");
-
-      DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CCM_DDS_DomainParticipant_i::create_publisher_with_profile - "
-                   "Creating Publisher\n"));
-      CCM_DDS_PublisherListener_i *rti_pl = 0;
-      if (!CORBA::is_nil (a_listener))
-        {
-          ACE_NEW_THROW_EX (rti_pl,
-                            CCM_DDS_PublisherListener_i (a_listener),
-                            CORBA::NO_MEMORY ());
-        }
-      DDSPublisher * rti_pub =
-        this->impl ()->create_publisher_with_profile (library_name,
-                                                      profile_name,
-                                                      rti_pl,
-                                                      mask);
-
-      if (!rti_pub)
-        {
-          DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipant_i::create_publisher_with_profile - "
-                       "Error: Unable to create Publisher\n"));
-          delete rti_pl;
-          throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0);
-        }
-
-      ::DDS::Publisher_var retval = ::DDS::Publisher::_nil ();
-      ACE_NEW_THROW_EX (retval,
-                        CCM_DDS_Publisher_i (rti_pub),
-                        CORBA::NO_MEMORY ());
-
-
-      DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "CCM_DDS_DomainParticipant_i::create_publisher_with_profile - "
-                   "Successfully created a DDSPublisher\n"));
-
-      rti_pub->enable ();
-      CCM_DDS_Publisher_i *rti_p = dynamic_cast < CCM_DDS_Publisher_i *> (retval.in ());
-      rti_p->set_impl (rti_pub);
-
-      return retval._retn ();
-    }
-#endif
-
-    ::DDS::Publisher_ptr
-    CCM_DDS_DomainParticipant_i::create_publisher (
-      const ::DDS::PublisherQos & qos,
-      ::DDS::PublisherListener_ptr a_listener,
-      ::DDS::StatusMask mask)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_publisher");
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-
-      ACE_UNUSED_ARG (qos);
-
-      DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CCM_DDS_DomainParticipant_i::create_publisher - "
-                   "Creating Publisher\n"));
-
-      DDS_PublisherQos rti_qos = DDS_PUBLISHER_QOS_DEFAULT;
-
-      CCM_DDS_PublisherListener_i *rti_pl = 0;
-      if (!CORBA::is_nil (a_listener))
-        {
-          ACE_NEW_THROW_EX (rti_pl,
-                            CCM_DDS_PublisherListener_i (a_listener),
-                            CORBA::NO_MEMORY ());
-        }
-
-      DDSPublisher * rti_pub =
-        this->impl ()->create_publisher (rti_qos,
-                                         rti_pl,
-                                         mask);
-
-      if (!rti_pub)
-        {
-          DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipant_i::create_publisher - "
-                       "Error: Unable to create Publisher\n"));
-          throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0);
-        }
-
-      ::DDS::Publisher_var retval = ::DDS::Publisher::_nil ();
-      ACE_NEW_THROW_EX (retval,
-                        CCM_DDS_Publisher_i (rti_pub),
-                        CORBA::NO_MEMORY ());
-
-
-      DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "CCM_DDS_DomainParticipant_i::create_publisher - "
-                   "Successfully created a DDSPublisher\n"));
-
-      rti_pub->enable ();
-      CCM_DDS_Publisher_i *rti_p = dynamic_cast < CCM_DDS_Publisher_i *> (retval.in ());
-      rti_p->set_impl (rti_pub);
-
-      return retval._retn ();
-#else
-      return this->impl ()->create_publisher (qos, a_listener, mask);
-#endif
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_DomainParticipant_i::delete_publisher (::DDS::Publisher_ptr p)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      CCM_DDS_Publisher_i *rti_pub = dynamic_cast < CCM_DDS_Publisher_i * > (p);
-
-      if (!rti_pub)
-        {
-          DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipant_i::delete_publisher - "
-                       "Unable to cast provided object refence to servant pointer.\n"));
-          return ::DDS::RETCODE_ERROR;
-        }
-
-      DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CCM_DDS_DomainParticipant_i::delete_publisher - "
-                   "Successfully casted provided object refence to CCM_DDS_Publisher_i\n"));
-
-      DDS_ReturnCode_t const retval = this->impl ()->delete_publisher (rti_pub->get_impl ());
-
-      if (retval != DDS_RETCODE_OK)
-        {
-          DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipant_i::delete_publisher - "
-                       "Error: RTI delete_publisher returned non-ok error code %C\n",
-                       translate_retcode (retval)));
-        }
-      else DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "CCM_DDS_DomainParticipant_i::delete_publisher - "
-                        "Provided publisher successfully deleted\n"));
-
-      return retval;
-#else
-      return this->impl ()->delete_publisher (p);
-#endif
-    }
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-    ::DDS::Subscriber_ptr
-    CCM_DDS_DomainParticipant_i::create_subscriber_with_profile (
-      const char* library_name,
-      const char *profile_name,
-      ::DDS::SubscriberListener_ptr a_listener,
-      ::DDS::StatusMask mask)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_subscriber_with_profile");
-
-      DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CCM_DDS_DomainParticipant_i::create_subscriber_with_profile - "
-                   "Creating Subscriber\n"));
-
-      CCM_DDS_SubscriberListener_i *rti_sl = 0;
-      if (!CORBA::is_nil (a_listener))
-        {
-          ACE_NEW_THROW_EX (rti_sl,
-                            CCM_DDS_SubscriberListener_i (a_listener),
-                            CORBA::NO_MEMORY ());
-        }
-      DDSSubscriber * rti_sub =
-        this->impl ()->create_subscriber_with_profile (
-          library_name,
-          profile_name,
-          rti_sl,
-          mask);
-
-      if (!rti_sub)
-        {
-          DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipant_i::create_subscriber_with_profile - "
-                       "Error: Unable to create Subscriber\n"));
-          delete rti_sl;
-          throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0);
-        }
-
-      ::DDS::Subscriber_var retval = ::DDS::Subscriber::_nil ();
-      ACE_NEW_THROW_EX (retval,
-                        CCM_DDS_Subscriber_i (rti_sub),
-                        CORBA::NO_MEMORY ());
-
-      DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "CCM_DDS_DomainParticipant_i::create_subscriber_with_profile - "
-                   "Successfully created a DDSSubscriber\n"));
-
-      rti_sub->enable ();
-      CCM_DDS_Subscriber_i *rti_s = dynamic_cast < CCM_DDS_Subscriber_i *> (retval.in ());
-      rti_s->set_impl (rti_sub);
-
-      return retval._retn ();
-    }
-#endif
-
-    ::DDS::Subscriber_ptr
-    CCM_DDS_DomainParticipant_i::create_subscriber (const ::DDS::SubscriberQos & qos,
-                                                ::DDS::SubscriberListener_ptr a_listener,
-                                                ::DDS::StatusMask mask)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_subscriber");
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ACE_UNUSED_ARG (qos);
-
-      DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CCM_DDS_DomainParticipant_i::create_subscriber - "
-                   "Creating Subscriber\n"));
-
-      CCM_DDS_SubscriberListener_i *rti_sl = 0;
-      if (!CORBA::is_nil (a_listener))
-        {
-          ACE_NEW_THROW_EX (rti_sl,
-                            CCM_DDS_SubscriberListener_i (a_listener),
-                            CORBA::NO_MEMORY ());
-        }
-      DDSSubscriber * rti_sub =
-        this->impl ()->create_subscriber (DDS_SUBSCRIBER_QOS_DEFAULT,
-                                          rti_sl,
-                                          mask);
-
-      if (!rti_sub)
-        {
-          DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipant_i::create_subscriber - "
-                       "Error: Unable to create Subscriber\n"));
-          delete rti_sl;
-          throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0);
-        }
-
-      ::DDS::Subscriber_var retval = ::DDS::Subscriber::_nil ();
-      ACE_NEW_THROW_EX (retval,
-                        CCM_DDS_Subscriber_i (rti_sub),
-                        CORBA::NO_MEMORY ());
-
-      DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "CCM_DDS_DomainParticipant_i::create_subscriber - "
-                   "Successfully created a DDSSubscriber\n"));
-
-      rti_sub->enable ();
-      CCM_DDS_Subscriber_i *rti_s = dynamic_cast < CCM_DDS_Subscriber_i *> (retval.in ());
-      rti_s->set_impl (rti_sub);
-
-      return retval._retn ();
-#else
-      return this->impl ()->create_subscriber (qos,
-                                          a_listener,
-                                          mask);
-#endif
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_DomainParticipant_i::delete_subscriber (::DDS::Subscriber_ptr s)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      CCM_DDS_Subscriber_i *rti_sub = dynamic_cast < CCM_DDS_Subscriber_i * > (s);
-
-      if (!rti_sub)
-        {
-          DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipant_i::delete_subscriber - "
-                       "Unable to cast provided object refence to servant pointer.\n"));
-          return ::DDS::RETCODE_ERROR;
-        }
-
-      DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CCM_DDS_DomainParticipant_i::delete_subscriber - "
-                   "Successfully casted provided object refence to CCM_DDS_Subscriber_i\n"));
-
-      DDS_ReturnCode_t const retval = this->impl ()->delete_subscriber (rti_sub->get_impl ());
-
-      if (retval != DDS_RETCODE_OK)
-        {
-          DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipant_i::delete_subscriber - "
-                       "Error: RTI delete_subscriber returned non-ok error code %C\n",
-                       translate_retcode (retval)));
-        }
-      else DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "CCM_DDS_DomainParticipant_i::delete_subscriber - "
-                        "Provided subscriber successfully deleted\n"));
-
-      return retval;
-#else
-      return this->impl ()->delete_subscriber (s);
-#endif
-    }
-
-    ::DDS::Subscriber_ptr
-    CCM_DDS_DomainParticipant_i::get_builtin_subscriber (void)
-    {
-      ::DDS::Subscriber_var retval = ::DDS::Subscriber::_nil ();
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      DDSSubscriber* sub = this->impl ()->get_builtin_subscriber ();
-      ACE_NEW_THROW_EX (retval,
-                        CCM_DDS_Subscriber_i (sub),
-                        CORBA::NO_MEMORY ());
-#else
-      ::DDS::Subscriber_var sub = this->impl ()->get_builtin_subscriber ();
-      ACE_NEW_THROW_EX (retval,
-                        CCM_DDS_Subscriber_i (sub.in ()),
-                        CORBA::NO_MEMORY ());
-#endif
-      return retval._retn ();
-    }
-
-    ::DDS::Topic_ptr
-    CCM_DDS_DomainParticipant_i::create_topic (const char * impl_name,
-                                           const char * type_name,
-                                           const ::DDS::TopicQos & qos,
-                                           ::DDS::TopicListener_ptr a_listener,
-                                           ::DDS::StatusMask mask)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_topic");
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ACE_UNUSED_ARG (qos);
-
-      if (impl_name == 0)
-        {
-          DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "DDS_DomainParticipant_i::create_topic - "
-                       "Error: provided nil topic name\n"));
-          throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER,
-                                        0);
-        }
-
-      if (type_name == 0)
-        {
-          DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "DDS_DomainParticipant_i::create_topic - "
-                       "Error: provided nil type name\n"));
-          throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER,
-                                        0);
-        }
-
-      DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO "DDS_DomainParticipant_i::create_topic - "
-                   "Attempting to create topic with name %C and type %C\n",
-                   impl_name, type_name));
-
-      CCM_DDS_TopicListener_i *rti_tl = 0;
-      if (!CORBA::is_nil (a_listener))
-        {
-          ACE_NEW_THROW_EX (rti_tl,
-                            CCM_DDS_TopicListener_i (a_listener),
-                            CORBA::NO_MEMORY ());
-        }
-
-      DDSTopic *rti_topic = this->impl ()->create_topic (impl_name,
-                                                      type_name,
-                                                      DDS_TOPIC_QOS_DEFAULT,
-                                                      rti_tl,
-                                                      mask);
-
-      if (rti_topic == 0)
-        {
-          DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "DDS_DomainParticipant_i::create_topic - "
-                      "Error: RTI DDS returned a nil topic\n"));
-          delete rti_tl;
-          throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0);
-        }
-
-      ::DDS::Topic_var retval = ::DDS::Topic::_nil ();
-      ACE_NEW_THROW_EX (retval,
-                        CCM_DDS_Topic_i (rti_topic),
-                        CORBA::NO_MEMORY ());
-
-      DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "DDS_DomainParticipant_i::create_topic - "
-                  "Successfully created topic with name %C and type %C\n",
-                  impl_name, type_name));
-
-      CCM_DDS_Topic_i *tp = dynamic_cast < CCM_DDS_Topic_i *> (retval.in ());
-      tp->set_impl (rti_topic);
-
-      return retval._retn ();
-#else
-      return this->impl ()->create_topic (impl_name,
-                                                      type_name,
-                                                      qos,
-                                                      a_listener,
-                                                      mask);
-#endif
-    }
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-    ::DDS::Topic_ptr
-    CCM_DDS_DomainParticipant_i::create_topic_with_profile (
-        const char *impl_name,
-        const char *type_name,
-        const char *library_name,
+    namespace RTI
+    {
+      RTI_DomainParticipant_i::RTI_DomainParticipant_i (void)
+        : impl_ (0)
+      {
+        CIAO_TRACE ("RTI_DomainParticipant_i::RTI_DomainParticipant_i");
+      }
+
+      RTI_DomainParticipant_i::~RTI_DomainParticipant_i (void)
+      {
+        CIAO_TRACE ("RTI_DomainParticipant_i::~RTI_DomainParticipant_i");
+      }
+
+      ::DDS::Publisher_ptr
+      RTI_DomainParticipant_i::create_publisher_with_profile (
+        const char* library_name,
         const char *profile_name,
-        ::DDS::TopicListener_ptr a_listener,
+        ::DDS::PublisherListener_ptr a_listener,
         ::DDS::StatusMask mask)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_topic_with_profile");
-
-      if (impl_name == 0)
-        {
-          DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "DDS_DomainParticipant_i::create_topic_with_profile - "
-                       "Error: provided nil topic name\n"));
-          throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0);
-        }
-
-      if (type_name == 0)
-        {
-          DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "DDS_DomainParticipant_i::create_topic_with_profile - "
-                       "Error: provided nil type name\n"));
-          throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0);
-        }
-
-      DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO "DDS_DomainParticipant_i::create_topic_with_profile - "
-                   "Attempting to create topic with name %C and type %C\n",
-                   impl_name, type_name));
-
-      ::DDS::Duration_t dur = { 0, 1000000 };
-      ::DDS::Topic_var tp = this->find_topic (impl_name, dur);
-      if (CORBA::is_nil (tp))
-        {
-          CCM_DDS_TopicListener_i *rti_tl = 0;
-          if (!CORBA::is_nil (a_listener))
-            {
-              ACE_NEW_THROW_EX (rti_tl,
-                                CCM_DDS_TopicListener_i (a_listener),
-                                CORBA::NO_MEMORY ());
-            }
-          DDSTopic *rti_topic = this->impl ()->create_topic_with_profile (impl_name,
-                                                          type_name,
-                                                          library_name,
-                                                          profile_name,
-                                                          rti_tl,
-                                                          mask);
-
-          if (rti_topic == 0)
-            {
-              DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "DDS_DomainParticipant_i::create_topic_with_profile - "
-                          "Error: RTI DDS returned a nil topic\n"));
-              delete rti_tl;
-              throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0);
-            }
-
-          ::DDS::Topic_var retval = ::DDS::Topic::_nil ();
-          ACE_NEW_THROW_EX (retval,
-                            CCM_DDS_Topic_i (rti_topic),
-                            CORBA::NO_MEMORY ());
-
-          DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "DDS_DomainParticipant_i::create_topic_with_profile - "
-                      "Successfully created topic with name %C and type %C\n",
-                      impl_name, type_name));
-
-          CCM_DDS_Topic_i *tp = dynamic_cast < CCM_DDS_Topic_i *> (retval.in ());
-          tp->set_impl (rti_topic);
-
-          return retval._retn ();
-        }
-      else
-        {
-          DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO "DDS_DomainParticipant_i::create_topic_with_profile - "
-                      "Re-using topic  with name %C and type %C.\n",
-                      impl_name, type_name));
-          return ::DDS::Topic::_duplicate (tp.in ());
-        }
-    }
-#endif
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_DomainParticipant_i::delete_topic (::DDS::Topic_ptr a_topic)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::delete_topic");
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      CCM_DDS_Topic_i *top = dynamic_cast< CCM_DDS_Topic_i *> (a_topic);
-
-      if (top == 0)
-        {
-          DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipant_i::delete_topic - "
-                       "Unable to cast provided object reference to servant.\n"));
-          return ::DDS::RETCODE_BAD_PARAMETER;
-        }
-
-      DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CCM_DDS_DomainParticipant_i::delete_topic - "
-                   "Successfully casted provided object reference to servant.\n"));
-
-      DDS_ReturnCode_t const retval = this->impl ()->delete_topic (top->get_impl ());
-
-      if (retval != DDS_RETCODE_OK)
-        {
-          DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipant_i::delete_topic - "
-                       "Error: RTI delete_topic returned non-ok error code %C\n",
-                       translate_retcode (retval)));
-        }
-      else DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "CCM_DDS_DomainParticipant_i::delete_topic - "
-                        "Provided topic successfully deleted\n"));
-
-      return retval;
-#else
-      return this->impl ()->delete_topic (a_topic);
-#endif
-    }
-
-    ::DDS::Topic_ptr
-    CCM_DDS_DomainParticipant_i::find_topic (const char * impl_name,
-                                         const ::DDS::Duration_t & timeout)
-    {
-      ::DDS::Topic_var retval = ::DDS::Topic::_nil ();
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ::DDS_Duration_t ddstimeout;
-      ddstimeout <<= timeout;
-      ::DDSTopic* topic = this->impl ()->find_topic (impl_name, ddstimeout);
-      if (topic)
-        {
-          ACE_NEW_RETURN (retval,
-                          CCM_DDS_Topic_i (topic),
-                          ::DDS::Topic::_nil ());
-        }
-#else
-      ::DDS::Topic_var topic = this->impl ()->find_topic (impl_name, timeout);
-      if (!CORBA::is_nil (topic.in ())
-        {
-          ACE_NEW_RETURN (retval,
-                          CCM_DDS_Topic_i (topic.in ()),
-                          ::DDS::Topic::_nil ());
-        }
-#endif
-      return retval._retn ();
-    }
-
-    ::DDS::TopicDescription_ptr
-    CCM_DDS_DomainParticipant_i::lookup_topicdescription (const char * name)
-    {
-      ::DDS::TopicDescription_var retval = ::DDS::TopicDescription::_nil ();
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ::DDSTopicDescription* topic = this->impl ()->lookup_topicdescription (name);
-      ACE_NEW_THROW_EX (retval,
-                        CCM_DDS_TopicDescription_i (topic),
-                        CORBA::NO_MEMORY ());
-#else
-      ::DDSTopicDescription_var topic = this->impl ()->lookup_topicdescription (name);
-      ACE_NEW_THROW_EX (retval,
-                        CCM_DDS_TopicDescription_i (topic.in ()),
-                        CORBA::NO_MEMORY ());
-#endif
-      return retval._retn ();
-    }
-
-    ::DDS::ContentFilteredTopic_ptr
-    CCM_DDS_DomainParticipant_i::create_contentfilteredtopic (const char * name,
-                                                          ::DDS::Topic_ptr related_topic,
-                                                          const char * filter_expression,
-                                                          const ::DDS::StringSeq & expression_parameters)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_contentfilteredtopic");
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      CCM_DDS_Topic_i *top = dynamic_cast< CCM_DDS_Topic_i *> (related_topic);
-      if (!top)
-        {
-          DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipant_i::create_contentfilteredtopic - "
-                       "Unable to cast provided topic.\n"));
-          throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0);
-        }
-
-      const char** parameterlist = 0;
-      ACE_NEW_THROW_EX (parameterlist,
-                        const char*[expression_parameters.length ()],
-                        CORBA::NO_MEMORY ());
-
-      for (CORBA::ULong i = 0; i < expression_parameters.length (); ++i)
-        {
-          parameterlist[i] = expression_parameters[i].in ();
-        }
-      DDS_StringSeq parameters (expression_parameters.length ());
-      parameters.from_array (parameterlist, expression_parameters.length ());
-
-      DDSContentFilteredTopic * rti_cft = this->impl ()->create_contentfilteredtopic (
-                                                                  name,
-                                                                  top->get_impl (),
-                                                                  filter_expression,
-                                                                  parameters);
-      delete [] parameterlist;
-      if (!rti_cft)
-        {
-          DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipant_i::create_contentfilteredtopic - "
-                       "RTI DDS returned a nil ContentFilteredTopic.\n"));
-          throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0);
-        }
-
-      ::DDS::ContentFilteredTopic_var retval = ::DDS::ContentFilteredTopic::_nil ();
-      ACE_NEW_THROW_EX (retval,
-                        CCM_DDS_ContentFilteredTopic_i (rti_cft),
-                        CORBA::NO_MEMORY ());
-
-      DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "DDS_DomainParticipant_i::create_contentfilteredtopic - "
-                   "Successfully created topic with name <%C> and filter expression <%C>\n",
-                   name, filter_expression));
-
-      CCM_DDS_ContentFilteredTopic_i *tp = dynamic_cast < CCM_DDS_ContentFilteredTopic_i *> (retval.in ());
-      tp->set_impl (rti_cft);
-
-      return retval._retn ();
-#else
-      return this->impl ()->create_contentfilteredtopic (
-                                                                  name,
-                                                                  related_topic,
-                                                                  filter_expression,
-                                                                  expression_parameters);
-#endif
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_DomainParticipant_i::delete_contentfilteredtopic (::DDS::ContentFilteredTopic_ptr /*a_contentfilteredtopic*/)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::delete_contentfilteredtopic");
-      throw CORBA::NO_IMPLEMENT ();
-
-    }
-
-    ::DDS::MultiTopic_ptr
-    CCM_DDS_DomainParticipant_i::create_multitopic (const char * /*name*/,
-                                                const char * /*type_name*/,
-                                                const char * /*subscription_expression*/,
-                                                const ::DDS::StringSeq & /*expression_parameters*/)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::create_multitopic");
-      throw CORBA::NO_IMPLEMENT ();
-
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_DomainParticipant_i::delete_multitopic (::DDS::MultiTopic_ptr /*a_multitopic*/)
-    {
-      //this->impl ()->delete_multitopic (
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::delete_multitopic");
-      throw CORBA::NO_IMPLEMENT ();
-
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_DomainParticipant_i::delete_contained_entities (void)
-    {
-      return this->impl ()->delete_contained_entities ();
-
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_DomainParticipant_i::set_qos (const ::DDS::DomainParticipantQos & /*qos*/)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::set_qos");
-      throw CORBA::NO_IMPLEMENT ();
-
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_DomainParticipant_i::get_qos (::DDS::DomainParticipantQos & /*qos*/)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_qos");
-      throw CORBA::NO_IMPLEMENT ();
-
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_DomainParticipant_i::set_listener (::DDS::DomainParticipantListener_ptr a_listener,
-                                           ::DDS::StatusMask mask)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      CCM_DDS_DomainPublisherListener_i* rti_impl_list = 0;
-      if (!CORBA::is_nil (a_listener))
-        {
-          ACE_NEW_THROW_EX (rti_impl_list,
-                            CCM_DDS_DomainPublisherListener_i (a_listener),
-                            CORBA::NO_MEMORY ());
-        }
-      return this->impl_->set_listener (rti_impl_list, mask);
-#else
-      return this->impl_->set_listener (a_listener, mask);
-#endif
-    }
-
-    ::DDS::DomainParticipantListener_ptr
-    CCM_DDS_DomainParticipant_i::get_listener (void)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_listener");
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      DDSDomainParticipantListener *rti_dp_list = this->impl ()->get_listener ();
-      CCM_DDS_DomainPublisherListener_i *list_proxy = dynamic_cast <CCM_DDS_DomainPublisherListener_i *> (rti_dp_list);
-      if (!list_proxy)
-        {
-          DDS4CCM_DEBUG (6, (LM_DEBUG, "CCM_DDS_DomainParticipant_i::get_listener - "
-                                    "DDS returned a NIL listener.\n"));
-          return ::DDS::DomainParticipantListener::_nil ();
-        }
-      return list_proxy->get_domainparticipantlistener ();
-#else
-      return this->impl ()->get_listener ();
-#endif
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_DomainParticipant_i::ignore_participant (DDS_INSTANCE_HANDLE_T_IN handle)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ::DDS_InstanceHandle_t rti_handle;
-      rti_handle <<= handle;
-      return this->impl ()->ignore_participant (rti_handle);
-#else
-      return this->impl ()->ignore_participant (handle);
-#endif
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_DomainParticipant_i::ignore_topic (DDS_INSTANCE_HANDLE_T_IN handle)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ::DDS_InstanceHandle_t rti_handle;
-      rti_handle <<= handle;
-      return this->impl ()->ignore_topic (rti_handle);
-#else
-      return this->impl ()->ignore_topic (handle);
-#endif
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_DomainParticipant_i::ignore_publication (DDS_INSTANCE_HANDLE_T_IN handle)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ::DDS_InstanceHandle_t rti_handle;
-      rti_handle <<= handle;
-      return this->impl ()->ignore_publication (rti_handle);
-#else
-      return this->impl ()->ignore_publication (handle);
-#endif
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_DomainParticipant_i::ignore_subscription (DDS_INSTANCE_HANDLE_T_IN handle)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ::DDS_InstanceHandle_t rti_handle;
-      rti_handle <<= handle;
-      return this->impl ()->ignore_subscription (rti_handle);
-#else
-      return this->impl ()->ignore_subscription (handle);
-#endif
-    }
-
-    ::DDS::DomainId_t
-    CCM_DDS_DomainParticipant_i::get_domain_id (void)
-    {
-      return this->impl ()->get_domain_id ();
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_DomainParticipant_i::assert_liveliness (void)
-    {
-      return this->impl ()->assert_liveliness ();
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_DomainParticipant_i::set_default_publisher_qos (const ::DDS::PublisherQos & /*qos*/)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::set_default_publisher_qos");
-      throw CORBA::NO_IMPLEMENT ();
-
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_DomainParticipant_i::get_default_publisher_qos (::DDS::PublisherQos & /*qos*/)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_default_publisher_qos");
-      throw CORBA::NO_IMPLEMENT ();
-
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_DomainParticipant_i::set_default_subscriber_qos (const ::DDS::SubscriberQos & /*qos*/)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::set_default_subscriber_qos");
-      throw CORBA::NO_IMPLEMENT ();
-
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_DomainParticipant_i::get_default_subscriber_qos (::DDS::SubscriberQos & /*qos*/)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_default_subscriber_qos");
-      throw CORBA::NO_IMPLEMENT ();
-
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_DomainParticipant_i::set_default_topic_qos (const ::DDS::TopicQos & /*qos*/)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::set_default_topic_qos");
-      throw CORBA::NO_IMPLEMENT ();
-
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_DomainParticipant_i::get_default_topic_qos (::DDS::TopicQos & /*qos*/)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_default_topic_qos");
-      throw CORBA::NO_IMPLEMENT ();
-
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_DomainParticipant_i::get_discovered_participants (::DDS::InstanceHandleSeq & impl_handles)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ::DDS_InstanceHandleSeq rtiseq;
-      ::DDS::ReturnCode_t const retval = this->impl ()->get_discovered_participants (rtiseq);
-      rtiseq >>= impl_handles;
-      return retval;
-#else
-      return this->impl ()->get_discovered_participants (impl_handles);
-#endif
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_DomainParticipant_i::get_discovered_participant_data (::DDS::ParticipantBuiltinTopicData & /*impl_data*/,
-                                                              DDS_INSTANCE_HANDLE_T_IN /*impl_handle*/)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_discovered_participant_data");
-      throw CORBA::NO_IMPLEMENT ();
-
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_DomainParticipant_i::get_discovered_topics (::DDS::InstanceHandleSeq & impl_handles)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ::DDS_InstanceHandleSeq rtiseq;
-      ::DDS::ReturnCode_t const retval = this->impl ()->get_discovered_topics (rtiseq);
-      rtiseq >>= impl_handles;
-      return retval;
-#else
-      return this->impl ()->get_discovered_topics (impl_handles);
-#endif
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_DomainParticipant_i::get_discovered_topic_data (::DDS::TopicBuiltinTopicData & /*impl_data*/,
-                                                        DDS_INSTANCE_HANDLE_T_IN /*impl_handle*/)
-    {
-      DDS4CCM_TRACE ("DDS_DomainParticipant_i::get_discovered_topic_data");
-      throw CORBA::NO_IMPLEMENT ();
-
-    }
-
-    ::CORBA::Boolean
-    CCM_DDS_DomainParticipant_i::contains_entity (DDS_INSTANCE_HANDLE_T_IN a_handle)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ::DDS_InstanceHandle_t rti_handle;
-      rti_handle <<= a_handle;
-      return this->impl ()->contains_entity (rti_handle);
-#else
-      return this->impl ()->contains_entity (a_handle);
-#endif
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_DomainParticipant_i::get_current_time (::DDS::Time_t & current_time)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      DDS_Time_t rti_time;
-      ::DDS::ReturnCode_t const retval = this->impl ()->get_current_time (rti_time);
-      rti_time >>= current_time;
-      return retval;
-#else
-      return this->impl ()->get_current_time (current_time);
-#endif
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_DomainParticipant_i::enable (void)
-    {
-      return this->impl ()->enable ();
-    }
-
-    ::DDS::StatusCondition_ptr
-    CCM_DDS_DomainParticipant_i::get_statuscondition (void)
-    {
-      ::DDS::StatusCondition_var retval = ::DDS::StatusCondition::_nil ();
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      DDSStatusCondition* sc = this->impl ()->get_statuscondition ();
-      ACE_NEW_THROW_EX (retval,
-                        CCM_DDS_StatusCondition_i (sc),
-                        CORBA::NO_MEMORY ());
-#else
-      ::DDS::StatusCondition_var sc = this->impl ()->get_statuscondition ();
-      ACE_NEW_THROW_EX (retval,
-                        CCM_DDS_StatusCondition_i (sc.in ()),
-                        CORBA::NO_MEMORY ());
-#endif
-      return retval._retn ();
-    }
-
-    ::DDS::StatusMask
-    CCM_DDS_DomainParticipant_i::get_status_changes (void)
-    {
-      return this->impl ()->get_status_changes ();
-    }
-
-    DDS_INSTANCE_HANDLE_T_RETN
-    CCM_DDS_DomainParticipant_i::get_instance_handle (void)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ::DDS_InstanceHandle_t const rtihandle = this->impl ()->get_instance_handle ();
-      ::DDS::InstanceHandle_t handle;
-      handle <<= rtihandle;
-      return handle;
-#else
-      return this->impl ()->get_instance_handle ();
-#endif
-    }
-
-    DDSDomainParticipant *
-    CCM_DDS_DomainParticipant_i::get_impl (void)
-    {
-      return this->impl_;
-    }
-
-    void
-    CCM_DDS_DomainParticipant_i::set_impl (DDSDomainParticipant * dp)
-    {
-      this->impl_ = dp;
-    }
-
-    DDSDomainParticipant *
-    CCM_DDS_DomainParticipant_i::impl (void)
-    {
-      if (!this->impl_)
-        {
-          throw ::CORBA::BAD_INV_ORDER ();
-        }
-      return this->impl_;
+      {
+        CIAO_TRACE ("DDS_DomainParticipant_i::create_publisher_with_profile");
+
+        CIAO_DEBUG (9, (LM_TRACE, CLINFO "RTI_DomainParticipant_i::create_publisher_with_profile - "
+                     "Creating Publisher\n"));
+
+        RTI_PublisherListener_i *rti_pl = 0;
+        if (!CORBA::is_nil (a_listener))
+          {
+            rti_pl = new RTI_PublisherListener_i (a_listener);
+          }
+        DDSPublisher * rti_pub =
+          this->impl ()->create_publisher_with_profile (library_name,
+                                                        profile_name,
+                                                        rti_pl,
+                                                        mask);
+
+        if (!rti_pub)
+          {
+            CIAO_ERROR (1, (LM_ERROR, CLINFO "RTI_DomainParticipant_i::create_publisher_with_profile - "
+                         "Error: Unable to create Publisher\n"));
+            throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0);
+          }
+
+        CIAO_DEBUG (6, (LM_INFO, CLINFO "RTI_DomainParticipant_i::create_publisher_with_profile - "
+                     "Successfully created a DDSPublisher\n"));
+
+        rti_pub->enable ();
+        ::DDS::Publisher_var retval = new RTI_Publisher_i ();
+        RTI_Publisher_i *rti_p = dynamic_cast < RTI_Publisher_i *> (retval.in ());
+        rti_p->set_impl (rti_pub);
+
+        return retval._retn ();
+      }
+
+      ::DDS::Publisher_ptr
+      RTI_DomainParticipant_i::create_publisher (
+        const ::DDS::PublisherQos & /*qos*/,
+        ::DDS::PublisherListener_ptr a_listener,
+        ::DDS::StatusMask mask)
+      {
+        CIAO_TRACE ("DDS_DomainParticipant_i::create_publisher");
+
+        CIAO_DEBUG (9, (LM_TRACE, CLINFO "RTI_DomainParticipant_i::create_publisher - "
+                     "Creating Publisher\n"));
+
+        DDS_PublisherQos rti_qos = DDS_PUBLISHER_QOS_DEFAULT;
+
+        RTI_PublisherListener_i *rti_pl = 0;
+        if (!CORBA::is_nil (a_listener))
+          {
+            rti_pl = new RTI_PublisherListener_i (a_listener);
+          }
+
+        DDSPublisher * rti_pub =
+          this->impl ()->create_publisher (rti_qos,
+                                           rti_pl,
+                                           mask);
+
+        if (!rti_pub)
+          {
+            CIAO_ERROR (1, (LM_ERROR, CLINFO "RTI_DomainParticipant_i::create_publisher - "
+                         "Error: Unable to create Publisher\n"));
+            throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0);
+          }
+
+        CIAO_DEBUG (6, (LM_INFO, CLINFO "RTI_DomainParticipant_i::create_publisher - "
+                     "Successfully created a DDSPublisher\n"));
+
+        rti_pub->enable ();
+        ::DDS::Publisher_var retval = new RTI_Publisher_i ();
+        RTI_Publisher_i *rti_p = dynamic_cast < RTI_Publisher_i *> (retval.in ());
+        rti_p->set_impl (rti_pub);
+
+        return retval._retn ();
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_DomainParticipant_i::delete_publisher (::DDS::Publisher_ptr p)
+      {
+        RTI_Publisher_i *rti_pub = dynamic_cast < RTI_Publisher_i * > (p);
+
+        if (!rti_pub)
+          {
+            CIAO_ERROR (1, (LM_ERROR, CLINFO "RTI_DomainParticipant_i::delete_publisher - "
+                         "Unable to cast provided object refence to servant pointer.\n"));
+            return ::DDS::RETCODE_ERROR;
+          }
+
+        CIAO_DEBUG (9, (LM_TRACE, CLINFO "RTI_DomainParticipant_i::delete_publisher - "
+                     "Successfully casted provided object refence to RTI_Publisher_i\n"));
+
+        DDS_ReturnCode_t const retval = this->impl ()->delete_publisher (rti_pub->get_impl ());
+
+        if (retval != DDS_RETCODE_OK)
+          {
+            CIAO_ERROR (1, (LM_ERROR, CLINFO "RTI_DomainParticipant_i::delete_publisher - "
+                         "Error: RTI delete_publisher returned non-ok error code %C\n",
+                         translate_retcode (retval)));
+          }
+        else CIAO_DEBUG (6, (LM_INFO, CLINFO "RTI_DomainParticipant_i::delete_publisher - "
+                          "Provided publisher successfully deleted\n"));
+
+        return retval;
+      }
+
+      ::DDS::Subscriber_ptr
+      RTI_DomainParticipant_i::create_subscriber_with_profile (
+        const char* library_name,
+        const char *profile_name,
+        ::DDS::SubscriberListener_ptr a_listener,
+        ::DDS::StatusMask mask)
+      {
+        CIAO_TRACE ("DDS_DomainParticipant_i::create_subscriber_with_profile");
+
+        CIAO_DEBUG (9, (LM_TRACE, CLINFO "RTI_DomainParticipant_i::create_subscriber_with_profile - "
+                     "Creating Subscriber\n"));
+
+        RTI_SubscriberListener_i *rti_sl = 0;
+        if (!CORBA::is_nil (a_listener))
+          {
+            rti_sl = new RTI_SubscriberListener_i (a_listener);
+          }
+        DDSSubscriber * rti_sub =
+          this->impl ()->create_subscriber_with_profile (
+            library_name,
+            profile_name,
+            rti_sl,
+            mask);
+
+        if (!rti_sub)
+          {
+            CIAO_ERROR (1, (LM_ERROR, CLINFO "RTI_DomainParticipant_i::create_subscriber_with_profile - "
+                         "Error: Unable to create Subscriber\n"));
+            throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0);
+          }
+
+        CIAO_DEBUG (6, (LM_INFO, CLINFO "RTI_DomainParticipant_i::create_subscriber_with_profile - "
+                     "Successfully created a DDSSubscriber\n"));
+
+        rti_sub->enable ();
+        ::DDS::Subscriber_var retval = new RTI_Subscriber_i ();
+        RTI_Subscriber_i *rti_s = dynamic_cast < RTI_Subscriber_i *> (retval.in ());
+        rti_s->set_impl (rti_sub);
+
+        return retval._retn ();
+      }
+
+      ::DDS::Subscriber_ptr
+      RTI_DomainParticipant_i::create_subscriber (const ::DDS::SubscriberQos & /*qos*/,
+                                                  ::DDS::SubscriberListener_ptr a_listener,
+                                                  ::DDS::StatusMask mask)
+      {
+        CIAO_TRACE ("DDS_DomainParticipant_i::create_subscriber");
+
+        CIAO_DEBUG (9, (LM_TRACE, CLINFO "RTI_DomainParticipant_i::create_subscriber - "
+                     "Creating Subscriber\n"));
+
+        RTI_SubscriberListener_i *rti_sl = 0;
+        if (!CORBA::is_nil (a_listener))
+          {
+            rti_sl = new RTI_SubscriberListener_i (a_listener);
+          }
+        DDSSubscriber * rti_sub =
+          this->impl ()->create_subscriber (DDS_SUBSCRIBER_QOS_DEFAULT,
+                                            rti_sl,
+                                            mask);
+
+        if (!rti_sub)
+          {
+            CIAO_ERROR (1, (LM_ERROR, CLINFO "RTI_DomainParticipant_i::create_subscriber - "
+                         "Error: Unable to create Subscriber\n"));
+            throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0);
+          }
+
+        CIAO_DEBUG (6, (LM_INFO, CLINFO "RTI_DomainParticipant_i::create_subscriber - "
+                     "Successfully created a DDSSubscriber\n"));
+
+        rti_sub->enable ();
+        ::DDS::Subscriber_var retval = new RTI_Subscriber_i ();
+        RTI_Subscriber_i *rti_s = dynamic_cast < RTI_Subscriber_i *> (retval.in ());
+        rti_s->set_impl (rti_sub);
+
+        return retval._retn ();
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_DomainParticipant_i::delete_subscriber (::DDS::Subscriber_ptr s)
+      {
+        RTI_Subscriber_i *rti_sub = dynamic_cast < RTI_Subscriber_i * > (s);
+
+        if (!rti_sub)
+          {
+            CIAO_ERROR (1, (LM_ERROR, CLINFO "RTI_DomainParticipant_i::delete_subscriber - "
+                         "Unable to cast provided object refence to servant pointer.\n"));
+            return ::DDS::RETCODE_ERROR;
+          }
+
+        CIAO_DEBUG (9, (LM_TRACE, CLINFO "RTI_DomainParticipant_i::delete_subscriber - "
+                     "Successfully casted provided object refence to RTI_Subscriber_i\n"));
+
+        DDS_ReturnCode_t const retval = this->impl ()->delete_subscriber (rti_sub->get_impl ());
+
+        if (retval != DDS_RETCODE_OK)
+          {
+            CIAO_ERROR (1, (LM_ERROR, CLINFO "RTI_DomainParticipant_i::delete_subscriber - "
+                         "Error: RTI delete_subscriber returned non-ok error code %C\n",
+                         translate_retcode (retval)));
+          }
+        else CIAO_DEBUG (6, (LM_INFO, CLINFO "RTI_DomainParticipant_i::delete_subscriber - "
+                          "Provided subscriber successfully deleted\n"));
+
+        return retval;
+      }
+
+      ::DDS::Subscriber_ptr
+      RTI_DomainParticipant_i::get_builtin_subscriber (void)
+      {
+        DDSSubscriber* rti_sub = this->impl ()->get_builtin_subscriber ();
+        ::DDS::Subscriber_var retval = new RTI_Subscriber_i ();
+        RTI_Subscriber_i *rti_s = dynamic_cast < RTI_Subscriber_i *> (retval.in ());
+        rti_s->set_impl (rti_sub);
+        return retval._retn ();
+      }
+
+      ::DDS::Topic_ptr
+      RTI_DomainParticipant_i::create_topic (const char * impl_name,
+                                             const char * type_name,
+                                             const ::DDS::TopicQos & /*qos*/,
+                                             ::DDS::TopicListener_ptr a_listener,
+                                             ::DDS::StatusMask mask)
+      {
+        CIAO_TRACE ("DDS_DomainParticipant_i::create_topic");
+
+        if (impl_name == 0)
+          {
+            CIAO_ERROR (1, (LM_ERROR, CLINFO "DDS_DomainParticipant_i::create_topic - "
+                         "Error: provided nil topic name\n"));
+            throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER,
+                                          0);
+          }
+
+        if (type_name == 0)
+          {
+            CIAO_ERROR (1, (LM_ERROR, CLINFO "DDS_DomainParticipant_i::create_topic - "
+                         "Error: provided nil type name\n"));
+            throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER,
+                                          0);
+          }
+
+        CIAO_DEBUG (6, (LM_DEBUG, CLINFO "DDS_DomainParticipant_i::create_topic - "
+                     "Attempting to create topic with name %C and type %C\n",
+                     impl_name, type_name));
+
+        RTI_TopicListener_i *rti_tl = 0;
+        if (!CORBA::is_nil (a_listener))
+          {
+            rti_tl = new RTI_TopicListener_i (a_listener);
+          }
+
+        DDSTopic *rti_topic = this->impl ()->create_topic (impl_name,
+                                                         type_name,
+                                                         DDS_TOPIC_QOS_DEFAULT,
+                                                         rti_tl,
+                                                         mask);
+        if (rti_topic == 0)
+          {
+            CIAO_ERROR (1, (LM_ERROR, CLINFO "DDS_DomainParticipant_i::create_topic - "
+                         "Error: RTI DDS returned a nil topic\n"));
+            throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0);
+          }
+
+        CIAO_DEBUG (6, (LM_INFO, CLINFO "DDS_DomainParticipant_i::create_topic - "
+                     "Successfully created topic with name %C and type %C\n",
+                     impl_name, type_name));
+
+        ::DDS::Topic_var retval = new RTI_Topic_i ();
+        RTI_Topic_i *tp = dynamic_cast < RTI_Topic_i *> (retval.in ());
+        tp->set_impl (rti_topic);
+
+        return retval._retn ();
+      }
+
+      ::DDS::Topic_ptr
+      RTI_DomainParticipant_i::create_topic_with_profile (
+          const char *impl_name,
+          const char *type_name,
+          const char *library_name,
+          const char *profile_name,
+          ::DDS::TopicListener_ptr a_listener,
+          ::DDS::StatusMask mask)
+      {
+        CIAO_TRACE ("DDS_DomainParticipant_i::create_topic_with_profile");
+
+        if (impl_name == 0)
+          {
+            CIAO_ERROR (1, (LM_ERROR, CLINFO "DDS_DomainParticipant_i::create_topic_with_profile - "
+                         "Error: provided nil topic name\n"));
+            throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0);
+          }
+
+        if (type_name == 0)
+          {
+            CIAO_ERROR (1, (LM_ERROR, CLINFO "DDS_DomainParticipant_i::create_topic_with_profile - "
+                         "Error: provided nil type name\n"));
+            throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0);
+          }
+
+        CIAO_DEBUG (6, (LM_DEBUG, CLINFO "DDS_DomainParticipant_i::create_topic_with_profile - "
+                     "Attempting to create topic with name %C and type %C\n",
+                     impl_name, type_name));
+
+        RTI_TopicListener_i *rti_tl = 0;
+        if (!CORBA::is_nil (a_listener))
+          {
+            rti_tl = new RTI_TopicListener_i (a_listener);
+          }
+        DDSTopic *rti_topic = this->impl ()->create_topic_with_profile (impl_name,
+                                                         type_name,
+                                                         library_name,
+                                                         profile_name,
+                                                         rti_tl,
+                                                         mask);
+
+        if (rti_topic == 0)
+          {
+            CIAO_ERROR (1, (LM_ERROR, CLINFO "DDS_DomainParticipant_i::create_topic - "
+                         "Error: RTI DDS returned a nil topic\n"));
+            throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0);
+          }
+
+        CIAO_DEBUG (6, (LM_INFO, CLINFO "DDS_DomainParticipant_i::create_topic - "
+                     "Successfully created topic with name %C and type %C\n",
+                     impl_name, type_name));
+
+        ::DDS::Topic_var retval = new RTI_Topic_i ();
+        RTI_Topic_i *tp = dynamic_cast < RTI_Topic_i *> (retval.in ());
+        tp->set_impl (rti_topic);
+
+        return retval._retn ();
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_DomainParticipant_i::delete_topic (::DDS::Topic_ptr a_topic)
+      {
+        CIAO_TRACE ("DDS_DomainParticipant_i::delete_topic");
+
+        RTI_Topic_i *top = dynamic_cast< RTI_Topic_i *> (a_topic);
+
+        if (top == 0)
+          {
+            CIAO_ERROR (1, (LM_ERROR, CLINFO "RTI_DomainParticipant_i::delete_topic - "
+                         "Unable to cast provided object reference to servant.\n"));
+            return ::DDS::RETCODE_BAD_PARAMETER;
+          }
+
+        CIAO_DEBUG (9, (LM_TRACE, CLINFO "RTI_DomainParticipant_i::delete_topic - "
+                     "Successfully casted provided object reference to servant.\n"));
+
+        DDS_ReturnCode_t const retval = this->impl ()->delete_topic (top->get_impl ());
+
+        if (retval != DDS_RETCODE_OK)
+          {
+            CIAO_ERROR (1, (LM_ERROR, CLINFO "RTI_DomainParticipant_i::delete_topic - "
+                         "Error: RTI delete_topic returned non-ok error code %C\n",
+                         translate_retcode (retval)));
+          }
+        else CIAO_DEBUG (6, (LM_INFO, CLINFO "RTI_DomainParticipant_i::delete_topic - "
+                          "Provided topic successfully deleted\n"));
+
+        return retval;
+      }
+
+      ::DDS::Topic_ptr
+      RTI_DomainParticipant_i::find_topic (const char * impl_name,
+                                           const ::DDS::Duration_t & timeout)
+      {
+        ::DDS_Duration_t ddstimeout;
+        ddstimeout <<= timeout;
+        ::DDSTopic* rti_topic = this->impl ()->find_topic (impl_name, ddstimeout);
+        ::DDS::Topic_var retval = new RTI_Topic_i ();
+        RTI_Topic_i *tp = dynamic_cast < RTI_Topic_i *> (retval.in ());
+        tp->set_impl (rti_topic);
+        return retval._retn ();
+      }
+
+      ::DDS::TopicDescription_ptr
+      RTI_DomainParticipant_i::lookup_topicdescription (const char * name)
+      {
+        ::DDSTopicDescription* rti_topic = this->impl ()->lookup_topicdescription (name);
+        ::DDS::TopicDescription_var retval = new RTI_TopicDescription_i ();
+        RTI_TopicDescription_i *rti_td = dynamic_cast < RTI_TopicDescription_i *>(retval.in ());
+        rti_td->set_impl (rti_topic);
+        return retval._retn ();
+      }
+
+      ::DDS::ContentFilteredTopic_ptr
+      RTI_DomainParticipant_i::create_contentfilteredtopic (const char * name,
+                                                            ::DDS::Topic_ptr related_topic,
+                                                            const char * filter_expression,
+                                                            const ::DDS::StringSeq & expression_parameters)
+      {
+        CIAO_TRACE ("DDS_DomainParticipant_i::create_contentfilteredtopic");
+
+        RTI_Topic_i *top = dynamic_cast< RTI_Topic_i *> (related_topic);
+        if (!top)
+          {
+            CIAO_ERROR (1, (LM_ERROR, CLINFO "RTI_DomainParticipant_i::create_contentfilteredtopic - "
+                         "Unable to cast provided topic.\n"));
+            throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0);
+          }
+        const char** parameterlist = new const char*[expression_parameters.length ()];
+
+        for (CORBA::ULong i = 0; i < expression_parameters.length (); ++i)
+          {
+            parameterlist[i] = expression_parameters[i].in ();
+          }
+        DDS_StringSeq parameters (expression_parameters.length ());
+        parameters.from_array (parameterlist, expression_parameters.length ());
+
+        DDSContentFilteredTopic * rti_cft = this->impl ()->create_contentfilteredtopic (
+                                                                    name,
+                                                                    top->get_impl (),
+                                                                    filter_expression,
+                                                                    parameters);
+        delete [] parameterlist;
+        if (!rti_cft)
+          {
+            CIAO_ERROR (1, (LM_ERROR, CLINFO "RTI_DomainParticipant_i::create_contentfilteredtopic - "
+                         "RTI DDS returned a nil ContentFilteredTopic.\n"));
+            throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0);
+          }
+        CIAO_DEBUG (6, (LM_INFO, CLINFO "DDS_DomainParticipant_i::create_contentfilteredtopic - "
+                     "Successfully created topic with name <%C> and filter expression <%C>\n",
+                     name, filter_expression));
+
+        ::DDS::ContentFilteredTopic_var retval = new RTI_ContentFilteredTopic_i ();
+        RTI_ContentFilteredTopic_i *tp = dynamic_cast < RTI_ContentFilteredTopic_i *> (retval.in ());
+        tp->set_impl (rti_cft);
+
+        return retval._retn ();
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_DomainParticipant_i::delete_contentfilteredtopic (::DDS::ContentFilteredTopic_ptr /*a_contentfilteredtopic*/)
+      {
+        CIAO_TRACE ("DDS_DomainParticipant_i::delete_contentfilteredtopic");
+        throw CORBA::NO_IMPLEMENT ();
+
+      }
+
+      ::DDS::MultiTopic_ptr
+      RTI_DomainParticipant_i::create_multitopic (const char * /*name*/,
+                                                  const char * /*type_name*/,
+                                                  const char * /*subscription_expression*/,
+                                                  const ::DDS::StringSeq & /*expression_parameters*/)
+      {
+        CIAO_TRACE ("DDS_DomainParticipant_i::create_multitopic");
+        throw CORBA::NO_IMPLEMENT ();
+
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_DomainParticipant_i::delete_multitopic (::DDS::MultiTopic_ptr /*a_multitopic*/)
+      {
+        //this->impl ()->delete_multitopic (
+        CIAO_TRACE ("DDS_DomainParticipant_i::delete_multitopic");
+        throw CORBA::NO_IMPLEMENT ();
+
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_DomainParticipant_i::delete_contained_entities (void)
+      {
+        return this->impl ()->delete_contained_entities ();
+
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_DomainParticipant_i::set_qos (const ::DDS::DomainParticipantQos & /*qos*/)
+      {
+        CIAO_TRACE ("DDS_DomainParticipant_i::set_qos");
+        throw CORBA::NO_IMPLEMENT ();
+
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_DomainParticipant_i::get_qos (::DDS::DomainParticipantQos & /*qos*/)
+      {
+        CIAO_TRACE ("DDS_DomainParticipant_i::get_qos");
+        throw CORBA::NO_IMPLEMENT ();
+
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_DomainParticipant_i::set_listener (::DDS::DomainParticipantListener_ptr a_listener,
+                                             ::DDS::StatusMask mask)
+      {
+        RTI_DomainParticipantListener_i* rti_impl_list = new RTI_DomainParticipantListener_i (a_listener);
+        return this->impl_->set_listener (rti_impl_list, mask);
+      }
+
+      ::DDS::DomainParticipantListener_ptr
+      RTI_DomainParticipant_i::get_listener (void)
+      {
+        CIAO_TRACE ("DDS_DomainParticipant_i::get_listener");
+        throw CORBA::NO_IMPLEMENT ();
+
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_DomainParticipant_i::ignore_participant (const ::DDS::InstanceHandle_t & handle)
+      {
+        ::DDS_InstanceHandle_t rti_handle;
+        rti_handle <<= handle;
+        return this->impl ()->ignore_participant (rti_handle);
+
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_DomainParticipant_i::ignore_topic (const ::DDS::InstanceHandle_t & handle)
+      {
+        ::DDS_InstanceHandle_t rti_handle;
+        rti_handle <<= handle;
+        return this->impl ()->ignore_topic (rti_handle);
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_DomainParticipant_i::ignore_publication (const ::DDS::InstanceHandle_t & handle)
+      {
+        ::DDS_InstanceHandle_t rti_handle;
+        rti_handle <<= handle;
+        return this->impl ()->ignore_publication (rti_handle);
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_DomainParticipant_i::ignore_subscription (const ::DDS::InstanceHandle_t & handle)
+      {
+        ::DDS_InstanceHandle_t rti_handle;
+        rti_handle <<= handle;
+        return this->impl ()->ignore_subscription (rti_handle);
+      }
+
+      ::DDS::DomainId_t
+      RTI_DomainParticipant_i::get_domain_id (void)
+      {
+        return this->impl ()->get_domain_id ();
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_DomainParticipant_i::assert_liveliness (void)
+      {
+        return this->impl ()->assert_liveliness ();
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_DomainParticipant_i::set_default_publisher_qos (const ::DDS::PublisherQos & /*qos*/)
+      {
+        CIAO_TRACE ("DDS_DomainParticipant_i::set_default_publisher_qos");
+        throw CORBA::NO_IMPLEMENT ();
+
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_DomainParticipant_i::get_default_publisher_qos (::DDS::PublisherQos & /*qos*/)
+      {
+        CIAO_TRACE ("DDS_DomainParticipant_i::get_default_publisher_qos");
+        throw CORBA::NO_IMPLEMENT ();
+
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_DomainParticipant_i::set_default_subscriber_qos (const ::DDS::SubscriberQos & /*qos*/)
+      {
+        CIAO_TRACE ("DDS_DomainParticipant_i::set_default_subscriber_qos");
+        throw CORBA::NO_IMPLEMENT ();
+
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_DomainParticipant_i::get_default_subscriber_qos (::DDS::SubscriberQos & /*qos*/)
+      {
+        CIAO_TRACE ("DDS_DomainParticipant_i::get_default_subscriber_qos");
+        throw CORBA::NO_IMPLEMENT ();
+
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_DomainParticipant_i::set_default_topic_qos (const ::DDS::TopicQos & /*qos*/)
+      {
+        CIAO_TRACE ("DDS_DomainParticipant_i::set_default_topic_qos");
+        throw CORBA::NO_IMPLEMENT ();
+
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_DomainParticipant_i::get_default_topic_qos (::DDS::TopicQos & /*qos*/)
+      {
+        CIAO_TRACE ("DDS_DomainParticipant_i::get_default_topic_qos");
+        throw CORBA::NO_IMPLEMENT ();
+
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_DomainParticipant_i::get_discovered_participants (::DDS::InstanceHandleSeq & impl_handles)
+      {
+        ::DDS_InstanceHandleSeq rtiseq;
+        ::DDS::ReturnCode_t const retval = this->impl ()->get_discovered_participants (rtiseq);
+        rtiseq >>= impl_handles;
+        return retval;
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_DomainParticipant_i::get_discovered_participant_data (::DDS::ParticipantBuiltinTopicData & /*impl_data*/,
+                                                                const ::DDS::InstanceHandle_t & /*impl_handle*/)
+      {
+        CIAO_TRACE ("DDS_DomainParticipant_i::get_discovered_participant_data");
+        throw CORBA::NO_IMPLEMENT ();
+
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_DomainParticipant_i::get_discovered_topics (::DDS::InstanceHandleSeq & impl_handles)
+      {
+        ::DDS_InstanceHandleSeq rtiseq;
+        ::DDS::ReturnCode_t const retval = this->impl ()->get_discovered_topics (rtiseq);
+        rtiseq >>= impl_handles;
+        return retval;
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_DomainParticipant_i::get_discovered_topic_data (::DDS::TopicBuiltinTopicData & /*impl_data*/,
+                                                          const ::DDS::InstanceHandle_t & /*impl_handle*/)
+      {
+        CIAO_TRACE ("DDS_DomainParticipant_i::get_discovered_topic_data");
+        throw CORBA::NO_IMPLEMENT ();
+
+      }
+
+      ::CORBA::Boolean
+      RTI_DomainParticipant_i::contains_entity (const ::DDS::InstanceHandle_t & a_handle)
+      {
+        ::DDS_InstanceHandle_t rti_handle;
+        rti_handle <<= a_handle;
+        return this->impl ()->contains_entity (rti_handle);
+
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_DomainParticipant_i::get_current_time (::DDS::Time_t & current_time)
+      {
+        DDS_Time_t rti_time;
+        ::DDS::ReturnCode_t const retval = this->impl ()->get_current_time (rti_time);
+        rti_time >>= current_time;
+        return retval;
+
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_DomainParticipant_i::enable (void)
+      {
+        return this->impl ()->enable ();
+      }
+
+      ::DDS::StatusCondition_ptr
+      RTI_DomainParticipant_i::get_statuscondition (void)
+      {
+        DDSStatusCondition* sc = this->impl ()->get_statuscondition ();
+        ::DDS::StatusCondition_var retval = new RTI_StatusCondition_i ();
+        RTI_StatusCondition_i *rti_sc = dynamic_cast < RTI_StatusCondition_i *> (retval.in ());
+        rti_sc->set_impl (sc);
+        return retval._retn ();
+      }
+
+      ::DDS::StatusMask
+      RTI_DomainParticipant_i::get_status_changes (void)
+      {
+        return this->impl ()->get_status_changes ();
+      }
+
+      ::DDS::InstanceHandle_t
+      RTI_DomainParticipant_i::get_instance_handle (void)
+      {
+        ::DDS_InstanceHandle_t const rtihandle = this->impl ()->get_instance_handle ();
+        ::DDS::InstanceHandle_t handle;
+        handle <<= rtihandle;
+        return handle;
+      }
+
+      DDSDomainParticipant *
+      RTI_DomainParticipant_i::get_impl (void)
+      {
+        return this->impl_;
+      }
+
+      void
+      RTI_DomainParticipant_i::set_impl (DDSDomainParticipant * dp)
+      {
+        this->impl_ = dp;
+      }
+
+      DDSDomainParticipant *
+      RTI_DomainParticipant_i::impl (void)
+      {
+        if (!this->impl_)
+          {
+            throw ::CORBA::BAD_INV_ORDER ();
+          }
+        return this->impl_;
+      }
     }
   }
 }
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.h b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.h
index f8658668c1b..8df41a7b687 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipant.h
@@ -12,196 +12,188 @@
 
 #include "tao/LocalObject.h"
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
+
 #include "dds4ccm/idl/dds_rtf2_dcpsEC.h"
-#include "dds4ccm/impl/ndds/InstanceHandle_t.h"
+
 #include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h"
 
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 #include "ndds/ndds_cpp.h"
-#endif
-
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::DomainParticipant DDSDomainParticipant;
-#endif
-
 #include "tao/LocalObject.h"
 
+
 namespace CIAO
 {
   namespace DDS4CCM
   {
-    class DDS4CCM_NDDS_IMPL_Export CCM_DDS_DomainParticipant_i :
-      public virtual ::DDS::CCM_DomainParticipant,
-      public virtual ::CORBA::LocalObject
+    namespace RTI
     {
-    public:
-      /// Constructor
-      CCM_DDS_DomainParticipant_i (DDSDomainParticipant * dp);
-
-      /// Destructor
-      virtual ~CCM_DDS_DomainParticipant_i (void);
-
-      virtual ::DDS::Publisher_ptr create_publisher (
-        const ::DDS::PublisherQos & qos,
-        ::DDS::PublisherListener_ptr a_listener,
-        ::DDS::StatusMask mask);
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      virtual ::DDS::Publisher_ptr create_publisher_with_profile (
-        const char* library_name,
-        const char *profile_name,
-        ::DDS::PublisherListener_ptr a_listener,
-        ::DDS::StatusMask mask);
-#endif
+      class DDS4CCM_NDDS_IMPL_Export RTI_DomainParticipant_i :
+        public virtual ::DDS::CCM_DomainParticipant,
+        public virtual ::CORBA::LocalObject
+      {
+      public:
+        // Constructor
+        RTI_DomainParticipant_i (void);
 
-      virtual ::DDS::ReturnCode_t delete_publisher (::DDS::Publisher_ptr p);
+        // Destructor
+        virtual ~RTI_DomainParticipant_i (void);
 
-      virtual ::DDS::Subscriber_ptr create_subscriber (
-        const ::DDS::SubscriberQos & qos,
-        ::DDS::SubscriberListener_ptr a_listener,
-        ::DDS::StatusMask mask);
+        virtual ::DDS::Publisher_ptr create_publisher (
+          const ::DDS::PublisherQos & qos,
+          ::DDS::PublisherListener_ptr a_listener,
+          ::DDS::StatusMask mask);
 
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      virtual ::DDS::Subscriber_ptr create_subscriber_with_profile(
-        const char* library_name,
-        const char *profile_name,
-        ::DDS::SubscriberListener_ptr a_listener,
-        ::DDS::StatusMask mask);
-#endif
+        virtual ::DDS::Publisher_ptr create_publisher_with_profile (
+          const char* library_name,
+          const char *profile_name,
+          ::DDS::PublisherListener_ptr a_listener,
+          ::DDS::StatusMask mask);
 
-      virtual ::DDS::ReturnCode_t delete_subscriber (::DDS::Subscriber_ptr s);
-
-      virtual ::DDS::Subscriber_ptr get_builtin_subscriber (void);
-
-      virtual ::DDS::Topic_ptr create_topic (
-        const char * impl_name,
-        const char * type_name,
-        const ::DDS::TopicQos & qos,
-        ::DDS::TopicListener_ptr a_listener,
-        ::DDS::StatusMask mask);
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      virtual ::DDS::Topic_ptr create_topic_with_profile (
-        const char * impl_name,
-        const char * type_name,
-        const char* library_name,
-        const char *profile_name,
-        ::DDS::TopicListener_ptr a_listener,
-        ::DDS::StatusMask mask);
-#endif
+        virtual ::DDS::ReturnCode_t delete_publisher (::DDS::Publisher_ptr p);
+
+        virtual ::DDS::Subscriber_ptr create_subscriber (
+          const ::DDS::SubscriberQos & qos,
+          ::DDS::SubscriberListener_ptr a_listener,
+          ::DDS::StatusMask mask);
+
+        virtual ::DDS::Subscriber_ptr create_subscriber_with_profile(
+          const char* library_name,
+          const char *profile_name,
+          ::DDS::SubscriberListener_ptr a_listener,
+          ::DDS::StatusMask mask);
+
+        virtual ::DDS::ReturnCode_t delete_subscriber (::DDS::Subscriber_ptr s);
+
+        virtual ::DDS::Subscriber_ptr get_builtin_subscriber (void);
+
+        virtual ::DDS::Topic_ptr create_topic (
+          const char * impl_name,
+          const char * type_name,
+          const ::DDS::TopicQos & qos,
+          ::DDS::TopicListener_ptr a_listener,
+          ::DDS::StatusMask mask);
+
+        virtual ::DDS::Topic_ptr create_topic_with_profile (
+          const char * impl_name,
+          const char * type_name,
+          const char* library_name,
+          const char *profile_name,
+          ::DDS::TopicListener_ptr a_listener,
+          ::DDS::StatusMask mask);
 
-      virtual ::DDS::ReturnCode_t delete_topic (::DDS::Topic_ptr a_topic);
+        virtual ::DDS::ReturnCode_t delete_topic (::DDS::Topic_ptr a_topic);
 
-      virtual ::DDS::Topic_ptr find_topic (
-        const char * impl_name,
-        const ::DDS::Duration_t & timeout);
+        virtual ::DDS::Topic_ptr find_topic (
+          const char * impl_name,
+          const ::DDS::Duration_t & timeout);
 
-      virtual ::DDS::TopicDescription_ptr lookup_topicdescription (
-        const char * name);
+        virtual ::DDS::TopicDescription_ptr lookup_topicdescription (
+          const char * name);
 
-      virtual ::DDS::ContentFilteredTopic_ptr create_contentfilteredtopic (
-        const char * name,
-        ::DDS::Topic_ptr related_topic,
-        const char * filter_expression,
-        const ::DDS::StringSeq & expression_parameters);
+        virtual ::DDS::ContentFilteredTopic_ptr create_contentfilteredtopic (
+          const char * name,
+          ::DDS::Topic_ptr related_topic,
+          const char * filter_expression,
+          const ::DDS::StringSeq & expression_parameters);
 
-      virtual ::DDS::ReturnCode_t delete_contentfilteredtopic (
-        ::DDS::ContentFilteredTopic_ptr a_contentfilteredtopic);
+        virtual ::DDS::ReturnCode_t delete_contentfilteredtopic (
+          ::DDS::ContentFilteredTopic_ptr a_contentfilteredtopic);
 
-      virtual ::DDS::MultiTopic_ptr create_multitopic (
-        const char * name,
-        const char * type_name,
-        const char * subscription_expression,
-        const ::DDS::StringSeq & expression_parameters);
+        virtual ::DDS::MultiTopic_ptr create_multitopic (
+          const char * name,
+          const char * type_name,
+          const char * subscription_expression,
+          const ::DDS::StringSeq & expression_parameters);
 
-      virtual ::DDS::ReturnCode_t delete_multitopic (
-        ::DDS::MultiTopic_ptr a_multitopic);
+        virtual ::DDS::ReturnCode_t delete_multitopic (
+          ::DDS::MultiTopic_ptr a_multitopic);
 
-      virtual ::DDS::ReturnCode_t delete_contained_entities (void);
+        virtual ::DDS::ReturnCode_t delete_contained_entities (void);
 
-      virtual ::DDS::ReturnCode_t set_qos (
-        const ::DDS::DomainParticipantQos & qos);
+        virtual ::DDS::ReturnCode_t set_qos (
+          const ::DDS::DomainParticipantQos & qos);
 
-      virtual ::DDS::ReturnCode_t get_qos (
-        ::DDS::DomainParticipantQos & qos);
+        virtual ::DDS::ReturnCode_t get_qos (
+          ::DDS::DomainParticipantQos & qos);
 
-      virtual ::DDS::ReturnCode_t set_listener (
-        ::DDS::DomainParticipantListener_ptr a_listener,
-        ::DDS::StatusMask mask);
+        virtual ::DDS::ReturnCode_t set_listener (
+          ::DDS::DomainParticipantListener_ptr a_listener,
+          ::DDS::StatusMask mask);
 
-      virtual ::DDS::DomainParticipantListener_ptr get_listener (void);
+        virtual ::DDS::DomainParticipantListener_ptr get_listener (void);
 
-      virtual ::DDS::ReturnCode_t ignore_participant (
-        DDS_INSTANCE_HANDLE_T_IN handle);
+        virtual ::DDS::ReturnCode_t ignore_participant (
+          const ::DDS::InstanceHandle_t & handle);
 
-      virtual ::DDS::ReturnCode_t ignore_topic (
-        DDS_INSTANCE_HANDLE_T_IN handle);
+        virtual ::DDS::ReturnCode_t ignore_topic (
+          const ::DDS::InstanceHandle_t & handle);
 
-      virtual ::DDS::ReturnCode_t ignore_publication (
-        DDS_INSTANCE_HANDLE_T_IN handle);
+        virtual ::DDS::ReturnCode_t ignore_publication (
+          const ::DDS::InstanceHandle_t & handle);
 
-      virtual ::DDS::ReturnCode_t ignore_subscription (
-        DDS_INSTANCE_HANDLE_T_IN handle);
+        virtual ::DDS::ReturnCode_t ignore_subscription (
+          const ::DDS::InstanceHandle_t & handle);
 
-      virtual ::DDS::DomainId_t get_domain_id (void);
+        virtual ::DDS::DomainId_t get_domain_id (void);
 
-      virtual ::DDS::ReturnCode_t assert_liveliness (void);
+        virtual ::DDS::ReturnCode_t assert_liveliness (void);
 
-      virtual ::DDS::ReturnCode_t set_default_publisher_qos (
-        const ::DDS::PublisherQos & qos);
+        virtual ::DDS::ReturnCode_t set_default_publisher_qos (
+          const ::DDS::PublisherQos & qos);
 
-      virtual ::DDS::ReturnCode_t get_default_publisher_qos (
-        ::DDS::PublisherQos & qos);
+        virtual ::DDS::ReturnCode_t get_default_publisher_qos (
+          ::DDS::PublisherQos & qos);
 
-      virtual ::DDS::ReturnCode_t set_default_subscriber_qos (
-        const ::DDS::SubscriberQos & qos);
+        virtual ::DDS::ReturnCode_t set_default_subscriber_qos (
+          const ::DDS::SubscriberQos & qos);
 
-      virtual ::DDS::ReturnCode_t get_default_subscriber_qos (
-        ::DDS::SubscriberQos & qos);
+        virtual ::DDS::ReturnCode_t get_default_subscriber_qos (
+          ::DDS::SubscriberQos & qos);
 
-      virtual ::DDS::ReturnCode_t set_default_topic_qos (
-        const ::DDS::TopicQos & qos);
+        virtual ::DDS::ReturnCode_t set_default_topic_qos (
+          const ::DDS::TopicQos & qos);
 
-      virtual ::DDS::ReturnCode_t get_default_topic_qos (
-        ::DDS::TopicQos & qos);
+        virtual ::DDS::ReturnCode_t get_default_topic_qos (
+          ::DDS::TopicQos & qos);
 
-      virtual ::DDS::ReturnCode_t get_discovered_participants (
-        ::DDS::InstanceHandleSeq & impl_handles);
+        virtual ::DDS::ReturnCode_t get_discovered_participants (
+          ::DDS::InstanceHandleSeq & impl_handles);
 
-      virtual ::DDS::ReturnCode_t get_discovered_participant_data (
-        ::DDS::ParticipantBuiltinTopicData & impl_data,
-        DDS_INSTANCE_HANDLE_T_IN impl_handle);
+        virtual ::DDS::ReturnCode_t get_discovered_participant_data (
+          ::DDS::ParticipantBuiltinTopicData & impl_data,
+          const ::DDS::InstanceHandle_t & impl_handle);
 
-      virtual ::DDS::ReturnCode_t get_discovered_topics (
-        ::DDS::InstanceHandleSeq & impl_handles);
+        virtual ::DDS::ReturnCode_t get_discovered_topics (
+          ::DDS::InstanceHandleSeq & impl_handles);
 
-      virtual ::DDS::ReturnCode_t get_discovered_topic_data (
-        ::DDS::TopicBuiltinTopicData & impl_data,
-        DDS_INSTANCE_HANDLE_T_IN impl_handle);
+        virtual ::DDS::ReturnCode_t get_discovered_topic_data (
+          ::DDS::TopicBuiltinTopicData & impl_data,
+          const ::DDS::InstanceHandle_t & impl_handle);
 
-      virtual ::CORBA::Boolean contains_entity (
-        DDS_INSTANCE_HANDLE_T_IN a_handle);
+        virtual ::CORBA::Boolean contains_entity (
+          const ::DDS::InstanceHandle_t & a_handle);
 
-      virtual ::DDS::ReturnCode_t get_current_time (
-        ::DDS::Time_t & current_time);
+        virtual ::DDS::ReturnCode_t get_current_time (
+          ::DDS::Time_t & current_time);
 
-      virtual ::DDS::ReturnCode_t enable (void);
+        virtual ::DDS::ReturnCode_t enable (void);
 
-      virtual ::DDS::StatusCondition_ptr get_statuscondition (void);
+        virtual ::DDS::StatusCondition_ptr get_statuscondition (void);
 
-      virtual ::DDS::StatusMask get_status_changes (void);
+        virtual ::DDS::StatusMask get_status_changes (void);
 
-      virtual DDS_INSTANCE_HANDLE_T_RETN get_instance_handle (void);
+        virtual ::DDS::InstanceHandle_t get_instance_handle (void);
 
-      DDSDomainParticipant * get_impl (void);
+        DDSDomainParticipant * get_impl (void);
 
-      void set_impl (DDSDomainParticipant * dp);
+        void set_impl (DDSDomainParticipant * dp);
 
-    protected:
-      DDSDomainParticipant *impl_;
+      protected:
+        DDSDomainParticipant *impl_;
 
-      DDSDomainParticipant * impl (void);
-    };
+        DDSDomainParticipant * impl (void);
+      };
+    }
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp
index d385fb4c128..c42b2aa65bc 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.cpp
@@ -5,306 +5,230 @@
 #include "DomainParticipantListener.h"
 #include "Utils.h"
 
-#include "dds4ccm/impl/logger/Log_Macros.h"
+#include "ciao/Logger/Log_Macros.h"
 #include "dds4ccm/idl/dds4ccm_BaseC.h"
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef  ::DDS::DomainParticipantFactory DDSDomainParticipantFactory;
-#endif
-
 namespace CIAO
 {
   namespace DDS4CCM
   {
-     CCM_DDS_DomainParticipantFactory_i::CCM_DDS_DomainParticipantFactory_i (void)
-     {
-       DDS4CCM_TRACE ("CCM_DDS_DomainParticipantFactory_i::CCM_DDS_DomainParticipantFactory_i");
-     }
-
-     CCM_DDS_DomainParticipantFactory_i::~CCM_DDS_DomainParticipantFactory_i (void)
-     {
-       DDS4CCM_TRACE ("CCM_DDS_DomainParticipantFactory_i::~CCM_DDS_DomainParticipantFactory_i");
-     }
-
-    ::DDS::DomainParticipant_ptr
-    CCM_DDS_DomainParticipantFactory_i::create_participant (::DDS::DomainId_t domain_id,
-                                                        const ::DDS::DomainParticipantQos & qos,
-                                                        ::DDS::DomainParticipantListener_ptr a_listener,
-                                                        ::DDS::StatusMask mask)
+    namespace RTI
     {
-      DDS4CCM_TRACE ("CCM_DDS_DomainParticipantFactory_i::create_participant");
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ACE_UNUSED_ARG (qos);
-
-      DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CCM_DDS_DomainParticipantFactory_i::create_participant - "
-                   "Creating domain participant for domain <%d>\n",
-                   domain_id));
-
-      CCM_DDS_DomainPublisherListener_i *rti_dpl = 0;
-      if (!CORBA::is_nil (a_listener))
-        {
-          ACE_NEW_THROW_EX (rti_dpl,
-                            CCM_DDS_DomainPublisherListener_i (a_listener),
-                            CORBA::NO_MEMORY ());
-        }
+       RTI_DomainParticipantFactory_i::RTI_DomainParticipantFactory_i (void)
+       {
+         CIAO_TRACE ("RTI_DomainParticipantFactory_i::RTI_DomainParticipantFactory_i");
+       }
+
+       RTI_DomainParticipantFactory_i::~RTI_DomainParticipantFactory_i (void)
+       {
+         CIAO_TRACE ("RTI_DomainParticipantFactory_i::~RTI_DomainParticipantFactory_i");
+       }
+
+      ::DDS::DomainParticipant_ptr
+      RTI_DomainParticipantFactory_i::create_participant (::DDS::DomainId_t domain_id,
+                                                          const ::DDS::DomainParticipantQos & /*qos*/,
+                                                          ::DDS::DomainParticipantListener_ptr a_listener,
+                                                          ::DDS::StatusMask mask)
+      {
+        CIAO_TRACE ("RTI_DomainParticipantFactory_i::create_participant");
 
-      DDSDomainParticipant *part = DDSDomainParticipantFactory::get_instance ()->
-        create_participant (domain_id,
-                            DDS_PARTICIPANT_QOS_DEFAULT,
-                            rti_dpl,
-                            mask);
+        CIAO_DEBUG (9, (LM_TRACE, CLINFO "RTI_DomainParticipantFactory_i::create_participant - "
+                     "Creating domain participant\n"));
 
-      if (!part)
-        {
-          DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipantFactory_i::create_participant - "
-                       "Error: Unable to create DomainParticipant for domain <%d>\n",
-                       domain_id));
-          throw CCM_DDS::InternalError (1, 0);
-        }
+        RTI_DomainParticipantListener_i *rti_dpl = 0;
+        if (!CORBA::is_nil (a_listener))
+          {
+            rti_dpl = new RTI_DomainParticipantListener_i (a_listener);
+          }
 
-      ::DDS::DomainParticipant_var retval = ::DDS::DomainParticipant::_nil ();
-      ACE_NEW_THROW_EX (retval,
-                        CCM_DDS_DomainParticipant_i (part),
-                        CORBA::NO_MEMORY ());
-      part->enable ();
-      CCM_DDS_DomainParticipant_i *rti_dp = dynamic_cast < CCM_DDS_DomainParticipant_i *> (retval.in ());
-      rti_dp->set_impl (part);
-
-      return retval._retn ();
-#else
-      return DDSDomainParticipantFactory::get_instance ()->
-        create_participant (domain_id,
-                            qos,
-                            a_listener,
-                            mask);
-#endif
-    }
+        DDSDomainParticipant *part = DDSDomainParticipantFactory::get_instance ()->
+          create_participant (domain_id,
+                              DDS_PARTICIPANT_QOS_DEFAULT,
+                              rti_dpl,
+                              mask);
 
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-    ::DDS::DomainParticipant_ptr
-    CCM_DDS_DomainParticipantFactory_i::create_participant_with_profile (
-      ::DDS::DomainId_t domain_id,
-      const char * library_name,
-      const char * profile_name,
-      ::DDS::DomainParticipantListener_ptr a_listener,
-      ::DDS::StatusMask mask)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_DomainParticipantFactory_i::create_participant_with_profile");
+        if (!part)
+          {
+            CIAO_ERROR (1, (LM_ERROR, CLINFO "RTI_DomainParticipantFactory_i::create_participant - "
+                         "Error: Unable to create DomainParticipant\n"));
+            throw CCM_DDS::InternalError (1, 0);
+          }
 
-      DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CCM_DDS_DomainParticipantFactory_i::create_participant_with_profile - "
-                   "Creating domain participant: profile <%C#%C> - domain <%d>\n",
-                   library_name, profile_name, domain_id));
-      CCM_DDS_DomainPublisherListener_i *rti_dpl = 0;
-      if (!CORBA::is_nil (a_listener))
-        {
-          ACE_NEW_THROW_EX (rti_dpl,
-                            CCM_DDS_DomainPublisherListener_i (a_listener),
-                            CORBA::NO_MEMORY ());
-        }
+        part->enable ();
+        ::DDS::DomainParticipant_var retval = new RTI_DomainParticipant_i ();
+        RTI_DomainParticipant_i *rti_dp = dynamic_cast < RTI_DomainParticipant_i *> (retval.in ());
+        rti_dp->set_impl (part);
 
-      ACE_CString qos_profile = library_name;
-      qos_profile += ACE_TEXT ("#");
-      qos_profile += profile_name;
+        return retval._retn ();
+      }
 
-      CCM_DDS_DomainParticipant_i *rti_dp = 0;
 
-      ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard,
-                      this->dps_mutex_, CORBA::INTERNAL ());
+      ::DDS::DomainParticipant_ptr
+      RTI_DomainParticipantFactory_i::create_participant_with_profile (
+        ::DDS::DomainId_t domain_id,
+        const char * library_name,
+        const char * profile_name,
+        ::DDS::DomainParticipantListener_ptr a_listener,
+        ::DDS::StatusMask mask)
       {
-        rti_dp = this->dps_[qos_profile];
-
-        if (!rti_dp)
-          {
-            DDS4CCM_DEBUG (6, (LM_DEBUG, "CCM_DDS_DomainParticipantFactory_i::create_participant_with_profile - "
-                                      "Creating participant: profile <%C> - domain <%d>\n",
-                                      qos_profile.c_str (),
-                                      domain_id));
-            DDSDomainParticipant * part = DDSDomainParticipantFactory::get_instance ()->
-                    create_participant_with_profile (domain_id,
-                                      library_name,
-                                      profile_name,
-                                      rti_dpl,
-                                      mask);
-            if (!part)
-              {
-                DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipantFactory_i::create_participant_with_profile - "
-                            "Error: Unable to create DomainParticipant\n"));
-                throw CCM_DDS::InternalError (1, 0);
-              }
-            ::DDS::DomainParticipant_var retval = ::DDS::DomainParticipant::_nil ();
-            ACE_NEW_THROW_EX (retval,
-                              CCM_DDS_DomainParticipant_i (part),
-                              CORBA::NO_MEMORY ());
-
-            part->enable ();
+        CIAO_TRACE ("RTI_DomainParticipantFactory_i::create_participant_with_profile");
 
-            rti_dp = dynamic_cast < CCM_DDS_DomainParticipant_i *> (retval.in ());
-            rti_dp->set_impl (part);
-            this->dps_[qos_profile] = rti_dp;
-            return retval._retn ();
-          }
-        else
+        CIAO_DEBUG (9, (LM_TRACE, CLINFO "RTI_DomainParticipantFactory_i::create_participant_with_profile - "
+                     "Creating domain participant\n"));
+        RTI_DomainParticipantListener_i *rti_dpl = 0;
+        if (!CORBA::is_nil (a_listener))
           {
-            DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO "CCM_DDS_DomainParticipantFactory_i::create_participant_with_profile - "
-                        "Re-using participant for QOS profile <%C> and domin <%d>.\n",
-                        qos_profile.c_str (),
-                        domain_id));
-            return ::DDS::DomainParticipant::_duplicate (rti_dp);
+            rti_dpl = new RTI_DomainParticipantListener_i (a_listener);
           }
-      }
-    }
-#endif
-
-    void
-    CCM_DDS_DomainParticipantFactory_i::remove_participant (CCM_DDS_DomainParticipant_i * part)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_DomainParticipantFactory_i::remove_participant");
 
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard,
-                      this->dps_mutex_, CORBA::INTERNAL ());
+        ACE_CString qos_profile = library_name;
+        qos_profile += ACE_TEXT ("#");
+        qos_profile += profile_name;
 
-      if (part->_refcount_value () == 1)
+        DDSDomainParticipant * part = 0;
         {
-          DomainParticipants::iterator pos;
-          for (pos = this->dps_.begin(); pos != this->dps_.end(); ++pos)
+          ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard,
+                          this->dps_mutex_, CORBA::INTERNAL ());
+          //part = this->dps_[qos_profile];
+          if (!part)
             {
-              if (pos->second == part)
+              part = DDSDomainParticipantFactory::get_instance ()->
+                create_participant_with_profile (domain_id,
+                                  library_name,
+                                  profile_name,
+                                  rti_dpl,
+                                  mask);
+              if (!part)
                 {
-                  DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CCM_DDS_DomainParticipantFactory_i::remove_participant - "
-                            "Removing participant for %C from list.\n",
-                            pos->first.c_str ()));
-                  this->dps_.erase (pos->first);
-                  break;
+                  CIAO_ERROR (1, (LM_ERROR, CLINFO "RTI_DomainParticipantFactory_i::create_participant_with_profile - "
+                              "Error: Unable to create DomainParticipant\n"));
+                  throw CCM_DDS::InternalError (1, 0);
                 }
+              part->enable ();
             }
-        }
-      else
-        {
-          DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CCM_DDS_DomainParticipantFactory_i::remove_participant - "
-                    "Don't delete participant since it's still used - ref_count <%d>\n",
-                    part->_refcount_value ()));
-        }
-#else
-#endif
-    }
+          else CIAO_DEBUG (9, (LM_TRACE, CLINFO "RTI_DomainParticipantFactory_i::create_participant_with_profile - "
+                          "Re-using participant for %C.\n",
+                          qos_profile.c_str ()));
 
-    ::DDS::ReturnCode_t
-    CCM_DDS_DomainParticipantFactory_i::delete_participant (::DDS::DomainParticipant_ptr a_participant)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_DomainParticipantFactory_i::delete_participant");
+          ::DDS::DomainParticipant_var retval = new RTI_DomainParticipant_i ();
+          RTI_DomainParticipant_i *rti_dp = dynamic_cast < RTI_DomainParticipant_i *> (retval.in ());
+          rti_dp->set_impl (part);
 
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      CCM_DDS_DomainParticipant_i *part = dynamic_cast< CCM_DDS_DomainParticipant_i * > (a_participant);
+          //this->dps_[qos_profile] = part;
 
-      if (!part)
-        {
-          DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipantFactory_i::delete_participant - "
-                       "Unable to cast provided object reference to servant type, bailing.\n"));
-          return DDS::RETCODE_ERROR;
+          return retval._retn ();
         }
-      DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CCM_DDS_DomainParticipantFactory_i::delete_participant - "
-                   "Successfully casted provided object reference to servant type.\n"));
+      }
+
+      void
+      RTI_DomainParticipantFactory_i::remove_participant (DDSDomainParticipant * part)
+      {
+        CIAO_TRACE ("RTI_DomainParticipantFactory_i::remove_participant");
+        ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard,
+                        this->dps_mutex_, CORBA::INTERNAL ());
+
+        DomainParticipants::iterator pos;
+        for (pos = this->dps_.begin(); pos != this->dps_.end(); ++pos)
+          {
+            if (pos->second == part)
+              {
+                CIAO_DEBUG (9, (LM_TRACE, CLINFO "RTI_DomainParticipantFactory_i::remove_participant - "
+                          "Deleting participant for %C.\n",
+                          pos->first.c_str ()));
+                this->dps_.erase (pos->first);
+                break;
+              }
+          }
+      }
 
-      this->remove_participant (part);
+      ::DDS::ReturnCode_t
+      RTI_DomainParticipantFactory_i::delete_participant (::DDS::DomainParticipant_ptr a_participant)
+      {
+        CIAO_TRACE ("RTI_DomainParticipantFactory_i::delete_participant");
 
-      DDS::ReturnCode_t retval = DDS::RETCODE_OK;
+        RTI_DomainParticipant_i *part = dynamic_cast< RTI_DomainParticipant_i * > (a_participant);
 
-      if (part->_refcount_value () == 1)
-        {
-          retval = DDSDomainParticipantFactory::get_instance ()->
-              delete_participant (part->get_impl ());
+        if (!part)
+          {
+            CIAO_ERROR (1, (LM_ERROR, CLINFO "RTI_DomainParticipantFactory_i::delete_participant - "
+                         "Unable to cast provided object reference to servant type, bailing.\n"));
+            return DDS::RETCODE_ERROR;
+          }
+        CIAO_DEBUG (9, (LM_TRACE, CLINFO "RTI_DomainParticipantFactory_i::delete_participant - "
+                     "Successfully casted provided object reference to servant type.\n"));
 
-          if (retval != DDS::RETCODE_OK)
-            {
-              DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_DomainParticipantFactory_i::delete_participant - "
-                          "RTI delete_participant returned non-ok error code %C\n",
-                          translate_retcode (retval)));
-            }
-          else DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "CCM_DDS_DomainParticipantFactory_i::delete_participant - "
-                            "Successfully deleted provided participant.\n"));
-        }
-      return retval;
-#else
-      return DDSDomainParticipantFactory::get_instance ()->
-              delete_participant (a_participant);
-#endif
-    }
+        //this->remove_participant (part->get_impl ());
 
-    ::DDS::DomainParticipant_ptr
-    CCM_DDS_DomainParticipantFactory_i::lookup_participant (::DDS::DomainId_t domain_id)
-    {
-      ::DDS::DomainParticipant_var retval = ::DDS::DomainParticipant::_nil ();
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      DDSDomainParticipant* dp = DDSDomainParticipantFactory::get_instance ()->lookup_participant (domain_id);
-      ACE_NEW_THROW_EX (retval,
-                        CCM_DDS_DomainParticipant_i (dp),
-                        CORBA::NO_MEMORY ());
-#else
-      ::DDS::DomainParticipant_var dp = DDSDomainParticipantFactory::get_instance ()->lookup_participant (domain_id);
-      ACE_NEW_THROW_EX (retval,
-                        CCM_DDS_DomainParticipant_i (dp.in ()),
-                        CORBA::NO_MEMORY ());
-#endif
-      return retval._retn ();
-    }
+        DDS_ReturnCode_t const retval = DDSDomainParticipantFactory::get_instance ()->
+            delete_participant (part->get_impl ());
 
-    ::DDS::ReturnCode_t
-    CCM_DDS_DomainParticipantFactory_i::set_default_participant_qos (const ::DDS::DomainParticipantQos & /*qos*/)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_DomainParticipantFactory_i::set_default_participant_qos");
+        if (retval != DDS_RETCODE_OK)
+          {
+            CIAO_ERROR (1, (LM_ERROR, CLINFO "RTI_DomainParticipantFactory_i::delete_participant - "
+                         "RTI delete_participant returned non-ok error code %C\n",
+                         translate_retcode (retval)));
+          }
+        else CIAO_DEBUG (6, (LM_INFO, CLINFO "RTI_DomainParticipantFactory_i::delete_participant - "
+                          "Successfully deleted provided participant.\n"));
+        return retval;
+      }
 
-      throw CORBA::NO_IMPLEMENT ();
-    }
+      ::DDS::DomainParticipant_ptr
+      RTI_DomainParticipantFactory_i::lookup_participant (::DDS::DomainId_t domain_id)
+      {
+        DDSDomainParticipant* dp = DDSDomainParticipantFactory::get_instance ()->lookup_participant (domain_id);
+        ::DDS::DomainParticipant_var retval = new RTI_DomainParticipant_i ();
+        RTI_DomainParticipant_i *rti_dp = dynamic_cast < RTI_DomainParticipant_i *> (retval.in ());
+        rti_dp->set_impl (dp);
+        return retval._retn ();
+      }
 
-    ::DDS::ReturnCode_t
-    CCM_DDS_DomainParticipantFactory_i::get_default_participant_qos (::DDS::DomainParticipantQos & /*qos*/)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_DomainParticipantFactory_i::get_default_participant_qos");
+      ::DDS::ReturnCode_t
+      RTI_DomainParticipantFactory_i::set_default_participant_qos (const ::DDS::DomainParticipantQos & /*qos*/)
+      {
+        CIAO_TRACE ("RTI_DomainParticipantFactory_i::set_default_participant_qos");
 
-      throw CORBA::NO_IMPLEMENT ();
-    }
+        throw CORBA::NO_IMPLEMENT ();
+      }
 
-    ::DDS::ReturnCode_t
-    CCM_DDS_DomainParticipantFactory_i::set_qos (const ::DDS::DomainParticipantFactoryQos & /*qos*/)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_DomainParticipantFactory_i::set_qos");
+      ::DDS::ReturnCode_t
+      RTI_DomainParticipantFactory_i::get_default_participant_qos (::DDS::DomainParticipantQos & /*qos*/)
+      {
+        CIAO_TRACE ("RTI_DomainParticipantFactory_i::get_default_participant_qos");
 
-      throw CORBA::NO_IMPLEMENT ();
-    }
+        throw CORBA::NO_IMPLEMENT ();
+      }
 
-    ::DDS::ReturnCode_t
-    CCM_DDS_DomainParticipantFactory_i::get_qos (::DDS::DomainParticipantFactoryQos & /*qos*/)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_DomainParticipantFactory_i::get_qos");
+      ::DDS::ReturnCode_t
+      RTI_DomainParticipantFactory_i::set_qos (const ::DDS::DomainParticipantFactoryQos & /*qos*/)
+      {
+        CIAO_TRACE ("RTI_DomainParticipantFactory_i::set_qos");
 
-      throw CORBA::NO_IMPLEMENT ();
-    }
+        throw CORBA::NO_IMPLEMENT ();
+      }
 
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-    ::DDS::ReturnCode_t
-    CCM_DDS_DomainParticipantFactory_i::set_default_participant_qos_with_profile (
-                                                        const char * library_name,
-                                                        const char * profile_name)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_DomainParticipantFactory_i::set_default_participant_qos_with_profile");
+      ::DDS::ReturnCode_t
+      RTI_DomainParticipantFactory_i::get_qos (::DDS::DomainParticipantFactoryQos & /*qos*/)
+      {
+        CIAO_TRACE ("RTI_DomainParticipantFactory_i::get_qos");
 
-      return DDSDomainParticipantFactory::get_instance ()->set_default_participant_qos_with_profile (library_name, profile_name);
-    }
-#endif
+        throw CORBA::NO_IMPLEMENT ();
+      }
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-    ::DDS::DomainParticipantFactory_ptr
-    CCM_DDS_DomainParticipantFactory_i::get_instance (void)
-    {
-      return 0;
+      ::DDS::ReturnCode_t
+      RTI_DomainParticipantFactory_i::set_default_participant_qos_with_profile (
+                                                          const char * library_name,
+                                                          const char * profile_name)
+      {
+        CIAO_TRACE ("RTI_DomainParticipantFactory_i::set_default_participant_qos_with_profile");
+
+        return DDSDomainParticipantFactory::get_instance ()->set_default_participant_qos_with_profile (library_name, profile_name);
+      }
     }
-#endif
   }
 }
 
 #if defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
-template ACE_Singleton<CIAO::DDS4CCM::CCM_DDS_DomainParticipantFactory_i, TAO_SYNCH_MUTEX> *
-         ACE_Singleton<CIAO::DDS4CCM::CCM_DDS_DomainParticipantFactory_i, TAO_SYNCH_MUTEX>::singleton_;
+template ACE_Singleton<CIAO::DDS4CCM::RTI::RTI_DomainParticipantFactory_i, TAO_SYNCH_MUTEX> *
+         ACE_Singleton<CIAO::DDS4CCM::RTI::RTI_DomainParticipantFactory_i, TAO_SYNCH_MUTEX>::singleton_;
 #endif /* ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h
index bb27d7cc1ab..72bdd6b7b9b 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactory.h
@@ -22,90 +22,84 @@
 
 #include <map>
 
+class DDSDomainParticipant;
+
 namespace CIAO
 {
   namespace DDS4CCM
   {
-    class CCM_DDS_DomainParticipant_i;
-
-    class DDS4CCM_NDDS_IMPL_Export CCM_DDS_DomainParticipantFactory_i :
-      public virtual ::DDS::CCM_DomainParticipantFactory,
-      public virtual ::CORBA::LocalObject
+    namespace RTI
     {
-    friend class ACE_Singleton<CCM_DDS_DomainParticipantFactory_i, TAO_SYNCH_MUTEX>;
-
-    private:
-      // Construtor
-      CCM_DDS_DomainParticipantFactory_i (void);
-
-      /// Destructor
-      virtual ~CCM_DDS_DomainParticipantFactory_i (void);
-
-    public:
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-      virtual ::DDS::DomainParticipantFactory_ptr get_instance (void);
-#endif
-
-      virtual
-        ::DDS::DomainParticipant_ptr create_participant (::DDS::DomainId_t domain_id,
-                                                         const ::DDS::DomainParticipantQos & qos,
-                                                         ::DDS::DomainParticipantListener_ptr a_listener,
-                                                         ::DDS::StatusMask mask);
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      virtual
-        ::DDS::DomainParticipant_ptr create_participant_with_profile (::DDS::DomainId_t domain_id,
-                                                        const char * library_name,
-                                                        const char * profile_name,
-                                                         ::DDS::DomainParticipantListener_ptr a_listener,
-                                                         ::DDS::StatusMask mask);
-#endif
-
-      virtual
-        ::DDS::ReturnCode_t delete_participant (::DDS::DomainParticipant_ptr a_participant);
-
-      virtual
-        ::DDS::DomainParticipant_ptr lookup_participant (::DDS::DomainId_t domain_id);
-
-      virtual
-        ::DDS::ReturnCode_t set_default_participant_qos (const ::DDS::DomainParticipantQos & qos);
-
-      virtual
-        ::DDS::ReturnCode_t get_default_participant_qos (::DDS::DomainParticipantQos & qos);
-
-      virtual
-        ::DDS::ReturnCode_t set_qos (const ::DDS::DomainParticipantFactoryQos & qos);
-
-      virtual
-        ::DDS::ReturnCode_t get_qos (::DDS::DomainParticipantFactoryQos & qos);
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      virtual ::DDS::ReturnCode_t set_default_participant_qos_with_profile(
-                                                        const char * library_name,
-                                                        const char * profile_name);
-#endif
-
-    private:
-      void remove_participant (CCM_DDS_DomainParticipant_i * part);
-
-      TAO_SYNCH_MUTEX dps_mutex_;
-      typedef std::map<ACE_CString, CCM_DDS_DomainParticipant_i *> DomainParticipants;
-      DomainParticipants dps_;
-    private:
-      ACE_UNIMPLEMENTED_FUNC (void operator= (const CCM_DDS_DomainParticipantFactory_i &))
-      ACE_UNIMPLEMENTED_FUNC (CCM_DDS_DomainParticipantFactory_i (const CCM_DDS_DomainParticipantFactory_i &))
-    };
-
-    typedef ACE_Singleton<CCM_DDS_DomainParticipantFactory_i,
-              TAO_SYNCH_MUTEX> Domain_Participant_Factory;
+      class DDS4CCM_NDDS_IMPL_Export RTI_DomainParticipantFactory_i :
+        public virtual ::DDS::CCM_DomainParticipantFactory,
+        public virtual ::CORBA::LocalObject
+      {
+      friend class ACE_Singleton<RTI_DomainParticipantFactory_i, TAO_SYNCH_MUTEX>;
+
+      private:
+        // Construtor
+        RTI_DomainParticipantFactory_i (void);
+
+        // Destructor
+        virtual ~RTI_DomainParticipantFactory_i (void);
+
+      public:
+        virtual
+          ::DDS::DomainParticipant_ptr create_participant (::DDS::DomainId_t domain_id,
+                                                           const ::DDS::DomainParticipantQos & qos,
+                                                           ::DDS::DomainParticipantListener_ptr a_listener,
+                                                           ::DDS::StatusMask mask);
+
+        virtual
+          ::DDS::DomainParticipant_ptr create_participant_with_profile (::DDS::DomainId_t domain_id,
+                                                          const char * library_name,
+                                                          const char * profile_name,
+                                                           ::DDS::DomainParticipantListener_ptr a_listener,
+                                                           ::DDS::StatusMask mask);
+
+        virtual
+          ::DDS::ReturnCode_t delete_participant (::DDS::DomainParticipant_ptr a_participant);
+
+        virtual
+          ::DDS::DomainParticipant_ptr lookup_participant (::DDS::DomainId_t domain_id);
+
+        virtual
+          ::DDS::ReturnCode_t set_default_participant_qos (const ::DDS::DomainParticipantQos & qos);
+
+        virtual
+          ::DDS::ReturnCode_t get_default_participant_qos (::DDS::DomainParticipantQos & qos);
+
+        virtual
+          ::DDS::ReturnCode_t set_qos (const ::DDS::DomainParticipantFactoryQos & qos);
+
+        virtual
+          ::DDS::ReturnCode_t get_qos (::DDS::DomainParticipantFactoryQos & qos);
+
+        virtual ::DDS::ReturnCode_t set_default_participant_qos_with_profile(
+                                                          const char * library_name,
+                                                          const char * profile_name);
+      private:
+        void remove_participant (DDSDomainParticipant * part);
+
+        TAO_SYNCH_MUTEX dps_mutex_;
+        typedef std::map<ACE_CString, DDSDomainParticipant *> DomainParticipants;
+        DomainParticipants dps_;
+      private:
+        ACE_UNIMPLEMENTED_FUNC (void operator= (const RTI_DomainParticipantFactory_i &))
+        ACE_UNIMPLEMENTED_FUNC (RTI_DomainParticipantFactory_i (const RTI_DomainParticipantFactory_i &))
+      };
+
+      typedef ACE_Singleton<RTI_DomainParticipantFactory_i,
+                TAO_SYNCH_MUTEX> Domain_Participant_Factory;
+    }
   }
 }
 
-#define DPFACTORY ::CIAO::DDS4CCM::Domain_Participant_Factory::instance ()
+#define DPFACTORY ::CIAO::DDS4CCM::RTI::Domain_Participant_Factory::instance ()
 
 /// Declare a process wide singleton
 DDS4CCM_NDDS_IMPL_SINGLETON_DECLARE (ACE_Singleton,
-                                      ::CIAO::DDS4CCM::CCM_DDS_DomainParticipantFactory_i,
+                                      ::CIAO::DDS4CCM::RTI::RTI_DomainParticipantFactory_i,
                                       TAO_SYNCH_MUTEX)
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactoryQos.h b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactoryQos.h
index 19ebdea5b16..ba7c84c030d 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactoryQos.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantFactoryQos.h
@@ -6,16 +6,11 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_DOMAINPARTICIPANTFACTORYQOSPOLICY_H
-#define DDS4CCM_DOMAINPARTICIPANTFACTORYQOSPOLICY_H
+#ifndef CIAO_RTI_DOMAINPARTICIPANTFACTORYQOSPOLICY_H
+#define CIAO_RTI_DOMAINPARTICIPANTFACTORYQOSPOLICY_H
 
 #include "EntityFactoryQosPolicy.h"
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::DomainParticipantFactoryQos DDS_DomainParticipantFactoryQos;
-#endif
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::DomainParticipantFactoryQos &ddsqos, const ::DDS_DomainParticipantFactoryQos & qos)
 {
@@ -39,6 +34,5 @@ operator>>= (const ::DDS::DomainParticipantFactoryQos &qos, ::DDS_DomainParticip
 {
   ddsqos.entity_factory <<= qos.entity_factory;
 }
-#endif
 
-#endif /* DDS4CCM_DOMAINPARTICIPANTFACTORYQOSPOLICY_H */
+#endif /* CIAO_RTI_DOMAINPARTICIPANTFACTORYQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.cpp
index 828eda9a2b1..37a4c33fc7d 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.cpp
@@ -11,115 +11,29 @@
 
 #include "dds4ccm/idl/dds4ccm_BaseC.h"
 
-#include "dds4ccm/impl/logger/Log_Macros.h"
+#include "ciao/Logger/Log_Macros.h"
 
 namespace CIAO
 {
   namespace DDS4CCM
   {
-    CCM_DDS_DomainPublisherListener_i::CCM_DDS_DomainPublisherListener_i (
-      ::DDS::DomainParticipantListener_ptr p)
-        : impl_ (::DDS::DomainParticipantListener::_duplicate (p))
-    {
-    }
-
-    CCM_DDS_DomainPublisherListener_i::~CCM_DDS_DomainPublisherListener_i (void)
-    {
-    }
-
-    void
-    CCM_DDS_DomainPublisherListener_i::on_inconsistent_topic (
-        ::DDS::Topic_ptr,
-        const ::DDS::InconsistentTopicStatus & )
-    {
-    }
-
-    void
-    CCM_DDS_DomainPublisherListener_i::on_requested_deadline_missed (
-        ::DDS::DataReader_ptr ,
-        const ::DDS::RequestedDeadlineMissedStatus & )
-    {
-    }
-
-    void
-    CCM_DDS_DomainPublisherListener_i::on_requested_incompatible_qos (
-        ::DDS::DataReader_ptr ,
-        const ::DDS::RequestedIncompatibleQosStatus & )
-    {
-    }
-
-    void
-    CCM_DDS_DomainPublisherListener_i::on_sample_rejected (
-        ::DDS::DataReader_ptr ,
-        const ::DDS::SampleRejectedStatus & )
-    {
-    }
-
-    void
-    CCM_DDS_DomainPublisherListener_i::on_liveliness_changed (
-        ::DDS::DataReader_ptr ,
-        const ::DDS::LivelinessChangedStatus & )
-    {
-    }
-
-    void
-    CCM_DDS_DomainPublisherListener_i::on_data_available (
-        ::DDS::DataReader_ptr )
-    {
-    }
-
-    void
-    CCM_DDS_DomainPublisherListener_i::on_subscription_matched (
-        ::DDS::DataReader_ptr ,
-        const ::DDS::SubscriptionMatchedStatus & )
-    {
-    }
-
-    void
-    CCM_DDS_DomainPublisherListener_i::on_sample_lost (
-        ::DDS::DataReader_ptr ,
-        const ::DDS::SampleLostStatus & )
-    {
-    }
-
-    void
-    CCM_DDS_DomainPublisherListener_i::on_offered_deadline_missed (
-        ::DDS::DataWriter_ptr ,
-        const ::DDS::OfferedDeadlineMissedStatus & )
-    {
-    }
-
-    void
-    CCM_DDS_DomainPublisherListener_i::on_offered_incompatible_qos (
-        ::DDS::DataWriter_ptr ,
-        const ::DDS::OfferedIncompatibleQosStatus & )
-    {
-    }
-
-    void
-    CCM_DDS_DomainPublisherListener_i::on_liveliness_lost (
-        ::DDS::DataWriter_ptr ,
-        const ::DDS::LivelinessLostStatus & )
-    {
-    }
-
-    void
-    CCM_DDS_DomainPublisherListener_i::on_publication_matched (
-        ::DDS::DataWriter_ptr ,
-        const ::DDS::PublicationMatchedStatus & )
-    {
-    }
-
-    void
-    CCM_DDS_DomainPublisherListener_i::on_data_on_readers (
-        ::DDS::Subscriber_ptr )
-    {
-    }
-
-    ::DDS::DomainParticipantListener_ptr
-    CCM_DDS_DomainPublisherListener_i::get_domainparticipantlistener (void)
-    {
-      return ::DDS::DomainParticipantListener::_duplicate (this->impl_.in ());
+    namespace RTI
+    {
+      RTI_DomainParticipantListener_i::RTI_DomainParticipantListener_i (
+        ::DDS::DomainParticipantListener_ptr p)
+          : impl_ (::DDS::DomainParticipantListener::_duplicate (p))
+      {
+      }
+
+      RTI_DomainParticipantListener_i::~RTI_DomainParticipantListener_i (void)
+      {
+      }
+
+      ::DDS::DomainParticipantListener_ptr
+      RTI_DomainParticipantListener_i::get_domainparticipantlistener (void)
+      {
+        return ::DDS::DomainParticipantListener::_duplicate (this->impl_.in ());
+      }
     }
   }
 }
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.h b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.h
index ef0b7f6aee9..0fd77cee91b 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener.h
@@ -7,104 +7,37 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_DOMAINPARTICIPANTLISTENER_H
-#define DDS4CCM_DOMAINPARTICIPANTLISTENER_H
+#ifndef CIAO_RTI_DOMAINPARTICIPANTLISTENER_H
+#define CIAO_RTI_DOMAINPARTICIPANTLISTENER_H
 
 #include "tao/LocalObject.h"
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "dds4ccm_ndds_impl_export.h"
 
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-# include "ndds/ndds_cpp.h"
-#endif
-
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::DomainParticipantListener DDSDomainParticipantListener;
-#endif
+#include "ndds/ndds_cpp.h"
 
 namespace CIAO
 {
   namespace DDS4CCM
   {
-    class DDS4CCM_NDDS_IMPL_Export CCM_DDS_DomainPublisherListener_i :
-      public virtual ::DDSDomainParticipantListener
+    namespace RTI
     {
-    public:
-      /// Constructor
-      CCM_DDS_DomainPublisherListener_i (::DDS::DomainParticipantListener_ptr p);
-
-      /// Destructor
-      virtual ~CCM_DDS_DomainPublisherListener_i (void);
-
-      ::DDS::DomainParticipantListener_ptr get_domainparticipantlistener (void);
-
-      virtual void
-      on_inconsistent_topic (
-        ::DDS::Topic_ptr,
-        const ::DDS::InconsistentTopicStatus & );
-
-      virtual void
-      on_requested_deadline_missed (
-        ::DDS::DataReader_ptr ,
-        const ::DDS::RequestedDeadlineMissedStatus & );
-
-      virtual void
-      on_requested_incompatible_qos (
-        ::DDS::DataReader_ptr ,
-        const ::DDS::RequestedIncompatibleQosStatus & );
-
-      virtual void
-      on_sample_rejected (
-        ::DDS::DataReader_ptr ,
-        const ::DDS::SampleRejectedStatus & );
-
-      virtual void
-      on_liveliness_changed (
-        ::DDS::DataReader_ptr ,
-        const ::DDS::LivelinessChangedStatus & );
-
-      virtual void
-      on_data_available (
-        ::DDS::DataReader_ptr );
-
-      virtual void
-      on_subscription_matched (
-        ::DDS::DataReader_ptr ,
-        const ::DDS::SubscriptionMatchedStatus & );
-
-      virtual void
-      on_sample_lost (
-        ::DDS::DataReader_ptr ,
-        const ::DDS::SampleLostStatus & );
-
-      virtual void
-      on_offered_deadline_missed (
-        ::DDS::DataWriter_ptr ,
-        const ::DDS::OfferedDeadlineMissedStatus & );
-
-      virtual void
-      on_offered_incompatible_qos (
-        ::DDS::DataWriter_ptr ,
-        const ::DDS::OfferedIncompatibleQosStatus & );
-
-      virtual void
-      on_liveliness_lost (
-        ::DDS::DataWriter_ptr ,
-        const ::DDS::LivelinessLostStatus & );
-
-      virtual void
-      on_publication_matched (
-        ::DDS::DataWriter_ptr ,
-        const ::DDS::PublicationMatchedStatus & );
-
-      virtual void
-      on_data_on_readers (
-        ::DDS::Subscriber_ptr );
-
-    private:
-      ::DDS::DomainParticipantListener_var impl_;
-    };
+      class DDS4CCM_NDDS_IMPL_Export RTI_DomainParticipantListener_i :
+        public virtual ::DDSDomainParticipantListener
+      {
+      public:
+        // Constructor
+        RTI_DomainParticipantListener_i (::DDS::DomainParticipantListener_ptr p);
+
+        // Destructor
+        virtual ~RTI_DomainParticipantListener_i (void);
+
+        ::DDS::DomainParticipantListener_ptr get_domainparticipantlistener (void);
+      private:
+        ::DDS::DomainParticipantListener_var impl_;
+      };
+    }
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.cpp
index 136904aa34a..7c6b0361c90 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.cpp
@@ -2,141 +2,31 @@
 #include "dds4ccm/impl/ndds/Utils.h"
 
 #include "dds4ccm/impl/ndds/DataReader.h"
-#include "dds4ccm/impl/logger/Log_Macros.h"
+#include "ciao/Logger/Log_Macros.h"
 #include "dds4ccm/impl/ndds/DataReaderHandler_T.h"
 #include "tao/ORB_Core.h"
 
+// Implementation skeleton constructor
 template <typename DDS_TYPE, typename CCM_TYPE>
 CIAO::DDS4CCM::DomainParticipantListener_T<DDS_TYPE, CCM_TYPE>::DomainParticipantListener_T (
       ::CCM_DDS::ConnectorStatusListener_ptr error_listener)
       : error_listener_ (::CCM_DDS::ConnectorStatusListener::_duplicate (error_listener))
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::DomainParticipantListener_T::DomainParticipantListener_T");
+  CIAO_TRACE ("CIAO::DDS4CCM::DomainParticipantListener_T::DomainParticipantListener_T");
 }
 
+// Implementation skeleton destructor
 template <typename DDS_TYPE, typename CCM_TYPE>
 CIAO::DDS4CCM::DomainParticipantListener_T<DDS_TYPE, CCM_TYPE>::~DomainParticipantListener_T (void)
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::DomainParticipantListener_T::~DomainParticipantListener_T");
+  CIAO_TRACE ("CIAO::DDS4CCM::DomainParticipantListener_T::~DomainParticipantListener_T");
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE>
-void
-CIAO::DDS4CCM::DomainParticipantListener_T<DDS_TYPE, CCM_TYPE>::on_inconsistent_topic (
-  ::DDS::Topic_ptr,
-  const ::DDS::InconsistentTopicStatus & )
-{
-}
-
-template <typename DDS_TYPE, typename CCM_TYPE>
-void
-CIAO::DDS4CCM::DomainParticipantListener_T<DDS_TYPE, CCM_TYPE>::on_requested_deadline_missed (
-  ::DDS::DataReader_ptr ,
-  const ::DDS::RequestedDeadlineMissedStatus & )
-{
-}
-
-template <typename DDS_TYPE, typename CCM_TYPE>
-void
-CIAO::DDS4CCM::DomainParticipantListener_T<DDS_TYPE, CCM_TYPE>::on_requested_incompatible_qos (
-  ::DDS::DataReader_ptr ,
-  const ::DDS::RequestedIncompatibleQosStatus & )
-{
-}
-
-template <typename DDS_TYPE, typename CCM_TYPE>
-void
-CIAO::DDS4CCM::DomainParticipantListener_T<DDS_TYPE, CCM_TYPE>::on_sample_rejected (
-  ::DDS::DataReader_ptr ,
-  const ::DDS::SampleRejectedStatus & )
-{
-}
-
-template <typename DDS_TYPE, typename CCM_TYPE>
-void
-CIAO::DDS4CCM::DomainParticipantListener_T<DDS_TYPE, CCM_TYPE>::on_liveliness_changed (
-  ::DDS::DataReader_ptr ,
-  const ::DDS::LivelinessChangedStatus & )
-{
-}
-
-template <typename DDS_TYPE, typename CCM_TYPE>
-void
-CIAO::DDS4CCM::DomainParticipantListener_T<DDS_TYPE, CCM_TYPE>::on_data_available (
-  ::DDS::DataReader_ptr )
-{
-}
-
-template <typename DDS_TYPE, typename CCM_TYPE>
-void
-CIAO::DDS4CCM::DomainParticipantListener_T<DDS_TYPE, CCM_TYPE>::on_subscription_matched (
-  ::DDS::DataReader_ptr ,
-  const ::DDS::SubscriptionMatchedStatus & )
-{
-}
-
-template <typename DDS_TYPE, typename CCM_TYPE>
-void
-CIAO::DDS4CCM::DomainParticipantListener_T<DDS_TYPE, CCM_TYPE>::on_sample_lost (
-  ::DDS::DataReader_ptr ,
-  const ::DDS::SampleLostStatus & )
-{
-}
-
-template <typename DDS_TYPE, typename CCM_TYPE>
-void
-CIAO::DDS4CCM::DomainParticipantListener_T<DDS_TYPE, CCM_TYPE>::on_offered_deadline_missed (
-  ::DDS::DataWriter_ptr ,
-  const ::DDS::OfferedDeadlineMissedStatus & )
-{
-}
-
-template <typename DDS_TYPE, typename CCM_TYPE>
-void
-CIAO::DDS4CCM::DomainParticipantListener_T<DDS_TYPE, CCM_TYPE>::on_offered_incompatible_qos (
-  ::DDS::DataWriter_ptr ,
-  const ::DDS::OfferedIncompatibleQosStatus & )
-{
-}
-
-template <typename DDS_TYPE, typename CCM_TYPE>
-void
-CIAO::DDS4CCM::DomainParticipantListener_T<DDS_TYPE, CCM_TYPE>::on_liveliness_lost (
-  ::DDS::DataWriter_ptr ,
-  const ::DDS::LivelinessLostStatus & )
-{
-}
-
-template <typename DDS_TYPE, typename CCM_TYPE>
-void
-CIAO::DDS4CCM::DomainParticipantListener_T<DDS_TYPE, CCM_TYPE>::on_publication_matched (
-  ::DDS::DataWriter_ptr ,
-  const ::DDS::PublicationMatchedStatus & )
-{
-}
-
-template <typename DDS_TYPE, typename CCM_TYPE>
-void
-CIAO::DDS4CCM::DomainParticipantListener_T<DDS_TYPE, CCM_TYPE>::on_data_on_readers (
-  ::DDS::Subscriber_ptr )
-{
-}
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-template <typename DDS_TYPE, typename CCM_TYPE>
-void
-CIAO::DDS4CCM::DomainParticipantListener_T<DDS_TYPE, CCM_TYPE>::on_reliable_reader_activity_changed (
-  ::DDS::DataWriter_ptr ,
-  const ::DDS::ReliableReaderActivityChangedStatus & )
-{
-}
-#endif
-
-template <typename DDS_TYPE, typename CCM_TYPE>
 ::DDS::StatusMask
 CIAO::DDS4CCM::DomainParticipantListener_T<DDS_TYPE, CCM_TYPE>::get_mask (void)
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::DomainParticipantListener_T::get_mask");
-  return 0;
+  CIAO_TRACE ("CIAO::DDS4CCM::DomainParticipantListener_T::get_mask");
+  return DDS_STATUS_MASK_NONE;
 }
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.h b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.h
index 50b8b59806f..8032f5121f8 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantListener_T.h
@@ -30,75 +30,56 @@ namespace CIAO
 
       static ::DDS::StatusMask get_mask (void);
 
-      virtual void
-      on_inconsistent_topic (
-        ::DDS::Topic_ptr,
-        const ::DDS::InconsistentTopicStatus & );
-
-      virtual void
-      on_requested_deadline_missed (
-        ::DDS::DataReader_ptr ,
-        const ::DDS::RequestedDeadlineMissedStatus & );
-
-      virtual void
-      on_requested_incompatible_qos (
-        ::DDS::DataReader_ptr ,
-        const ::DDS::RequestedIncompatibleQosStatus & );
-
-      virtual void
-      on_sample_rejected (
-        ::DDS::DataReader_ptr ,
-        const ::DDS::SampleRejectedStatus & );
-
-      virtual void
-      on_liveliness_changed (
-        ::DDS::DataReader_ptr ,
-        const ::DDS::LivelinessChangedStatus & );
-
-      virtual void
-      on_data_available (
-        ::DDS::DataReader_ptr );
-
-      virtual void
-      on_subscription_matched (
-        ::DDS::DataReader_ptr ,
-        const ::DDS::SubscriptionMatchedStatus & );
-
-      virtual void
-      on_sample_lost (
-        ::DDS::DataReader_ptr ,
-        const ::DDS::SampleLostStatus & );
-
-      virtual void
-      on_offered_deadline_missed (
-        ::DDS::DataWriter_ptr ,
-        const ::DDS::OfferedDeadlineMissedStatus & );
-
-      virtual void
-      on_offered_incompatible_qos (
-        ::DDS::DataWriter_ptr ,
-        const ::DDS::OfferedIncompatibleQosStatus & );
-
-      virtual void
-      on_liveliness_lost (
-        ::DDS::DataWriter_ptr ,
-        const ::DDS::LivelinessLostStatus & );
-
-      virtual void
-      on_publication_matched (
-        ::DDS::DataWriter_ptr ,
-        const ::DDS::PublicationMatchedStatus & );
-
-      virtual void
-      on_data_on_readers (
-        ::DDS::Subscriber_ptr );
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      virtual void
-      on_reliable_reader_activity_changed (
-        ::DDS::DataWriter_ptr ,
-        const ::DDS::ReliableReaderActivityChangedStatus & );
-#endif
+    virtual void
+    on_inconsistent_topic (
+      ::DDS::Topic_ptr,
+      const ::DDS::InconsistentTopicStatus & ) {}
+    virtual void
+    on_requested_deadline_missed (
+      ::DDS::DataReader_ptr ,
+      const ::DDS::RequestedDeadlineMissedStatus & ) {}
+    virtual void
+    on_requested_incompatible_qos (
+      ::DDS::DataReader_ptr ,
+      const ::DDS::RequestedIncompatibleQosStatus & ) {}
+    virtual void
+    on_sample_rejected (
+      ::DDS::DataReader_ptr ,
+      const ::DDS::SampleRejectedStatus & ) {}
+    virtual void
+    on_liveliness_changed (
+      ::DDS::DataReader_ptr ,
+      const ::DDS::LivelinessChangedStatus & ) {}
+    virtual void
+    on_data_available (
+      ::DDS::DataReader_ptr ) {}
+    virtual void
+    on_subscription_matched (
+      ::DDS::DataReader_ptr ,
+      const ::DDS::SubscriptionMatchedStatus & ) {}
+    virtual void
+    on_sample_lost (
+      ::DDS::DataReader_ptr ,
+      const ::DDS::SampleLostStatus & ) {}
+    virtual void
+    on_offered_deadline_missed (
+      ::DDS::DataWriter_ptr ,
+      const ::DDS::OfferedDeadlineMissedStatus & ) {}
+    virtual void
+    on_offered_incompatible_qos (
+      ::DDS::DataWriter_ptr ,
+      const ::DDS::OfferedIncompatibleQosStatus & ) {}
+    virtual void
+    on_liveliness_lost (
+      ::DDS::DataWriter_ptr ,
+      const ::DDS::LivelinessLostStatus & ) {}
+    virtual void
+    on_publication_matched (
+      ::DDS::DataWriter_ptr ,
+      const ::DDS::PublicationMatchedStatus & ) {}
+    virtual void
+    on_data_on_readers (
+      ::DDS::Subscriber_ptr ) {}
 
     private:
       ::CCM_DDS::ConnectorStatusListener_var error_listener_;
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantQos.h b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantQos.h
index bc023e1c5e5..8f05d12328e 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantQos.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DomainParticipantQos.h
@@ -6,17 +6,12 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_DOMAINPARTICIPANTQOSPOLICY_H
-#define DDS4CCM_DOMAINPARTICIPANTQOSPOLICY_H
+#ifndef CIAO_RTI_DOMAINPARTICIPANTQOSPOLICY_H
+#define CIAO_RTI_DOMAINPARTICIPANTQOSPOLICY_H
 
 #include "UserDataQosPolicy.h"
 #include "EntityFactoryQosPolicy.h"
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::DomainParticipantQos DDS_DomainParticipantQos;
-#endif
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::DomainParticipantQos &ddsqos, const ::DDS_DomainParticipantQos & qos)
 {
@@ -43,6 +38,5 @@ operator>>= (const ::DDS::DomainParticipantQos &qos, ::DDS_DomainParticipantQos
   ddsqos.user_data <<= qos.user_data;
   ddsqos.entity_factory <<= qos.entity_factory;
 }
-#endif
 
-#endif /* DDS4CCM_DOMAINPARTICIPANTQOSPOLICY_H */
+#endif /* CIAO_RTI_DOMAINPARTICIPANTQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DurabilityQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/DurabilityQosPolicy.h
index 6b56460f3db..f915b8d5ecd 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DurabilityQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DurabilityQosPolicy.h
@@ -6,14 +6,9 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_DURABILITYQOSPOLICY_H
-#define DDS4CCM_DURABILITYQOSPOLICY_H
+#ifndef CIAO_RTI_DURABILITYQOSPOLICY_H
+#define CIAO_RTI_DURABILITYQOSPOLICY_H
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::DurabilityQosPolicy DDS_DurabilityQosPolicy;
-#endif
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::DurabilityQosPolicy &ddsqos, const ::DDS_DurabilityQosPolicy & qos)
 {
@@ -37,6 +32,5 @@ operator>>= (const ::DDS::DurabilityQosPolicy &qos, ::DDS_DurabilityQosPolicy &
 {
   ddsqos.kind = static_cast < ::DDS_DurabilityQosPolicyKind> (qos.kind);
 }
-#endif
 
-#endif /* DDS4CCM_DURABILITYQOSPOLICY_H */
+#endif /* CIAO_RTI_DURABILITYQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/DurabilityServiceQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/DurabilityServiceQosPolicy.h
index f1bbc26325a..63215703ab6 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/DurabilityServiceQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/DurabilityServiceQosPolicy.h
@@ -6,16 +6,11 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_DURABILITYSERVICEQOSPOLICY_H
-#define DDS4CCM_DURABILITYSERVICEQOSPOLICY_H
+#ifndef CIAO_RTI_DURABILITYSERVICEQOSPOLICY_H
+#define CIAO_RTI_DURABILITYSERVICEQOSPOLICY_H
 
 #include "Duration_t.h"
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::DurabilityServiceQosPolicy DDS_DurabilityServiceQosPolicy;
-#endif
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::DurabilityServiceQosPolicy &ddsqos, const ::DDS_DurabilityServiceQosPolicy & qos)
 {
@@ -59,6 +54,5 @@ operator>>= (const ::DDS::DurabilityServiceQosPolicy &qos, ::DDS_DurabilityServi
   ddsqos.max_instances = qos.max_instances;
   ddsqos.max_samples_per_instance = qos.max_samples_per_instance;
 }
-#endif
 
-#endif /* DDS4CCM_DURABILITYSERVICEQOSPOLICY_H */
+#endif /* CIAO_RTI_DURABILITYSERVICEQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Duration_t.h b/CIAO/connectors/dds4ccm/impl/ndds/Duration_t.h
index 74d6815b2a7..3f8245afc81 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Duration_t.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Duration_t.h
@@ -7,14 +7,9 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_DURATION_T_H
-#define DDS4CCM_DURATION_T_H
+#ifndef CIAO_RTI_DURATION_T_H
+#define CIAO_RTI_DURATION_T_H
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::Duration_t DDS_Duration_t;
-#endif
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::Duration_t &ddsduration, const ::DDS_Duration_t & duration)
 {
@@ -35,7 +30,6 @@ operator>>= (const ::DDS_Duration_t &duration, ::DDS::Duration_t & ddsduration)
   ddsduration.sec = duration.sec;
   ddsduration.nanosec = duration.nanosec;
 }
-#endif
 
-#endif /* DDS4CCM_DURATION_T_H */
+#endif /* CIAO_RTI_DURATION_T_H */
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/EntityFactoryQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/EntityFactoryQosPolicy.h
index ec0a24a23f2..f7f0fe8ae5e 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/EntityFactoryQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/EntityFactoryQosPolicy.h
@@ -6,14 +6,9 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_ENTITYFACTORYQOSPOLICY_H
-#define DDS4CCM_ENTITYFACTORYQOSPOLICY_H
+#ifndef CIAO_RTI_ENTITYFACTORYQOSPOLICY_H
+#define CIAO_RTI_ENTITYFACTORYQOSPOLICY_H
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::EntityFactoryQosPolicy DDS_EntityFactoryQosPolicy;
-#endif
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::EntityFactoryQosPolicy &ddsqos, const ::DDS_EntityFactoryQosPolicy & qos)
 {
@@ -37,6 +32,5 @@ operator>>= (const ::DDS::EntityFactoryQosPolicy &qos, ::DDS_EntityFactoryQosPol
 {
   ddsqos.autoenable_created_entities = qos.autoenable_created_entities;
 }
-#endif
 
-#endif /* DDS4CCM_ENTITYFACTORYQOSPOLICY_H */
+#endif /* CIAO_RTI_ENTITYFACTORYQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Getter_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Getter_T.cpp
index edd62df7f26..13fb03ca8fe 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Getter_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Getter_T.cpp
@@ -4,30 +4,32 @@
 #include "dds4ccm/impl/ndds/Duration_t.h"
 #include "dds4ccm/impl/ndds/SampleInfo.h"
 
-#include "dds4ccm/impl/logger/Log_Macros.h"
+#include "ciao/Logger/Log_Macros.h"
 
-template <typename DDS_TYPE, typename CCM_TYPE>
-CIAO::DDS4CCM::RTI::Getter_Base_T<DDS_TYPE, CCM_TYPE>::Getter_Base_T (void) :
+template <typename DDS_TYPE, typename CCM_TYPE >
+CIAO::DDS4CCM::RTI::Getter_T<DDS_TYPE, CCM_TYPE>::Getter_T (void) :
    impl_ (0),
    condition_(0),
    time_out_ (),
    max_delivered_data_ (0),
+   gd_ (0),
    ws_ (0),
    rd_condition_ (0)
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::RTI::Getter_Base_T::Getter_Base_T");
+  CIAO_TRACE ("CIAO::DDS4CCM::RTI::Getter_T::Getter_T");
 }
 
-template <typename DDS_TYPE, typename CCM_TYPE>
-CIAO::DDS4CCM::RTI::Getter_Base_T<DDS_TYPE, CCM_TYPE>::~Getter_Base_T (void)
+template <typename DDS_TYPE, typename CCM_TYPE >
+CIAO::DDS4CCM::RTI::Getter_T<DDS_TYPE, CCM_TYPE>::~Getter_T (void)
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::RTI::Getter_Base_T::~Getter_Base_T");
+  CIAO_TRACE ("CIAO::DDS4CCM::RTI::Getter_T::~Getter_T");
+  delete gd_;
   delete ws_;
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 typename DDS_TYPE::data_reader *
-CIAO::DDS4CCM::RTI::Getter_Base_T<DDS_TYPE, CCM_TYPE>::impl (void)
+CIAO::DDS4CCM::RTI::Getter_T<DDS_TYPE, CCM_TYPE>::impl (void)
 {
   if (this->impl_)
     {
@@ -39,25 +41,25 @@ CIAO::DDS4CCM::RTI::Getter_Base_T<DDS_TYPE, CCM_TYPE>::impl (void)
     }
 }
 
-template <typename DDS_TYPE, typename CCM_TYPE>
+template <typename DDS_TYPE, typename CCM_TYPE >
 bool
-CIAO::DDS4CCM::RTI::Getter_Base_T<DDS_TYPE, CCM_TYPE>::wait (
+CIAO::DDS4CCM::RTI::Getter_T<DDS_TYPE, CCM_TYPE>::wait (
           DDSConditionSeq& active_conditions)
 {
   DDS_Duration_t timeout;
   timeout <<= this->time_out_;
-  DDS_ReturnCode_t const retcode = this->ws_->wait (active_conditions, timeout);
+  DDS_ReturnCode_t const retcode = ws_->wait (active_conditions, timeout);
   if (retcode == DDS_RETCODE_TIMEOUT)
     {
-      DDS4CCM_DEBUG (6, (LM_DEBUG, ACE_TEXT ("Getter: No data available after timeout.\n")));
+      CIAO_DEBUG (6, (LM_DEBUG, ACE_TEXT ("Getter: No data available after timeout.\n")));
       return false;
     }
   return true;
 }
 
-template <typename DDS_TYPE, typename CCM_TYPE>
+template <typename DDS_TYPE, typename CCM_TYPE >
 bool
-CIAO::DDS4CCM::RTI::Getter_Base_T<DDS_TYPE, CCM_TYPE>::get_many (
+CIAO::DDS4CCM::RTI::Getter_T<DDS_TYPE, CCM_TYPE>::get_many (
           typename CCM_TYPE::seq_type::_out_type instances,
           ::CCM_DDS::ReadInfoSeq_out infos)
 {
@@ -80,17 +82,23 @@ CIAO::DDS4CCM::RTI::Getter_Base_T<DDS_TYPE, CCM_TYPE>::get_many (
   typename DDS_TYPE::dds_seq_type data;
   for (::DDS_Long i = 0; i < active_conditions.length(); i++)
     {
-      if (active_conditions[i] == this->rd_condition_)
+      if (active_conditions[i] == gd_)
+        {
+          gd_->set_trigger_value (false);
+        }
+
+      if (active_conditions[i] == rd_condition_)
         {
           // Check trigger
           active_conditions[i]->get_trigger_value ();
 
           // Take read condition
-          DDS_ReturnCode_t retcode = this->impl ()->read_w_condition (
-                                    data,
+          DDS_ReturnCode_t retcode = this->impl ()->read (data,
                                     sample_info,
                                     max_samples,
-                                    this->rd_condition_);
+                                    DDS_NOT_READ_SAMPLE_STATE ,
+                                    DDS_ANY_VIEW_STATE,
+                                    DDS_ANY_INSTANCE_STATE);
 
           if (retcode == DDS_RETCODE_OK && data.length () >= 1)
             {
@@ -102,7 +110,7 @@ CIAO::DDS4CCM::RTI::Getter_Base_T<DDS_TYPE, CCM_TYPE>::get_many (
                       ++number_read;
                     }
                 }
-              DDS4CCM_DEBUG (6, (LM_DEBUG, ACE_TEXT ("Getter_Base_T::get_many: ")
+              CIAO_DEBUG (6, (LM_DEBUG, ACE_TEXT ("Getter_T::get_many: ")
                                 ACE_TEXT ("read <%d> - valid <%d>\n"),
                                 sample_info.length (),
                                 number_read));
@@ -124,8 +132,8 @@ CIAO::DDS4CCM::RTI::Getter_Base_T<DDS_TYPE, CCM_TYPE>::get_many (
               // RETCODE_NO_DATA should be an error
               // because after a timeout there should be
               // data.
-              DDS4CCM_ERROR (1, (LM_ERROR, CLINFO
-                    "CIAO::DDS4CCM::RTI::Getter_Base_T::Getter_Base_T::get_many - "
+              CIAO_ERROR (1, (LM_ERROR, CLINFO
+                    "CIAO::DDS4CCM::RTI::Getter_T::Getter_T - "
                     "Error while reading from DDS: <%C>\n",
                     translate_retcode (retcode)));
               this->impl ()->return_loan(data,sample_info);
@@ -135,7 +143,7 @@ CIAO::DDS4CCM::RTI::Getter_Base_T<DDS_TYPE, CCM_TYPE>::get_many (
           retcode = this->impl ()->return_loan(data,sample_info);
           if (retcode != DDS_RETCODE_OK)
             {
-              DDS4CCM_ERROR (1, (LM_ERROR, ACE_TEXT ("return loan error %C\n"),
+              CIAO_ERROR (1, (LM_ERROR, ACE_TEXT ("return loan error %C\n"),
                           translate_retcode (retcode)));
             }
         }
@@ -143,31 +151,97 @@ CIAO::DDS4CCM::RTI::Getter_Base_T<DDS_TYPE, CCM_TYPE>::get_many (
   return true;
 }
 
-template <typename DDS_TYPE, typename CCM_TYPE>
+template <typename DDS_TYPE, typename CCM_TYPE >
+bool
+CIAO::DDS4CCM::RTI::Getter_T<DDS_TYPE, CCM_TYPE>::get_one (
+          typename DDS_TYPE::value_type::_out_type an_instance,
+          ::CCM_DDS::ReadInfo_out info)
+{
+  an_instance = new typename DDS_TYPE::value_type;
+
+  DDSConditionSeq active_conditions;
+  if (!this->wait (active_conditions))
+    {
+      return false;
+    }
+
+  DDS_SampleInfoSeq sample_info;
+  typename DDS_TYPE::dds_seq_type data;
+  for (::DDS_Long i = 0; i < active_conditions.length(); i++)
+    {
+      if (active_conditions[i] == gd_)
+        {
+          gd_->set_trigger_value (false);
+        }
+
+      if (active_conditions[i] == rd_condition_)
+        {
+          // Check trigger
+          active_conditions[i]->get_trigger_value ();
+
+          // Take read condition
+          DDS_ReturnCode_t retcode = this->impl ()->read (data,
+                                    sample_info,
+                                    DDS_LENGTH_UNLIMITED,
+                                    DDS_NOT_READ_SAMPLE_STATE ,
+                                    DDS_ANY_VIEW_STATE,
+                                    DDS_ANY_INSTANCE_STATE);
+
+          if (retcode == DDS_RETCODE_OK && data.length () >= 1)
+            {
+              info <<= sample_info[0]; //retrieves the last sample.
+              *an_instance = data[0];
+            }
+          else
+            {
+              // RETCODE_NO_DATA should be an error
+              // because after a timeout there should be
+              // data.
+              CIAO_ERROR (1, (LM_ERROR, CLINFO
+                    "CIAO::DDS4CCM::RTI::Getter_T::Getter_T - "
+                    "Error while reading from DDS: <%C>\n",
+                    translate_retcode (retcode)));
+              this->impl ()->return_loan(data,sample_info);
+              throw CCM_DDS::InternalError (retcode, 1);
+            }
+
+          retcode = this->impl ()->return_loan(data,sample_info);
+          if (retcode != DDS_RETCODE_OK)
+            {
+              CIAO_ERROR (1, (LM_ERROR,
+                          ACE_TEXT ("return loan error %C\n"),
+                          translate_retcode (retcode)));
+            }
+        }
+    }
+  return true;
+}
+
+template <typename DDS_TYPE, typename CCM_TYPE >
 ::DDS::Duration_t
-CIAO::DDS4CCM::RTI::Getter_Base_T<DDS_TYPE, CCM_TYPE>::time_out (void)
+CIAO::DDS4CCM::RTI::Getter_T<DDS_TYPE, CCM_TYPE>::time_out (void)
 {
   return this->time_out_;
 }
 
-template <typename DDS_TYPE, typename CCM_TYPE>
+template <typename DDS_TYPE, typename CCM_TYPE >
 void
-CIAO::DDS4CCM::RTI::Getter_Base_T<DDS_TYPE, CCM_TYPE>::time_out (
+CIAO::DDS4CCM::RTI::Getter_T<DDS_TYPE, CCM_TYPE>::time_out (
   const ::DDS::Duration_t & time_out)
 {
   this->time_out_ = time_out;
 }
 
-template <typename DDS_TYPE, typename CCM_TYPE>
+template <typename DDS_TYPE, typename CCM_TYPE >
 ::CCM_DDS::DataNumber_t
-CIAO::DDS4CCM::RTI::Getter_Base_T<DDS_TYPE, CCM_TYPE>::max_delivered_data (void)
+CIAO::DDS4CCM::RTI::Getter_T<DDS_TYPE, CCM_TYPE>::max_delivered_data (void)
 {
   return this->max_delivered_data_;
 }
 
-template <typename DDS_TYPE, typename CCM_TYPE>
+template <typename DDS_TYPE, typename CCM_TYPE >
 void
-CIAO::DDS4CCM::RTI::Getter_Base_T<DDS_TYPE, CCM_TYPE>::max_delivered_data (
+CIAO::DDS4CCM::RTI::Getter_T<DDS_TYPE, CCM_TYPE>::max_delivered_data (
   ::CCM_DDS::DataNumber_t max_delivered_data)
 {
   this->max_delivered_data_ = max_delivered_data;
@@ -175,61 +249,55 @@ CIAO::DDS4CCM::RTI::Getter_Base_T<DDS_TYPE, CCM_TYPE>::max_delivered_data (
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 void
-CIAO::DDS4CCM::RTI::Getter_Base_T<DDS_TYPE, CCM_TYPE>::passivate ()
+CIAO::DDS4CCM::RTI::Getter_T<DDS_TYPE, CCM_TYPE>::passivate ()
 {
   DDS_ReturnCode_t retcode = this->ws_->detach_condition (this->rd_condition_);
   if (retcode != DDS_RETCODE_OK)
     {
-      DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "Getter_Base_T::passivate - "
+      CIAO_ERROR (1, (LM_ERROR, CLINFO "Getter_T::passivate - "
                       "Unable to detach read condition from waitset.\n"));
     }
-  else
-    {
-      DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "Getter_Base_T::passivate - "
+    else CIAO_DEBUG (6, (LM_INFO, CLINFO "Getter_T::passivate - "
                       "Read condition succesfully detached from waitset.\n"));
-    }
+  retcode = this->ws_->detach_condition (this->gd_);
   if (retcode != DDS_RETCODE_OK)
     {
-      DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "Getter_Base_T::passivate - "
+      CIAO_ERROR (1, (LM_ERROR, CLINFO "Getter_T::passivate - "
                       "Unable to detach guard condition from waitset.\n"));
     }
-  else
-    {
-      DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "Getter_Base_T::passivate - "
+    else CIAO_DEBUG (6, (LM_INFO, CLINFO "Getter_T::passivate - "
                       "Guard condition succesfully detached from waitset.\n"));
-    }
   retcode = this->impl ()->delete_readcondition (this->rd_condition_);
   if (retcode != DDS_RETCODE_OK)
     {
-      DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "Getter_Base_T::passivate - "
+      CIAO_ERROR (1, (LM_ERROR, CLINFO "Getter_T::passivate - "
                       "Unable to delete read condition from DDSDataReader.\n"));
     }
-  else
-    {
-      DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "Getter_Base_T::passivate - "
+    else CIAO_DEBUG (6, (LM_INFO, CLINFO "Getter_T::passivate - "
                       "Read condition succesfully deleted from DDSDataReader.\n"));
-    }
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 void
-CIAO::DDS4CCM::RTI::Getter_Base_T<DDS_TYPE, CCM_TYPE>::set_impl (
+CIAO::DDS4CCM::RTI::Getter_T<DDS_TYPE, CCM_TYPE>::set_impl (
   ::DDS::DataReader_ptr reader)
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::RTI::Getter_Base_T::set_impl");
+  CIAO_TRACE ("CIAO::DDS4CCM::RTI::Getter_T::set_impl");
 
   if (::CORBA::is_nil (reader))
     {
       impl_ = 0;
-      delete this->ws_;
-      this->ws_ = 0;
+      delete gd_;
+      gd_ = 0;
+      delete ws_;
+      ws_ = 0;
     }
   else
     {
-      CCM_DDS_DataReader_i *rdr = dynamic_cast <CCM_DDS_DataReader_i *> (reader);
+      RTI_DataReader_i *rdr = dynamic_cast <RTI_DataReader_i *> (reader);
       if (!rdr)
         {
-          DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Getter_Base_T::data_reader - "
+          CIAO_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Getter_T::data_reader - "
                        "Unable to cast provided DataReader to servant\n"));
           throw CORBA::INTERNAL ();
         }
@@ -238,157 +306,30 @@ CIAO::DDS4CCM::RTI::Getter_Base_T<DDS_TYPE, CCM_TYPE>::set_impl (
 
       if (!this->impl_)
         {
-          DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Getter_Base_T::data_reader - "
+          CIAO_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Getter_T::data_reader - "
                        "Unable to narrow the provided writer entity to the specific "
                        "type necessary to publish messages\n"));
           throw CORBA::INTERNAL ();
         }
 
       // Now create the waitset conditions
+      this->gd_ = new DDSGuardCondition ();
       this->ws_ = new DDSWaitSet ();
       this->rd_condition_ = this->impl ()->create_readcondition (DDS_NOT_READ_SAMPLE_STATE,
-                                                       DDS_NEW_VIEW_STATE | DDS_NOT_NEW_VIEW_STATE,
-                                                       DDS_ALIVE_INSTANCE_STATE | DDS_NOT_ALIVE_INSTANCE_STATE);
-      DDS_ReturnCode_t retcode = this->ws_->attach_condition (this->rd_condition_);
+                                                         DDS_NEW_VIEW_STATE | DDS_NOT_NEW_VIEW_STATE,
+                                                         DDS_ALIVE_INSTANCE_STATE | DDS_NOT_ALIVE_INSTANCE_STATE);
+      DDS_ReturnCode_t retcode = this->ws_->attach_condition (this->gd_);
       if (retcode != DDS_RETCODE_OK)
         {
-          DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "GETTER: Unable to attach read condition to waitset.\n"));
-          throw CCM_DDS::InternalError (retcode, 1);
+          CIAO_ERROR (1, (LM_ERROR, CLINFO "GETTER: Unable to attach guard condition to waitset.\n"));
+          throw CCM_DDS::InternalError (retcode, 0);
         }
-    }
-}
-
-template <typename DDS_TYPE, typename CCM_TYPE>
-bool
-CIAO::DDS4CCM::RTI::Getter_T<DDS_TYPE, CCM_TYPE, true>::get_one (
-  typename DDS_TYPE::value_type::_out_type an_instance,
-  ::CCM_DDS::ReadInfo_out info)
-{
-  DDSConditionSeq active_conditions;
-  if (!this->wait (active_conditions))
-    {
-      return false;
-    }
-
-  for (::DDS_Long i = 0; i < active_conditions.length(); i++)
-    {
-      if (active_conditions[i] == this->rd_condition_)
-        {
-          bool valid_data_read = false;
-
-          while (!valid_data_read)
-            {
-              DDS_SampleInfoSeq sample_info;
-              typename DDS_TYPE::dds_seq_type data;
-              DDS_ReturnCode_t retcode = this->impl ()->read_w_condition (
-                                                                  data,
-                                                                  sample_info,
-                                                                  1,
-                                                                  this->rd_condition_);
-              if (retcode != DDS_RETCODE_OK)
-                {
-                  DDS4CCM_ERROR (1, (LM_ERROR, CLINFO
-                        "CIAO::DDS4CCM::RTI::Getter_T<DDS_TYPE, CCM_TYPE, true>::get_one - "
-                        "Error while reading from DDS: <%C>\n",
-                        translate_retcode (retcode)));
-                  if (this->impl ()->return_loan (data, sample_info) !=
-                      DDS_RETCODE_OK)
-                    {
-                      DDS4CCM_ERROR (1, (LM_ERROR,
-                                  ACE_TEXT ("CIAO::DDS4CCM::RTI::Getter_T")
-                                  ACE_TEXT ("<DDS_TYPE, CCM_TYPE, true>::get_one - ")
-                                  ACE_TEXT ("return loan error\n")));
-                    }
-                  throw CCM_DDS::InternalError (retcode, 1);
-                }
-              else if (data.length () == 1 &&
-                       sample_info[0].valid_data)
-                {
-                  info <<= sample_info[0];
-                  an_instance = data[0];
-                  valid_data_read = true;
-                }
-              //return the loan of each read.
-              if (this->impl ()->return_loan (data, sample_info) !=
-                  DDS_RETCODE_OK)
-                {
-                  DDS4CCM_ERROR (1, (LM_ERROR,
-                              ACE_TEXT ("CIAO::DDS4CCM::RTI::Getter_T")
-                              ACE_TEXT ("<DDS_TYPE, CCM_TYPE, true>::get_one - ")
-                              ACE_TEXT ("return loan error\n")));
-                }
-            }
-        }
-    }
-
-  return true;
-}
-
-template <typename DDS_TYPE, typename CCM_TYPE>
-bool
-CIAO::DDS4CCM::RTI::Getter_T<DDS_TYPE, CCM_TYPE, false>::get_one (
-  typename DDS_TYPE::value_type::_out_type an_instance,
-  ::CCM_DDS::ReadInfo_out info)
-{
-  an_instance = new typename DDS_TYPE::value_type;
-  DDSConditionSeq active_conditions;
-  if (!this->wait (active_conditions))
-    {
-      return false;
-    }
-
-  DDS_SampleInfoSeq sample_info;
-  typename DDS_TYPE::dds_seq_type data;
-  for (::DDS_Long i = 0; i < active_conditions.length(); i++)
-    {
-      if (active_conditions[i] == this->rd_condition_)
+      retcode = this->ws_->attach_condition (this->rd_condition_);
+      if (retcode != DDS_RETCODE_OK)
         {
-          bool valid_data_read = false;
-
-          while (!valid_data_read)
-            {
-              DDS_ReturnCode_t retcode = this->impl ()->read_w_condition (
-                                                                      data,
-                                                                      sample_info,
-                                                                      1,
-                                                                      this->rd_condition_);
-
-              if (retcode != DDS_RETCODE_OK)
-                {
-                  DDS4CCM_ERROR (1, (LM_ERROR, CLINFO
-                        "CIAO::DDS4CCM::RTI::Getter_T<DDS_TYPE, CCM_TYPE, true>::get_one - "
-                        "Error while reading from DDS: <%C>\n",
-                        translate_retcode (retcode)));
-                  if (this->impl ()->return_loan (data, sample_info) !=
-                      DDS_RETCODE_OK)
-                    {
-                      DDS4CCM_ERROR (1, (LM_ERROR,
-                                  ACE_TEXT ("CIAO::DDS4CCM::RTI::Getter_T")
-                                  ACE_TEXT ("<DDS_TYPE, CCM_TYPE, true>::get_one - ")
-                                  ACE_TEXT ("return loan error\n")));
-                    }
-                  throw CCM_DDS::InternalError (retcode, 1);
-                }
-              else if (data.length () == 1 &&
-                       sample_info[0].valid_data)
-                {
-                  info <<= sample_info[0];
-                  *an_instance = data[0];
-                  valid_data_read = true;
-                }
-              //return the loan of each sample
-              if (this->impl ()->return_loan (data, sample_info) !=
-                  DDS_RETCODE_OK)
-                {
-                  DDS4CCM_ERROR (1, (LM_ERROR,
-                              ACE_TEXT ("CIAO::DDS4CCM::RTI::Getter_T")
-                              ACE_TEXT ("<DDS_TYPE, CCM_TYPE, true>::get_one - ")
-                              ACE_TEXT ("return loan error\n")));
-                }
-            }
+          CIAO_ERROR (1, (LM_ERROR, CLINFO "GETTER: Unable to attach read condition to waitset.\n"));
+          throw CCM_DDS::InternalError (retcode, 1);
         }
     }
-
-  return true;
 }
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Getter_T.h b/CIAO/connectors/dds4ccm/impl/ndds/Getter_T.h
index 5312d708063..28ee0fb3e89 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Getter_T.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Getter_T.h
@@ -12,13 +12,6 @@
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "ace/Copy_Disabled.h"
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::GuardCondition DDSGuardCondition;
-typedef ::DDS::WaitSet DDSWaitSet;
-typedef ::DDS::ReadCondition DDSReadCondition;
-typedef ::DDS::ConditionSeq DDSConditionSeq;
-#endif
-
 namespace CIAO
 {
   namespace DDS4CCM
@@ -26,17 +19,21 @@ namespace CIAO
     namespace RTI
     {
       template <typename DDS_TYPE, typename CCM_TYPE>
-      class Getter_Base_T :
+      class Getter_T :
          public virtual CCM_TYPE::getter_type,
          public virtual ::CORBA::LocalObject,
          private virtual ACE_Copy_Disabled
       {
       public:
         /// Constructor
-        Getter_Base_T (void);
+        Getter_T (void);
 
         /// Destructor
-        virtual ~Getter_Base_T (void);
+        virtual ~Getter_T (void);
+
+        virtual bool get_one (
+          typename DDS_TYPE::value_type::_out_type an_instance,
+          ::CCM_DDS::ReadInfo_out info);
 
         virtual bool get_many (
           typename CCM_TYPE::seq_type::_out_type instances,
@@ -46,49 +43,26 @@ namespace CIAO
         virtual void time_out (const ::DDS::Duration_t & time_out);
 
         virtual ::CCM_DDS::DataNumber_t max_delivered_data (void);
-        virtual void max_delivered_data (
-          ::CCM_DDS::DataNumber_t max_delivered_data);
+        virtual void max_delivered_data (::CCM_DDS::DataNumber_t max_delivered_data);
 
         void set_impl (::DDS::DataReader_ptr reader);
 
         void passivate (void);
 
-      protected:
+      private:
         typename DDS_TYPE::data_reader *impl_;
 
         DDSQueryCondition* condition_;
         ::DDS::Duration_t time_out_;
         ::CCM_DDS::DataNumber_t max_delivered_data_;
+        DDSGuardCondition*  gd_;
         DDSWaitSet* ws_;
-        DDSReadCondition* rd_condition_;
+        DDSReadCondition*   rd_condition_;
 
         bool wait (DDSConditionSeq& active_conditions);
 
         typename DDS_TYPE::data_reader * impl (void);
       };
-
-      template <typename DDS_TYPE, typename CCM_TYPE, bool FIXED>
-      class Getter_T;
-
-      template <typename DDS_TYPE, typename CCM_TYPE>
-      class Getter_T <DDS_TYPE, CCM_TYPE, false> :
-        public Getter_Base_T <DDS_TYPE, CCM_TYPE>
-      {
-      public:
-        virtual bool get_one (
-          typename DDS_TYPE::value_type::_out_type an_instance,
-          ::CCM_DDS::ReadInfo_out info);
-      };
-
-      template <typename DDS_TYPE, typename CCM_TYPE>
-      class Getter_T <DDS_TYPE, CCM_TYPE, true> :
-        public Getter_Base_T <DDS_TYPE, CCM_TYPE>
-      {
-      public:
-        virtual bool get_one (
-          typename DDS_TYPE::value_type::_out_type an_instance,
-          ::CCM_DDS::ReadInfo_out info);
-      };
     }
   }
 }
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/GroupDataQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/GroupDataQosPolicy.h
index 096016416e7..96cc5611f85 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/GroupDataQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/GroupDataQosPolicy.h
@@ -6,21 +6,16 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_GROUPDATAQOSPOLICY_H
-#define DDS4CCM_GROUPDATAQOSPOLICY_H
+#ifndef CIAO_RTI_GROUPDATAQOSPOLICY_H
+#define CIAO_RTI_GROUPDATAQOSPOLICY_H
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::GroupDataQosPolicy DDS_GroupDataQosPolicy;
-#endif
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 // @todo here
 inline void
 operator<<= (::DDS::GroupDataQosPolicy &ddsqos, const ::DDS_GroupDataQosPolicy & qos)
 {
   ACE_UNUSED_ARG (ddsqos);
   ACE_UNUSED_ARG (qos);
-//   ACE_OS::memcpy (ddsqos.value, qos.value, sizeof (qos.value));
+//  ddsqos.value <<= qos.value;
 }
 
 inline void
@@ -28,7 +23,7 @@ operator<<= (::DDS_GroupDataQosPolicy &ddsqos, const ::DDS::GroupDataQosPolicy &
 {
   ACE_UNUSED_ARG (ddsqos);
   ACE_UNUSED_ARG (qos);
-//   ACE_OS::memcpy (ddsqos.value, qos.value, sizeof (qos.value));
+//  ddsqos.value <<= qos.value;
 }
 
 inline void
@@ -36,7 +31,7 @@ operator>>= (const ::DDS_GroupDataQosPolicy &qos, ::DDS::GroupDataQosPolicy & dd
 {
   ACE_UNUSED_ARG (ddsqos);
   ACE_UNUSED_ARG (qos);
-//   ACE_OS::memcpy (ddsqos.value, qos.value, sizeof (qos.value));
+//  ddsqos.value <<= qos.value;
 }
 
 inline void
@@ -44,8 +39,7 @@ operator>>= (const ::DDS::GroupDataQosPolicy &qos, ::DDS_GroupDataQosPolicy & dd
 {
   ACE_UNUSED_ARG (ddsqos);
   ACE_UNUSED_ARG (qos);
-//   ACE_OS::memcpy (qos.value, ddsqos.value, sizeof (ddsqos.value));
+//  ddsqos.value <<= qos.value;
 }
-#endif
 
-#endif /* DDS4CCM_GROUPDATAQOSPOLICY_H */
+#endif /* CIAO_RTI_GROUPDATAQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/HistoryQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/HistoryQosPolicy.h
index 0a4ce342254..5c759852d35 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/HistoryQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/HistoryQosPolicy.h
@@ -6,14 +6,9 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_HISTORYQOSPOLICY_H
-#define DDS4CCM_HISTORYQOSPOLICY_H
+#ifndef CIAO_RTI_HISTORYQOSPOLICY_H
+#define CIAO_RTI_HISTORYQOSPOLICY_H
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::HistoryQosPolicy DDS_HistoryQosPolicy;
-#endif
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::HistoryQosPolicy &ddsqos, const ::DDS_HistoryQosPolicy & qos)
 {
@@ -41,6 +36,5 @@ operator>>= (const ::DDS::HistoryQosPolicy &qos, ::DDS_HistoryQosPolicy & ddsqos
   ddsqos.kind = static_cast < ::DDS_HistoryQosPolicyKind> (qos.kind);
   ddsqos.depth = qos.depth;
 }
-#endif
 
-#endif /* DDS4CCM_HISTORYQOSPOLICY_H */
+#endif /* CIAO_RTI_HISTORYQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/InconsistentTopicStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/InconsistentTopicStatus.h
index 841b28e1660..31585e1a0d5 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/InconsistentTopicStatus.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/InconsistentTopicStatus.h
@@ -7,14 +7,9 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_INCONSISTENTTOPICSTATUS_H
-#define DDS4CCM_INCONSISTENTTOPICSTATUS_H
+#ifndef CIAO_RTI_INCONSISTENTTOPICSTATUS_H
+#define CIAO_RTI_INCONSISTENTTOPICSTATUS_H
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::InconsistentTopicStatus DDS_InconsistentTopicStatus;
-#endif
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::InconsistentTopicStatus &ddsstatus, const ::DDS_InconsistentTopicStatus & status)
 {
@@ -42,6 +37,5 @@ operator>>= (const ::DDS::InconsistentTopicStatus &status, ::DDS_InconsistentTop
   ddsstatus.total_count = status.total_count;
   ddsstatus.total_count_change = status.total_count_change;
 }
-#endif
 
-#endif /* DDS4CCM_INCONSISTENTTOPICSTATUS_H */
+#endif /* CIAO_RTI_INCONSISTENTTOPICSTATUS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.cpp
index 9eff3682e48..f272a21e41c 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.cpp
@@ -3,23 +3,25 @@
 #include "dds4ccm/impl/ndds/DataWriter.h"
 #include "dds4ccm/impl/ndds/Utils.h"
 #include "dds4ccm/impl/ndds/InstanceHandle_t.h"
-#include "dds4ccm/impl/logger/Log_Macros.h"
+#include "ciao/Logger/Log_Macros.h"
 
+// Implementation skeleton constructor
 template <typename DDS_TYPE, typename CCM_TYPE, typename BASE_TYPE>
-CIAO::DDS4CCM::InstanceHandleManager_T<DDS_TYPE, CCM_TYPE, BASE_TYPE>::InstanceHandleManager_T (void)
+CIAO::DDS4CCM::RTI::InstanceHandleManager_T<DDS_TYPE, CCM_TYPE, BASE_TYPE>::InstanceHandleManager_T (void)
   : impl_ (0)
 {
 }
 
+// Implementation skeleton destructor
 template <typename DDS_TYPE, typename CCM_TYPE, typename BASE_TYPE>
-CIAO::DDS4CCM::InstanceHandleManager_T<DDS_TYPE, CCM_TYPE, BASE_TYPE>::~InstanceHandleManager_T (void)
+CIAO::DDS4CCM::RTI::InstanceHandleManager_T<DDS_TYPE, CCM_TYPE, BASE_TYPE>::~InstanceHandleManager_T (void)
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::InstanceHandleManager_T::~InstanceHandleManager_T");
+  CIAO_TRACE ("CIAO::DDS4CCM::RTI::InstanceHandleManager_T::~InstanceHandleManager_T");
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE, typename BASE_TYPE>
 typename DDS_TYPE::data_writer *
-CIAO::DDS4CCM::InstanceHandleManager_T<DDS_TYPE, CCM_TYPE, BASE_TYPE>::impl (void)
+CIAO::DDS4CCM::RTI::InstanceHandleManager_T<DDS_TYPE, CCM_TYPE, BASE_TYPE>::impl (void)
 {
   if (this->impl_)
     {
@@ -33,7 +35,7 @@ CIAO::DDS4CCM::InstanceHandleManager_T<DDS_TYPE, CCM_TYPE, BASE_TYPE>::impl (voi
 
 template <typename DDS_TYPE, typename CCM_TYPE, typename BASE_TYPE>
 ::DDS::InstanceHandle_t
-CIAO::DDS4CCM::InstanceHandleManager_T<DDS_TYPE, CCM_TYPE, BASE_TYPE>::
+CIAO::DDS4CCM::RTI::InstanceHandleManager_T<DDS_TYPE, CCM_TYPE, BASE_TYPE>::
   register_instance (const typename DDS_TYPE::value_type & datum)
 {
   ::DDS::InstanceHandle_t dds_handle;
@@ -44,7 +46,7 @@ CIAO::DDS4CCM::InstanceHandleManager_T<DDS_TYPE, CCM_TYPE, BASE_TYPE>::
 
 template <typename DDS_TYPE, typename CCM_TYPE, typename BASE_TYPE>
 void
-CIAO::DDS4CCM::InstanceHandleManager_T<DDS_TYPE, CCM_TYPE, BASE_TYPE>::unregister_instance (
+CIAO::DDS4CCM::RTI::InstanceHandleManager_T<DDS_TYPE, CCM_TYPE, BASE_TYPE>::unregister_instance (
   const typename DDS_TYPE::value_type & datum,
   const ::DDS::InstanceHandle_t & instance_handle)
 {
@@ -55,10 +57,10 @@ CIAO::DDS4CCM::InstanceHandleManager_T<DDS_TYPE, CCM_TYPE, BASE_TYPE>::unregiste
 
 template <typename DDS_TYPE, typename CCM_TYPE, typename BASE_TYPE>
 void
-CIAO::DDS4CCM::InstanceHandleManager_T<DDS_TYPE, CCM_TYPE, BASE_TYPE>::set_impl (
+CIAO::DDS4CCM::RTI::InstanceHandleManager_T<DDS_TYPE, CCM_TYPE, BASE_TYPE>::set_impl (
   ::DDS::DataWriter_ptr writer)
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::InstanceHandleManager_T::set_impl");
+  CIAO_TRACE ("CIAO::DDS4CCM::RTI::InstanceHandleManager_T::set_impl");
 
   if (::CORBA::is_nil (writer))
     {
@@ -66,11 +68,11 @@ CIAO::DDS4CCM::InstanceHandleManager_T<DDS_TYPE, CCM_TYPE, BASE_TYPE>::set_impl
     }
   else
     {
-      CCM_DDS_DataWriter_i *rdw = dynamic_cast <CCM_DDS_DataWriter_i *> (writer);
+      RTI_DataWriter_i *rdw = dynamic_cast <RTI_DataWriter_i *> (writer);
 
       if (rdw == 0)
         {
-          DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::InstanceHandleManager_T::data_writer - "
+          CIAO_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::InstanceHandleManager_T::data_writer - "
                        "Unable to cast provided DataWriter to servant\n"));
           throw ::CORBA::INTERNAL ();
         }
@@ -79,7 +81,7 @@ CIAO::DDS4CCM::InstanceHandleManager_T<DDS_TYPE, CCM_TYPE, BASE_TYPE>::set_impl
 
       if (!this->impl_)
         {
-          DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::InstanceHandleManager_T::data_writer - "
+          CIAO_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::InstanceHandleManager_T::data_writer - "
                        "Unable to narrow the provided writer entity to the specific "
                        "type necessary to publish messages\n"));
           throw ::CORBA::INTERNAL ();
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.h b/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.h
index a232161c718..22d5a2393d7 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandleManager_T.h
@@ -16,33 +16,37 @@ namespace CIAO
 {
   namespace DDS4CCM
   {
-    template <typename DDS_TYPE, typename CCM_TYPE, typename BASE_TYPE>
-    class InstanceHandleManager_T :
-      public virtual BASE_TYPE,
-      public virtual ::CORBA::LocalObject,
-      private virtual ACE_Copy_Disabled
+    namespace RTI
     {
-    public:
-      /// Constructor
-      InstanceHandleManager_T (void);
+      template <typename DDS_TYPE, typename CCM_TYPE, typename BASE_TYPE>
+      class InstanceHandleManager_T :
+        public virtual BASE_TYPE,
+        public virtual ::CORBA::LocalObject,
+        private virtual ACE_Copy_Disabled
+      {
+      public:
+        /// Constructor
+        InstanceHandleManager_T (void);
 
-      /// Destructor
-      virtual ~InstanceHandleManager_T (void);
+        /// Destructor
+        virtual ~InstanceHandleManager_T (void);
 
-      virtual ::DDS::InstanceHandle_t register_instance (
-        const typename DDS_TYPE::value_type & datum);
+        virtual ::DDS::InstanceHandle_t register_instance (
+          const typename DDS_TYPE::value_type & datum);
 
-      virtual void unregister_instance (
-        const typename DDS_TYPE::value_type & datum,
-        const ::DDS::InstanceHandle_t & instance_handle);
+        virtual void unregister_instance (
+          const typename DDS_TYPE::value_type & datum,
+          const ::DDS::InstanceHandle_t & instance_handle);
 
-      void set_impl (::DDS::DataWriter_ptr writer);
+        void set_impl (::DDS::DataWriter_ptr writer);
 
-      typename DDS_TYPE::data_writer * impl (void);
+        typename DDS_TYPE::data_writer * impl (void);
 
-    private:
-      typename DDS_TYPE::data_writer *impl_;
-    };
+      private:
+        typename DDS_TYPE::data_writer *impl_;
+
+      };
+    }
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandleSeq.h b/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandleSeq.h
index e5c49ba137c..e3916285d14 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandleSeq.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandleSeq.h
@@ -7,16 +7,11 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_INSTANCEHANDLESEQ_H
-#define DDS4CCM_INSTANCEHANDLESEQ_H
+#ifndef CIAO_RTI_INSTANCEHANDLESEQ_H
+#define CIAO_RTI_INSTANCEHANDLESEQ_H
 
 #include "InstanceHandle_t.h"
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::InstanceHandleSeq DDS_InstanceHandleSeq;
-#endif
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 template <typename corbaseq, typename ddsseq>
 void convert_dds_to_corba_sequence(corbaseq & target, const ddsseq& source) {
   target.length (source.length ());
@@ -61,6 +56,5 @@ operator>>= (const ::DDS::InstanceHandleSeq &instancehandle, ::DDS_InstanceHandl
       ddsinstancehandleseqseq[index] <<= instancehandle[index];
     }
 }
-#endif
 
-#endif /* DDS4CCM_INSTANCEHANDLESEQ_H */
+#endif /* CIAO_RTI_INSTANCEHANDLESEQ_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandle_t.h b/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandle_t.h
index ea731ea7f28..a4272eeb122 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandle_t.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/InstanceHandle_t.h
@@ -7,21 +7,9 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_INSTANCEHANDLE_T_H
-#define DDS4CCM_INSTANCEHANDLE_T_H
+#ifndef CIAO_RTI_INSTANCEHANDLE_T_H
+#define CIAO_RTI_INSTANCEHANDLE_T_H
 
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-#include "ndds/ndds_cpp.h"
-#define DDS_INSTANCE_HANDLE_T_IN const ::DDS::InstanceHandle_t &
-#define DDS_INSTANCE_HANDLE_T_RETN ::DDS::InstanceHandle_t
-#endif
-
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-#define DDS_INSTANCE_HANDLE_T_IN ::DDS::InstanceHandle_t
-#define DDS_INSTANCE_HANDLE_T_RETN ::DDS::InstanceHandle_t
-#endif
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::InstanceHandle_t &ddsinstancehandle, const ::DDS_InstanceHandle_t & instancehandle)
 {
@@ -101,6 +89,5 @@ operator!= (const ::DDS::InstanceHandle_t & ccm_instancehandle, const DDS_Instan
          ccm_instancehandle.isValid != static_cast<CORBA::ULong>(dds_instancehandle.isValid) ||
          ACE_OS::memcmp (ccm_instancehandle.value, dds_instancehandle.keyHash.value, sizeof (ccm_instancehandle.value)) != 0;
 }
-#endif
 
-#endif /* DDS4CCM_INSTANCEHANDLE_T_H */
+#endif /* CIAO_RTI_INSTANCEHANDLE_T_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/LatencyBudgetQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/LatencyBudgetQosPolicy.h
index 0aaee70207c..270efbe4dd7 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/LatencyBudgetQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/LatencyBudgetQosPolicy.h
@@ -6,16 +6,11 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_LATENCYBUDGETQOSPOLICY_H
-#define DDS4CCM_LATENCYBUDGETQOSPOLICY_H
+#ifndef CIAO_RTI_LATENCYBUDGETQOSPOLICY_H
+#define CIAO_RTI_LATENCYBUDGETQOSPOLICY_H
 
 #include "Duration_t.h"
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::LatencyBudgetQosPolicy DDS_LatencyBudgetQosPolicy;
-#endif
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::LatencyBudgetQosPolicy &ddsqos, const ::DDS_LatencyBudgetQosPolicy & qos)
 {
@@ -39,6 +34,5 @@ operator>>= (const ::DDS::LatencyBudgetQosPolicy &qos, ::DDS_LatencyBudgetQosPol
 {
   ddsqos.duration <<= qos.duration;
 }
-#endif
 
-#endif /* DDS4CCM_LATENCYBUDGETQOSPOLICY_H */
+#endif /* CIAO_RTI_LATENCYBUDGETQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/LifespanQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/LifespanQosPolicy.h
index a40e0cae31f..92282613bf9 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/LifespanQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/LifespanQosPolicy.h
@@ -6,16 +6,11 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_LIFESPANQOSPOLICY_H
-#define DDS4CCM_LIFESPANQOSPOLICY_H
+#ifndef CIAO_RTI_LIFESPANQOSPOLICY_H
+#define CIAO_RTI_LIFESPANQOSPOLICY_H
 
 #include "Duration_t.h"
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::LifespanQosPolicy DDS_LifespanQosPolicy;
-#endif
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::LifespanQosPolicy &ddsqos, const ::DDS_LifespanQosPolicy & qos)
 {
@@ -39,6 +34,5 @@ operator>>= (const ::DDS::LifespanQosPolicy &qos, ::DDS_LifespanQosPolicy & ddsq
 {
   ddsqos.duration <<= qos.duration;
 }
-#endif
 
-#endif /* DDS4CCM_LIFESPANQOSPOLICY_H */
+#endif /* CIAO_RTI_LIFESPANQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/LivelinessChangedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/LivelinessChangedStatus.h
index 6828b018a51..4215f1bd160 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/LivelinessChangedStatus.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/LivelinessChangedStatus.h
@@ -7,16 +7,11 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_LIVELINESSCHANGEDSTATUS_H
-#define DDS4CCM_LIVELINESSCHANGEDSTATUS_H
+#ifndef CIAO_RTI_LIVELINESSCHANGEDSTATUS_H
+#define CIAO_RTI_LIVELINESSCHANGEDSTATUS_H
 
 #include "InstanceHandle_t.h"
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::LivelinessChangedStatus DDS_LivelinessChangedStatus;
-#endif
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::LivelinessChangedStatus &ddsstatus, const ::DDS_LivelinessChangedStatus & status)
 {
@@ -56,6 +51,5 @@ operator>>= (const ::DDS::LivelinessChangedStatus &status, ::DDS_LivelinessChang
   ddsstatus.not_alive_count_change = status.not_alive_count_change;
   ddsstatus.last_publication_handle <<= status.last_publication_handle;
 }
-#endif
 
-#endif /* DDS4CCM_LIVELINESSCHANGEDSTATUS_H */
+#endif /* CIAO_RTI_LIVELINESSCHANGEDSTATUS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/LivelinessLostStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/LivelinessLostStatus.h
index 6561f6fe2c4..926e39d8f08 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/LivelinessLostStatus.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/LivelinessLostStatus.h
@@ -7,14 +7,9 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_LIVELINESSLOSTSTATUS_H
-#define DDS4CCM_LIVELINESSLOSTSTATUS_H
+#ifndef CIAO_RTI_LIVELINESSLOSTSTATUS_H
+#define CIAO_RTI_LIVELINESSLOSTSTATUS_H
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::LivelinessLostStatus DDS_LivelinessLostStatus;
-#endif
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::LivelinessLostStatus &ddsstatus, const ::DDS_LivelinessLostStatus & status)
 {
@@ -42,6 +37,5 @@ operator>>= (const ::DDS::LivelinessLostStatus &status, ::DDS_LivelinessLostStat
   ddsstatus.total_count = status.total_count;
   ddsstatus.total_count_change = status.total_count_change;
 }
-#endif
 
-#endif /* DDS4CCM_LIVELINESSLOSTSTATUS_H */
+#endif /* CIAO_RTI_LIVELINESSLOSTSTATUS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/LivelinessQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/LivelinessQosPolicy.h
index ec3121e9efb..60c1c658d41 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/LivelinessQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/LivelinessQosPolicy.h
@@ -6,16 +6,11 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_LIVELINESSQOSPOLICY_H
-#define DDS4CCM_LIVELINESSQOSPOLICY_H
+#ifndef CIAO_RTI_LIVELINESSQOSPOLICY_H
+#define CIAO_RTI_LIVELINESSQOSPOLICY_H
 
 #include "Duration_t.h"
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::LivelinessQosPolicy DDS_LivelinessQosPolicy;
-#endif
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::LivelinessQosPolicy &ddsqos, const ::DDS_LivelinessQosPolicy & qos)
 {
@@ -43,6 +38,5 @@ operator>>= (const ::DDS::LivelinessQosPolicy &qos, ::DDS_LivelinessQosPolicy &
   ddsqos.kind = static_cast < ::DDS_LivelinessQosPolicyKind> (qos.kind);
   ddsqos.lease_duration <<= qos.lease_duration;
 }
-#endif
 
-#endif /* DDS4CCM_LIVELINESSQOSPOLICY_H */
+#endif /* CIAO_RTI_LIVELINESSQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/OfferedDeadlineMissedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/OfferedDeadlineMissedStatus.h
index 8c242eec417..255b22b4c71 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/OfferedDeadlineMissedStatus.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/OfferedDeadlineMissedStatus.h
@@ -7,16 +7,11 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_OFFEREDDEADLINEMISSEDSTATUS_H
-#define DDS4CCM_OFFEREDDEADLINEMISSEDSTATUS_H
+#ifndef CIAO_RTI_OFFEREDDEADLINEMISSEDSTATUS_H
+#define CIAO_RTI_OFFEREDDEADLINEMISSEDSTATUS_H
 
 #include "InstanceHandle_t.h"
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::OfferedDeadlineMissedStatus DDS_OfferedDeadlineMissedStatus;
-#endif
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::OfferedDeadlineMissedStatus &ddsstatus, const ::DDS_OfferedDeadlineMissedStatus & status)
 {
@@ -48,6 +43,5 @@ operator>>= (const ::DDS::OfferedDeadlineMissedStatus &status, ::DDS_OfferedDead
   ddsstatus.total_count_change = status.total_count_change;
   ddsstatus.last_instance_handle <<= status.last_instance_handle;
 }
-#endif
 
-#endif /* DDS4CCM_OFFEREDDEADLINEMISSEDSTATUS_H */
+#endif /* CIAO_RTI_OFFEREDDEADLINEMISSEDSTATUS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/OfferedIncompatibleQosStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/OfferedIncompatibleQosStatus.h
index 4ac14dc690b..3021d2ff935 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/OfferedIncompatibleQosStatus.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/OfferedIncompatibleQosStatus.h
@@ -7,16 +7,11 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_OFFEREDINCOMPATIBLEQOSSTATUS_H
-#define DDS4CCM_OFFEREDINCOMPATIBLEQOSSTATUS_H
+#ifndef CIAO_RTI_OFFEREDINCOMPATIBLEQOSSTATUS_H
+#define CIAO_RTI_OFFEREDINCOMPATIBLEQOSSTATUS_H
 
 #include "QosPolicyCountSeq.h"
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::OfferedIncompatibleQosStatus DDS_OfferedIncompatibleQosStatus;
-#endif
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::OfferedIncompatibleQosStatus &ddsstatus, const ::DDS_OfferedIncompatibleQosStatus & status)
 {
@@ -52,6 +47,5 @@ operator>>= (const ::DDS::OfferedIncompatibleQosStatus &status, ::DDS_OfferedInc
   ddsstatus.last_policy_id = static_cast <DDS_QosPolicyId_t>(status.last_policy_id);
   ddsstatus.policies <<= status.policies;
 }
-#endif
 
-#endif /* DDS4CCM_OFFEREDINCOMPATIBLEQOSSTATUS_H */
+#endif /* CIAO_RTI_OFFEREDINCOMPATIBLEQOSSTATUS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/OwnershipQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/OwnershipQosPolicy.h
index 1553d5d4ddb..9afc00e9a4f 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/OwnershipQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/OwnershipQosPolicy.h
@@ -6,14 +6,9 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_OWNERSHIPQOSPOLICY_H
-#define DDS4CCM_OWNERSHIPQOSPOLICY_H
+#ifndef CIAO_RTI_OWNERSHIPQOSPOLICY_H
+#define CIAO_RTI_OWNERSHIPQOSPOLICY_H
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::OwnershipQosPolicy DDS_OwnershipQosPolicy;
-#endif
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::OwnershipQosPolicy &ddsqos, const ::DDS_OwnershipQosPolicy & qos)
 {
@@ -37,6 +32,5 @@ operator>>= (const ::DDS::OwnershipQosPolicy &qos, ::DDS_OwnershipQosPolicy & dd
 {
   ddsqos.kind = static_cast < ::DDS_OwnershipQosPolicyKind> (qos.kind);
 }
-#endif
 
-#endif /* DDS4CCM_OWNERSHIPQOSPOLICY_H */
+#endif /* CIAO_RTI_OWNERSHIPQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/OwnershipStrengthQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/OwnershipStrengthQosPolicy.h
index 64e905a4faa..125fb0a3c09 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/OwnershipStrengthQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/OwnershipStrengthQosPolicy.h
@@ -6,14 +6,9 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_OWNERSHIPSTRENGTHQOSPOLICY_H
-#define DDS4CCM_OWNERSHIPSTRENGTHQOSPOLICY_H
+#ifndef CIAO_RTI_OWNERSHIPSTRENGTHQOSPOLICY_H
+#define CIAO_RTI_OWNERSHIPSTRENGTHQOSPOLICY_H
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::OwnershipStrengthQosPolicy DDS_OwnershipStrengthQosPolicy;
-#endif
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::OwnershipStrengthQosPolicy &ddsqos, const ::DDS_OwnershipStrengthQosPolicy & qos)
 {
@@ -37,6 +32,5 @@ operator>>= (const ::DDS::OwnershipStrengthQosPolicy &qos, ::DDS_OwnershipStreng
 {
   ddsqos.value = qos.value;
 }
-#endif
 
-#endif /* DDS4CCM_OWNERSHIPSTRENGTHQOSPOLICY_H */
+#endif /* CIAO_RTI_OWNERSHIPSTRENGTHQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/PartitionQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/PartitionQosPolicy.h
index 49a84ebc20c..1b67f6a9b40 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/PartitionQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/PartitionQosPolicy.h
@@ -6,39 +6,41 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_PARTITIONQOSPOLICY_H
-#define DDS4CCM_PARTITIONQOSPOLICY_H
+#ifndef CIAO_RTI_PARTITIONQOSPOLICY_H
+#define CIAO_RTI_PARTITIONQOSPOLICY_H
 
-#include "dds4ccm/impl/ndds/StringSeq.h"
+/// @todo
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::PartitionQosPolicy DDS_PartitionQosPolicy;
-#endif
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::PartitionQosPolicy &ddsqos, const ::DDS_PartitionQosPolicy & qos)
 {
-  ddsqos.name <<= qos.name;
+  ACE_UNUSED_ARG (ddsqos);
+  ACE_UNUSED_ARG (qos);
+//  ddsqos.name <<= qos.name;
 }
 
 inline void
 operator<<= (::DDS_PartitionQosPolicy &ddsqos, const ::DDS::PartitionQosPolicy & qos)
 {
-  ddsqos.name <<= qos.name;
+  ACE_UNUSED_ARG (ddsqos);
+  ACE_UNUSED_ARG (qos);
+//  ddsqos.name <<= qos.name;
 }
 
 inline void
 operator>>= (const ::DDS_PartitionQosPolicy &qos, ::DDS::PartitionQosPolicy & ddsqos)
 {
-  ddsqos.name <<= qos.name;
+  ACE_UNUSED_ARG (ddsqos);
+  ACE_UNUSED_ARG (qos);
+//  ddsqos.name <<= qos.name;
 }
 
 inline void
 operator>>= (const ::DDS::PartitionQosPolicy &qos, ::DDS_PartitionQosPolicy & ddsqos)
 {
-  ddsqos.name <<= qos.name;
+  ACE_UNUSED_ARG (ddsqos);
+  ACE_UNUSED_ARG (qos);
+//  ddsqos.name <<= qos.name;
 }
-#endif
 
-#endif /* DDS4CCM_PARTITIONQOSPOLICY_H */
+#endif /* CIAO_RTI_PARTITIONQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp
index 1344dd510fd..d07d6ac18e5 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/PortStatusListener_T.cpp
@@ -2,181 +2,84 @@
 #include "dds4ccm/impl/ndds/Utils.h"
 
 #include "dds4ccm/impl/ndds/DataReader.h"
-#include "dds4ccm/impl/logger/Log_Macros.h"
+#include "ciao/Logger/Log_Macros.h"
 #include "dds4ccm/impl/ndds/DataReaderHandler_T.h"
 #include "tao/ORB_Core.h"
 
 template <typename DDS_TYPE, typename CCM_TYPE>
-CIAO::DDS4CCM::PortStatusListener_T<DDS_TYPE, CCM_TYPE>::PortStatusListener_T (
-      ::CCM_DDS::PortStatusListener_ptr port_status_listener,
-      ACE_Reactor* reactor)
-      : port_status_listener_ (::CCM_DDS::PortStatusListener::_duplicate (port_status_listener)),
-        reactor_ (reactor)
+CIAO::DDS4CCM::RTI::PortStatusListener_T<DDS_TYPE, CCM_TYPE>::PortStatusListener_T (
+      ::CCM_DDS::PortStatusListener_ptr port_status_listener)
+      : port_status_listener_ (::CCM_DDS::PortStatusListener::_duplicate (port_status_listener))
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::PortStatusListener_T::PortStatusListener_T");
+  CIAO_TRACE ("CIAO::DDS4CCM::RTI::PortStatusListener_T::PortStatusListener_T");
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE>
-CIAO::DDS4CCM::PortStatusListener_T<DDS_TYPE, CCM_TYPE>::~PortStatusListener_T (void)
+CIAO::DDS4CCM::RTI::PortStatusListener_T<DDS_TYPE, CCM_TYPE>::~PortStatusListener_T (void)
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::PortStatusListener_T::~PortStatusListener_T");
+  CIAO_TRACE ("CIAO::DDS4CCM::RTI::PortStatusListener_T::~PortStatusListener_T");
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 void
-CIAO::DDS4CCM::PortStatusListener_T<DDS_TYPE, CCM_TYPE>::on_requested_deadline_missed (
+CIAO::DDS4CCM::RTI::PortStatusListener_T<DDS_TYPE, CCM_TYPE>::on_requested_deadline_missed (
   ::DDS::DataReader_ptr the_reader,
   const ::DDS::RequestedDeadlineMissedStatus & status)
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::PortStatusListener_T::on_requested_deadline_missed");
+  CIAO_TRACE ("CIAO::DDS4CCM::RTI::PortStatusListener_T::on_requested_deadline_missed");
 
-  DDS4CCM_DEBUG (10, (LM_DEBUG, CLINFO
-              ACE_TEXT ("PortStatusListener_T::on_requested_deadline_missed: ")
-              ACE_TEXT ("total count <%d> - total change <%d> - ")
-              ACE_TEXT ("last instance handle <length <%l> - isValid <%l>\n"),
-              status.total_count, status.total_count_change,
-              status.last_instance_handle.length, status.last_instance_handle.isValid));
-
-  if (!CORBA::is_nil (this->port_status_listener_))
+  try
     {
-      try
+      if (!CORBA::is_nil (this->port_status_listener_))
         {
-          if (this->reactor_)
-            {
-              ::CIAO::DDS4CCM::OnRequestedDeadlineMissedHandler* rh = 0;
-              ACE_NEW (rh,
-                       ::CIAO::DDS4CCM::OnRequestedDeadlineMissedHandler (
-                         this->port_status_listener_, the_reader, status));
-              ACE_Event_Handler_var safe_handler (rh);
-              if (this->reactor_->notify (rh) != 0)
-                {
-                  DDS4CCM_ERROR (1, (LM_ERROR, CLINFO
-                              ACE_TEXT ("PortStatusListener_T::on_requested_deadline_missed: ")
-                              ACE_TEXT ("failed to use reactor.\n")));
-                }
-            }
-          else
-            {
-              this->port_status_listener_->on_requested_deadline_missed (the_reader, status);
-            }
+          this->port_status_listener_->on_requested_deadline_missed (the_reader, status);
         }
-      catch (...)
+      else
         {
-          DDS4CCM_DEBUG (6, (LM_DEBUG, ACE_TEXT ("PortStatusListener_T::on_requested_deadline_missed: ")
-                                 ACE_TEXT ("DDS Exception caught\n")));
+          CIAO_DEBUG (6, (LM_DEBUG,
+                      ACE_TEXT ("PortStatusListener_T::on_requested_deadline_missed: ")
+                      ACE_TEXT ("No portstatus listener installed\n")));
         }
     }
-  else
+  catch (...)
     {
-      DDS4CCM_DEBUG (6, (LM_DEBUG,
-                  ACE_TEXT ("PortStatusListener_T::on_requested_deadline_missed: ")
-                  ACE_TEXT ("No portstatus listener installed\n")));
+      CIAO_DEBUG (6, (LM_DEBUG, ACE_TEXT ("PortStatusListener_T::on_requested_deadline_missed: ")
+                             ACE_TEXT ("DDS Exception caught\n")));
     }
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 void
-CIAO::DDS4CCM::PortStatusListener_T<DDS_TYPE, CCM_TYPE>::on_sample_lost (
+CIAO::DDS4CCM::RTI::PortStatusListener_T<DDS_TYPE, CCM_TYPE>::on_sample_lost (
   ::DDS::DataReader_ptr the_reader,
   const ::DDS::SampleLostStatus & status)
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::PortStatusListener_T::on_sample_lost");
-
-  DDS4CCM_DEBUG (10, (LM_DEBUG, CLINFO
-              ACE_TEXT ("PortStatusListener_T::on_sample_lost: ")
-              ACE_TEXT ("total count <%d> - total change <%d>\n"),
-              status.total_count, status.total_count_change));
+  CIAO_TRACE ("CIAO::DDS4CCM::RTI::PortStatusListener_T::on_sample_lost");
 
-  if (!CORBA::is_nil (this->port_status_listener_))
+  try
     {
-      try
+      if (!CORBA::is_nil (this->port_status_listener_))
         {
-          if (this->reactor_)
-            {
-              ::CIAO::DDS4CCM::OnSampleLostHandler* rh = 0;
-              ACE_NEW (rh,
-                       ::CIAO::DDS4CCM::OnSampleLostHandler (
-                         this->port_status_listener_,
-                         the_reader,
-                         status));
-              ACE_Event_Handler_var safe_handler (rh);
-              if (this->reactor_->notify (rh) != 0)
-                {
-                  DDS4CCM_ERROR (1, (LM_ERROR, CLINFO
-                              ACE_TEXT ("PortStatusListener_T::on_sample_lost: ")
-                              ACE_TEXT ("failed to use reactor.\n")));
-                }
-            }
-          else
-            {
-              this->port_status_listener_->on_sample_lost (the_reader, status);
-            }
+          this->port_status_listener_->on_sample_lost (the_reader, status);
         }
-      catch (...)
+      else
         {
-          DDS4CCM_DEBUG (6, (LM_DEBUG, ACE_TEXT ("PortStatusListener_T::on_sample_lost: ")
-                                 ACE_TEXT ("DDS Exception caught\n")));
+          CIAO_DEBUG (6, (LM_DEBUG,
+                      ACE_TEXT ("PortStatusListener_T::on_sample_lost: ")
+                      ACE_TEXT ("No portstatus listener installed\n")));
         }
     }
-  else
+  catch (...)
     {
-      DDS4CCM_DEBUG (6, (LM_DEBUG,
-                  ACE_TEXT ("PortStatusListener_T::on_sample_lost: ")
-                  ACE_TEXT ("No portstatus listener installed\n")));
+      CIAO_DEBUG (6, (LM_DEBUG, ACE_TEXT ("PortStatusListener_T::on_sample_lost: ")
+                             ACE_TEXT ("DDS Exception caught\n")));
     }
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE>
-void
-CIAO::DDS4CCM::PortStatusListener_T<DDS_TYPE, CCM_TYPE>::on_requested_incompatible_qos (
-  ::DDS::DataReader_ptr ,
-  const ::DDS::RequestedIncompatibleQosStatus & )
-{
-}
-
-template <typename DDS_TYPE, typename CCM_TYPE>
-void
-CIAO::DDS4CCM::PortStatusListener_T<DDS_TYPE, CCM_TYPE>::on_sample_rejected (
-  ::DDS::DataReader_ptr ,
-  const ::DDS::SampleRejectedStatus & )
-{
-}
-
-template <typename DDS_TYPE, typename CCM_TYPE>
-void
-CIAO::DDS4CCM::PortStatusListener_T<DDS_TYPE, CCM_TYPE>::on_liveliness_changed (
-  ::DDS::DataReader_ptr ,
-  const ::DDS::LivelinessChangedStatus & )
-{
-}
-
-template <typename DDS_TYPE, typename CCM_TYPE>
-void
-CIAO::DDS4CCM::PortStatusListener_T<DDS_TYPE, CCM_TYPE>::on_data_available (
-  ::DDS::DataReader_ptr )
-{
-}
-
-template <typename DDS_TYPE, typename CCM_TYPE>
-void
-CIAO::DDS4CCM::PortStatusListener_T<DDS_TYPE, CCM_TYPE>::on_subscription_matched (
-  ::DDS::DataReader_ptr ,
-  const ::DDS::SubscriptionMatchedStatus & )
-{
-}
-
-template <typename DDS_TYPE, typename CCM_TYPE>
 ::DDS::StatusMask
-CIAO::DDS4CCM::PortStatusListener_T<DDS_TYPE, CCM_TYPE>::get_mask (
-  ::CCM_DDS::PortStatusListener_ptr psl)
+CIAO::DDS4CCM::RTI::PortStatusListener_T<DDS_TYPE, CCM_TYPE>::get_mask (void)
 {
-  if (!CORBA::is_nil (psl) || CIAO_debug_level >= 10)
-    {
-      return DDS_REQUESTED_DEADLINE_MISSED_STATUS |
-             DDS_SAMPLE_LOST_STATUS;
-    }
-  else
-    {
-      return 0;
-    }
+  return DDS_REQUESTED_DEADLINE_MISSED_STATUS |
+         DDS_SAMPLE_LOST_STATUS;
 }
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/PortStatusListener_T.h b/CIAO/connectors/dds4ccm/impl/ndds/PortStatusListener_T.h
index 47f78d15947..873d6bc4fb8 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/PortStatusListener_T.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/PortStatusListener_T.h
@@ -13,67 +13,58 @@
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "ace/Copy_Disabled.h"
 
-class ACE_Reactor;
-
 namespace CIAO
 {
   namespace DDS4CCM
   {
-    template <typename DDS_TYPE, typename CCM_TYPE>
-    class PortStatusListener_T :
-      public ::DDS::DataReaderListener,
-      private ACE_Copy_Disabled
+    namespace RTI
     {
-    public:
-      /// Constructor
-      PortStatusListener_T (
-        ::CCM_DDS::PortStatusListener_ptr port_status_listener,
-        ACE_Reactor* reactor);
-
-      /// Destructor
-      virtual ~PortStatusListener_T (void);
-
-      virtual void on_requested_deadline_missed (
-        ::DDS::DataReader_ptr the_reader,
-        const ::DDS::RequestedDeadlineMissedStatus & status);
-
-      virtual void on_sample_lost (
-        ::DDS::DataReader_ptr the_reader,
-        const ::DDS::SampleLostStatus & status);
-
-      virtual void
-      on_requested_incompatible_qos (
-        ::DDS::DataReader_ptr ,
-        const ::DDS::RequestedIncompatibleQosStatus & );
-
-      virtual void
-      on_sample_rejected (
-        ::DDS::DataReader_ptr ,
-        const ::DDS::SampleRejectedStatus & );
-
-      virtual void
-      on_liveliness_changed (
-        ::DDS::DataReader_ptr ,
-        const ::DDS::LivelinessChangedStatus & );
-
-      virtual void
-      on_data_available (
-        ::DDS::DataReader_ptr );
-
-      virtual void
-      on_subscription_matched (
-        ::DDS::DataReader_ptr ,
-        const ::DDS::SubscriptionMatchedStatus & );
-
-      static ::DDS::StatusMask get_mask (
-        ::CCM_DDS::PortStatusListener_ptr psl);
-
-    private:
-      ::CCM_DDS::PortStatusListener_var port_status_listener_;
-    protected:
-      ACE_Reactor* reactor_;
-
-    };
+      template <typename DDS_TYPE, typename CCM_TYPE>
+      class PortStatusListener_T :
+        public ::DDS::DataReaderListener,
+        private ACE_Copy_Disabled
+      {
+      public:
+        /// Constructor
+        PortStatusListener_T (
+          ::CCM_DDS::PortStatusListener_ptr port_status_listener);
+
+        /// Destructor
+        virtual ~PortStatusListener_T (void);
+
+        virtual void on_requested_deadline_missed (
+          ::DDS::DataReader_ptr the_reader,
+          const ::DDS::RequestedDeadlineMissedStatus & status);
+
+        virtual void on_sample_lost (
+          ::DDS::DataReader_ptr the_reader,
+          const ::DDS::SampleLostStatus & status);
+
+    virtual void
+    on_requested_incompatible_qos (
+      ::DDS::DataReader_ptr ,
+      const ::DDS::RequestedIncompatibleQosStatus & ) {}
+    virtual void
+    on_sample_rejected (
+      ::DDS::DataReader_ptr ,
+      const ::DDS::SampleRejectedStatus & ) {}
+    virtual void
+    on_liveliness_changed (
+      ::DDS::DataReader_ptr ,
+      const ::DDS::LivelinessChangedStatus & ) {}
+    virtual void
+    on_data_available (
+      ::DDS::DataReader_ptr ) {}
+    virtual void
+    on_subscription_matched (
+      ::DDS::DataReader_ptr ,
+      const ::DDS::SubscriptionMatchedStatus & ) {}
+
+        static ::DDS::StatusMask get_mask (void);
+      private:
+        ::CCM_DDS::PortStatusListener_var port_status_listener_;
+      };
+    }
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/PresentationQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/PresentationQosPolicy.h
index b2018f2ec82..2be0c9005a1 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/PresentationQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/PresentationQosPolicy.h
@@ -6,18 +6,12 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_PRESENTATIONQOSPOLICY_H
-#define DDS4CCM_PRESENTATIONQOSPOLICY_H
+#ifndef CIAO_RTI_PRESENTATIONQOSPOLICY_H
+#define CIAO_RTI_PRESENTATIONQOSPOLICY_H
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::PresentationQosPolicy DDS_PresentationQosPolicy;
-#endif
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::PresentationQosPolicy &ddsqos, const ::DDS_PresentationQosPolicy & qos)
 {
-  ddsqos.access_scope = static_cast < ::DDS::PresentationQosPolicyAccessScopeKind> (qos.access_scope);
   ddsqos.coherent_access = qos.coherent_access;
   ddsqos.ordered_access = qos.ordered_access;
 }
@@ -25,7 +19,6 @@ operator<<= (::DDS::PresentationQosPolicy &ddsqos, const ::DDS_PresentationQosPo
 inline void
 operator<<= (::DDS_PresentationQosPolicy &ddsqos, const ::DDS::PresentationQosPolicy & qos)
 {
-  ddsqos.access_scope = static_cast < DDS_PresentationQosPolicyAccessScopeKind> (qos.access_scope);
   ddsqos.coherent_access = qos.coherent_access;
   ddsqos.ordered_access = qos.ordered_access;
 }
@@ -33,7 +26,6 @@ operator<<= (::DDS_PresentationQosPolicy &ddsqos, const ::DDS::PresentationQosPo
 inline void
 operator>>= (const ::DDS_PresentationQosPolicy &qos, ::DDS::PresentationQosPolicy & ddsqos)
 {
-  ddsqos.access_scope = static_cast < ::DDS::PresentationQosPolicyAccessScopeKind> (qos.access_scope);
   ddsqos.coherent_access = qos.coherent_access;
   ddsqos.ordered_access = qos.ordered_access;
 }
@@ -41,10 +33,8 @@ operator>>= (const ::DDS_PresentationQosPolicy &qos, ::DDS::PresentationQosPolic
 inline void
 operator>>= (const ::DDS::PresentationQosPolicy &qos, ::DDS_PresentationQosPolicy & ddsqos)
 {
-  ddsqos.access_scope = static_cast < DDS_PresentationQosPolicyAccessScopeKind> (qos.access_scope);
   ddsqos.coherent_access = qos.coherent_access;
   ddsqos.ordered_access = qos.ordered_access;
 }
-#endif
 
-#endif /* DDS4CCM_PRESENTATIONQOSPOLICY_H */
+#endif /* CIAO_RTI_PRESENTATIONQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/PublicationBuiltinTopicData.h b/CIAO/connectors/dds4ccm/impl/ndds/PublicationBuiltinTopicData.h
deleted file mode 100644
index ddae0d255e0..00000000000
--- a/CIAO/connectors/dds4ccm/impl/ndds/PublicationBuiltinTopicData.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/**
- * @author Marcel Smit <msmit@remedy.nl>
- *
- * $Id$
- *
- */
-
-#ifndef PUBLICATIONBUILTINTOPICDATA_H_
-#define PUBLICATIONBUILTINTOPICDATA_H_
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-inline void
-operator<<= (::DDS::PublicationBuiltinTopicData &ddstopicdata, const ::DDS_PublicationBuiltinTopicData & topicdata)
-{
-  ddstopicdata.key <<= topicdata.key;
-  ddstopicdata.participant_key <<= topicdata.participant_key;
-  ddstopicdata.topic_name = CORBA::string_dup (topicdata.topic_name);
-  ddstopicdata.type_name = CORBA::string_dup (topicdata.type_name);
-  ddstopicdata.durability <<= topicdata.durability;
-  ddstopicdata.durability_service <<= topicdata.durability_service;
-  ddstopicdata.deadline <<= topicdata.deadline;
-  ddstopicdata.latency_budget <<= topicdata.latency_budget;
-  ddstopicdata.liveliness <<= topicdata.liveliness;
-  ddstopicdata.reliability <<= topicdata.reliability;
-  ddstopicdata.lifespan <<= topicdata.lifespan;
-  ddstopicdata.user_data <<= topicdata.user_data;
-  ddstopicdata.ownership <<= topicdata.ownership;
-  ddstopicdata.ownership_strength <<= topicdata.ownership_strength;
-  ddstopicdata.destination_order <<= topicdata.destination_order;
-  ddstopicdata.presentation <<= topicdata.presentation;
-  ddstopicdata.partition <<= topicdata.partition;
-  ddstopicdata.topic_data <<= topicdata.topic_data;
-  ddstopicdata.group_data <<= topicdata.group_data;
-}
-
-inline void
-operator<<= (::DDS_PublicationBuiltinTopicData & ddstopicdata, const ::DDS::PublicationBuiltinTopicData & topicdata)
-{
-  topicdata.key <<= ddstopicdata.key;
-  topicdata.participant_key <<= ddstopicdata.participant_key;
-  topicdata.topic_name = CORBA::string_dup (ddstopicdata.topic_name);
-  topicdata.type_name = CORBA::string_dup (ddstopicdata.type_name);
-  topicdata.durability <<= ddstopicdata.durability;
-  topicdata.durability_service <<= ddstopicdata.durability_service;
-  topicdata.deadline <<= ddstopicdata.deadline;
-  topicdata.latency_budget <<= ddstopicdata.latency_budget;
-  topicdata.liveliness <<= ddstopicdata.liveliness;
-  topicdata.reliability <<= ddstopicdata.reliability;
-  topicdata.lifespan <<= ddstopicdata.lifespan;
-  topicdata.user_data <<= ddstopicdata.user_data;
-  topicdata.ownership <<= ddstopicdata.ownership;
-  topicdata.ownership_strength <<= ddstopicdata.ownership_strength;
-  topicdata.destination_order <<= ddstopicdata.destination_order;
-  topicdata.presentation <<= ddstopicdata.presentation;
-  topicdata.partition <<= ddstopicdata.partition;
-  topicdata.topic_data <<= ddstopicdata.topic_data;
-  topicdata.group_data <<= ddstopicdata.group_data;
-}
-
-inline void
-operator>>= (const ::DDS_PublicationBuiltinTopicData & topicdata, ::DDS::PublicationBuiltinTopicData & ddstopicdata)
-{
-  ddstopicdata.key <<= topicdata.key;
-  ddstopicdata.participant_key <<= topicdata.participant_key;
-  ddstopicdata.topic_name = CORBA::string_dup (topicdata.topic_name);
-  ddstopicdata.type_name = CORBA::string_dup (topicdata.type_name);
-  ddstopicdata.durability <<= topicdata.durability;
-  ddstopicdata.durability_service <<= topicdata.durability_service;
-  ddstopicdata.deadline <<= topicdata.deadline;
-  ddstopicdata.latency_budget <<= topicdata.latency_budget;
-  ddstopicdata.liveliness <<= topicdata.liveliness;
-  ddstopicdata.reliability <<= topicdata.reliability;
-  ddstopicdata.lifespan <<= topicdata.lifespan;
-  ddstopicdata.user_data <<= topicdata.user_data;
-  ddstopicdata.ownership <<= topicdata.ownership;
-  ddstopicdata.ownership_strength <<= topicdata.ownership_strength;
-  ddstopicdata.destination_order <<= topicdata.destination_order;
-  ddstopicdata.presentation <<= topicdata.presentation;
-  ddstopicdata.partition <<= topicdata.partition;
-  ddstopicdata.topic_data <<= topicdata.topic_data;
-  ddstopicdata.group_data <<= topicdata.group_data;
-}
-
-inline void
-operator>>= (const ::DDS::PublicationBuiltinTopicData & topicdata, ::DDS_PublicationBuiltinTopicData & ddstopicdata)
-{
-  ddstopicdata.key <<= topicdata.key;
-  ddstopicdata.participant_key <<= topicdata.participant_key;
-  ddstopicdata.topic_name = CORBA::string_dup (topicdata.topic_name);
-  ddstopicdata.type_name = CORBA::string_dup (topicdata.type_name);
-  ddstopicdata.durability <<= topicdata.durability;
-  ddstopicdata.durability_service <<= topicdata.durability_service;
-  ddstopicdata.deadline <<= topicdata.deadline;
-  ddstopicdata.latency_budget <<= topicdata.latency_budget;
-  ddstopicdata.liveliness <<= topicdata.liveliness;
-  ddstopicdata.reliability <<= topicdata.reliability;
-  ddstopicdata.lifespan <<= topicdata.lifespan;
-  ddstopicdata.user_data <<= topicdata.user_data;
-  ddstopicdata.ownership <<= topicdata.ownership;
-  ddstopicdata.ownership_strength <<= topicdata.ownership_strength;
-  ddstopicdata.destination_order <<= topicdata.destination_order;
-  ddstopicdata.presentation <<= topicdata.presentation;
-  ddstopicdata.partition <<= topicdata.partition;
-  ddstopicdata.topic_data <<= topicdata.topic_data;
-  ddstopicdata.group_data <<= topicdata.group_data;
-}
-
-#endif
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/PublicationMatchedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/PublicationMatchedStatus.h
index 819a2d447aa..fa967fcbee8 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/PublicationMatchedStatus.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/PublicationMatchedStatus.h
@@ -7,16 +7,11 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_PUBLICATIONMATCHEDSTATUS_H
-#define DDS4CCM_PUBLICATIONMATCHEDSTATUS_H
+#ifndef CIAO_RTI_PUBLICATIONMATCHEDSTATUS_H
+#define CIAO_RTI_PUBLICATIONMATCHEDSTATUS_H
 
 #include "InstanceHandle_t.h"
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::PublicationMatchedStatus DDS_PublicationMatchedStatus;
-#endif
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::PublicationMatchedStatus &ddsstatus, const ::DDS_PublicationMatchedStatus & status)
 {
@@ -56,6 +51,5 @@ operator>>= (const ::DDS::PublicationMatchedStatus &status, ::DDS_PublicationMat
   ddsstatus.current_count_change = status.current_count_change;
   ddsstatus.last_subscription_handle <<= status.last_subscription_handle;
 }
-#endif
 
-#endif /* DDS4CCM_PUBLICATIONMATCHEDSTATUS_H */
+#endif /* CIAO_RTI_PUBLICATIONMATCHEDSTATUS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Publisher.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Publisher.cpp
index aa5274fb602..e481cadbae5 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Publisher.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Publisher.cpp
@@ -13,391 +13,315 @@
 
 #include "dds4ccm/idl/dds4ccm_BaseC.h"
 
-#include "dds4ccm/impl/logger/Log_Macros.h"
+#include "ciao/Logger/Log_Macros.h"
 
 namespace CIAO
 {
   namespace DDS4CCM
   {
-    CCM_DDS_Publisher_i::CCM_DDS_Publisher_i (DDSPublisher * dw)
-      : impl_ (dw)
+    namespace RTI
     {
-      DDS4CCM_TRACE ("CCM_DDS_Publisher_i::CCM_DDS_Publisher_i");
-    }
-
-    CCM_DDS_Publisher_i::~CCM_DDS_Publisher_i (void)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_Publisher_i::~CCM_DDS_Publisher_i");
-    }
-
-    ::DDS::DataWriter_ptr
-    CCM_DDS_Publisher_i::create_datawriter (::DDS::Topic_ptr a_topic,
-                                        const ::DDS::DataWriterQos & qos,
-                                        ::DDS::DataWriterListener_ptr a_listener,
-                                        ::DDS::StatusMask mask)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_Publisher_i::create_datawriter");
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ACE_UNUSED_ARG (qos);
-
-      CCM_DDS_Topic_i * topic = dynamic_cast < CCM_DDS_Topic_i * > (a_topic);
-
-      if (!topic)
-        {
-          DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_Publisher_i::create_datawriter - "
-                       "Error: Unable to cast provided topic to its servant.\n"));
-          throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0);
-        }
-
-      DDSDataWriterListener *rti_drl = 0;
-      if (!CORBA::is_nil (a_listener))
-        {
-          ACE_NEW_THROW_EX (rti_drl,
-                            CCM_DDS_DataWriterListener_i (a_listener),
-                            CORBA::NO_MEMORY ());
-        }
-      DDS_DataWriterQos rti_qos = DDS_DATAWRITER_QOS_DEFAULT;
-      DDSDataWriter *rti_dw = this->impl ()->create_datawriter (
-                                                            topic->get_impl (),
-                                                            rti_qos,
-                                                            rti_drl,
-                                                            mask);
-
-      if (!rti_dw)
-        {
-          DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_Publisher_i::create_datawriter - "
-                       "Error: RTI Topic returned a nil datawriter.\n"));
-          delete rti_drl;
-          throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0);
-        }
-
-      ::DDS::DataWriter_var retval = ::DDS::DataWriter::_nil ();
-      ACE_NEW_THROW_EX (retval,
-                        CCM_DDS_DataWriter_i (rti_dw),
-                        CORBA::NO_MEMORY ());
-
-      rti_dw->enable ();
-      CCM_DDS_DataWriter_i *dw = dynamic_cast< CCM_DDS_DataWriter_i * > (retval.in ());
-      dw->set_impl (rti_dw);
-
-      return retval._retn ();
-#else
-      return this->impl ()->create_datawriter (
-                                                            a_topic,
-                                                            qos,
-                                                            a_listener,
-                                                            mask);
-#endif
-    }
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-    ::DDS::DataWriter_ptr
-    CCM_DDS_Publisher_i::create_datawriter_with_profile (::DDS::Topic_ptr a_topic,
-                                        const char* library_name,
-                                        const char *profile_name,
-                                        ::DDS::DataWriterListener_ptr a_listener,
-                                        ::DDS::StatusMask mask)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_Publisher_i::create_datawriter");
-
-      CCM_DDS_Topic_i * topic = dynamic_cast < CCM_DDS_Topic_i * > (a_topic);
-
-      if (!topic)
-        {
-          DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_Publisher_i::create_datawriter_with_profile - "
-                       "Error: Unable to cast provided topic to its servant.\n"));
-          throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0);
-        }
-
-      DDSDataWriterListener *rti_drl = 0;
-      if (!CORBA::is_nil (a_listener))
-        {
-          ACE_NEW_THROW_EX (rti_drl,
-                            CCM_DDS_DataWriterListener_i (a_listener),
-                            CORBA::NO_MEMORY ());
-        }
-      DDSDataWriter *rti_dw = this->impl ()->create_datawriter_with_profile (
-                                                              topic->get_impl (),
-                                                              library_name,
-                                                              profile_name,
-                                                              rti_drl,
-                                                              mask);
-
-      if (!rti_dw)
-        {
-          DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_Publisher_i::create_datawriter_with_profile - "
-                       "Error: RTI Topic returned a nil datawriter.\n"));
-          delete rti_drl;
-          throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0);
-        }
-
-      ::DDS::DataWriter_var retval = ::DDS::DataWriter::_nil ();
-      ACE_NEW_THROW_EX (retval,
-                        CCM_DDS_DataWriter_i (rti_dw),
-                        CORBA::NO_MEMORY ());
-
-      rti_dw->enable ();
-      CCM_DDS_DataWriter_i *dw = dynamic_cast< CCM_DDS_DataWriter_i * > (retval.in ());
-      dw->set_impl (rti_dw);
-
-      return retval._retn ();
-    }
-#endif
+      // Implementation skeleton constructor
+      RTI_Publisher_i::RTI_Publisher_i (void)
+        : impl_ (0)
+      {
+        CIAO_TRACE ("RTI_Publisher_i::RTI_Publisher_i");
+      }
+
+      // Implementation skeleton destructor
+      RTI_Publisher_i::~RTI_Publisher_i (void)
+      {
+        CIAO_TRACE ("RTI_Publisher_i::~RTI_Publisher_i");
+      }
+
+      ::DDS::DataWriter_ptr
+      RTI_Publisher_i::create_datawriter (::DDS::Topic_ptr a_topic,
+                                          const ::DDS::DataWriterQos & /*qos*/,
+                                          ::DDS::DataWriterListener_ptr a_listener,
+                                          ::DDS::StatusMask mask)
+      {
+        CIAO_TRACE ("RTI_Publisher_i::create_datawriter");
+
+        RTI_Topic_i * topic = dynamic_cast < RTI_Topic_i * > (a_topic);
+
+        if (!topic)
+          {
+            CIAO_ERROR (1, (LM_ERROR, CLINFO "RTI_Publisher_i::create_datawriter - "
+                         "Error: Unable to cast provided topic to its servant.\n"));
+            throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0);
+          }
+
+        DDSTopic *rti_topic = topic->get_impl ();
+        DDSDataWriterListener *rti_drl = 0;
+        if (!CORBA::is_nil (a_listener))
+          {
+            rti_drl = new RTI_DataWriterListener_i (a_listener);
+          }
+        DDS_DataWriterQos rti_qos = DDS_DATAWRITER_QOS_DEFAULT;
+//        rti_qos <<= qos;
+        DDSDataWriter *rti_dw = this->impl ()->create_datawriter (rti_topic,
+                                                                rti_qos,
+                                                                rti_drl,
+                                                                mask);
+
+        if (!rti_dw)
+          {
+            CIAO_ERROR (1, (LM_ERROR, CLINFO "RTI_Publisher_i::create_datawriter - "
+                         "Error: RTI Topic returned a nil datawriter.\n"));
+            throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0);
+          }
+
+        rti_dw->enable ();
+        ::DDS::DataWriter_var retval = new RTI_DataWriter_i ();
+        RTI_DataWriter_i *dw = dynamic_cast< RTI_DataWriter_i * > (retval.in ());
+        dw->set_impl (rti_dw);
+
+        return retval._retn ();
+      }
+
+      ::DDS::DataWriter_ptr
+      RTI_Publisher_i::create_datawriter_with_profile (::DDS::Topic_ptr a_topic,
+                                          const char* library_name,
+                                          const char *profile_name,
+                                          ::DDS::DataWriterListener_ptr a_listener,
+                                          ::DDS::StatusMask mask)
+      {
+        CIAO_TRACE ("RTI_Publisher_i::create_datawriter");
+
+        RTI_Topic_i * topic = dynamic_cast < RTI_Topic_i * > (a_topic);
+
+        if (!topic)
+          {
+            CIAO_ERROR (1, (LM_ERROR, CLINFO "RTI_Publisher_i::create_datawriter_with_profile - "
+                         "Error: Unable to cast provided topic to its servant.\n"));
+            throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0);
+          }
+
+        DDSTopic *rti_topic = topic->get_impl ();
+        DDSDataWriterListener *rti_drl = 0;
+        if (!CORBA::is_nil (a_listener))
+          {
+            rti_drl = new RTI_DataWriterListener_i (a_listener);
+          }
+        DDSDataWriter *rti_dw = this->impl ()->create_datawriter_with_profile (rti_topic,
+                                                                library_name,
+                                                                profile_name,
+                                                                rti_drl,
+                                                                mask);
+
+        if (!rti_dw)
+          {
+            CIAO_ERROR (1, (LM_ERROR, CLINFO "RTI_Publisher_i::create_datawriter_with_profile - "
+                         "Error: RTI Topic returned a nil datawriter.\n"));
+            throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0);
+          }
+
+        rti_dw->enable ();
+        ::DDS::DataWriter_var retval = new RTI_DataWriter_i ();
+        RTI_DataWriter_i *dw = dynamic_cast< RTI_DataWriter_i * > (retval.in ());
+        dw->set_impl (rti_dw);
+
+        return retval._retn ();
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_Publisher_i::delete_datawriter (::DDS::DataWriter_ptr a_datawriter)
+      {
+        CIAO_TRACE ("RTI_Publisher_i::delete_datawriter");
+
+        RTI_DataWriter_i *top = dynamic_cast< RTI_DataWriter_i *> (a_datawriter);
+
+        if (top == 0)
+          {
+            CIAO_ERROR (1, (LM_ERROR, CLINFO "RTI_Publisher_i::delete_datawriter - "
+                         "Unable to cast provided object reference to servant.\n"));
+            return ::DDS::RETCODE_BAD_PARAMETER;
+          }
+
+        CIAO_DEBUG (9, (LM_TRACE, CLINFO "RTI_Publisher_i::delete_datawriter - "
+                     "Successfully casted provided object reference to servant.\n"));
+
+        DDS_ReturnCode_t const retval = this->impl ()->delete_datawriter (top->get_impl ());
+
+        if (retval != DDS_RETCODE_OK)
+          {
+            CIAO_ERROR (1, (LM_ERROR, CLINFO "RTI_Publisher_i::delete_datawriter - "
+                         "Error: RTI delete_datawriter returned non-ok error code %C\n",
+                         translate_retcode (retval)));
+          }
+        else CIAO_DEBUG (6, (LM_INFO, CLINFO "RTI_Publisher_i::delete_datawriter - "
+                          "Provided datawriter successfully deleted\n"));
+
+        return retval;
+      }
+
+      ::DDS::DataWriter_ptr
+      RTI_Publisher_i::lookup_datawriter (const char * impl_name)
+      {
+        DDSDataWriter* dw = this->impl ()->lookup_datawriter (impl_name);
+        ::DDS::DataWriter_var retval = new RTI_DataWriter_i ();
+        RTI_DataWriter_i *rti_dw = dynamic_cast< RTI_DataWriter_i * > (retval.in ());
+        rti_dw->set_impl (dw);
+        return retval._retn ();
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_Publisher_i::delete_contained_entities (void)
+      {
+        return this->impl ()->delete_contained_entities ();
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_Publisher_i::set_qos (const ::DDS::PublisherQos & /*qos*/)
+      {
+        CIAO_TRACE ("RTI_Publisher_i::set_qos");
+        throw CORBA::NO_IMPLEMENT ();
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_Publisher_i::get_qos (::DDS::PublisherQos & /* qos*/)
+      {
+        CIAO_TRACE ("RTI_Publisher_i::get_qos");
+        throw CORBA::NO_IMPLEMENT ();
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_Publisher_i::set_listener (::DDS::PublisherListener_ptr a_listener,
+                                     ::DDS::StatusMask mask)
+      {
+        CIAO_TRACE ("RTI_Publisher_i::set_listener");
+
+        RTI_PublisherListener_i* rti_impl_list = new RTI_PublisherListener_i (a_listener);
+        return this->impl ()->set_listener (rti_impl_list, mask);
+      }
+
+      ::DDS::PublisherListener_ptr
+      RTI_Publisher_i::get_listener (void)
+      {
+/*        DDSPublisherListener* pl = this->impl ()->get_listener ();
+        ::DDS::PublisherListener_var retval = new RTI_PublisherListener_i (pl);
+        return retval._retn ();*/
+        throw CORBA::NO_IMPLEMENT ();
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_Publisher_i::suspend_publications (void)
+      {
+        return this->impl ()->suspend_publications ();
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_Publisher_i::resume_publications (void)
+      {
+        return this->impl ()->resume_publications ();
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_Publisher_i::begin_coherent_changes (void)
+      {
+        return this->impl ()->begin_coherent_changes ();
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_Publisher_i::end_coherent_changes (void)
+      {
+        return this->impl ()->end_coherent_changes ();
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_Publisher_i::wait_for_acknowledgments (const ::DDS::Duration_t & max_wait)
+      {
+        DDS_Duration_t rti_dds_duration;
+        rti_dds_duration <<= max_wait;
+        return this->impl ()->wait_for_acknowledgments (rti_dds_duration);
+      }
+
+      ::DDS::DomainParticipant_ptr
+      RTI_Publisher_i::get_participant (void)
+      {
+        CIAO_TRACE ("RTI_Publisher_i::get_participant");
+        DDSDomainParticipant* p = this->impl ()->get_participant ();
+        ::DDS::DomainParticipant_var retval = new RTI_DomainParticipant_i ();
+        RTI_DomainParticipant_i *rti_dp = dynamic_cast < RTI_DomainParticipant_i *> (retval.in ());
+        rti_dp->set_impl (p);
+        return retval._retn ();
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_Publisher_i::set_default_datawriter_qos (const ::DDS::DataWriterQos & /*qos*/)
+      {
+        CIAO_TRACE ("RTI_Publisher_i::set_default_datawriter_qos");
+        throw CORBA::NO_IMPLEMENT ();
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_Publisher_i::get_default_datawriter_qos (::DDS::DataWriterQos & /*qos*/)
+      {
+        CIAO_TRACE ("RTI_Publisher_i::get_default_datawriter_qos");
+        throw CORBA::NO_IMPLEMENT ();
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_Publisher_i::copy_from_topic_qos (::DDS::DataWriterQos & /*a_dataimpl_qos*/,
+                                            const ::DDS::TopicQos & /*a_impl_qos*/)
+      {
+        CIAO_TRACE ("RTI_Publisher_i::copy_from_topic_qos");
+        throw CORBA::NO_IMPLEMENT ();
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_Publisher_i::enable (void)
+      {
+        return this->impl ()->enable ();
+      }
+
+      ::DDS::StatusCondition_ptr
+      RTI_Publisher_i::get_statuscondition (void)
+      {
+        DDSStatusCondition* sc = this->impl ()->get_statuscondition ();
+        ::DDS::StatusCondition_var retval = new RTI_StatusCondition_i ();
+        RTI_StatusCondition_i *rti_sc = dynamic_cast < RTI_StatusCondition_i *> (retval.in ());
+        rti_sc->set_impl (sc);
+        return retval._retn ();
+      }
+
+      ::DDS::StatusMask
+      RTI_Publisher_i::get_status_changes (void)
+      {
+        return this->impl ()->get_status_changes ();
+      }
+
+      ::DDS::InstanceHandle_t
+      RTI_Publisher_i::get_instance_handle (void)
+      {
+        ::DDS_InstanceHandle_t const rtihandle = this->impl ()->get_instance_handle ();
+        ::DDS::InstanceHandle_t handle;
+        handle <<= rtihandle;
+        return handle;
+      }
+
+      DDSPublisher *
+      RTI_Publisher_i::get_impl (void)
+      {
+        return this->impl_;
+      }
+
+      void
+      RTI_Publisher_i::set_impl (DDSPublisher * dw)
+      {
+        this->impl_ = dw;
+      }
+
+      DDSPublisher *
+      RTI_Publisher_i::impl (void)
+      {
+        if (!this->impl_)
+          {
+            throw ::CORBA::BAD_INV_ORDER ();
+          }
+        return this->impl_;
+      }
 
-    ::DDS::ReturnCode_t
-    CCM_DDS_Publisher_i::delete_datawriter (::DDS::DataWriter_ptr a_datawriter)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_Publisher_i::delete_datawriter");
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      CCM_DDS_DataWriter_i *top = dynamic_cast< CCM_DDS_DataWriter_i *> (a_datawriter);
-
-      if (top == 0)
-        {
-          DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_Publisher_i::delete_datawriter - "
-                       "Unable to cast provided object reference to servant.\n"));
-          return ::DDS::RETCODE_BAD_PARAMETER;
-        }
-
-      DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CCM_DDS_Publisher_i::delete_datawriter - "
-                   "Successfully casted provided object reference to servant.\n"));
-
-      DDS_ReturnCode_t const retval = this->impl ()->delete_datawriter (top->get_impl ());
-
-      if (retval != DDS_RETCODE_OK)
-        {
-          DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_Publisher_i::delete_datawriter - "
-                       "Error: RTI delete_datawriter returned non-ok error code %C\n",
-                       translate_retcode (retval)));
-        }
-      else DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "CCM_DDS_Publisher_i::delete_datawriter - "
-                        "Provided datawriter successfully deleted\n"));
-
-      return retval;
-#else
-      return this->impl ()->delete_datawriter (a_datawriter);
-#endif
-    }
-
-    ::DDS::DataWriter_ptr
-    CCM_DDS_Publisher_i::lookup_datawriter (const char * impl_name)
-    {
-      ::DDS::DataWriter_var retval = ::DDS::DataWriter::_nil ();
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      DDSDataWriter* dw = this->impl ()->lookup_datawriter (impl_name);
-      ACE_NEW_THROW_EX (retval,
-                        CCM_DDS_DataWriter_i (dw),
-                        CORBA::NO_MEMORY ());
-#else
-      ::DDS::DataWriter_var dw = this->impl ()->lookup_datawriter (impl_name);
-      ACE_NEW_THROW_EX (retval,
-                        CCM_DDS_DataWriter_i (dw.in ()),
-                        CORBA::NO_MEMORY ());
-#endif
-      return retval._retn ();
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_Publisher_i::delete_contained_entities (void)
-    {
-      return this->impl ()->delete_contained_entities ();
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_Publisher_i::set_qos (const ::DDS::PublisherQos & /*qos*/)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_Publisher_i::set_qos");
-      throw CORBA::NO_IMPLEMENT ();
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_Publisher_i::get_qos (::DDS::PublisherQos & /* qos*/)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_Publisher_i::get_qos");
-      throw CORBA::NO_IMPLEMENT ();
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_Publisher_i::set_listener (::DDS::PublisherListener_ptr a_listener,
-                                   ::DDS::StatusMask mask)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_Publisher_i::set_listener");
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      CCM_DDS_PublisherListener_i *rti_impl_list  = 0;
-      if (!CORBA::is_nil (a_listener))
-        {
-          ACE_NEW_THROW_EX (rti_impl_list,
-                            CCM_DDS_PublisherListener_i (a_listener),
-                            CORBA::NO_MEMORY ());
-        }
-      return this->impl ()->set_listener (rti_impl_list, mask);
-#else
-      return this->impl ()->set_listener (a_listener, mask);
-#endif
-    }
-
-    ::DDS::PublisherListener_ptr
-    CCM_DDS_Publisher_i::get_listener (void)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_Publisher_i::get_listener");
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      DDSPublisherListener *rti_pub_list = this->impl ()->get_listener ();
-      CCM_DDS_PublisherListener_i *list_proxy = dynamic_cast <CCM_DDS_PublisherListener_i *> (rti_pub_list);
-      if (!list_proxy)
-        {
-          DDS4CCM_DEBUG (6, (LM_DEBUG, "CCM_DDS_Publisher_i::get_listener - "
-                                    "DDS returned a NIL listener.\n"));
-          return ::DDS::PublisherListener::_nil ();
-        }
-      return list_proxy->get_publisher_listener ();
-#else
-      return this->impl ()->get_listener ();
-#endif
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_Publisher_i::suspend_publications (void)
-    {
-      return this->impl ()->suspend_publications ();
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_Publisher_i::resume_publications (void)
-    {
-      return this->impl ()->resume_publications ();
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_Publisher_i::begin_coherent_changes (void)
-    {
-      return this->impl ()->begin_coherent_changes ();
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_Publisher_i::end_coherent_changes (void)
-    {
-      return this->impl ()->end_coherent_changes ();
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_Publisher_i::wait_for_acknowledgments (const ::DDS::Duration_t & max_wait)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      DDS_Duration_t rti_dds_duration;
-      rti_dds_duration <<= max_wait;
-      return this->impl ()->wait_for_acknowledgments (rti_dds_duration);
-#else
-      return this->impl ()->wait_for_acknowledgments (max_wait);
-#endif
-    }
-
-    ::DDS::DomainParticipant_ptr
-    CCM_DDS_Publisher_i::get_participant (void)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_Publisher_i::get_participant");
-      ::DDS::DomainParticipant_var retval = ::DDS::DomainParticipant::_nil ();
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      DDSDomainParticipant* p = this->impl ()->get_participant ();
-      ACE_NEW_THROW_EX (retval,
-                        CCM_DDS_DomainParticipant_i (p),
-                        CORBA::NO_MEMORY ());
-#else
-      ::DDS::DomainParticipant_var p = this->impl ()->get_participant ();
-      ACE_NEW_THROW_EX (retval,
-                        CCM_DDS_DomainParticipant_i (p.in ()),
-                        CORBA::NO_MEMORY ());
-#endif
-      return retval._retn ();
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_Publisher_i::set_default_datawriter_qos (const ::DDS::DataWriterQos & /*qos*/)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_Publisher_i::set_default_datawriter_qos");
-      throw CORBA::NO_IMPLEMENT ();
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_Publisher_i::get_default_datawriter_qos (::DDS::DataWriterQos & /*qos*/)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_Publisher_i::get_default_datawriter_qos");
-      throw CORBA::NO_IMPLEMENT ();
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_Publisher_i::copy_from_topic_qos (::DDS::DataWriterQos & /*a_dataimpl_qos*/,
-                                          const ::DDS::TopicQos & /*a_impl_qos*/)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_Publisher_i::copy_from_topic_qos");
-      throw CORBA::NO_IMPLEMENT ();
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_Publisher_i::enable (void)
-    {
-      return this->impl ()->enable ();
-    }
-
-    ::DDS::StatusCondition_ptr
-    CCM_DDS_Publisher_i::get_statuscondition (void)
-    {
-      ::DDS::StatusCondition_var retval = ::DDS::StatusCondition::_nil ();
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      DDSStatusCondition* sc = this->impl ()->get_statuscondition ();
-      ACE_NEW_THROW_EX (retval,
-                        CCM_DDS_StatusCondition_i (sc),
-                        CORBA::NO_MEMORY ());
-#else
-      ::DDS::StatusCondition_var sc = this->impl ()->get_statuscondition ();
-      ACE_NEW_THROW_EX (retval,
-                        CCM_DDS_StatusCondition_i (sc.in ()),
-                        CORBA::NO_MEMORY ());
-#endif
-      return retval._retn ();
-    }
-
-    ::DDS::StatusMask
-    CCM_DDS_Publisher_i::get_status_changes (void)
-    {
-      return this->impl ()->get_status_changes ();
-    }
-
-    ::DDS::InstanceHandle_t
-    CCM_DDS_Publisher_i::get_instance_handle (void)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ::DDS_InstanceHandle_t const rtihandle = this->impl ()->get_instance_handle ();
-      ::DDS::InstanceHandle_t handle;
-      handle <<= rtihandle;
-      return handle;
-#else
-      return this->impl ()->get_instance_handle ();
-#endif
-    }
-
-    DDSPublisher *
-    CCM_DDS_Publisher_i::get_impl (void)
-    {
-      return this->impl_;
-    }
-
-    void
-    CCM_DDS_Publisher_i::set_impl (DDSPublisher * dw)
-    {
-      this->impl_ = dw;
-    }
-
-    DDSPublisher *
-    CCM_DDS_Publisher_i::impl (void)
-    {
-      if (!this->impl_)
-        {
-          throw ::CORBA::BAD_INV_ORDER ();
-        }
-      return this->impl_;
     }
   }
 }
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Publisher.h b/CIAO/connectors/dds4ccm/impl/ndds/Publisher.h
index f090330c618..fbdd4c2285d 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Publisher.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Publisher.h
@@ -7,8 +7,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_PUBLISHER_H
-#define DDS4CCM_PUBLISHER_H
+#ifndef CIAO_RTI_PUBLISHER_H
+#define CIAO_RTI_PUBLISHER_H
 
 #include "tao/LocalObject.h"
 
@@ -17,115 +17,111 @@
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h"
 
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-# include "ndds/ndds_cpp.h"
-#endif
-
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::Publisher DDSPublisher;
-#endif
-
+#include "ndds/ndds_cpp.h"
 #include "tao/LocalObject.h"
 
 namespace CIAO
 {
   namespace DDS4CCM
   {
-    class DDS4CCM_NDDS_IMPL_Export CCM_DDS_Publisher_i :
-      public virtual ::DDS::CCM_Publisher,
-      public virtual ::CORBA::LocalObject
+    namespace RTI
     {
-    public:
-      /// Constructor
-      CCM_DDS_Publisher_i (DDSPublisher * dw);
+      class DDS4CCM_NDDS_IMPL_Export RTI_Publisher_i :
+        public virtual ::DDS::CCM_Publisher,
+        public virtual ::CORBA::LocalObject
+      {
+      public:
+        // Constructor
+        RTI_Publisher_i (void);
 
-      /// Destructor
-      virtual ~CCM_DDS_Publisher_i (void);
+        // Destructor
+        virtual ~RTI_Publisher_i (void);
 
-      virtual
-        ::DDS::DataWriter_ptr create_datawriter (::DDS::Topic_ptr a_topic,
-                                                 const ::DDS::DataWriterQos & qos,
-                                                 ::DDS::DataWriterListener_ptr a_listener,
-                                                 ::DDS::StatusMask mask);
+        virtual
+          ::DDS::DataWriter_ptr create_datawriter (::DDS::Topic_ptr a_topic,
+                                                   const ::DDS::DataWriterQos & qos,
+                                                   ::DDS::DataWriterListener_ptr a_listener,
+                                                   ::DDS::StatusMask mask);
 
-      virtual
-        ::DDS::DataWriter_ptr create_datawriter_with_profile (::DDS::Topic_ptr a_topic,
-        const char* library_name,
-        const char *profile_name,
-                                                 ::DDS::DataWriterListener_ptr a_listener,
-                                                 ::DDS::StatusMask mask);
+        virtual
+          ::DDS::DataWriter_ptr create_datawriter_with_profile (::DDS::Topic_ptr a_topic,
+          const char* library_name,
+          const char *profile_name,
+                                                   ::DDS::DataWriterListener_ptr a_listener,
+                                                   ::DDS::StatusMask mask);
 
-      virtual
-        ::DDS::ReturnCode_t delete_datawriter (::DDS::DataWriter_ptr a_datawriter);
+        virtual
+          ::DDS::ReturnCode_t delete_datawriter (::DDS::DataWriter_ptr a_datawriter);
 
-      virtual
-        ::DDS::DataWriter_ptr lookup_datawriter (const char * impl_name);
+        virtual
+          ::DDS::DataWriter_ptr lookup_datawriter (const char * impl_name);
 
-      virtual
-        ::DDS::ReturnCode_t delete_contained_entities (void);
+        virtual
+          ::DDS::ReturnCode_t delete_contained_entities (void);
 
-      virtual
-        ::DDS::ReturnCode_t set_qos (const ::DDS::PublisherQos & qos);
+        virtual
+          ::DDS::ReturnCode_t set_qos (const ::DDS::PublisherQos & qos);
 
-      virtual
-        ::DDS::ReturnCode_t get_qos (::DDS::PublisherQos & qos);
+        virtual
+          ::DDS::ReturnCode_t get_qos (::DDS::PublisherQos & qos);
 
-      virtual
-        ::DDS::ReturnCode_t set_listener (::DDS::PublisherListener_ptr a_listener,
-                                          ::DDS::StatusMask mask);
+        virtual
+          ::DDS::ReturnCode_t set_listener (::DDS::PublisherListener_ptr a_listener,
+                                            ::DDS::StatusMask mask);
 
-      virtual
-        ::DDS::PublisherListener_ptr get_listener (void);
+        virtual
+          ::DDS::PublisherListener_ptr get_listener (void);
 
-      virtual
-        ::DDS::ReturnCode_t suspend_publications (void);
+        virtual
+          ::DDS::ReturnCode_t suspend_publications (void);
 
-      virtual
-        ::DDS::ReturnCode_t resume_publications (void);
+        virtual
+          ::DDS::ReturnCode_t resume_publications (void);
 
-      virtual
-        ::DDS::ReturnCode_t begin_coherent_changes (void);
+        virtual
+          ::DDS::ReturnCode_t begin_coherent_changes (void);
 
-      virtual
-        ::DDS::ReturnCode_t end_coherent_changes (void);
+        virtual
+          ::DDS::ReturnCode_t end_coherent_changes (void);
 
-      virtual
-        ::DDS::ReturnCode_t wait_for_acknowledgments (const ::DDS::Duration_t & max_wait);
+        virtual
+          ::DDS::ReturnCode_t wait_for_acknowledgments (const ::DDS::Duration_t & max_wait);
 
-      virtual
-        ::DDS::DomainParticipant_ptr get_participant (void);
+        virtual
+          ::DDS::DomainParticipant_ptr get_participant (void);
 
-      virtual
-        ::DDS::ReturnCode_t set_default_datawriter_qos (const ::DDS::DataWriterQos & qos);
+        virtual
+          ::DDS::ReturnCode_t set_default_datawriter_qos (const ::DDS::DataWriterQos & qos);
 
-      virtual
-        ::DDS::ReturnCode_t get_default_datawriter_qos (::DDS::DataWriterQos & qos);
+        virtual
+          ::DDS::ReturnCode_t get_default_datawriter_qos (::DDS::DataWriterQos & qos);
 
-      virtual
-        ::DDS::ReturnCode_t copy_from_topic_qos (::DDS::DataWriterQos & a_dataimpl_qos,
-                                                 const ::DDS::TopicQos & a_impl_qos);
+        virtual
+          ::DDS::ReturnCode_t copy_from_topic_qos (::DDS::DataWriterQos & a_dataimpl_qos,
+                                                   const ::DDS::TopicQos & a_impl_qos);
 
-      virtual
-        ::DDS::ReturnCode_t enable (void);
+        virtual
+          ::DDS::ReturnCode_t enable (void);
 
-      virtual
-        ::DDS::StatusCondition_ptr get_statuscondition (void);
+        virtual
+          ::DDS::StatusCondition_ptr get_statuscondition (void);
 
-      virtual
-        ::DDS::StatusMask get_status_changes (void);
+        virtual
+          ::DDS::StatusMask get_status_changes (void);
 
-      virtual
-        ::DDS::InstanceHandle_t get_instance_handle (void);
+        virtual
+          ::DDS::InstanceHandle_t get_instance_handle (void);
 
-      DDSPublisher * get_impl (void);
+        DDSPublisher * get_impl (void);
 
-      void set_impl (DDSPublisher *p);
+        void set_impl (DDSPublisher *p);
 
-    private:
-      DDSPublisher *impl_;
+      private:
+        DDSPublisher *impl_;
 
-      DDSPublisher *impl (void);
-    };
+        DDSPublisher *impl (void);
+      };
+    }
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.cpp b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.cpp
index fe61d91b23b..902923b6a72 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.cpp
@@ -7,7 +7,7 @@
 #include "LivelinessLostStatus.h"
 #include "OfferedIncompatibleQosStatus.h"
 #include "OfferedDeadlineMissedStatus.h"
-#include "dds4ccm/impl/logger/Log_Macros.h"
+#include "ciao/Logger/Log_Macros.h"
 
 #include "dds4ccm/idl/dds4ccm_BaseC.h"
 
@@ -15,105 +15,86 @@ namespace CIAO
 {
   namespace DDS4CCM
   {
-    CCM_DDS_PublisherListener_i::CCM_DDS_PublisherListener_i ( ::DDS::PublisherListener_ptr p)
-      : impl_ (::DDS::PublisherListener::_duplicate (p))
+    namespace RTI
     {
-      DDS4CCM_TRACE ("CCM_DDS_PublisherListener_i::CCM_DDS_PublisherListener_i");
-    }
+      // Implementation skeleton constructor
+      RTI_PublisherListener_i::RTI_PublisherListener_i ( ::DDS::PublisherListener_ptr p)
+        : impl_ (::DDS::PublisherListener::_duplicate (p))
+      {
+        CIAO_TRACE ("RTI_PublisherListener_i::RTI_PublisherListener_i");
+      }
 
-    CCM_DDS_PublisherListener_i::~CCM_DDS_PublisherListener_i (void)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_PublisherListener_i::~CCM_DDS_PublisherListener_i");
-    }
+      // Implementation skeleton destructor
+      RTI_PublisherListener_i::~RTI_PublisherListener_i (void)
+      {
+        CIAO_TRACE ("RTI_PublisherListener_i::~RTI_PublisherListener_i");
+      }
 
-    void
-    CCM_DDS_PublisherListener_i::on_offered_deadline_missed (
-      ::DDSDataWriter* writer,
-      const ::DDS_OfferedDeadlineMissedStatus & status)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_PublisherListener_i::on_offered_deadline_missed");
+      void
+      RTI_PublisherListener_i::on_offered_deadline_missed (
+        ::DDSDataWriter* writer,
+        const ::DDS_OfferedDeadlineMissedStatus & status)
+      {
+        CIAO_TRACE ("RTI_PublisherListener_i::on_offered_deadline_missed");
 
-      ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil ();
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ::DDS::OfferedDeadlineMissedStatus ddsstatus;
-      ddsstatus <<= status;
-      ACE_NEW (dds_writer, 
-               CCM_DDS_DataWriter_i (writer));
-      this->impl_->on_offered_deadline_missed (dds_writer.in (), ddsstatus);
-#else
-      ACE_NEW (dds_writer, 
-               CCM_DDS_DataWriter_i (writer));
-      this->impl_->on_offered_deadline_missed (dds_writer.in (), status);
-#endif
-    }
+        ::DDS::OfferedDeadlineMissedStatus ddsstatus;
+        ddsstatus <<= status;
+        ::DDS::DataWriter_var dds_writer = new RTI_DataWriter_i ();
+        RTI_DataWriter_i *dw = dynamic_cast< RTI_DataWriter_i * > (dds_writer.in ());
+        dw->set_impl (writer);
+        this->impl_->on_offered_deadline_missed (dds_writer.in (), ddsstatus);
+      }
 
-    void
-    CCM_DDS_PublisherListener_i::on_offered_incompatible_qos (
-      ::DDSDataWriter* writer,
-      const ::DDS_OfferedIncompatibleQosStatus & status)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_PublisherListener_i::on_offered_incompatible_qos");
+      void
+      RTI_PublisherListener_i::on_offered_incompatible_qos (
+        ::DDSDataWriter* writer,
+        const ::DDS_OfferedIncompatibleQosStatus & status)
+      {
+        CIAO_TRACE ("RTI_PublisherListener_i::on_offered_incompatible_qos");
 
-      ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil ();
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ::DDS::OfferedIncompatibleQosStatus ddsstatus;
-      ddsstatus <<= status;
-      ACE_NEW (dds_writer, 
-               CCM_DDS_DataWriter_i (writer));
-      this->impl_->on_offered_incompatible_qos (dds_writer.in (), ddsstatus);
-#else
-      ACE_NEW (dds_writer, 
-               CCM_DDS_DataWriter_i (writer));
-      this->impl_->on_offered_incompatible_qos (dds_writer.in (), status);
-#endif
-    }
+        ::DDS::OfferedIncompatibleQosStatus ddsstatus;
+        ddsstatus <<= status;
+        ::DDS::DataWriter_var dds_writer = new RTI_DataWriter_i ();
+        RTI_DataWriter_i *dw = dynamic_cast< RTI_DataWriter_i * > (dds_writer.in ());
+        dw->set_impl (writer);
+        this->impl_->on_offered_incompatible_qos (dds_writer.in (), ddsstatus);
+      }
 
-    void
-    CCM_DDS_PublisherListener_i::on_liveliness_lost (
-      ::DDSDataWriter* writer,
-      const ::DDS_LivelinessLostStatus & status)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_PublisherListener_i::on_liveliness_lost");
+      void
+      RTI_PublisherListener_i::on_liveliness_lost (
+        ::DDSDataWriter* writer,
+        const ::DDS_LivelinessLostStatus & status)
+      {
+        CIAO_TRACE ("RTI_PublisherListener_i::on_liveliness_lost");
 
-      ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil ();
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ::DDS::LivelinessLostStatus ddsstatus;
-      ddsstatus <<= status;
-      ACE_NEW (dds_writer, 
-               CCM_DDS_DataWriter_i (writer));
-      this->impl_->on_liveliness_lost (dds_writer.in (), ddsstatus);
-#else
-      ACE_NEW (dds_writer, 
-               CCM_DDS_DataWriter_i (writer));
-      this->impl_->on_liveliness_lost (dds_writer.in (), status);
-#endif
-    }
+        ::DDS::LivelinessLostStatus ddsstatus;
+        ddsstatus <<= status;
+        ::DDS::DataWriter_var dds_writer = new RTI_DataWriter_i ();
+        RTI_DataWriter_i *dw = dynamic_cast< RTI_DataWriter_i * > (dds_writer.in ());
+        dw->set_impl (writer);
+        this->impl_->on_liveliness_lost (dds_writer.in (), ddsstatus);
+      }
 
-    void
-    CCM_DDS_PublisherListener_i::on_publication_matched (
-      ::DDSDataWriter* writer,
-      const ::DDS_PublicationMatchedStatus & status)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_PublisherListener_i::on_publication_matched");
+      void
+      RTI_PublisherListener_i::on_publication_matched (
+        ::DDSDataWriter* writer,
+        const ::DDS_PublicationMatchedStatus & status)
+      {
+        CIAO_TRACE ("RTI_PublisherListener_i::on_publication_matched");
 
-      ::DDS::DataWriter_var dds_writer = ::DDS::DataWriter::_nil ();
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ::DDS::PublicationMatchedStatus ddsstatus;
-      ddsstatus <<= status;
-      ACE_NEW (dds_writer, 
-               CCM_DDS_DataWriter_i (writer));
-      this->impl_->on_publication_matched (dds_writer.in (), ddsstatus);
-#else
-      ACE_NEW (dds_writer, 
-               CCM_DDS_DataWriter_i (writer));
-      this->impl_->on_publication_matched (dds_writer.in (), status);
-#endif
-    }
+        ::DDS::PublicationMatchedStatus ddsstatus;
+        ddsstatus <<= status;
+        ::DDS::DataWriter_var dds_writer = new RTI_DataWriter_i ();
+        RTI_DataWriter_i *dw = dynamic_cast< RTI_DataWriter_i * > (dds_writer.in ());
+        dw->set_impl (writer);
+        this->impl_->on_publication_matched (dds_writer.in (), ddsstatus);
+      }
 
-    ::DDS::PublisherListener_ptr
-    CCM_DDS_PublisherListener_i::get_publisher_listener (void)
-    {
-      return ::DDS::PublisherListener::_duplicate (this->impl_.in ());
+      ::DDS::PublisherListener_ptr
+      RTI_PublisherListener_i::get_publisher_listener (void)
+      {
+        return ::DDS::PublisherListener::_duplicate (this->impl_.in ());
+      }
     }
   }
 }
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.h b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.h
index 4feaaeb4e31..edad2f0a620 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener.h
@@ -7,8 +7,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_PUBLISHERLISTENER_H
-#define DDS4CCM_PUBLISHERLISTENER_H
+#ifndef CIAO_RTI_PUBLISHERLISTENER_H
+#define CIAO_RTI_PUBLISHERLISTENER_H
 
 #include "tao/LocalObject.h"
 
@@ -17,59 +17,50 @@
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h"
 
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-# include "ndds/ndds_cpp.h"
-#endif
-
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::PublisherListener DDSPublisherListener;
-typedef ::DDS::DataWriter DDSDataWriter;
-typedef ::DDS::OfferedDeadlineMissedStatus DDS_OfferedDeadlineMissedStatus;
-typedef ::DDS::OfferedIncompatibleQosStatus DDS_OfferedIncompatibleQosStatus;
-typedef ::DDS::LivelinessLostStatus DDS_LivelinessLostStatus;
-typedef ::DDS::PublicationMatchedStatus DDS_PublicationMatchedStatus;
-#endif
-
+#include "ndds/ndds_cpp.h"
 #include "tao/LocalObject.h"
 
 namespace CIAO
 {
   namespace DDS4CCM
   {
-    class DDS4CCM_NDDS_IMPL_Export CCM_DDS_PublisherListener_i :
-      public virtual ::DDSPublisherListener
+    namespace RTI
     {
-    public:
-      /// Constructor
-      CCM_DDS_PublisherListener_i (::DDS::PublisherListener_ptr p);
+      class DDS4CCM_NDDS_IMPL_Export RTI_PublisherListener_i :
+        public virtual ::DDSPublisherListener
+      {
+      public:
+        // Constructor
+        RTI_PublisherListener_i (::DDS::PublisherListener_ptr p);
 
-      /// Destructor
-      virtual ~CCM_DDS_PublisherListener_i (void);
+        // Destructor
+        virtual ~RTI_PublisherListener_i (void);
 
-      virtual void
-      on_offered_deadline_missed (
-        ::DDSDataWriter *writer,
-        const ::DDS_OfferedDeadlineMissedStatus & status);
+        virtual void
+        on_offered_deadline_missed (
+          ::DDSDataWriter *writer,
+          const ::DDS_OfferedDeadlineMissedStatus & status);
 
-      virtual void
-      on_offered_incompatible_qos (
-        ::DDSDataWriter *writer,
-        const ::DDS_OfferedIncompatibleQosStatus & status);
+        virtual void
+        on_offered_incompatible_qos (
+          ::DDSDataWriter *writer,
+          const ::DDS_OfferedIncompatibleQosStatus & status);
 
-      virtual void
-      on_liveliness_lost (
-        ::DDSDataWriter* writer,
-        const ::DDS_LivelinessLostStatus & status);
+        virtual void
+        on_liveliness_lost (
+          ::DDSDataWriter* writer,
+          const ::DDS_LivelinessLostStatus & status);
 
-      virtual void
-      on_publication_matched (
-        ::DDSDataWriter *writer,
-        const ::DDS_PublicationMatchedStatus & status);
+        virtual void
+        on_publication_matched (
+          ::DDSDataWriter *writer,
+          const ::DDS_PublicationMatchedStatus & status);
 
-      ::DDS::PublisherListener_ptr get_publisher_listener (void);
-    private:
-      ::DDS::PublisherListener_var impl_;
-    };
+        ::DDS::PublisherListener_ptr get_publisher_listener (void);
+      private:
+        ::DDS::PublisherListener_var impl_;
+      };
+    }
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp
index f1789309e7c..88d52df2c54 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener_T.cpp
@@ -2,259 +2,146 @@
 #include "dds4ccm/impl/ndds/Utils.h"
 
 #include "dds4ccm/impl/ndds/DataReader.h"
-#include "dds4ccm/impl/logger/Log_Macros.h"
+#include "ciao/Logger/Log_Macros.h"
 #include "dds4ccm/impl/ndds/DataReaderHandler_T.h"
-#include "dds4ccm/impl/ndds/DDSCallbackStatusHandler.h"
 #include "tao/ORB_Core.h"
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 CIAO::DDS4CCM::PublisherListener_T<DDS_TYPE, CCM_TYPE>::PublisherListener_T (
-  ::CCM_DDS::ConnectorStatusListener_ptr error_listener,
-  ACE_Reactor* reactor)
-      : error_listener_ (::CCM_DDS::ConnectorStatusListener::_duplicate (error_listener)),
-        reactor_ (reactor)
+  typename CCM_TYPE::context_type::_ptr_type context,
+  ::CCM_DDS::ConnectorStatusListener_ptr error_listener)
+      : context_ (CCM_TYPE::context_type::_duplicate (context)),
+        error_listener_ (::CCM_DDS::ConnectorStatusListener::_duplicate (error_listener))
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::PublisherListener_T::PublisherListener_T");
+  CIAO_TRACE ("CIAO::DDS4CCM::PublisherListener_T::PublisherListener_T");
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 CIAO::DDS4CCM::PublisherListener_T<DDS_TYPE, CCM_TYPE>::~PublisherListener_T (void)
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::PublisherListener_T::~PublisherListener_T");
+  CIAO_TRACE ("CIAO::DDS4CCM::PublisherListener_T::~PublisherListener_T");
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 void
-CIAO::DDS4CCM::PublisherListener_T<DDS_TYPE, CCM_TYPE>::on_unexpected_status (
-  ::DDS::Entity_ptr entity,
-  ::DDS::StatusKind status_kind)
+CIAO::DDS4CCM::PublisherListener_T<DDS_TYPE, CCM_TYPE>::on_offered_deadline_missed (
+  ::DDS::DataWriter_ptr the_Writer,
+  const ::DDS::OfferedDeadlineMissedStatus & status)
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::PublisherListener_T::on_unexpected_status");
+  CIAO_TRACE ("CIAO::DDS4CCM::PublisherListener_T::on_offered_deadline_missed");
 
-  if (!CORBA::is_nil (this->error_listener_))
+  try
     {
-      try
+      if (!CORBA::is_nil (this->error_listener_))
         {
-          if (this->reactor_)
-            {
-              ::CIAO::DDS4CCM::OnUnexpectedStatusHandler* rh = 0;
-              ACE_NEW (rh,
-                       ::CIAO::DDS4CCM::OnUnexpectedStatusHandler (
-                         this->error_listener_, entity, status_kind));
-              ACE_Event_Handler_var safe_handler (rh);
-              if (this->reactor_->notify (rh) != 0)
-                {
-                  DDS4CCM_ERROR (1, (LM_ERROR, ACE_TEXT ("PublisherListener_T::failed to use reactor.\n")));
-                }
-            }
-          else
-            {
-              this->error_listener_->on_unexpected_status (entity, status_kind);
-            }
+          this->error_listener_->on_offered_deadline_missed (the_Writer, status);
         }
-      catch (...)
+      else
         {
-          DDS4CCM_DEBUG (6, (LM_DEBUG,
-              ACE_TEXT ("PublisherListener_T::on_unexpected_status: ")
-              ACE_TEXT ("DDS Exception caught\n")));
+          CIAO_DEBUG (6, (LM_DEBUG, CLINFO
+                      ACE_TEXT ("PublisherListener_T::on_offered_deadline_missed: ")
+                      ACE_TEXT ("No error listener connected\n")));
         }
     }
-  else
+  catch (...)
     {
-      DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO
-                  ACE_TEXT ("PublisherListener_T::on_offered_deadline_missed: ")
-                  ACE_TEXT ("No error listener connected\n")));
+      CIAO_DEBUG (6, (LM_DEBUG, ACE_TEXT ("PublisherListener_T::on_offered_deadline_missed: ")
+                             ACE_TEXT ("DDS Exception caught\n")));
     }
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 void
-CIAO::DDS4CCM::PublisherListener_T<DDS_TYPE, CCM_TYPE>::on_offered_deadline_missed (
+CIAO::DDS4CCM::PublisherListener_T<DDS_TYPE, CCM_TYPE>::on_offered_incompatible_qos (
   ::DDS::DataWriter_ptr the_Writer,
-  const ::DDS::OfferedDeadlineMissedStatus & status)
+  const ::DDS::OfferedIncompatibleQosStatus & status)
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::PublisherListener_T::on_offered_deadline_missed");
-
-  DDS4CCM_DEBUG (10, (LM_DEBUG, CLINFO
-              ACE_TEXT ("PublisherListener_T::on_offered_deadline_missed: ")
-              ACE_TEXT ("total count <%d> - count change <%d> - ")
-              ACE_TEXT ("last instance handle <length <%d> - isValid <%d>\n"),
-              status.total_count, status.total_count_change,
-              status.last_instance_handle.length,
-              status.last_instance_handle.isValid));
+  CIAO_TRACE ("CIAO::DDS4CCM::PublisherListener_T::on_offered_incompatible_qos");
 
-  if (!CORBA::is_nil (this->error_listener_))
+  try
     {
-      try
+      if (!CORBA::is_nil (this->error_listener_))
         {
-          if (this->reactor_)
-            {
-              ::CIAO::DDS4CCM::OnOfferedDeadlineMissedHandler* rh = 0;
-              ACE_NEW (rh,
-                       ::CIAO::DDS4CCM::OnOfferedDeadlineMissedHandler (
-                         this->error_listener_, the_Writer, status));
-              ACE_Event_Handler_var safe_handler (rh);
-              if (this->reactor_->notify (rh) != 0)
-                {
-                  DDS4CCM_ERROR (1, (LM_ERROR, ACE_TEXT ("PublisherListener_T::failed to use reactor.\n")));
-                }
-            }
-          else
-            {
-              this->error_listener_->on_offered_deadline_missed (the_Writer, status);
-            }
+          this->error_listener_->on_offered_incompatible_qos (the_Writer, status);
         }
-      catch (...)
+      else
         {
-          DDS4CCM_DEBUG (6, (LM_DEBUG, ACE_TEXT ("PublisherListener_T::on_offered_deadline_missed: ")
-                                 ACE_TEXT ("DDS Exception caught\n")));
+          CIAO_DEBUG (6, (LM_DEBUG, CLINFO
+                      ACE_TEXT ("PublisherListener_T::on_offered_incompatible_qos: ")
+                      ACE_TEXT ("No error listener connected\n")));
         }
     }
-  else
+  catch (...)
     {
-      DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO
-                  ACE_TEXT ("PublisherListener_T::on_offered_deadline_missed: ")
-                  ACE_TEXT ("No error listener connected\n")));
+      CIAO_DEBUG (6, (LM_DEBUG, ACE_TEXT ("PublisherListener_T::on_offered_incompatible_qos: ")
+                             ACE_TEXT ("DDS Exception caught\n")));
     }
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 void
-CIAO::DDS4CCM::PublisherListener_T<DDS_TYPE, CCM_TYPE>::on_offered_incompatible_qos (
+CIAO::DDS4CCM::PublisherListener_T<DDS_TYPE, CCM_TYPE>::on_liveliness_lost (
   ::DDS::DataWriter_ptr the_Writer,
-  const ::DDS::OfferedIncompatibleQosStatus & status)
+  const ::DDS::LivelinessLostStatus &)
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::PublisherListener_T::on_offered_incompatible_qos");
+  CIAO_TRACE ("CIAO::DDS4CCM::PublisherListener_T::on_liveliness_lost");
 
-  DDS4CCM_DEBUG (10, (LM_DEBUG, CLINFO
-              ACE_TEXT ("PublisherListener_T::on_offered_incompatible_qos: ")
-              ACE_TEXT ("total count <%d> - total change <%d> - ")
-              ACE_TEXT ("last policy id <%d> - policies "),
-              status.total_count, status.total_count_change,
-              status.last_policy_id));
-  for (CORBA::ULong i = 0; i < status.policies.length (); ++i)
+  try
     {
-      DDS4CCM_DEBUG (10, (LM_DEBUG,
-                  ACE_TEXT ("\t\tid <%d> - count <%d>\n"),
-                  status.policies[i].policy_id,
-                  status.policies[i].count));
-    }
-
-  if (!CORBA::is_nil (this->error_listener_))
-    {
-      try
+      if (!CORBA::is_nil (this->error_listener_))
         {
-          if (this->reactor_)
-            {
-              ::CIAO::DDS4CCM::OnOfferedIncompatibleQoSHandler* rh = 0;
-              ACE_NEW (rh,
-                       ::CIAO::DDS4CCM::OnOfferedIncompatibleQoSHandler (
-                         this->error_listener_, the_Writer, status));
-              ACE_Event_Handler_var safe_handler (rh);
-              if (this->reactor_->notify (rh) != 0)
-                {
-                  DDS4CCM_ERROR (1, (LM_ERROR, ACE_TEXT ("PublisherListener_T::failed to use reactor.\n")));
-                }
-            }
-          else
-            {
-              this->error_listener_->on_offered_incompatible_qos (the_Writer, status);
-            }
+          this->error_listener_->on_unexpected_status (the_Writer, ::DDS::LIVELINESS_LOST_STATUS);
         }
-      catch (...)
+      else
         {
-          DDS4CCM_DEBUG (6, (LM_DEBUG, ACE_TEXT ("PublisherListener_T::on_offered_incompatible_qos: ")
-                                 ACE_TEXT ("DDS Exception caught\n")));
+          CIAO_DEBUG (6, (LM_DEBUG,CLINFO
+                      ACE_TEXT ("PublisherListener_T::on_liveliness_lost: ")
+                      ACE_TEXT ("No error listener connected\n")));
         }
     }
-  else
+  catch (...)
     {
-      DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO
-                  ACE_TEXT ("PublisherListener_T::on_offered_incompatible_qos: ")
-                  ACE_TEXT ("No error listener connected\n")));
+      CIAO_DEBUG (6, (LM_DEBUG, ACE_TEXT ("PublisherListener_T::on_liveliness_lost: ")
+                             ACE_TEXT ("DDS Exception caught\n")));
     }
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 void
-CIAO::DDS4CCM::PublisherListener_T<DDS_TYPE, CCM_TYPE>::on_liveliness_lost (
-  ::DDS::DataWriter_ptr the_Writer,
-  const ::DDS::LivelinessLostStatus & status)
-{
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::PublisherListener_T::on_liveliness_lost");
-
-  DDS4CCM_DEBUG (10, (LM_DEBUG, CLINFO
-            ACE_TEXT ("PublisherListener_T::on_liveliness_lost: ")
-            ACE_TEXT ("total count <%d> - count change <%d>\n"),
-            status.total_count, status.total_count_change));
-
-  this->on_unexpected_status (the_Writer, ::DDS::LIVELINESS_LOST_STATUS);
-}
-
-template <typename DDS_TYPE, typename CCM_TYPE>
-void
 CIAO::DDS4CCM::PublisherListener_T<DDS_TYPE, CCM_TYPE>::on_publication_matched (
   ::DDS::DataWriter_ptr the_Writer,
-  const ::DDS::PublicationMatchedStatus & status)
+  const ::DDS::PublicationMatchedStatus &)
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::PublisherListener_T::on_publication_matched");
-
-  DDS4CCM_DEBUG (10, (LM_DEBUG, CLINFO
-              ACE_TEXT ("PublisherListener_T::on_publication_matched: ")
-              ACE_TEXT ("total count <%d> - count change <%d> - ")
-              ACE_TEXT ("current count <%d> - current count change <%d> ")
-              ACE_TEXT ("last publication handle <length <%d> - isValid <%d>\n"),
-              status.total_count, status.total_count_change,
-              status.current_count, status.current_count_change,
-              status.last_subscription_handle.length,
-              status.last_subscription_handle.isValid));
+  CIAO_TRACE ("CIAO::DDS4CCM::PublisherListener_T::on_publication_matched");
 
-  this->on_unexpected_status (the_Writer, ::DDS::PUBLICATION_MATCHED_STATUS);
+  try
+    {
+      if (!CORBA::is_nil (this->error_listener_))
+        {
+          this->error_listener_->on_unexpected_status (the_Writer, ::DDS::PUBLICATION_MATCHED_STATUS);
+        }
+      else
+        {
+          CIAO_DEBUG (6, (LM_DEBUG, CLINFO
+                      ACE_TEXT ("PublisherListener_T::on_publication_matched: ")
+                      ACE_TEXT ("No error listener connected\n")));
+        }
+    }
+  catch (...)
+    {
+      CIAO_DEBUG (6, (LM_DEBUG, ACE_TEXT ("PublisherListener_T::on_publication_matched: ")
+                             ACE_TEXT ("DDS Exception caught\n")));
+    }
 }
 
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-template <typename DDS_TYPE, typename CCM_TYPE>
-void
-CIAO::DDS4CCM::PublisherListener_T<DDS_TYPE, CCM_TYPE>::on_reliable_reader_activity_changed (
-  ::DDS::DataWriter_ptr the_Writer,
-  const ::DDS::ReliableReaderActivityChangedStatus & status)
-{
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::PublisherListener_T::on_reliable_reader_activity_changed");
-
-  DDS4CCM_DEBUG (10, (LM_DEBUG, CLINFO
-              ACE_TEXT ("PublisherListener_T::on_reliable_reader_activity_changed: ")
-              ACE_TEXT ("active count <%d> - active change <%d> - ")
-              ACE_TEXT ("not active count <%d> - inactive count change <%d>")
-              ACE_TEXT ("last instance handle <length <%d> - isValid <%d>\n"),
-              status.active_count, status.active_count_change,
-              status.not_active_count, status.inactive_count_change,
-              status.last_instance_handle.length,
-              status.last_instance_handle.isValid));
-
-  this->on_unexpected_status (the_Writer, ::DDS::RELIABLE_READER_ACTIVITY_CHANGED_STATUS);
-}
-#endif
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 ::DDS::StatusMask
-CIAO::DDS4CCM::PublisherListener_T<DDS_TYPE, CCM_TYPE>::get_mask (
-  ::CCM_DDS::ConnectorStatusListener_ptr error_listener)
+CIAO::DDS4CCM::PublisherListener_T<DDS_TYPE, CCM_TYPE>::get_mask (void)
 {
-  if (!CORBA::is_nil (error_listener) || CIAO_debug_level >= 10)
-    {
-      return DDS_STATUS_MASK_ALL;
-/*      
-              ::DDS::OFFERED_DEADLINE_MISSED_STATUS |
-             ::DDS::OFFERED_INCOMPATIBLE_QOS_STATUS |
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-             ::DDS::RELIABLE_READER_ACTIVITY_CHANGED_STATUS |
-#endif
-             ::DDS::LIVELINESS_LOST_STATUS |
-             ::DDS::PUBLICATION_MATCHED_STATUS;*/
-    }
-  else
-    {
-      return 0;
-    }
+  return DDS_OFFERED_DEADLINE_MISSED_STATUS |
+         DDS_OFFERED_INCOMPATIBLE_QOS_STATUS |
+         DDS_LIVELINESS_LOST_STATUS |
+         DDS_PUBLICATION_MATCHED_STATUS;
 }
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener_T.h b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener_T.h
index 23c2fe3b747..3760f5754d4 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener_T.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/PublisherListener_T.h
@@ -13,8 +13,6 @@
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "ace/Copy_Disabled.h"
 
-class ACE_Reactor;
-
 namespace CIAO
 {
   namespace DDS4CCM
@@ -27,45 +25,33 @@ namespace CIAO
     public:
       /// Constructor
       PublisherListener_T (
-        ::CCM_DDS::ConnectorStatusListener_ptr error_listener,
-        ACE_Reactor* reactor);
+        typename CCM_TYPE::context_type::_ptr_type context,
+        ::CCM_DDS::ConnectorStatusListener_ptr error_listener);
 
       virtual void on_offered_deadline_missed (
-        ::DDS::DataWriter_ptr the_Writer,
+        ::DDS::DataWriter *the_writer,
         const ::DDS::OfferedDeadlineMissedStatus & status);
 
       virtual void on_liveliness_lost (
-        ::DDS::DataWriter_ptr the_Writer,
+        ::DDS::DataWriter *the_writer,
         const ::DDS::LivelinessLostStatus & status);
 
       virtual void on_offered_incompatible_qos (
-        ::DDS::DataWriter_ptr the_Writer,
+        ::DDS::DataWriter *the_writer,
         const ::DDS::OfferedIncompatibleQosStatus & status);
 
       virtual void on_publication_matched (
-        ::DDS::DataWriter_ptr the_Writer,
+        ::DDS::DataWriter *the_writer,
         const ::DDS::PublicationMatchedStatus & status);
 
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      virtual void on_reliable_reader_activity_changed (
-        ::DDS::DataWriter_ptr the_Writer,
-        const ::DDS::ReliableReaderActivityChangedStatus & status);
-#endif
-
       /// Destructor
       virtual ~PublisherListener_T (void);
 
-      static ::DDS::StatusMask get_mask (
-        ::CCM_DDS::ConnectorStatusListener_ptr error_listener);
+      static ::DDS::StatusMask get_mask (void);
 
     private:
-      virtual void on_unexpected_status (
-        ::DDS::Entity_ptr entity,
-        ::DDS::StatusKind status_kind);
-
+      typename CCM_TYPE::context_type::_var_type context_;
       ::CCM_DDS::ConnectorStatusListener_var error_listener_;
-
-      ACE_Reactor* reactor_;
     };
   }
 }
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/PublisherQos.h b/CIAO/connectors/dds4ccm/impl/ndds/PublisherQos.h
index f948216ebe7..25244282b6b 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/PublisherQos.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/PublisherQos.h
@@ -6,19 +6,14 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_PUBLISHERQOS_H
-#define DDS4CCM_PUBLISHERQOS_H
+#ifndef CIAO_RTI_PUBLISHERQOS_H
+#define CIAO_RTI_PUBLISHERQOS_H
 
 #include "PresentationQosPolicy.h"
 #include "PartitionQosPolicy.h"
 #include "GroupDataQosPolicy.h"
 #include "EntityFactoryQosPolicy.h"
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::PublisherQos DDS_PublisherQos;
-#endif
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::PublisherQos &ddsqos, const ::DDS_PublisherQos & qos)
 {
@@ -54,6 +49,5 @@ operator>>= (const ::DDS::PublisherQos &qos, ::DDS_PublisherQos & ddsqos)
   ddsqos.group_data <<= qos.group_data;
   ddsqos.entity_factory <<= qos.entity_factory;
 }
-#endif
 
-#endif /* DDS4CCM_PUBLISHERQOS_H */
+#endif /* CIAO_RTI_PUBLISHERQOS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/QosPolicyCountSeq.h b/CIAO/connectors/dds4ccm/impl/ndds/QosPolicyCountSeq.h
index 01b6abd175c..a54eb46faf6 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/QosPolicyCountSeq.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/QosPolicyCountSeq.h
@@ -7,57 +7,28 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_QOSPOLICYCOUNTSEQ_H
-#define DDS4CCM_QOSPOLICYCOUNTSEQ_H
+#ifndef CIAO_RTI_QOSPOLICYCOUNTSEQ_H
+#define CIAO_RTI_QOSPOLICYCOUNTSEQ_H
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::QosPolicyCountSeq DDS_QosPolicyCountSeq;
-#endif
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
-operator<<= (::DDS::QosPolicyCountSeq & ddspolicycount, const ::DDS_QosPolicyCountSeq & policycount)
+operator<<= (::DDS::QosPolicyCountSeq &/*ddsstatus*/, const ::DDS_QosPolicyCountSeq & /*status*/)
 {
-  ddspolicycount.length (policycount.length ());
-  for (::DDS_Long i = 0 ; i < policycount.length (); ++i)
-    {
-      ddspolicycount[i].policy_id = policycount[i].policy_id;
-      ddspolicycount[i].count = policycount[i].count;
-    }
+  // todo
 }
 
 inline void
-operator<<= (::DDS_QosPolicyCountSeq & ddspolicycount, const ::DDS::QosPolicyCountSeq & policycount)
+operator<<= (::DDS_QosPolicyCountSeq &/*ddsstatus*/, const ::DDS::QosPolicyCountSeq & /*status*/)
 {
-  ddspolicycount.length (policycount.length ());
-  for (::CORBA::ULong i = 0 ; i < policycount.length (); ++i)
-    {
-      ddspolicycount[i].policy_id = static_cast <DDS_QosPolicyId_t> (policycount[i].policy_id);
-      ddspolicycount[i].count = policycount[i].count;
-    }
 }
 
 inline void
-operator>>= (const ::DDS_QosPolicyCountSeq & policycount, ::DDS::QosPolicyCountSeq & ddspolicycount)
+operator>>= (const ::DDS_QosPolicyCountSeq &/*status*/, ::DDS::QosPolicyCountSeq & /*ddsstatus*/)
 {
-  ddspolicycount.length (policycount.length ());
-  for (::DDS_Long i = 0 ; i < policycount.length (); ++i)
-    {
-      ddspolicycount[i].policy_id = policycount[i].policy_id;
-      ddspolicycount[i].count = policycount[i].count;
-    }
 }
 
 inline void
-operator>>= (const ::DDS::QosPolicyCountSeq & policycount, ::DDS_QosPolicyCountSeq & ddspolicycount)
+operator>>= (const ::DDS::QosPolicyCountSeq &/*status*/, ::DDS_QosPolicyCountSeq & /*ddsstatus*/)
 {
-  ddspolicycount.length (policycount.length ());
-  for (::CORBA::ULong i = 0 ; i < policycount.length (); ++i)
-    {
-      ddspolicycount[i].policy_id = static_cast <DDS_QosPolicyId_t> (policycount[i].policy_id);
-      ddspolicycount[i].count = policycount[i].count;
-    }
 }
-#endif
 
-#endif /* DDS4CCM_QOSPOLICYCOUNTSEQ_H */
+#endif /* CIAO_RTI_QOSPOLICYCOUNTSEQ_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.cpp b/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.cpp
index b6c2fe40e40..c2b5bf8f1b9 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.cpp
@@ -7,121 +7,108 @@
 
 #include "dds4ccm/idl/dds4ccm_BaseC.h"
 
-#include "dds4ccm/impl/logger/Log_Macros.h"
+#include "ciao/Logger/Log_Macros.h"
 
 namespace CIAO
 {
   namespace DDS4CCM
   {
-    CCM_DDS_QueryCondition_i::CCM_DDS_QueryCondition_i ()
-      : impl_ (0)
+    namespace RTI
     {
-    }
-
-    CCM_DDS_QueryCondition_i::~CCM_DDS_QueryCondition_i (void)
-    {
-    }
-
-    ::CORBA::Boolean
-    CCM_DDS_QueryCondition_i::get_trigger_value (void)
-    {
-      return this->impl ()->get_trigger_value ();
-    }
-
-    ::DDS::SampleStateMask
-    CCM_DDS_QueryCondition_i::get_sample_state_mask (void)
-    {
-      return this->impl ()->get_sample_state_mask ();
-    }
+      // Implementation skeleton constructor
+      RTI_QueryCondition_i::RTI_QueryCondition_i ()
+        : impl_ (0)
+      {
+      }
+
+      // Implementation skeleton destructor
+      RTI_QueryCondition_i::~RTI_QueryCondition_i (void)
+      {
+      }
+
+      ::CORBA::Boolean
+      RTI_QueryCondition_i::get_trigger_value (void)
+      {
+        return this->impl ()->get_trigger_value ();
+      }
+
+      ::DDS::SampleStateMask
+      RTI_QueryCondition_i::get_sample_state_mask (void)
+      {
+        return this->impl ()->get_sample_state_mask ();
+      }
+
+      ::DDS::ViewStateMask
+      RTI_QueryCondition_i::get_view_state_mask (void)
+      {
+        return this->impl ()->get_view_state_mask ();
+      }
+
+      ::DDS::InstanceStateMask
+      RTI_QueryCondition_i::get_instance_state_mask (void)
+      {
+        return this->impl ()->get_instance_state_mask ();
+      }
+
+      ::DDS::DataReader_ptr
+      RTI_QueryCondition_i::get_datareader (void)
+      {
+        ::DDSDataReader* reader = this->impl ()->get_datareader ();
+        ::DDS::DataReader_var dds_reader = new RTI_DataReader_i ();
+        RTI_DataReader_i *rti_dr = dynamic_cast < RTI_DataReader_i *>(dds_reader.in ());
+        rti_dr->set_impl (reader);
+
+        return dds_reader._retn ();
+      }
+
+      char *
+      RTI_QueryCondition_i::get_query_expression (void)
+      {
+        return ::CORBA::string_dup (this->impl ()->get_query_expression ());
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_QueryCondition_i::get_query_parameters (
+        ::DDS::StringSeq & query_parameters)
+      {
+        DDS_StringSeq parameters;
+        ::DDS::ReturnCode_t retval = this->impl ()->get_query_parameters (
+                                                           parameters);
+        query_parameters <<= parameters;
+        return retval;
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_QueryCondition_i::set_query_parameters (
+        const ::DDS::StringSeq & query_parameters)
+      {
+        DDS_StringSeq parameters;
+        parameters <<= query_parameters;
+        return this->impl ()->set_query_parameters (parameters);
+      }
+
+      DDSQueryCondition *
+      RTI_QueryCondition_i::get_impl (void)
+      {
+        return this->impl_;
+      }
+
+      void
+      RTI_QueryCondition_i::set_impl (DDSQueryCondition * dw)
+      {
+        this->impl_ = dw;
+      }
+
+      DDSQueryCondition *
+      RTI_QueryCondition_i::impl (void)
+      {
+        if (!this->impl_)
+          {
+            throw ::CORBA::BAD_INV_ORDER ();
+          }
+        return this->impl_;
+      }
 
-    ::DDS::ViewStateMask
-    CCM_DDS_QueryCondition_i::get_view_state_mask (void)
-    {
-      return this->impl ()->get_view_state_mask ();
-    }
-
-    ::DDS::InstanceStateMask
-    CCM_DDS_QueryCondition_i::get_instance_state_mask (void)
-    {
-      return this->impl ()->get_instance_state_mask ();
-    }
-
-    ::DDS::DataReader_ptr
-    CCM_DDS_QueryCondition_i::get_datareader (void)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil ();
-      ACE_NEW_THROW_EX (dds_reader,
-                        CCM_DDS_DataReader_i (),
-                        CORBA::NO_MEMORY ());
-      ::DDSDataReader* reader = this->impl ()->get_datareader ();
-      CCM_DDS_DataReader_i *rti_dr = dynamic_cast < CCM_DDS_DataReader_i *>(dds_reader.in ());
-      rti_dr->set_impl (reader);
-
-      return dds_reader._retn ();
-#else
-      return this->impl ()->get_datareader ();
-#endif
-    }
-
-    char *
-    CCM_DDS_QueryCondition_i::get_query_expression (void)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      return ::CORBA::string_dup (this->impl ()->get_query_expression ());
-#else
-      return this->impl ()->get_query_expression ();
-#endif
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_QueryCondition_i::get_query_parameters (
-      ::DDS::StringSeq & query_parameters)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      DDS_StringSeq parameters;
-      ::DDS::ReturnCode_t retval = this->impl ()->get_query_parameters (
-                                                         parameters);
-      query_parameters <<= parameters;
-      return retval;
-#else
-      return this->impl ()->get_query_parameters (query_parameters);
-#endif
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_QueryCondition_i::set_query_parameters (
-      const ::DDS::StringSeq & query_parameters)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      DDS_StringSeq parameters;
-      parameters <<= query_parameters;
-      return this->impl ()->set_query_parameters (parameters);
-#else
-      return this->impl ()->set_query_parameters (query_parameters);
-#endif
-    }
-
-    DDSQueryCondition *
-    CCM_DDS_QueryCondition_i::get_impl (void)
-    {
-      return this->impl_;
-    }
-
-    void
-    CCM_DDS_QueryCondition_i::set_impl (DDSQueryCondition * dw)
-    {
-      this->impl_ = dw;
-    }
-
-    DDSQueryCondition *
-    CCM_DDS_QueryCondition_i::impl (void)
-    {
-      if (!this->impl_)
-        {
-          throw ::CORBA::BAD_INV_ORDER ();
-        }
-      return this->impl_;
     }
   }
 }
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.h b/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.h
index e7f7bd0dc17..bf602477877 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/QueryCondition.h
@@ -7,8 +7,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_QUERYCONDITION_H
-#define DDS4CCM_QUERYCONDITION_H
+#ifndef CIAO_RTI_QUERYCONDITION_H
+#define CIAO_RTI_QUERYCONDITION_H
 
 #include "tao/LocalObject.h"
 
@@ -17,67 +17,63 @@
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h"
 
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 #include "ndds/ndds_cpp.h"
-#endif
-
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::QueryCondition DDSQueryCondition;
-#endif
-
 #include "tao/LocalObject.h"
 
 namespace CIAO
 {
   namespace DDS4CCM
   {
-    class DDS4CCM_NDDS_IMPL_Export CCM_DDS_QueryCondition_i :
-      public virtual ::DDS::CCM_QueryCondition,
-      public virtual ::CORBA::LocalObject
+    namespace RTI
     {
-    public:
-      /// Constructor
-      CCM_DDS_QueryCondition_i (void);
+      class DDS4CCM_NDDS_IMPL_Export RTI_QueryCondition_i :
+        public virtual ::DDS::CCM_QueryCondition,
+        public virtual ::CORBA::LocalObject
+      {
+      public:
+        // Constructor
+        RTI_QueryCondition_i (void);
 
-      /// Destructor
-      virtual ~CCM_DDS_QueryCondition_i (void);
+        // Destructor
+        virtual ~RTI_QueryCondition_i (void);
 
-      virtual ::CORBA::Boolean
-      get_trigger_value (void);
+        virtual ::CORBA::Boolean
+        get_trigger_value (void);
 
-      virtual ::DDS::SampleStateMask
-      get_sample_state_mask (void);
+        virtual ::DDS::SampleStateMask
+        get_sample_state_mask (void);
 
-      virtual ::DDS::ViewStateMask
-      get_view_state_mask (void);
+        virtual ::DDS::ViewStateMask
+        get_view_state_mask (void);
 
-      virtual ::DDS::InstanceStateMask
-      get_instance_state_mask (void);
+        virtual ::DDS::InstanceStateMask
+        get_instance_state_mask (void);
 
-      virtual ::DDS::DataReader_ptr
-      get_datareader (void);
+        virtual ::DDS::DataReader_ptr
+        get_datareader (void);
 
-      virtual char *
-      get_query_expression (void);
+        virtual char *
+        get_query_expression (void);
 
-      virtual ::DDS::ReturnCode_t
-      get_query_parameters (
-        ::DDS::StringSeq & query_parameters);
+        virtual ::DDS::ReturnCode_t
+        get_query_parameters (
+          ::DDS::StringSeq & query_parameters);
 
-      virtual ::DDS::ReturnCode_t
-      set_query_parameters (
-        const ::DDS::StringSeq & query_parameters);
+        virtual ::DDS::ReturnCode_t
+        set_query_parameters (
+          const ::DDS::StringSeq & query_parameters);
 
-      DDSQueryCondition * get_impl (void);
+        DDSQueryCondition * get_impl (void);
 
-      void set_impl (DDSQueryCondition * qc);
+        void set_impl (DDSQueryCondition * qc);
 
-    private:
-      DDSQueryCondition * impl_;
+      private:
+        DDSQueryCondition * impl_;
 
-      DDSQueryCondition * impl ();
-    };
+        DDSQueryCondition * impl ();
+      };
+    }
   }
 }
 
-#endif /* DDS4CCM_QUERYCONDITION_H */
+#endif /* CIAO_RTI_QUERYCONDITION_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.cpp b/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.cpp
index c34642dab63..5ae5382892a 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.cpp
@@ -7,73 +7,76 @@ namespace CIAO
 {
   namespace DDS4CCM
   {
-    CCM_DDS_ReadCondition_i::CCM_DDS_ReadCondition_i (void)
-      : impl_ (0)
+    namespace RTI
     {
-    }
+      // Implementation skeleton constructor
+      RTI_ReadCondition_i::RTI_ReadCondition_i (void)
+        : impl_ (0)
+      {
+      }
 
-    CCM_DDS_ReadCondition_i::~CCM_DDS_ReadCondition_i (void)
-    {
-    }
+      // Implementation skeleton destructor
+      RTI_ReadCondition_i::~RTI_ReadCondition_i (void)
+      {
+      }
 
-    ::CORBA::Boolean
-    CCM_DDS_ReadCondition_i::get_trigger_value (void)
-    {
-      return this->impl ()->get_trigger_value ();
-    }
+      ::CORBA::Boolean
+      RTI_ReadCondition_i::get_trigger_value (void)
+      {
+        return this->impl ()->get_trigger_value ();
+      }
 
-    ::DDS::SampleStateMask
-    CCM_DDS_ReadCondition_i::get_sample_state_mask (void)
-    {
-      return this->impl ()->get_sample_state_mask ();
-    }
+      ::DDS::SampleStateMask
+      RTI_ReadCondition_i::get_sample_state_mask (void)
+      {
+        return this->impl ()->get_sample_state_mask ();
+      }
 
-    ::DDS::ViewStateMask
-    CCM_DDS_ReadCondition_i::get_view_state_mask (void)
-    {
-      return this->impl ()->get_view_state_mask ();
-    }
+      ::DDS::ViewStateMask
+      RTI_ReadCondition_i::get_view_state_mask (void)
+      {
+        return this->impl ()->get_view_state_mask ();
+      }
 
-    ::DDS::InstanceStateMask
-    CCM_DDS_ReadCondition_i::get_instance_state_mask (void)
-    {
-      return this->impl ()->get_instance_state_mask ();
-    }
+      ::DDS::InstanceStateMask
+      RTI_ReadCondition_i::get_instance_state_mask (void)
+      {
+        return this->impl ()->get_instance_state_mask ();
+      }
 
-    ::DDS::DataReader_ptr
-    CCM_DDS_ReadCondition_i::get_datareader (void)
-    {
-      ::DDS::DataReader_var retval = ::DDS::DataReader::_nil ();
-      ACE_NEW_THROW_EX (retval,
-                        CCM_DDS_DataReader_i (),
-                        CORBA::NO_MEMORY ());
-      DDSDataReader* rd = this->impl ()->get_datareader ();
-      CCM_DDS_DataReader_i *rti_dr = dynamic_cast < CCM_DDS_DataReader_i *>(retval.in ());
-      rti_dr->set_impl (rd);
+      ::DDS::DataReader_ptr
+      RTI_ReadCondition_i::get_datareader (void)
+      {
+        DDSDataReader* rd = this->impl ()->get_datareader ();
+        ::DDS::DataReader_var retval = new RTI_DataReader_i ();
+        RTI_DataReader_i *rti_dr = dynamic_cast < RTI_DataReader_i *>(retval.in ());
+        rti_dr->set_impl (rd);
 
-      return retval._retn ();
-    }
+        return retval._retn ();
+      }
 
-    DDSReadCondition *
-    CCM_DDS_ReadCondition_i::get_impl (void)
-    {
-      return this->impl_;
-    }
+      DDSReadCondition *
+      RTI_ReadCondition_i::get_impl (void)
+      {
+        return this->impl_;
+      }
 
-    void
-    CCM_DDS_ReadCondition_i::set_impl (DDSReadCondition * rc)
-    {
-      this->impl_ = rc;
-    }
+      void
+      RTI_ReadCondition_i::set_impl (DDSReadCondition * rc)
+      {
+        this->impl_ = rc;
+      }
+
+      DDSReadCondition *
+      RTI_ReadCondition_i::impl (void)
+      {
+        if (!this->impl_)
+          {
+            throw ::CORBA::BAD_INV_ORDER ();
+          }
+        return this->impl_;
+      }
 
-    DDSReadCondition *
-    CCM_DDS_ReadCondition_i::impl (void)
-    {
-      if (!this->impl_)
-        {
-          throw ::CORBA::BAD_INV_ORDER ();
-        }
-      return this->impl_;
     }
   }
 }
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.h b/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.h
index 7bf2c6325b2..c2f72f601f8 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/ReadCondition.h
@@ -7,8 +7,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_READCONDITION_H
-#define DDS4CCM_READCONDITION_H
+#ifndef CIAO_RTI_READCONDITION_H
+#define CIAO_RTI_READCONDITION_H
 
 #include "tao/LocalObject.h"
 
@@ -17,56 +17,52 @@
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h"
 
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 #include "ndds/ndds_cpp.h"
-#endif
-
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::ReadCondition DDSReadCondition;
-#endif
-
 #include "tao/LocalObject.h"
 
 namespace CIAO
 {
   namespace DDS4CCM
   {
-    class DDS4CCM_NDDS_IMPL_Export CCM_DDS_ReadCondition_i :
-      public virtual ::DDS::CCM_ReadCondition,
-      public virtual ::CORBA::LocalObject
+    namespace RTI
     {
-    public:
-      /// Constructor
-      CCM_DDS_ReadCondition_i (void);
+      class DDS4CCM_NDDS_IMPL_Export RTI_ReadCondition_i :
+        public virtual ::DDS::CCM_ReadCondition,
+        public virtual ::CORBA::LocalObject
+      {
+      public:
+        // Constructor
+        RTI_ReadCondition_i (void);
 
-      /// Destructor
-      virtual ~CCM_DDS_ReadCondition_i (void);
+        // Destructor
+        virtual ~RTI_ReadCondition_i (void);
 
-      virtual ::CORBA::Boolean
-      get_trigger_value (void);
+        virtual ::CORBA::Boolean
+        get_trigger_value (void);
 
-      virtual ::DDS::SampleStateMask
-      get_sample_state_mask (void);
+        virtual ::DDS::SampleStateMask
+        get_sample_state_mask (void);
 
-      virtual ::DDS::ViewStateMask
-      get_view_state_mask (void);
+        virtual ::DDS::ViewStateMask
+        get_view_state_mask (void);
 
-      virtual ::DDS::InstanceStateMask
-      get_instance_state_mask (void);
+        virtual ::DDS::InstanceStateMask
+        get_instance_state_mask (void);
 
-      virtual ::DDS::DataReader_ptr
-      get_datareader (void);
+        virtual ::DDS::DataReader_ptr
+        get_datareader (void);
 
-      DDSReadCondition * get_impl (void);
+        DDSReadCondition * get_impl (void);
 
-      void set_impl (DDSReadCondition * rc);
+        void set_impl (DDSReadCondition * rc);
 
-    private:
-      DDSReadCondition *impl_;
+      private:
+        DDSReadCondition *impl_;
 
-      DDSReadCondition * impl (void);
-    };
+        DDSReadCondition * impl (void);
+      };
+    }
   }
 }
 
-#endif /* DDS4CCM_READCONDITION_H */
+#endif /* CIAO_RTI_READCONDITION_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/ReaderDataLifecycleQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/ReaderDataLifecycleQosPolicy.h
index b383e26b23c..abc9363bfc3 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/ReaderDataLifecycleQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/ReaderDataLifecycleQosPolicy.h
@@ -6,14 +6,9 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_READERDATALIFECYCLEQOSPOLICY_H
-#define DDS4CCM_READERDATALIFECYCLEQOSPOLICY_H
+#ifndef CIAO_RTI_READERDATALIFECYCLEQOSPOLICY_H
+#define CIAO_RTI_READERDATALIFECYCLEQOSPOLICY_H
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::ReaderDataLifecycleQosPolicy DDS_ReaderDataLifecycleQosPolicy;
-#endif
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::ReaderDataLifecycleQosPolicy &ddsqos, const ::DDS_ReaderDataLifecycleQosPolicy & qos)
 {
@@ -41,6 +36,5 @@ operator>>= (const ::DDS::ReaderDataLifecycleQosPolicy &qos, ::DDS_ReaderDataLif
   ddsqos.autopurge_nowriter_samples_delay <<= qos.autopurge_nowriter_samples_delay;
   ddsqos.autopurge_disposed_samples_delay <<= qos.autopurge_disposed_samples_delay;
 }
-#endif
 
-#endif /* DDS4CCM_READERDATALIFECYCLEQOSPOLICY_H */
+#endif /* CIAO_RTI_READERDATALIFECYCLEQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Reader_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Reader_T.cpp
index b69f25cae52..b18ecbe950e 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Reader_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Reader_T.cpp
@@ -6,8 +6,9 @@
 #include "dds4ccm/impl/ndds/SampleInfo.h"
 #include "dds4ccm/impl/ndds/Subscriber.h"
 #include "dds4ccm/impl/ndds/QueryCondition.h"
-#include "dds4ccm/impl/logger/Log_Macros.h"
+#include "ciao/Logger/Log_Macros.h"
 
+// Implementation skeleton constructor
 template <typename DDS_TYPE, typename CCM_TYPE>
 CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::Reader_T (void)
   : topic_ (0),
@@ -15,18 +16,19 @@ CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::Reader_T (void)
     profile_name_ (""),
     impl_ (0)
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::RTI::Reader_T::Reader_T");
+  CIAO_TRACE ("CIAO::DDS4CCM::RTI::Reader_T::Reader_T");
   #if defined DDS4CCM_USES_QUERY_CONDITION
-    this->qc_ ::= DDS::QueryCondition::_nil ();
+    this->qc_ = DDS::QueryCondition::_nil ();
   #else
-    this->cft_ = ::DDS::ContentFilteredTopic::_nil ();
+    this->cft_ = DDS::ContentFilteredTopic::_nil ();
   #endif
 }
 
+// Implementation skeleton destructor
 template <typename DDS_TYPE, typename CCM_TYPE>
 CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::~Reader_T (void)
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::RTI::Reader_T::~Reader_T");
+  CIAO_TRACE ("CIAO::DDS4CCM::RTI::Reader_T::~Reader_T");
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE>
@@ -43,12 +45,12 @@ CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::impl (void)
     }
 }
 
-// For the requirement : 'samples ordered by instances' the following settings are necessary:
+//for the requirement : 'samples ordered by instances' the following settings are necessary:
 // ordered_access -> true   and     DDS_INSTANCE_PRESENTATION_QOS (default) .
 template <typename DDS_TYPE, typename CCM_TYPE>
 CORBA::ULong
 CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::get_nr_valid_samples (
-  const DDS_SampleInfoSeq& sample_info,
+  const DDS_SampleInfoSeq & sample_info,
   bool determine_last)
 {
   CORBA::ULong nr_of_samples = 0;
@@ -56,7 +58,8 @@ CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::get_nr_valid_samples (
     {
       if (determine_last)
         {
-          if (sample_info[i].sample_rank == 0 && sample_info[i].valid_data)
+          if (sample_info[i].sample_rank == 0 &&
+              sample_info[i].valid_data)
             {
               ++nr_of_samples;
             }
@@ -86,7 +89,7 @@ CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::read_without_instance (
   if (retval != DDS_RETCODE_OK && retval != DDS_RETCODE_NO_DATA)
     {
       this->impl ()->return_loan(data, sample_info);
-      DDS4CCM_ERROR (1, (LM_ERROR, ACE_TEXT ("CIAO::DDS4CCM::RTI::Reader_T::read_without_instance - ")
+      CIAO_ERROR (1, (LM_ERROR, ACE_TEXT ("CIAO::DDS4CCM::RTI::Reader_T::read_without_instance - ")
                             ACE_TEXT ("retval is %C\n"), translate_retcode(retval)));
       throw ::CCM_DDS::InternalError (retval, 0);
     }
@@ -99,28 +102,26 @@ CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::read_last (
   typename CCM_TYPE::seq_type::_out_type instances,
   ::CCM_DDS::ReadInfoSeq_out infos)
 {
-  // This function has to return the last sample of all instances
+  //this function has to return the last sample of all instances
   DDS_SampleInfoSeq sample_info;
   typename DDS_TYPE::dds_seq_type data;
 
-  this->read_without_instance (data, sample_info);
+  read_without_instance (data, sample_info);
 
-  typename CCM_TYPE::seq_type::_var_type inst_seq = new typename CCM_TYPE::seq_type;
+  typename CCM_TYPE::seq_type::_var_type  inst_seq = new typename CCM_TYPE::seq_type;
   ::CCM_DDS::ReadInfoSeq_var infoseq = new ::CCM_DDS::ReadInfoSeq;
 
-  CORBA::ULong const nr_of_last_samples = this->get_nr_valid_samples (sample_info, true);
+  CORBA::ULong const nr_of_last_samples = get_nr_valid_samples (sample_info, true);
 
-  DDS4CCM_DEBUG (6, (LM_DEBUG, ACE_TEXT ("CIAO::DDS4CCM::RTI::Reader_T::read_last - ")
-                            ACE_TEXT ("total number of samples <%u> - ")
-                            ACE_TEXT ("last number of samples <%u>\n"),
+  CIAO_DEBUG (6, (LM_DEBUG, ACE_TEXT ("CIAO::DDS4CCM::RTI::Reader_T::read_last - ")
+                          ACE_TEXT ("total number of samples <%u> - ")
+                          ACE_TEXT ("last number of samples <%u>\n"),
                             data.length(),
                             nr_of_last_samples));
   CORBA::ULong ix = 0;
-
   infoseq->length (nr_of_last_samples);
   inst_seq->length (nr_of_last_samples);
-
-  // We need only the last sample of each instance
+  // we need only the last sample of each instance
   for (::DDS_Long i = 0 ; i < sample_info.length(); ++i)
     {
       if((sample_info[i].sample_rank == 0) && (sample_info[i].valid_data))
@@ -130,8 +131,7 @@ CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::read_last (
           ++ix;
         }
     }
-
-  // Return the loan
+  //return the loan
   this->impl ()->return_loan(data,sample_info);
   infos = infoseq._retn ();
   instances = inst_seq._retn();
@@ -143,16 +143,16 @@ CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::read_all (
           typename CCM_TYPE::seq_type::_out_type instances,
           ::CCM_DDS::ReadInfoSeq_out infos)
 {
-  // This function has to return all samples of all instances
+  //this function has to return all samples of all instances
   DDS_SampleInfoSeq sample_info;
   typename DDS_TYPE::dds_seq_type data;
 
   this->read_without_instance (data, sample_info);
 
-  CORBA::ULong const nr_of_valid_samples = this->get_nr_valid_samples (sample_info);
-  DDS4CCM_DEBUG (6, (LM_DEBUG, ACE_TEXT ("CIAO::DDS4CCM::RTI::Reader_T::read_all - ")
-                            ACE_TEXT ("total number of samples <%u> - ")
-                            ACE_TEXT ("valid number of samples <%u>\n"),
+  CORBA::ULong const nr_of_valid_samples = get_nr_valid_samples (sample_info);
+  CIAO_DEBUG (6, (LM_DEBUG, ACE_TEXT ("CIAO::DDS4CCM::RTI::Reader_T::read_all - ")
+                          ACE_TEXT ("total number of samples <%u> - ")
+                          ACE_TEXT ("valid number of samples <%u>\n"),
                             data.length (),
                             nr_of_valid_samples));
 
@@ -173,8 +173,7 @@ CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::read_all (
             ++ix;
           }
     }
-
-  // Return the loan
+  //return the loan
   this->impl ()->return_loan(data,sample_info);
 
   infos = infoseq._retn ();
@@ -184,13 +183,13 @@ CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::read_all (
 template <typename DDS_TYPE, typename CCM_TYPE>
 DDS_InstanceHandle_t
 CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::check_handle (
-  const typename DDS_TYPE::value_type& an_instance,
-  const ::DDS::InstanceHandle_t & instance_handle)
+          const typename DDS_TYPE::value_type& an_instance,
+          const ::DDS::InstanceHandle_t & instance_handle)
 {
   DDS_InstanceHandle_t hnd = ::DDS_HANDLE_NIL;
   hnd <<= instance_handle;
 
-  DDS_InstanceHandle_t const lookup_hnd =
+  DDS_InstanceHandle_t lookup_hnd =
       this->impl ()->lookup_instance (an_instance);
   if (!DDS_InstanceHandle_equals (&hnd, &::DDS_HANDLE_NIL) &&
       !DDS_InstanceHandle_equals (&hnd, &lookup_hnd))
@@ -211,8 +210,8 @@ CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::read_with_instance (
   const ::DDS_InstanceHandle_t & lookup_hnd,
   DDS_SampleInfoSeq & sample_info)
 {
-  DDS4CCM_DEBUG (6, (LM_INFO, ACE_TEXT ("CIAO::DDS4CCM::RTI::Reader_T::read_with_instance - ")
-                           ACE_TEXT ("Reading with instance.\n")));
+  CIAO_DEBUG (6, (LM_INFO, ACE_TEXT ("CIAO::DDS4CCM::RTI::Reader_T::read_with_instance - ")
+                        ACE_TEXT ("Reading with instance.\n")));
   DDS_ReturnCode_t const retval = this->impl ()->read_instance (
                                       data,
                                       sample_info,
@@ -224,7 +223,7 @@ CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::read_with_instance (
   if (retval != DDS_RETCODE_OK && retval != DDS_RETCODE_NO_DATA)
     {
       this->impl ()->return_loan(data, sample_info);
-      DDS4CCM_ERROR (1, (LM_ERROR, ACE_TEXT ("CIAO::DDS4CCM::RTI::Reader_T::read_with_instance - ")
+      CIAO_ERROR (1, (LM_ERROR, ACE_TEXT ("CIAO::DDS4CCM::RTI::Reader_T::read_with_instance - ")
                             ACE_TEXT ("retval is %C\n"), translate_retcode(retval)));
       throw ::CCM_DDS::InternalError (retval, 0);
     }
@@ -233,27 +232,24 @@ CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::read_with_instance (
 template <typename DDS_TYPE, typename CCM_TYPE>
 void
 CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::read_one_last (
-  typename DDS_TYPE::value_type& an_instance,
-  ::CCM_DDS::ReadInfo_out info,
-  const ::DDS::InstanceHandle_t & instance_handle)
+          typename DDS_TYPE::value_type& an_instance,
+          ::CCM_DDS::ReadInfo_out info,
+          const ::DDS::InstanceHandle_t & instance_handle)
 {
-  DDS_InstanceHandle_t const lookup_hnd = this->check_handle (an_instance, instance_handle);
+  DDS_InstanceHandle_t lookup_hnd = check_handle (an_instance, instance_handle);
 
   DDS_SampleInfoSeq sample_info;
   typename DDS_TYPE::dds_seq_type data;
-
-  // For now, only read with instance...
+  //for now, only read with instance...
   this->read_with_instance (data, lookup_hnd, sample_info);
 
   ::DDS_Long sample = data.length();
-  DDS4CCM_DEBUG (6, (LM_INFO,
+  CIAO_DEBUG (6, (LM_INFO,
               ACE_TEXT ("CIAO::DDS4CCM::RTI::Reader_T::read_one_last - ")
               ACE_TEXT ("total number of samples <%u>\n"),
               sample));
   while (sample >= 0 && !sample_info[sample-1].valid_data)
-    {
-      --sample;
-    }
+    --sample;
   if (sample >= 0)
     {
       if(sample_info[sample-1].valid_data)
@@ -274,8 +270,7 @@ CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::read_one_all (
   ::CCM_DDS::ReadInfoSeq_out infos,
   const ::DDS::InstanceHandle_t & instance_handle)
 {
-  DDS_InstanceHandle_t const lookup_hnd =
-    this->check_handle (an_instance, instance_handle);
+  DDS_InstanceHandle_t const lookup_hnd = check_handle (an_instance, instance_handle);
 
   DDS_SampleInfoSeq sample_info;
   typename DDS_TYPE::dds_seq_type data;
@@ -283,15 +278,15 @@ CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::read_one_all (
   this->read_with_instance (data, lookup_hnd, sample_info);
 
   // Count the number of valid samples
-  CORBA::ULong const nr_of_valid_samples = this->get_nr_valid_samples (sample_info);
-  DDS4CCM_DEBUG (6, (LM_DEBUG, ACE_TEXT ("CIAO::DDS4CCM::RTI::Reader_T::read_all - ")
-                            ACE_TEXT ("total number of samples <%u> - ")
-                            ACE_TEXT ("valid number of samples <%u>\n"),
+  CORBA::ULong nr_of_valid_samples = this->get_nr_valid_samples (sample_info);
+  CIAO_DEBUG (6, (LM_DEBUG, ACE_TEXT ("CIAO::DDS4CCM::RTI::Reader_T::read_all - ")
+                          ACE_TEXT ("total number of samples <%u> - ")
+                          ACE_TEXT ("valid number of samples <%u>\n"),
                             data.length (),
                             nr_of_valid_samples));
 
-  typename CCM_TYPE::seq_type::_var_type inst_seq = new typename CCM_TYPE::seq_type (nr_of_valid_samples);
-  ::CCM_DDS::ReadInfoSeq_var infoseq = new ::CCM_DDS::ReadInfoSeq (nr_of_valid_samples);
+  typename CCM_TYPE::seq_type::_var_type inst_seq = new typename CCM_TYPE::seq_type;
+  ::CCM_DDS::ReadInfoSeq_var infoseq = new ::CCM_DDS::ReadInfoSeq;
 
   infoseq->length (nr_of_valid_samples);
   inst_seq->length (nr_of_valid_samples);
@@ -320,44 +315,40 @@ void
 CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::create_filter (
   const ::CCM_DDS::QueryFilter & filter)
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::RTI::Reader_T::create_filter");
+  CIAO_TRACE ("CIAO::DDS4CCM::RTI::Reader_T::create_filter");
   ::DDS::Subscriber_var sub = this->reader_->get_subscriber ();
   if (CORBA::is_nil (sub))
     {
-      DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Reader_T::create_filter - "
+      CIAO_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Reader_T::create_filter - "
                     "Error: Unable to get Subscriber.\n"));
       throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0);
     }
   ::DDS::DomainParticipant_var dp = sub->get_participant ();
   if (CORBA::is_nil (dp))
     {
-      DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Reader_T::create_filter - "
+      CIAO_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Reader_T::create_filter - "
                     "Error: Unable to get Participant.\n"));
       throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 1);
     }
 
-  this->cft_ = dp->create_contentfilteredtopic (
+  this->cft_ =
+    dp->create_contentfilteredtopic (
                         "DDS4CCMContentFilteredTopic",
                         this->topic_.in (),
                         filter.query,
                         filter.query_parameters);
   if (CORBA::is_nil (this->cft_))
     {
-      DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Reader_T::create_filter - "
+      CIAO_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Reader_T::create_filter - "
                     "Error: Unable to create ContentFilteredTopic.\n"));
       throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 1);
     }
   ::DDS::DataReaderListener_var listener = this->reader_->get_listener ();
-  CCM_DDS::PortStatusListener_ptr psl = CCM_DDS::PortStatusListener::_nil ();
-  if (!CORBA::is_nil (listener))
-    {
-      psl = dynamic_cast <CCM_DDS::PortStatusListener_ptr> (listener.in ());
-      this->reader_->set_listener (::DDS::DataReaderListener::_nil (), 0);
-    }
-  ::DDS::ReturnCode_t const retval = sub->delete_datareader (this->reader_);
+  this->reader_->set_listener (::DDS::DataReaderListener::_nil (), 0);
+  ::DDS::ReturnCode_t retval = sub->delete_datareader (this->reader_);
   if (retval != ::DDS::RETCODE_OK)
     {
-      DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Reader_T::create_filter - "
+      CIAO_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Reader_T::create_filter - "
                     "Error: Unable to delete DataReader.\n"));
     }
   this->reader_ = ::DDS::CCM_DataReader::_nil ();
@@ -371,8 +362,7 @@ CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::create_filter (
                         this->library_name_.c_str (),
                         this->profile_name_.c_str (),
                         listener,
-                        ::CIAO::DDS4CCM::PortStatusListener_T<DDS_TYPE, CCM_TYPE>::get_mask (
-                          psl));
+                        ::CIAO::DDS4CCM::RTI::PortStatusListener_T<DDS_TYPE, CCM_TYPE>::get_mask ());
     }
   else
     {
@@ -381,12 +371,11 @@ CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::create_filter (
                         this->cft_,
                         drqos,
                         listener,
-                        ::CIAO::DDS4CCM::PortStatusListener_T<DDS_TYPE, CCM_TYPE>::get_mask (
-                          psl));
+                        ::CIAO::DDS4CCM::RTI::PortStatusListener_T<DDS_TYPE, CCM_TYPE>::get_mask ());
     }
   if (CORBA::is_nil(reader))
     {
-      DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Reader_T::create_filter - "
+      CIAO_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Reader_T::create_filter - "
                     "Error: Unable to create a new DataReader.\n"));
     }
   this->reader_ = ::DDS::CCM_DataReader::_narrow (reader);
@@ -400,7 +389,7 @@ template <typename DDS_TYPE, typename CCM_TYPE>
   #if defined DDS4CCM_USES_QUERY_CONDITION
     if (CORBA::is_nil (this->qc_))
       {
-        DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Reader_T::filter - "
+        CIAO_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Reader_T::filter - "
                       "Error: No QueryCondition set yet. First set a filter.\n"));
         throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0);
       }
@@ -411,17 +400,17 @@ template <typename DDS_TYPE, typename CCM_TYPE>
   #else
     if (CORBA::is_nil (this->cft_))
       {
-        DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Reader_T::filter - "
+        CIAO_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Reader_T::filter - "
                       "Error: No ContentFilter set yet. First set a filter.\n"));
         throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0);
       }
     ::CCM_DDS::QueryFilter * filter = new ::CCM_DDS::QueryFilter();
     filter->query = this->cft_->get_filter_expression ();
-    ::DDS::ReturnCode_t const retval = this->cft_->get_expression_parameters (
+    ::DDS::ReturnCode_t retval = this->cft_->get_expression_parameters (
                                           filter->query_parameters);
     if (retval != DDS::RETCODE_OK)
       {
-        DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Reader_T::filter - "
+        CIAO_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Reader_T::filter - "
                                   "Error getting expression_parameters. "
                                   "Retval is %C\n",
                                   translate_retcode(retval)));
@@ -436,7 +425,7 @@ void
 CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::filter (
   const ::CCM_DDS::QueryFilter & filter)
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::RTI::Reader_T::filter");
+  CIAO_TRACE ("CIAO::DDS4CCM::RTI::Reader_T::filter");
   #if defined DDS4CCM_USES_QUERY_CONDITION
     if (CORBA::is_nil (this->qc_))
       {
@@ -448,7 +437,7 @@ CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::filter (
                                 filter.query_parameters);
         if (CORBA::is_nil (this->qc_))
           {
-            DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Reader_T::filter - "
+            CIAO_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Reader_T::filter - "
                                       "Error creating query condition."));
             throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 1);
           }
@@ -459,7 +448,7 @@ CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::filter (
                                 filter.query_parameters);
       if (retval != ::DDS::RETCODE_OK)
         {
-          DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Reader_T::filter - "
+          CIAO_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Reader_T::filter - "
                                     "Error setting expression_parameters. "
                                     "Retval is %C\n",
                                     translate_retcode(retval)));
@@ -469,7 +458,7 @@ CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::filter (
   #else
     if (CORBA::is_nil (this->cft_))
       {
-        this->create_filter (filter);
+        create_filter (filter);
       }
     else
       {
@@ -477,7 +466,7 @@ CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::filter (
           filter.query_parameters);
         if (retval != ::DDS::RETCODE_OK)
           {
-            DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Reader_T::filter - "
+            CIAO_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Reader_T::filter - "
                                       "Error setting expression_parameters. "
                                       "Retval is %C\n",
                                       translate_retcode(retval)));
@@ -504,7 +493,7 @@ void
 CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::set_impl (
   ::DDS::DataReader_ptr reader)
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::RTI::Reader_T::set_impl");
+  CIAO_TRACE ("CIAO::DDS4CCM::RTI::Reader_T::set_impl");
 
   if (::CORBA::is_nil (reader))
     {
@@ -513,11 +502,11 @@ CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::set_impl (
   else
     {
       this->reader_ = reader;
-      CCM_DDS_DataReader_i *rdr = dynamic_cast <CCM_DDS_DataReader_i *> (reader);
+      RTI_DataReader_i *rdr = dynamic_cast <RTI_DataReader_i *> (reader);
 
       if (!rdr)
         {
-          DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Reader_T::data_reader - "
+          CIAO_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Reader_T::data_reader - "
                        "Unable to cast provided DataReader to servant\n"));
           throw ::CORBA::INTERNAL ();
         }
@@ -526,7 +515,7 @@ CIAO::DDS4CCM::RTI::Reader_T<DDS_TYPE, CCM_TYPE>::set_impl (
 
       if (!this->impl ())
         {
-          DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Reader_T::data_reader - "
+          CIAO_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Reader_T::data_reader - "
                        "Unable to narrow the provided reader entity to the specific "
                        "type necessary to publish messages\n"));
           throw ::CORBA::INTERNAL ();
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Reader_T.h b/CIAO/connectors/dds4ccm/impl/ndds/Reader_T.h
index de473f0e4c7..f80d8bad896 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Reader_T.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Reader_T.h
@@ -12,11 +12,6 @@
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "ace/Copy_Disabled.h"
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::InstanceHandle_t DDS_InstanceHandle_t;
-typedef ::DDS::SampleInfoSeq DDS_SampleInfoSeq;
-#endif
-
 namespace CIAO
 {
   namespace DDS4CCM
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/ReliabilityQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/ReliabilityQosPolicy.h
index 031474a4484..1a114e4c3a4 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/ReliabilityQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/ReliabilityQosPolicy.h
@@ -6,16 +6,11 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_RELIABILITYSQOSPOLICY_H
-#define DDS4CCM_RELIABILITYSQOSPOLICY_H
+#ifndef CIAO_RTI_RELIABILITYSQOSPOLICY_H
+#define CIAO_RTI_RELIABILITYSQOSPOLICY_H
 
 #include "Duration_t.h"
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::ReliabilityQosPolicy DDS_ReliabilityQosPolicy;
-#endif
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::ReliabilityQosPolicy &ddsqos, const ::DDS_ReliabilityQosPolicy & qos)
 {
@@ -43,6 +38,5 @@ operator>>= (const ::DDS::ReliabilityQosPolicy &qos, ::DDS_ReliabilityQosPolicy
   ddsqos.kind = static_cast < ::DDS_ReliabilityQosPolicyKind> (qos.kind);
   ddsqos.max_blocking_time <<= qos.max_blocking_time;
 }
-#endif
 
-#endif /* DDS4CCM_RELIABILITYSQOSPOLICY_H */
+#endif /* CIAO_RTI_RELIABILITYSQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/RequestedDeadlineMissedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/RequestedDeadlineMissedStatus.h
index fe0fa067115..9d9f203c649 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/RequestedDeadlineMissedStatus.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/RequestedDeadlineMissedStatus.h
@@ -7,16 +7,11 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_REQUESTEDDEADLINEMISSEDSTATUS_H
-#define DDS4CCM_REQUESTEDDEADLINEMISSEDSTATUS_H
+#ifndef CIAO_RTI_REQUESTEDDEADLINEMISSEDSTATUS_H
+#define CIAO_RTI_REQUESTEDDEADLINEMISSEDSTATUS_H
 
 #include "InstanceHandle_t.h"
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::RequestedDeadlineMissedStatus DDS_RequestedDeadlineMissedStatus;
-#endif
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::RequestedDeadlineMissedStatus &ddsstatus, const ::DDS_RequestedDeadlineMissedStatus & status)
 {
@@ -48,6 +43,5 @@ operator>>= (const ::DDS::RequestedDeadlineMissedStatus &status, ::DDS_Requested
   ddsstatus.total_count_change = status.total_count_change;
   ddsstatus.last_instance_handle <<= status.last_instance_handle;
 }
-#endif
 
-#endif /* DDS4CCM_REQUESTEDDEADLINEMISSEDSTATUS_H */
+#endif /* CIAO_RTI_REQUESTEDDEADLINEMISSEDSTATUS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/RequestedIncompatibleQosStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/RequestedIncompatibleQosStatus.h
index 2300236f884..b657de7c1fc 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/RequestedIncompatibleQosStatus.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/RequestedIncompatibleQosStatus.h
@@ -7,16 +7,11 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_REQUESTEDINCOMPATIBLEQOSSTATUS_H
-#define DDS4CCM_REQUESTEDINCOMPATIBLEQOSSTATUS_H
+#ifndef CIAO_RTI_REQUESTEDINCOMPATIBLEQOSSTATUS_H
+#define CIAO_RTI_REQUESTEDINCOMPATIBLEQOSSTATUS_H
 
 #include "QosPolicyCountSeq.h"
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::RequestedIncompatibleQosStatus DDS_RequestedIncompatibleQosStatus;
-#endif
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::RequestedIncompatibleQosStatus &ddsstatus, const ::DDS_RequestedIncompatibleQosStatus & status)
 {
@@ -52,6 +47,5 @@ operator>>= (const ::DDS::RequestedIncompatibleQosStatus &status, ::DDS_Requeste
   ddsstatus.last_policy_id = static_cast <DDS_QosPolicyId_t>(status.last_policy_id);
   ddsstatus.policies <<= status.policies;
 }
-#endif
 
-#endif /* DDS4CCM_REQUESTEDINCOMPATIBLEQOSSTATUS_H */
+#endif /* CIAO_RTI_REQUESTEDINCOMPATIBLEQOSSTATUS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/ResourceLimitsQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/ResourceLimitsQosPolicy.h
index 439c4c0047b..1f41063358a 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/ResourceLimitsQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/ResourceLimitsQosPolicy.h
@@ -6,14 +6,9 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_RESOURCELIMITSQOSPOLICY_H
-#define DDS4CCM_RESOURCELIMITSQOSPOLICY_H
+#ifndef CIAO_RTI_RESOURCELIMITSQOSPOLICY_H
+#define CIAO_RTI_RESOURCELIMITSQOSPOLICY_H
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::ResourceLimitsQosPolicy DDS_ResourceLimitsQosPolicy;
-#endif
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::ResourceLimitsQosPolicy &ddsqos, const ::DDS_ResourceLimitsQosPolicy & qos)
 {
@@ -45,6 +40,5 @@ operator>>= (const ::DDS::ResourceLimitsQosPolicy &qos, ::DDS_ResourceLimitsQosP
   ddsqos.max_instances = qos.max_instances;
   ddsqos.max_samples_per_instance = qos.max_samples_per_instance;
 }
-#endif
 
-#endif /* DDS4CCM_RESOURCELIMITSQOSPOLICY_H */
+#endif /* CIAO_RTI_RESOURCELIMITSQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/SampleInfo.h b/CIAO/connectors/dds4ccm/impl/ndds/SampleInfo.h
index 8d3d816576d..16f664924c8 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/SampleInfo.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/SampleInfo.h
@@ -13,19 +13,14 @@
 #include "Time_t.h"
 #include "InstanceHandle_t.h"
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::SampleStateKind DDS_SampleStateKind;
-typedef ::DDS::SampleInfo DDS_SampleInfo;
-#endif
-
 inline void
 operator<<= (::CCM_DDS::AccessStatus & access_status, const ::DDS_SampleStateKind & sample_state)
 {
-  if (sample_state == ::DDS::NOT_READ_SAMPLE_STATE)
+  if (sample_state == DDS_NOT_READ_SAMPLE_STATE)
     {
       access_status = ::CCM_DDS::FRESH_INFO;
     }
-  else if (sample_state == ::DDS::READ_SAMPLE_STATE)
+  else if (sample_state == DDS_READ_SAMPLE_STATE)
     {
       access_status = ::CCM_DDS::ALREADY_SEEN;
     }
@@ -34,32 +29,24 @@ operator<<= (::CCM_DDS::AccessStatus & access_status, const ::DDS_SampleStateKin
 inline void
 operator<<= (::CCM_DDS::ReadInfo& ccm_dds_readinfo, const ::DDS_SampleInfo& sample_info)
 {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
   ccm_dds_readinfo.source_timestamp <<= sample_info.source_timestamp;
-#else
-  ccm_dds_readinfo.source_timestamp = sample_info.source_timestamp;
-#endif  
   ccm_dds_readinfo.access_status <<= sample_info.sample_state;
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
   ccm_dds_readinfo.instance_handle <<= sample_info.instance_handle;
-#else
-  ccm_dds_readinfo.instance_handle = sample_info.instance_handle;
-#endif
 
-  if (sample_info.instance_state == ::DDS::ALIVE_INSTANCE_STATE &&
-      sample_info.view_state == ::DDS::NEW_VIEW_STATE)
+  if (sample_info.instance_state == DDS_ALIVE_INSTANCE_STATE && 
+      sample_info.view_state == DDS_NEW_VIEW_STATE)
     {
       // Instance_status new
       ccm_dds_readinfo.instance_status = ::CCM_DDS::INSTANCE_CREATED;
     }
-  else if (sample_info.instance_state == ::DDS::NOT_ALIVE_DISPOSED_INSTANCE_STATE)
+  else if (sample_info.instance_state == DDS_NOT_ALIVE_DISPOSED_INSTANCE_STATE)
     {
       // Instance_status deleted
       ccm_dds_readinfo.instance_status = ::CCM_DDS::INSTANCE_DELETED;
     }
-  else if ((sample_info.instance_state == ::DDS::ALIVE_INSTANCE_STATE &&
-            sample_info.view_state == ::DDS::NOT_NEW_VIEW_STATE) ||
-            sample_info.instance_state == ::DDS::NOT_ALIVE_NO_WRITERS_INSTANCE_STATE)
+  else if ((sample_info.instance_state == DDS_ALIVE_INSTANCE_STATE &&
+            sample_info.view_state == DDS_NOT_NEW_VIEW_STATE) ||
+            sample_info.instance_state == DDS_NOT_ALIVE_NO_WRITERS_INSTANCE_STATE)
     {
       // Instance_status updated
       ccm_dds_readinfo.instance_status = ::CCM_DDS::INSTANCE_UPDATED;
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/SampleLostStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/SampleLostStatus.h
index 920f4051bd4..4e51ef3e61a 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/SampleLostStatus.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/SampleLostStatus.h
@@ -7,14 +7,9 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_SAMPLELOSTSTATUS_H
-#define DDS4CCM_SAMPLELOSTSTATUS_H
+#ifndef CIAO_RTI_SAMPLELOSTSTATUS_H
+#define CIAO_RTI_SAMPLELOSTSTATUS_H
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::SampleLostStatus DDS_SampleLostStatus;
-#endif
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::SampleLostStatus &ddsstatus, const ::DDS_SampleLostStatus & status)
 {
@@ -28,7 +23,6 @@ operator>>= (const ::DDS_SampleLostStatus &status, ::DDS::SampleLostStatus & dds
   ddsstatus.total_count = status.total_count;
   ddsstatus.total_count_change = status.total_count_change;
 }
-#endif
 
-#endif /* DDS4CCM_SAMPLELOSTSTATUS_H */
+#endif /* CIAO_RTI_SAMPLELOSTSTATUS_H */
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/SampleRejectedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/SampleRejectedStatus.h
index 032aca41a8c..09bee568910 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/SampleRejectedStatus.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/SampleRejectedStatus.h
@@ -6,17 +6,12 @@
  *
  * Wrapper facade for NDDS.
  */
-
-#ifndef DDS4CCM_SAMPLEREJECTEDSTATUS_H
-#define DDS4CCM_SAMPLEREJECTEDSTATUS_H
+ 
+#ifndef CIAO_RTI_SAMPLEREJECTEDSTATUS_H
+#define CIAO_RTI_SAMPLEREJECTEDSTATUS_H
 
 #include "InstanceHandle_t.h"
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::SampleRejectedStatus DDS_SampleRejectedStatus;
-#endif
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::SampleRejectedStatus &ddsstatus, const ::DDS_SampleRejectedStatus & status)
 {
@@ -50,8 +45,7 @@ operator>>= (const ::DDS::SampleRejectedStatus &status, ::DDS_SampleRejectedStat
   ddsstatus.total_count = status.total_count;
   ddsstatus.total_count_change = status.total_count_change;
   ddsstatus.last_reason = static_cast < ::DDS_SampleRejectedStatusKind> (status.last_reason);
-  ddsstatus.last_instance_handle <<= status.last_instance_handle;
+  ddsstatus.last_instance_handle <<= status.last_instance_handle; 
 }
-#endif
 
-#endif /* DDS4CCM_SAMPLEREJECTEDSTATUS_H */
+#endif /* CIAO_RTI_SAMPLEREJECTEDSTATUS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/StateListenerControl_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/StateListenerControl_T.cpp
index 197e999eae8..1a6c0c536b0 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/StateListenerControl_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/StateListenerControl_T.cpp
@@ -5,20 +5,20 @@ template <typename BASE_TYPE>
 CCM_DDS_StateListenerControl_T<BASE_TYPE>::CCM_DDS_StateListenerControl_T (void)
     : is_filter_interpreted_ (false)
 {
-  DDS4CCM_TRACE ("CCM_DDS_StateListenerControl_T::CCM_DDS_StateListenerControl_T");
+  CIAO_TRACE ("CCM_DDS_StateListenerControl_T::CCM_DDS_StateListenerControl_T");
 }
 
 template <typename BASE_TYPE>
 CCM_DDS_StateListenerControl_T<BASE_TYPE>::~CCM_DDS_StateListenerControl_T (void)
 {
-  DDS4CCM_TRACE ("CCM_DDS_StateListenerControl_T::~CCM_DDS_StateListenerControl_T");
+  CIAO_TRACE ("CCM_DDS_StateListenerControl_T::~CCM_DDS_StateListenerControl_T");
 }
 
 template <typename BASE_TYPE>
 ::CORBA::Boolean
 CCM_DDS_StateListenerControl_T<BASE_TYPE>::is_filter_interpreted (void)
 {
-  DDS4CCM_TRACE ("CCM_DDS_StateListenerControl_T::is_filter_interpreted");
+  CIAO_TRACE ("CCM_DDS_StateListenerControl_T::is_filter_interpreted");
 
   return this->is_filter_interpreted_.value ();
 }
@@ -28,7 +28,7 @@ void
 CCM_DDS_StateListenerControl_T<BASE_TYPE>::is_filter_interpreted (
   ::CORBA::Boolean is_filter_interpreted)
 {
-  DDS4CCM_TRACE ("CCM_DDS_StateListenerControl_T::is_filter_interpreted");
+  CIAO_TRACE ("CCM_DDS_StateListenerControl_T::is_filter_interpreted");
 
   this->is_filter_interpreted_ = is_filter_interpreted;
 }
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.cpp b/CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.cpp
index 37baef77d72..6fd74b9bf82 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.cpp
@@ -5,67 +5,72 @@
 
 #include "dds4ccm/idl/dds4ccm_BaseC.h"
 
-#include "dds4ccm/impl/logger/Log_Macros.h"
+#include "ciao/Logger/Log_Macros.h"
 
 namespace CIAO
 {
   namespace DDS4CCM
   {
-    CCM_DDS_StatusCondition_i::CCM_DDS_StatusCondition_i (
-      DDSStatusCondition * sc) :
-      impl_ (sc)
+    namespace RTI
     {
-    }
+      // Implementation skeleton constructor
+      RTI_StatusCondition_i::RTI_StatusCondition_i (void)
+        : impl_ (0)
+      {
+      }
 
-    CCM_DDS_StatusCondition_i::~CCM_DDS_StatusCondition_i (void)
-    {
-    }
+      // Implementation skeleton destructor
+      RTI_StatusCondition_i::~RTI_StatusCondition_i (void)
+      {
+      }
 
-    ::CORBA::Boolean
-    CCM_DDS_StatusCondition_i::get_trigger_value (void)
-    {
-      return this->impl ()->get_trigger_value ();
-    }
+      ::CORBA::Boolean
+      RTI_StatusCondition_i::get_trigger_value (void)
+      {
+        return this->impl ()->get_trigger_value ();
+      }
 
-    ::DDS::StatusMask
-    CCM_DDS_StatusCondition_i::get_enabled_statuses (void)
-    {
-      return this->impl ()->get_enabled_statuses ();
-    }
+      ::DDS::StatusMask
+      RTI_StatusCondition_i::get_enabled_statuses (void)
+      {
+        return this->impl ()->get_enabled_statuses ();
+      }
 
-    ::DDS::ReturnCode_t
-    CCM_DDS_StatusCondition_i::set_enabled_statuses (
-      ::DDS::StatusMask mask)
-    {
-      return this->impl ()->set_enabled_statuses (mask);
-    }
+      ::DDS::ReturnCode_t
+      RTI_StatusCondition_i::set_enabled_statuses (
+        ::DDS::StatusMask mask)
+      {
+        return this->impl ()->set_enabled_statuses (mask);
+      }
 
-    ::DDS::Entity_ptr
-    CCM_DDS_StatusCondition_i::get_entity (void)
-    {
-      throw CORBA::NO_IMPLEMENT ();
-    }
+      ::DDS::Entity_ptr
+      RTI_StatusCondition_i::get_entity (void)
+      {
+        throw CORBA::NO_IMPLEMENT ();
+      }
 
-    DDSStatusCondition *
-    CCM_DDS_StatusCondition_i::get_impl (void)
-    {
-      return this->impl_;
-    }
+      DDSStatusCondition *
+      RTI_StatusCondition_i::get_impl (void)
+      {
+        return this->impl_;
+      }
 
-    void
-    CCM_DDS_StatusCondition_i::set_impl (DDSStatusCondition * sc)
-    {
-      this->impl_ = sc;
-    }
+      void
+      RTI_StatusCondition_i::set_impl (DDSStatusCondition * sc)
+      {
+        this->impl_ = sc;
+      }
+
+      DDSStatusCondition *
+      RTI_StatusCondition_i::impl (void)
+      {
+        if (!this->impl_)
+          {
+            throw ::CORBA::BAD_INV_ORDER ();
+          }
+        return this->impl_;
+      }
 
-    DDSStatusCondition *
-    CCM_DDS_StatusCondition_i::impl (void)
-    {
-      if (!this->impl_)
-        {
-          throw ::CORBA::BAD_INV_ORDER ();
-        }
-      return this->impl_;
     }
   }
 }
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.h b/CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.h
index 1101549109a..c30d2cad0bb 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/StatusCondition.h
@@ -7,8 +7,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_STATUSCONDITION_H
-#define DDS4CCM_STATUSCONDITION_H
+#ifndef CIAO_RTI_STATUSCONDITION_H
+#define CIAO_RTI_STATUSCONDITION_H
 
 #include "tao/LocalObject.h"
 
@@ -17,48 +17,50 @@
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h"
 
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-# include "ndds/ndds_cpp.h"
-#endif
-
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::StatusCondition DDSStatusCondition;
-#endif
-
+#include "ndds/ndds_cpp.h"
 #include "tao/LocalObject.h"
 
 namespace CIAO
 {
   namespace DDS4CCM
   {
-    class DDS4CCM_NDDS_IMPL_Export CCM_DDS_StatusCondition_i :
-      public virtual ::DDS::CCM_StatusCondition,
-      public virtual ::CORBA::LocalObject
+    namespace RTI
     {
-    public:
-      /// Constructor
-      CCM_DDS_StatusCondition_i (DDSStatusCondition *sc);
+      class DDS4CCM_NDDS_IMPL_Export RTI_StatusCondition_i :
+        public virtual ::DDS::CCM_StatusCondition,
+        public virtual ::CORBA::LocalObject
+      {
+      public:
+        // Constructor
+        RTI_StatusCondition_i (void);
+
+        // Destructor
+        virtual ~RTI_StatusCondition_i (void);
 
-      /// Destructor
-      virtual ~CCM_DDS_StatusCondition_i (void);
+        virtual ::CORBA::Boolean
+        get_trigger_value (void);
 
-      virtual ::CORBA::Boolean get_trigger_value (void);
+        virtual ::DDS::StatusMask
+        get_enabled_statuses (void);
 
-      virtual ::DDS::StatusMask get_enabled_statuses (void);
+        virtual ::DDS::ReturnCode_t
+        set_enabled_statuses (
+          ::DDS::StatusMask mask);
 
-      virtual ::DDS::ReturnCode_t set_enabled_statuses (::DDS::StatusMask mask);
+        virtual ::DDS::Entity_ptr
+        get_entity (void);
 
-      virtual ::DDS::Entity_ptr get_entity (void);
+        DDSStatusCondition * get_impl (void);
 
-      DDSStatusCondition * get_impl (void);
+        void set_impl (DDSStatusCondition * sc);
 
-      void set_impl (DDSStatusCondition * sc);
+      private:
+        DDSStatusCondition * impl_;
 
-    private:
-      DDSStatusCondition * impl_;
-      DDSStatusCondition * impl (void);
-    };
+        DDSStatusCondition * impl (void);
+      };
+    }
   }
 }
 
-#endif /* DDS4CCM_STATUSCONDITION_H */
+#endif /* CIAO_RTI_STATUSCONDITION_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/StringSeq.h b/CIAO/connectors/dds4ccm/impl/ndds/StringSeq.h
index 6f75683fd3f..23b5d723ca0 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/StringSeq.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/StringSeq.h
@@ -6,15 +6,9 @@
  *
  */
 
-#ifndef DDS4CCM_STRINGSEQ_T_H
-#define DDS4CCM_STRINGSEQ_T_H
+#ifndef CIAO_RTI_STRINGSEQ_T_H
+#define CIAO_RTI_STRINGSEQ_T_H
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::StringSeq DDS_StringSeq;
-typedef long DDS_Long;
-#endif
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::StringSeq & string_seq, const ::DDS_StringSeq & dds_string_seq)
 {
@@ -38,6 +32,5 @@ operator<<= (::DDS_StringSeq & dds_string_seq, const ::DDS::StringSeq & string_s
     dds_string_seq.from_array (parameterlist, string_seq.length ());
     delete [] parameterlist;
 }
-#endif
 
-#endif /* DDS4CCM_STRINGSEQ_T_H */
+#endif /* CIAO_RTI_STRINGSEQ_T_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.cpp
index 928c314cddb..dfd65313a35 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.cpp
@@ -12,466 +12,392 @@
 
 #include "dds4ccm/idl/dds4ccm_BaseC.h"
 
-#include "dds4ccm/impl/logger/Log_Macros.h"
+#include "ciao/Logger/Log_Macros.h"
 
 namespace CIAO
 {
   namespace DDS4CCM
   {
-    CCM_DDS_Subscriber_i::CCM_DDS_Subscriber_i (DDSSubscriber * sub)
-      : impl_ (sub)
+    namespace RTI
     {
-      DDS4CCM_TRACE ("CCM_DDS_Subscriber_i::CCM_DDS_Subscriber_i");
-    }
-
-    CCM_DDS_Subscriber_i::~CCM_DDS_Subscriber_i (void)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_Subscriber_i::~CCM_DDS_Subscriber_i");
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_Subscriber_i::enable (void)
-    {
-      return this->impl ()->enable ();
-    }
-
-    ::DDS::StatusCondition_ptr
-    CCM_DDS_Subscriber_i::get_statuscondition (void)
-    {
-      ::DDS::StatusCondition_var retval = ::DDS::StatusCondition::_nil ();
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      DDSStatusCondition* sc = this->impl ()->get_statuscondition ();
-      ACE_NEW_THROW_EX (retval,
-                        CCM_DDS_StatusCondition_i (sc),
-                        CORBA::NO_MEMORY ());
-#else
-      ::DDS::StatusCondition_var sc = this->impl ()->get_statuscondition ();
-      ACE_NEW_THROW_EX (retval,
-                        CCM_DDS_StatusCondition_i (sc.in ()),
-                        CORBA::NO_MEMORY ());
-#endif
-      return retval._retn ();
-    }
-
-    ::DDS::StatusMask
-    CCM_DDS_Subscriber_i::get_status_changes (void)
-    {
-      return this->impl ()->get_status_changes ();
-    }
-
-    ::DDS::InstanceHandle_t
-    CCM_DDS_Subscriber_i::get_instance_handle (void)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ::DDS_InstanceHandle_t const rtihandle = this->impl ()->get_instance_handle ();
-      ::DDS::InstanceHandle_t handle;
-      handle <<= rtihandle;
-      return handle;
-#else
-      return this->impl ()->get_instance_handle ();
-#endif
-    }
-
-    DDSDataReader *
-    CCM_DDS_Subscriber_i::create_datareader (
-                  DDSContentFilteredTopic * topic,
-                  DDSDataReaderListener * rti_drl,
-                  ::DDS::StatusMask mask)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      DDS_DataReaderQos rti_qos = DDS_DATAREADER_QOS_DEFAULT;
-#else
-      ::DDS::DataReaderQos rti_qos;
-#endif
-      return this->impl ()->create_datareader (topic,
-                                               rti_qos,
-                                               rti_drl,
-                                               mask);
-    }
-
-    DDSDataReader *
-    CCM_DDS_Subscriber_i::create_datareader (
-                  DDSTopic * topic,
-                  DDSDataReaderListener * rti_drl,
-                  ::DDS::StatusMask mask)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      DDS_DataReaderQos rti_qos = DDS_DATAREADER_QOS_DEFAULT;
-#else
-      DDS::DataReaderQos rti_qos;
-#endif
-      return this->impl ()->create_datareader (topic,
-                                               rti_qos,
-                                               rti_drl,
-                                               mask);
-    }
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-    DDSDataReader *
-    CCM_DDS_Subscriber_i::create_datareader_with_profile (
-                  DDSContentFilteredTopic * topic,
-                  const char * library_name,
-                  const char * profile_name,
-                  DDSDataReaderListener * rti_drl,
-                  ::DDS::StatusMask mask)
-    {
-      return this->impl ()->create_datareader_with_profile (topic,
-                                                            library_name,
-                                                            profile_name,
-                                                            rti_drl,
-                                                            mask);
-    }
-#endif
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-    DDSDataReader *
-    CCM_DDS_Subscriber_i::create_datareader_with_profile (
-                  DDSTopic * topic,
-                  const char * library_name,
-                  const char * profile_name,
-                  DDSDataReaderListener * rti_drl,
-                  ::DDS::StatusMask mask)
-    {
-      return this->impl ()->create_datareader_with_profile (topic,
-                                                            library_name,
-                                                            profile_name,
-                                                            rti_drl,
-                                                            mask);
-    }
-#endif
-
-    ::DDS::DataReader_ptr
-    CCM_DDS_Subscriber_i::create_datareader (
-      ::DDS::TopicDescription_ptr a_topic,
-      const ::DDS::DataReaderQos & /*qos*/,
-      ::DDS::DataReaderListener_ptr a_listener,
-      ::DDS::StatusMask mask)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_Subscriber_i::create_datareader");
-      ::DDS::DataReader_var retval = ::DDS::DataReader::_nil ();
-      ACE_NEW_THROW_EX (retval,
-                        CCM_DDS_DataReader_i (),
-                        CORBA::NO_MEMORY ());
-
-      DDSDataReaderListener *rti_drl = 0;
-      if (!CORBA::is_nil (a_listener))
-        {
-          ACE_NEW_THROW_EX (rti_drl,
-                            CCM_DDS_DataReaderListener_i (a_listener),
-                            CORBA::NO_MEMORY ());
-        }
-
-      DDSDataReader * rti_dr = 0;
-      CCM_DDS_Topic_i * topic = dynamic_cast < CCM_DDS_Topic_i * > (a_topic);
-
-      if (!topic)
-        {
-          CCM_DDS_ContentFilteredTopic_i * cf_topic =
-            dynamic_cast < CCM_DDS_ContentFilteredTopic_i * > (a_topic);
-          if (!cf_topic)
-            {
-              DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_Subscriber_i::create_datareader - "
-                          "Error: Unable to cast provided topic to one of its servant.\n"));
-              delete rti_drl;
-              throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0);
-            }
-          else
-            rti_dr = this->create_datareader (cf_topic->get_impl (), rti_drl, mask);
-        }
-      else
-        rti_dr = this->create_datareader (topic->get_impl (), rti_drl, mask);
-
-      if (!rti_dr)
-        {
-          DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_Subscriber_i::create_datareader - "
-                       "Error: RTI Topic returned a nil datareader.\n"));
-          delete rti_drl;
-          throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0);
-        }
-      else
-        {
-          DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO "CCM_DDS_Subscriber_i::create_datareader_with_profile - "
-                       "Successfully created datareader.\n"));
-        }
-
-      rti_dr->enable ();
-      CCM_DDS_DataReader_i *dr = dynamic_cast < CCM_DDS_DataReader_i *>(retval.in ());
-      dr->set_impl (rti_dr);
-
-      return retval._retn ();
-    }
-
-    ::DDS::DataReader_ptr
-    CCM_DDS_Subscriber_i::create_datareader_with_profile (
-      ::DDS::TopicDescription_ptr a_topic,
-      const char * library_name,
-      const char * profile_name,
-      ::DDS::DataReaderListener_ptr a_listener,
-      ::DDS::StatusMask mask)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_Subscriber_i::create_datareader_with_profile");
-      ::DDS::DataReader_var retval = ::DDS::DataReader::_nil ();
-      ACE_NEW_THROW_EX (retval,
-                        CCM_DDS_DataReader_i (),
-                        CORBA::NO_MEMORY ());
-
-      DDSDataReaderListener *rti_drl = 0;
-      if (!CORBA::is_nil (a_listener))
-        {
-          ACE_NEW_THROW_EX (rti_drl,
-                            CCM_DDS_DataReaderListener_i (a_listener),
-                            CORBA::NO_MEMORY ());
-        }
-
-      DDSDataReader * rti_dr = 0;
-      CCM_DDS_Topic_i * topic = dynamic_cast < CCM_DDS_Topic_i * > (a_topic);
-
-      if (!topic)
-        {
-          CCM_DDS_ContentFilteredTopic_i * cf_topic =
-            dynamic_cast < CCM_DDS_ContentFilteredTopic_i * > (a_topic);
-          if (!cf_topic)
-            {
-              DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_Subscriber_i::create_datareader_with_profile - "
-                          "Error: Unable to cast provided topic to one of its servant.\n"));
-              delete rti_drl;
-              throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0);
-            }
-          else
-            rti_dr = this->create_datareader_with_profile (cf_topic->get_impl (),
-                                                           library_name,
-                                                           profile_name,
-                                                           rti_drl,
-                                                           mask);
-        }
-      else
-        rti_dr = this->create_datareader_with_profile (topic->get_impl (),
-                                                           library_name,
-                                                           profile_name,
-                                                           rti_drl,
-                                                           mask);
-
-      if (!rti_dr)
-        {
-          DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_Subscriber_i::create_datareader_with_profile - "
-                       "Error: RTI Topic returned a nil datareader.\n"));
-          delete rti_drl;
-          throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0);
-        }
-      else
-        {
-          DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO "CCM_DDS_Subscriber_i::create_datareader_with_profile - "
-                       "Successfully created datareader with profile <%C#%C>.\n",
-                       library_name,
-                       profile_name));
-        }
-
-      rti_dr->enable ();
-      CCM_DDS_DataReader_i *dr = dynamic_cast < CCM_DDS_DataReader_i *>(retval.in ());
-      dr->set_impl (rti_dr);
-
-      return retval._retn ();
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_Subscriber_i::delete_datareader (
-      ::DDS::DataReader_ptr a_datareader)
-    {
-      CCM_DDS_DataReader_i *dr = dynamic_cast< CCM_DDS_DataReader_i *> (a_datareader);
-      if (!dr)
-        {
-          DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_Subscriber_i::delete_datareader - "
-                       "Unable to cast provided object reference to servant.\n"));
-          return ::DDS::RETCODE_BAD_PARAMETER;
-        }
-
-      DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CCM_DDS_Subscriber_i::delete_datareader - "
-                   "Successfully casted provided object reference to servant.\n"));
-
-      DDS_ReturnCode_t const retval = this->impl ()->delete_datareader (dr->get_impl ());
-
-      if (retval != DDS_RETCODE_OK)
-        {
-          DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CCM_DDS_Subscriber_i::delete_datareader - "
-                       "Error: Returned non-ok error code %C\n",
-                       translate_retcode (retval)));
-        }
-      else DDS4CCM_DEBUG (6, (LM_INFO, CLINFO "CCM_DDS_Subscriber_i::delete_datareader - "
-                        "Datareader successfully  deleted\n"));
-
-      return retval;
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_Subscriber_i::delete_contained_entities (void)
-    {
-      return this->impl ()->delete_contained_entities ();
-    }
-
-    ::DDS::DataReader_ptr
-    CCM_DDS_Subscriber_i::lookup_datareader (
-      const char * impl_name)
-    {
-      ::DDS::DataReader_var retval = ::DDS::DataReader::_nil ();
-      ACE_NEW_THROW_EX (retval,
-                        CCM_DDS_DataReader_i (),
-                        CORBA::NO_MEMORY ());
-      DDSDataReader* dr = this->impl ()->lookup_datareader (impl_name);
-      CCM_DDS_DataReader_i *rti_dr = dynamic_cast < CCM_DDS_DataReader_i *>(retval.in ());
-      rti_dr->set_impl (dr);
-      return retval._retn ();
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_Subscriber_i::get_datareaders (
-      ::DDS::DataReaderSeq & /*readers*/,
-      ::DDS::SampleStateMask /*sample_states*/,
-      ::DDS::ViewStateMask /*view_states*/,
-      ::DDS::InstanceStateMask /*instance_states*/)
-    {
-      throw CORBA::NO_IMPLEMENT ();
-      // Add your implementation here
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_Subscriber_i::notify_datareaders (void)
-    {
-      return this->impl ()->notify_datareaders ();
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_Subscriber_i::set_qos (
-      const ::DDS::SubscriberQos & /*qos*/)
-    {
-      DDS_SubscriberQos rti_impl_qos;
+      // Implementation skeleton constructor
+      RTI_Subscriber_i::RTI_Subscriber_i (void)
+        : impl_ (0)
+      {
+        CIAO_TRACE ("RTI_Subscriber_i::RTI_Subscriber_i");
+      }
+
+      // Implementation skeleton destructor
+      RTI_Subscriber_i::~RTI_Subscriber_i (void)
+      {
+        CIAO_TRACE ("RTI_Subscriber_i::~RTI_Subscriber_i");
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_Subscriber_i::enable (void)
+      {
+        return this->impl ()->enable ();
+      }
+
+      ::DDS::StatusCondition_ptr
+      RTI_Subscriber_i::get_statuscondition (void)
+      {
+        DDSStatusCondition* sc = this->impl ()->get_statuscondition ();
+        ::DDS::StatusCondition_var retval = new RTI_StatusCondition_i ();
+        RTI_StatusCondition_i *rti_sc = dynamic_cast < RTI_StatusCondition_i *> (retval.in ());
+        rti_sc->set_impl (sc);
+        return retval._retn ();
+      }
+
+      ::DDS::StatusMask
+      RTI_Subscriber_i::get_status_changes (void)
+      {
+        return this->impl ()->get_status_changes ();
+      }
+
+      ::DDS::InstanceHandle_t
+      RTI_Subscriber_i::get_instance_handle (void)
+      {
+        ::DDS_InstanceHandle_t const rtihandle = this->impl ()->get_instance_handle ();
+        ::DDS::InstanceHandle_t handle;
+        handle <<= rtihandle;
+        return handle;
+      }
+
+      DDSDataReader *
+      RTI_Subscriber_i::create_datareader (
+                    DDSContentFilteredTopic * topic,
+                    DDSDataReaderListener * rti_drl,
+                    ::DDS::StatusMask mask)
+      {
+        DDS_DataReaderQos rti_qos = DDS_DATAREADER_QOS_DEFAULT;
+        return this->impl ()->create_datareader (topic,
+                                                 rti_qos,
+                                                 rti_drl,
+                                                 mask);
+      }
+
+      DDSDataReader *
+      RTI_Subscriber_i::create_datareader (
+                    DDSTopic * topic,
+                    DDSDataReaderListener * rti_drl,
+                    ::DDS::StatusMask mask)
+      {
+        DDS_DataReaderQos rti_qos = DDS_DATAREADER_QOS_DEFAULT;
+        return this->impl ()->create_datareader (topic,
+                                                 rti_qos,
+                                                 rti_drl,
+                                                 mask);
+      }
+
+      DDSDataReader *
+      RTI_Subscriber_i::create_datareader_with_profile (
+                    DDSContentFilteredTopic * topic,
+                    const char * library_name,
+                    const char * profile_name,
+                    DDSDataReaderListener * rti_drl,
+                    ::DDS::StatusMask mask)
+      {
+        return this->impl ()->create_datareader_with_profile (topic,
+                                                              library_name,
+                                                              profile_name,
+                                                              rti_drl,
+                                                              mask);
+      }
+
+      DDSDataReader *
+      RTI_Subscriber_i::create_datareader_with_profile (
+                    DDSTopic * topic,
+                    const char * library_name,
+                    const char * profile_name,
+                    DDSDataReaderListener * rti_drl,
+                    ::DDS::StatusMask mask)
+      {
+        return this->impl ()->create_datareader_with_profile (topic,
+                                                              library_name,
+                                                              profile_name,
+                                                              rti_drl,
+                                                              mask);
+      }
+
+      ::DDS::DataReader_ptr
+      RTI_Subscriber_i::create_datareader (
+        ::DDS::TopicDescription_ptr a_topic,
+        const ::DDS::DataReaderQos & /*qos*/,
+        ::DDS::DataReaderListener_ptr a_listener,
+        ::DDS::StatusMask mask)
+      {
+
+        DDSDataReaderListener *rti_drl = 0;
+        if (!CORBA::is_nil (a_listener))
+          {
+            rti_drl = new RTI_DataReaderListener_i (a_listener);
+          }
+
+        DDSDataReader * rti_dr = 0;
+        RTI_Topic_i * topic = dynamic_cast < RTI_Topic_i * > (a_topic);
+
+        if (!topic)
+          {
+            RTI_ContentFilteredTopic_i * cf_topic =
+              dynamic_cast < RTI_ContentFilteredTopic_i * > (a_topic);
+            if (!cf_topic)
+              {
+                CIAO_ERROR (1, (LM_ERROR, CLINFO "RTI_Subscriber_i::create_datareader - "
+                            "Error: Unable to cast provided topic to one of its servant.\n"));
+                throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0);
+              }
+            else
+              rti_dr = this->create_datareader (cf_topic->get_impl (), rti_drl, mask);
+          }
+        else
+          rti_dr = this->create_datareader (topic->get_impl (), rti_drl, mask);
+
+        if (!rti_dr)
+          {
+            CIAO_ERROR (1, (LM_ERROR, CLINFO "RTI_Subscriber_i::create_datareader - "
+                         "Error: RTI Topic returned a nil datareader.\n"));
+            throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0);
+          }
+
+        rti_dr->enable ();
+        ::DDS::DataReader_var retval = new RTI_DataReader_i ();
+        RTI_DataReader_i *dr = dynamic_cast < RTI_DataReader_i *>(retval.in ());
+        dr->set_impl (rti_dr);
+
+        return retval._retn ();
+      }
+
+      ::DDS::DataReader_ptr
+      RTI_Subscriber_i::create_datareader_with_profile (
+        ::DDS::TopicDescription_ptr a_topic,
+        const char * library_name,
+        const char * profile_name,
+        ::DDS::DataReaderListener_ptr a_listener,
+        ::DDS::StatusMask mask)
+      {
+        DDSDataReaderListener *rti_drl = 0;
+        if (!CORBA::is_nil (a_listener))
+          {
+            rti_drl = new RTI_DataReaderListener_i (a_listener);
+          }
+
+        DDSDataReader * rti_dr = 0;
+        RTI_Topic_i * topic = dynamic_cast < RTI_Topic_i * > (a_topic);
+
+        if (!topic)
+          {
+            RTI_ContentFilteredTopic_i * cf_topic =
+              dynamic_cast < RTI_ContentFilteredTopic_i * > (a_topic);
+            if (!cf_topic)
+              {
+                CIAO_ERROR (1, (LM_ERROR, CLINFO "RTI_Subscriber_i::create_datareader_with_profile - "
+                            "Error: Unable to cast provided topic to one of its servant.\n"));
+                throw CCM_DDS::InternalError (::DDS::RETCODE_BAD_PARAMETER, 0);
+              }
+            else
+              rti_dr = this->create_datareader_with_profile (cf_topic->get_impl (),
+                                                             library_name,
+                                                             profile_name,
+                                                             rti_drl,
+                                                             mask);
+          }
+        else
+          rti_dr = this->create_datareader_with_profile (topic->get_impl (),
+                                                             library_name,
+                                                             profile_name,
+                                                             rti_drl,
+                                                             mask);
+
+        if (!rti_dr)
+          {
+            CIAO_ERROR (1, (LM_ERROR, CLINFO "RTI_Subscriber_i::create_datareader_with_profile - "
+                         "Error: RTI Topic returned a nil datareader.\n"));
+            throw CCM_DDS::InternalError (::DDS::RETCODE_ERROR, 0);
+          }
+
+        rti_dr->enable ();
+        ::DDS::DataReader_var retval = new RTI_DataReader_i ();
+        RTI_DataReader_i *dr = dynamic_cast < RTI_DataReader_i *>(retval.in ());
+        dr->set_impl (rti_dr);
+
+        return retval._retn ();
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_Subscriber_i::delete_datareader (
+        ::DDS::DataReader_ptr a_datareader)
+      {
+        RTI_DataReader_i *dr = dynamic_cast< RTI_DataReader_i *> (a_datareader);
+        if (!dr)
+          {
+            CIAO_ERROR (1, (LM_ERROR, CLINFO "RTI_Subscriber_i::delete_datareader - "
+                         "Unable to cast provided object reference to servant.\n"));
+            return ::DDS::RETCODE_BAD_PARAMETER;
+          }
+
+        CIAO_DEBUG (9, (LM_TRACE, CLINFO "RTI_Subscriber_i::delete_datareader - "
+                     "Successfully casted provided object reference to servant.\n"));
+
+        DDS_ReturnCode_t const retval = this->impl ()->delete_datareader (dr->get_impl ());
+
+        if (retval != DDS_RETCODE_OK)
+          {
+            CIAO_ERROR (1, (LM_ERROR, CLINFO "RTI_Subscriber_i::delete_datareader - "
+                         "Error: Returned non-ok error code %C\n",
+                         translate_retcode (retval)));
+          }
+        else CIAO_DEBUG (6, (LM_INFO, CLINFO "RTI_Subscriber_i::delete_datareader - "
+                          "Datareader successfully  deleted\n"));
+
+        return retval;
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_Subscriber_i::delete_contained_entities (void)
+      {
+        return this->impl ()->delete_contained_entities ();
+      }
+
+      ::DDS::DataReader_ptr
+      RTI_Subscriber_i::lookup_datareader (
+        const char * impl_name)
+      {
+        DDSDataReader* dr = this->impl ()->lookup_datareader (impl_name);
+        ::DDS::DataReader_var retval = new RTI_DataReader_i ();
+        RTI_DataReader_i *rti_dr = dynamic_cast < RTI_DataReader_i *>(retval.in ());
+        rti_dr->set_impl (dr);
+        return retval._retn ();
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_Subscriber_i::get_datareaders (
+        ::DDS::DataReaderSeq & /*readers*/,
+        ::DDS::SampleStateMask /*sample_states*/,
+        ::DDS::ViewStateMask /*view_states*/,
+        ::DDS::InstanceStateMask /*instance_states*/)
+      {
+        throw CORBA::NO_IMPLEMENT ();
+        // Add your implementation here
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_Subscriber_i::notify_datareaders (void)
+      {
+        return this->impl ()->notify_datareaders ();
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_Subscriber_i::set_qos (
+        const ::DDS::SubscriberQos & /*qos*/)
+      {
+        DDS_SubscriberQos rti_impl_qos;
 /*        rti_impl_qos.presentation = qos.presentation;
-      rti_impl_qos.partition = qos.partition;
-      rti_impl_qos.group_data = qos.group_data;
-      rti_impl_qos.entity_factory = qos.entity_factory;*/
-      return this->impl ()->set_qos (rti_impl_qos);
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_Subscriber_i::get_qos (
-      ::DDS::SubscriberQos & /*qos*/)
-    {
-      DDS_SubscriberQos rti_impl_qos;
-      ::DDS::ReturnCode_t const rti_retcode = this->impl ()->get_qos (rti_impl_qos);
-      /*qos.presentation = rti_impl_qos.presentation;
-      qos.partition = rti_impl_qos.partition;
-      qos.group_data = rti_impl_qos.group_data;
-      qos.entity_factory = rti_impl_qos.entity_factory;*/
-      return rti_retcode;
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_Subscriber_i::set_listener (
-      ::DDS::SubscriberListener_ptr a_listener,
-      ::DDS::StatusMask mask)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_Subscriber_i::set_listener");
-
-      CCM_DDS_SubscriberListener_i* rti_impl_list = 0;
-      if (!CORBA::is_nil (a_listener))
-        {
-          ACE_NEW_THROW_EX (rti_impl_list,
-                            CCM_DDS_SubscriberListener_i (a_listener),
-                            CORBA::NO_MEMORY ());
-        }
-      return this->impl ()->set_listener (rti_impl_list, mask);
-    }
-
-    ::DDS::SubscriberListener_ptr
-    CCM_DDS_Subscriber_i::get_listener (void)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_Subscriber_i::get_listener");
-
-      DDSSubscriberListener *rti_impl_list = this->impl ()->get_listener ();
-      CCM_DDS_SubscriberListener_i *list_proxy = dynamic_cast <CCM_DDS_SubscriberListener_i *> (rti_impl_list);
-      if (!list_proxy)
-        {
-          DDS4CCM_DEBUG (6, (LM_DEBUG, "CCM_DDS_Subscriber_i::get_listener - "
-                                    "DDS returned a NIL listener.\n"));
-          return ::DDS::SubscriberListener::_nil ();
-        }
-      return list_proxy->get_subscriber_listener ();
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_Subscriber_i::begin_access (void)
-    {
-      return this->impl ()->begin_access ();
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_Subscriber_i::end_access (void)
-    {
-      return this->impl ()->end_access ();
-    }
-
-    ::DDS::DomainParticipant_ptr
-    CCM_DDS_Subscriber_i::get_participant (void)
-    {
-      ::DDS::DomainParticipant_var retval = ::DDS::DomainParticipant::_nil ();
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      DDSDomainParticipant* p = this->impl ()->get_participant ();
-      ACE_NEW_THROW_EX (retval,
-                        CCM_DDS_DomainParticipant_i (p),
-                        CORBA::NO_MEMORY ());
-#else
-      ::DDS::DomainParticipant_var p = this->impl ()->get_participant ();
-      ACE_NEW_THROW_EX (retval,
-                        CCM_DDS_DomainParticipant_i (p.in ()),
-                        CORBA::NO_MEMORY ());
-#endif
-      return retval._retn ();
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_Subscriber_i::set_default_datareader_qos (
-      const ::DDS::DataReaderQos & /*qos*/)
-    {
-      throw CORBA::NO_IMPLEMENT ();
-      // Add your implementation here
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_Subscriber_i::get_default_datareader_qos (
-      ::DDS::DataReaderQos & /*qos*/)
-    {
-      throw CORBA::NO_IMPLEMENT ();
-      // Add your implementation here
-    }
-
-    ::DDS::ReturnCode_t
-    CCM_DDS_Subscriber_i::copy_from_topic_qos (
-      ::DDS::DataReaderQos & /*a_datareader_qos*/,
-      const ::DDS::TopicQos & /*a_impl_qos*/)
-    {
-      throw CORBA::NO_IMPLEMENT ();
-      // Add your implementation here
-    }
-
-    DDSSubscriber *
-    CCM_DDS_Subscriber_i::get_impl (void)
-    {
-      return this->impl_;
-    }
-
-    void
-    CCM_DDS_Subscriber_i::set_impl (DDSSubscriber * sub)
-    {
-      this->impl_ = sub;
-    }
-
-    DDSSubscriber *
-    CCM_DDS_Subscriber_i::impl (void)
-    {
-      if (!this->impl_)
-        {
-          throw ::CORBA::BAD_INV_ORDER ();
-        }
-      return this->impl_;
+        rti_impl_qos.partition = qos.partition;
+        rti_impl_qos.group_data = qos.group_data;
+        rti_impl_qos.entity_factory = qos.entity_factory;*/
+        return this->impl ()->set_qos (rti_impl_qos);
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_Subscriber_i::get_qos (
+        ::DDS::SubscriberQos & /*qos*/)
+      {
+        DDS_SubscriberQos rti_impl_qos;
+        DDS_ReturnCode_t const rti_retcode = this->impl ()->get_qos (rti_impl_qos);
+        /*qos.presentation = rti_impl_qos.presentation;
+        qos.partition = rti_impl_qos.partition;
+        qos.group_data = rti_impl_qos.group_data;
+        qos.entity_factory = rti_impl_qos.entity_factory;*/
+        return rti_retcode;
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_Subscriber_i::set_listener (
+        ::DDS::SubscriberListener_ptr a_listener,
+        ::DDS::StatusMask mask)
+      {
+        RTI_SubscriberListener_i* rti_impl_list = new RTI_SubscriberListener_i (a_listener);
+        return this->impl ()->set_listener (rti_impl_list, mask);
+      }
+
+      ::DDS::SubscriberListener_ptr
+      RTI_Subscriber_i::get_listener (void)
+      {
+//        DDSSubscriberListener* rti_impl_list = this->impl ()->get_listener ();
+//        ::DDS::SubscriberListener_var retval = new RTI_SubscriberListener_i (rti_impl_list);
+//        return retval._retn ();
+        throw CORBA::NO_IMPLEMENT ();
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_Subscriber_i::begin_access (void)
+      {
+        return this->impl ()->begin_access ();
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_Subscriber_i::end_access (void)
+      {
+        return this->impl ()->end_access ();
+      }
+
+      ::DDS::DomainParticipant_ptr
+      RTI_Subscriber_i::get_participant (void)
+      {
+        DDSDomainParticipant* p = this->impl ()->get_participant ();
+        ::DDS::DomainParticipant_var retval = new RTI_DomainParticipant_i ();
+        RTI_DomainParticipant_i *rti_dp = dynamic_cast < RTI_DomainParticipant_i *> (retval.in ());
+        rti_dp->set_impl (p);
+        return retval._retn ();
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_Subscriber_i::set_default_datareader_qos (
+        const ::DDS::DataReaderQos & /*qos*/)
+      {
+        throw CORBA::NO_IMPLEMENT ();
+        // Add your implementation here
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_Subscriber_i::get_default_datareader_qos (
+        ::DDS::DataReaderQos & /*qos*/)
+      {
+        throw CORBA::NO_IMPLEMENT ();
+        // Add your implementation here
+      }
+
+      ::DDS::ReturnCode_t
+      RTI_Subscriber_i::copy_from_topic_qos (
+        ::DDS::DataReaderQos & /*a_datareader_qos*/,
+        const ::DDS::TopicQos & /*a_impl_qos*/)
+      {
+        throw CORBA::NO_IMPLEMENT ();
+        // Add your implementation here
+      }
+
+      DDSSubscriber *
+      RTI_Subscriber_i::get_impl (void)
+      {
+        return this->impl_;
+      }
+
+      void
+      RTI_Subscriber_i::set_impl (DDSSubscriber * sub)
+      {
+        this->impl_ = sub;
+      }
+
+      DDSSubscriber *
+      RTI_Subscriber_i::impl (void)
+      {
+        if (!this->impl_)
+          {
+            throw ::CORBA::BAD_INV_ORDER ();
+          }
+        return this->impl_;
+      }
     }
   }
 }
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.h b/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.h
index 3465ecc0cef..439d3b33986 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Subscriber.h
@@ -7,8 +7,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_SUBSCRIBER_H
-#define DDS4CCM_SUBSCRIBER_H
+#ifndef CIAO_RTI_SUBSCRIBER_H
+#define CIAO_RTI_SUBSCRIBER_H
 
 #include "tao/LocalObject.h"
 
@@ -17,157 +17,151 @@
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h"
 
-#include "tao/LocalObject.h"
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 #include "ndds/ndds_cpp.h"
-#endif
+#include "tao/LocalObject.h"
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::Subscriber DDSSubscriber;
-typedef ::DDS::DataReaderListener DDSDataReaderListener;
-typedef ::DDS::DataReader DDSDataReader;
-typedef ::DDS::ContentFilteredTopic DDSContentFilteredTopic;
-typedef ::DDS::Topic DDSTopic;
-#endif
 
 namespace CIAO
 {
   namespace DDS4CCM
   {
-    class DDS4CCM_NDDS_IMPL_Export CCM_DDS_Subscriber_i :
-      public virtual ::DDS::CCM_Subscriber,
-      public virtual ::CORBA::LocalObject
+    namespace RTI
     {
-    public:
-      /// Constructor
-      CCM_DDS_Subscriber_i (DDSSubscriber * sub);
-
-      /// Destructor
-      virtual ~CCM_DDS_Subscriber_i (void);
-
-      virtual ::DDS::ReturnCode_t enable (void);
-
-      virtual ::DDS::StatusCondition_ptr get_statuscondition (void);
-
-      virtual ::DDS::StatusMask get_status_changes (void);
-
-      virtual ::DDS::InstanceHandle_t get_instance_handle (void);
-
-      virtual ::DDS::DataReader_ptr create_datareader (
-        ::DDS::TopicDescription_ptr a_topic,
-        const ::DDS::DataReaderQos & qos,
-        ::DDS::DataReaderListener_ptr a_listener,
-        ::DDS::StatusMask mask);
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      virtual ::DDS::DataReader_ptr
-      create_datareader_with_profile (
-        ::DDS::TopicDescription_ptr a_topic,
-        const char* library_name,
-        const char *profile_name,
-        ::DDS::DataReaderListener_ptr a_listener,
-        ::DDS::StatusMask mask);
-#endif
-
-      virtual ::DDS::ReturnCode_t
-      delete_datareader (
-        ::DDS::DataReader_ptr a_datareader);
-
-      virtual ::DDS::ReturnCode_t delete_contained_entities (void);
-
-      virtual ::DDS::DataReader_ptr lookup_datareader (
-        const char * impl_name);
-
-      virtual ::DDS::ReturnCode_t
-      get_datareaders (
-        ::DDS::DataReaderSeq & readers,
-        ::DDS::SampleStateMask sample_states,
-        ::DDS::ViewStateMask view_states,
-        ::DDS::InstanceStateMask instance_states);
-
-      virtual ::DDS::ReturnCode_t
-      notify_datareaders (void);
+      class DDS4CCM_NDDS_IMPL_Export RTI_Subscriber_i :
+        public virtual ::DDS::CCM_Subscriber,
+        public virtual ::CORBA::LocalObject
+      {
+      public:
+        // Constructor
+        RTI_Subscriber_i (void);
 
-      virtual ::DDS::ReturnCode_t
-      set_qos (
-        const ::DDS::SubscriberQos & qos);
+        // Destructor
+        virtual ~RTI_Subscriber_i (void);
 
-      virtual ::DDS::ReturnCode_t
-      get_qos (
-        ::DDS::SubscriberQos & qos);
+        virtual ::DDS::ReturnCode_t
+        enable (void);
 
-      virtual ::DDS::ReturnCode_t
-      set_listener (
-        ::DDS::SubscriberListener_ptr a_listener,
-        ::DDS::StatusMask mask);
-
-      virtual ::DDS::SubscriberListener_ptr
-      get_listener (void);
-
-      virtual ::DDS::ReturnCode_t
-      begin_access (void);
-
-      virtual ::DDS::ReturnCode_t
-      end_access (void);
-
-      virtual ::DDS::DomainParticipant_ptr
-      get_participant (void);
-
-      virtual ::DDS::ReturnCode_t
-      set_default_datareader_qos (
-        const ::DDS::DataReaderQos & qos);
-
-      virtual ::DDS::ReturnCode_t
-      get_default_datareader_qos (
-        ::DDS::DataReaderQos & qos);
-
-      virtual ::DDS::ReturnCode_t
-      copy_from_topic_qos (
-        ::DDS::DataReaderQos & a_datareader_qos,
-        const ::DDS::TopicQos & a_impl_qos);
-
-      DDSSubscriber * get_impl (void);
-
-      void set_impl (DDSSubscriber * sub);
-
-    private:
-      DDSSubscriber *impl_;
-
-      DDSSubscriber *impl (void);
-
-      DDSDataReader *
-      create_datareader (
-        DDSTopic * topic,
-        DDSDataReaderListener * rti_drl,
-        ::DDS::StatusMask mask);
-
-      DDSDataReader *
-      create_datareader (
-        DDSContentFilteredTopic * topic,
-        DDSDataReaderListener * rti_drl,
-        ::DDS::StatusMask mask);
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      DDSDataReader *
-      create_datareader_with_profile (
-        DDSContentFilteredTopic * topic,
-        const char* library_name,
-        const char *profile_name,
-        DDSDataReaderListener * rti_drl,
-        ::DDS::StatusMask mask);
-#endif
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      DDSDataReader *
-      create_datareader_with_profile (
-        DDSTopic * topic,
-        const char* library_name,
-        const char *profile_name,
-        DDSDataReaderListener * rti_drl,
-        ::DDS::StatusMask mask);
-#endif
-    };
+        virtual ::DDS::StatusCondition_ptr
+        get_statuscondition (void);
+
+        virtual ::DDS::StatusMask
+        get_status_changes (void);
+
+        virtual ::DDS::InstanceHandle_t
+        get_instance_handle (void);
+
+        virtual ::DDS::DataReader_ptr
+        create_datareader (
+          ::DDS::TopicDescription_ptr a_topic,
+          const ::DDS::DataReaderQos & qos,
+          ::DDS::DataReaderListener_ptr a_listener,
+          ::DDS::StatusMask mask);
+
+        virtual ::DDS::DataReader_ptr
+        create_datareader_with_profile (
+          ::DDS::TopicDescription_ptr a_topic,
+          const char* library_name,
+          const char *profile_name,
+          ::DDS::DataReaderListener_ptr a_listener,
+          ::DDS::StatusMask mask);
+
+        virtual ::DDS::ReturnCode_t
+        delete_datareader (
+          ::DDS::DataReader_ptr a_datareader);
+
+        virtual ::DDS::ReturnCode_t
+        delete_contained_entities (void);
+
+        virtual ::DDS::DataReader_ptr
+        lookup_datareader (
+          const char * impl_name);
+
+        virtual ::DDS::ReturnCode_t
+        get_datareaders (
+          ::DDS::DataReaderSeq & readers,
+          ::DDS::SampleStateMask sample_states,
+          ::DDS::ViewStateMask view_states,
+          ::DDS::InstanceStateMask instance_states);
+
+        virtual ::DDS::ReturnCode_t
+        notify_datareaders (void);
+
+        virtual ::DDS::ReturnCode_t
+        set_qos (
+          const ::DDS::SubscriberQos & qos);
+
+        virtual ::DDS::ReturnCode_t
+        get_qos (
+          ::DDS::SubscriberQos & qos);
+
+        virtual ::DDS::ReturnCode_t
+        set_listener (
+          ::DDS::SubscriberListener_ptr a_listener,
+          ::DDS::StatusMask mask);
+
+        virtual ::DDS::SubscriberListener_ptr
+        get_listener (void);
+
+        virtual ::DDS::ReturnCode_t
+        begin_access (void);
+
+        virtual ::DDS::ReturnCode_t
+        end_access (void);
+
+        virtual ::DDS::DomainParticipant_ptr
+        get_participant (void);
+
+        virtual ::DDS::ReturnCode_t
+        set_default_datareader_qos (
+          const ::DDS::DataReaderQos & qos);
+
+        virtual ::DDS::ReturnCode_t
+        get_default_datareader_qos (
+          ::DDS::DataReaderQos & qos);
+
+        virtual ::DDS::ReturnCode_t
+        copy_from_topic_qos (
+          ::DDS::DataReaderQos & a_datareader_qos,
+          const ::DDS::TopicQos & a_impl_qos);
+
+        DDSSubscriber * get_impl (void);
+
+        void set_impl (DDSSubscriber * sub);
+
+      private:
+        DDSSubscriber *impl_;
+
+        DDSSubscriber *impl (void);
+
+        DDSDataReader *
+        create_datareader (
+          DDSTopic * topic,
+          DDSDataReaderListener * rti_drl,
+          ::DDS::StatusMask mask);
+
+        DDSDataReader *
+        create_datareader (
+          DDSContentFilteredTopic * topic,
+          DDSDataReaderListener * rti_drl,
+          ::DDS::StatusMask mask);
+
+        DDSDataReader *
+        create_datareader_with_profile (
+          DDSContentFilteredTopic * topic,
+          const char* library_name,
+          const char *profile_name,
+          DDSDataReaderListener * rti_drl,
+          ::DDS::StatusMask mask);
+
+        DDSDataReader *
+        create_datareader_with_profile (
+          DDSTopic * topic,
+          const char* library_name,
+          const char *profile_name,
+          DDSDataReaderListener * rti_drl,
+          ::DDS::StatusMask mask);
+      };
+    }
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.cpp b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.cpp
index 0328e563935..a40db67d2e4 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.cpp
@@ -9,177 +9,148 @@
 #include "SampleRejectedStatus.h"
 #include "LivelinessChangedStatus.h"
 #include "RequestedIncompatibleQosStatus.h"
-#include "dds4ccm/impl/logger/Log_Macros.h"
+#include "ciao/Logger/Log_Macros.h"
 
 namespace CIAO
 {
   namespace DDS4CCM
   {
-    CCM_DDS_SubscriberListener_i::CCM_DDS_SubscriberListener_i (::DDS::SubscriberListener_ptr p)
-      : impl_ ( ::DDS::SubscriberListener::_duplicate (p))
+    namespace RTI
     {
-      DDS4CCM_TRACE ("CCM_DDS_SubscriberListener_i::CCM_DDS_SubscriberListener_i");
-    }
-
-    CCM_DDS_SubscriberListener_i::~CCM_DDS_SubscriberListener_i (void)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_SubscriberListener_i::~CCM_DDS_SubscriberListener_i");
-    }
-
-    void
-    CCM_DDS_SubscriberListener_i::on_data_on_readers (
-        ::DDSSubscriber* the_subscriber)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_SubscriberListener_i::on_data_on_readers");
-
-      ::DDS::Subscriber_var sub = ::DDS::Subscriber::_nil ();
-      ACE_NEW (sub,
-               CCM_DDS_Subscriber_i (the_subscriber));
-      this->impl_->on_data_on_readers (sub.in ());
-      the_subscriber->notify_datareaders ();
-    }
-
-    void
-    CCM_DDS_SubscriberListener_i::on_requested_deadline_missed (
-      ::DDSDataReader* the_reader,
-      const ::DDS_RequestedDeadlineMissedStatus & status)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_SubscriberListener_i::on_requested_deadline_missed");
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ::DDS::RequestedDeadlineMissedStatus ddsstatus;
-      ddsstatus <<= status;
-      ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil ();
-      ACE_NEW (dds_reader, CCM_DDS_DataReader_i ());
-      CCM_DDS_DataReader_i *rti_dr = dynamic_cast < CCM_DDS_DataReader_i *>(dds_reader.in ());
-      rti_dr->set_impl (the_reader);
-      this->impl_->on_requested_deadline_missed (dds_reader.in (), ddsstatus);
-#else
-      this->impl_->on_requested_deadline_missed (the_reader, status);
-#endif
-    }
-
-    void
-    CCM_DDS_SubscriberListener_i::on_requested_incompatible_qos (
-      ::DDSDataReader* the_reader,
-      const ::DDS_RequestedIncompatibleQosStatus & status)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_SubscriberListener_i::on_requested_incompatible_qos");
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ::DDS::RequestedIncompatibleQosStatus ddsstatus;
-      ddsstatus <<= status;
-      ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil ();
-      ACE_NEW (dds_reader, CCM_DDS_DataReader_i ());
-      CCM_DDS_DataReader_i *rti_dr = dynamic_cast < CCM_DDS_DataReader_i *>(dds_reader.in ());
-      rti_dr->set_impl (the_reader);
-      this->impl_->on_requested_incompatible_qos (dds_reader.in (), ddsstatus);
-#else
-      this->impl_->on_requested_incompatible_qos (the_reader, status);
-#endif
-    }
-
-    void
-    CCM_DDS_SubscriberListener_i::on_sample_rejected (
-      ::DDSDataReader* the_reader,
-      const ::DDS_SampleRejectedStatus & status)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_SubscriberListener_i::on_sample_rejected");
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ::DDS::SampleRejectedStatus ddsstatus;
-      ddsstatus <<= status;
-      ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil ();
-      ACE_NEW (dds_reader, CCM_DDS_DataReader_i ());
-      CCM_DDS_DataReader_i *rti_dr = dynamic_cast < CCM_DDS_DataReader_i *>(dds_reader.in ());
-      rti_dr->set_impl (the_reader);
-      this->impl_->on_sample_rejected (dds_reader.in (), ddsstatus);
-#else
-      this->impl_->on_sample_rejected (the_reader, status);
-#endif
-    }
-
-    void
-    CCM_DDS_SubscriberListener_i::on_liveliness_changed (
-      ::DDSDataReader* the_reader,
-      const ::DDS_LivelinessChangedStatus & status)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_SubscriberListener_i::on_liveliness_changed");
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ::DDS::LivelinessChangedStatus ddsstatus;
-      ddsstatus <<= status;
-      ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil ();
-      ACE_NEW (dds_reader, CCM_DDS_DataReader_i ());
-      CCM_DDS_DataReader_i *rti_dr = dynamic_cast < CCM_DDS_DataReader_i *>(dds_reader.in ());
-      rti_dr->set_impl (the_reader);
-      this->impl_->on_liveliness_changed (dds_reader.in (), ddsstatus);
-#else
-      this->impl_->on_liveliness_changed (the_reader, status);
-#endif
-    }
-
-    void
-    CCM_DDS_SubscriberListener_i::on_data_available (
-      ::DDSDataReader* the_reader)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_SubscriberListener_i::on_data_available");
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil ();
-      ACE_NEW (dds_reader, CCM_DDS_DataReader_i ());
-      CCM_DDS_DataReader_i *rti_dr = dynamic_cast < CCM_DDS_DataReader_i *>(dds_reader.in ());
-      rti_dr->set_impl (the_reader);
-      this->impl_->on_data_available (dds_reader.in ());
-#else
-      this->impl_->on_data_available (the_reader);
-#endif
-    }
-
-    void
-    CCM_DDS_SubscriberListener_i::on_subscription_matched (
-      ::DDSDataReader* the_reader,
-      const ::DDS_SubscriptionMatchedStatus & status)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_SubscriberListener_i::on_subscription_matched");
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ::DDS::SubscriptionMatchedStatus ddsstatus;
-      ddsstatus <<= status;
-      ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil ();
-      ACE_NEW (dds_reader, CCM_DDS_DataReader_i ());
-      CCM_DDS_DataReader_i *rti_dr = dynamic_cast < CCM_DDS_DataReader_i *>(dds_reader.in ());
-      rti_dr->set_impl (the_reader);
-      this->impl_->on_subscription_matched (dds_reader.in (), ddsstatus);
-#else
-      this->impl_->on_subscription_matched (the_reader, status);
-#endif
-    }
-
-    void
-    CCM_DDS_SubscriberListener_i::on_sample_lost (
-      ::DDSDataReader* the_reader,
-      const ::DDS_SampleLostStatus & status)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_SubscriberListener_i::on_sample_lost");
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ::DDS::SampleLostStatus ddsstatus;
-      ddsstatus <<= status;
-      ::DDS::DataReader_var dds_reader = ::DDS::DataReader::_nil ();
-      ACE_NEW (dds_reader, CCM_DDS_DataReader_i ());
-      CCM_DDS_DataReader_i *rti_dr = dynamic_cast < CCM_DDS_DataReader_i *>(dds_reader.in ());
-      rti_dr->set_impl (the_reader);
-      this->impl_->on_sample_lost (dds_reader.in (), ddsstatus);
-#else
-      this->impl_->on_sample_lost (the_reader, status);
-#endif
-    }
-
-    ::DDS::SubscriberListener_ptr
-    CCM_DDS_SubscriberListener_i::get_subscriber_listener (void)
-    {
-      return ::DDS::SubscriberListener::_duplicate (this->impl_.in ());
+      // Implementation skeleton constructor
+      RTI_SubscriberListener_i::RTI_SubscriberListener_i (::DDS::SubscriberListener_ptr p)
+        : impl_ ( ::DDS::SubscriberListener::_duplicate (p))
+      {
+        CIAO_TRACE ("RTI_SubscriberListener_i::RTI_SubscriberListener_i");
+      }
+
+      // Implementation skeleton destructor
+      RTI_SubscriberListener_i::~RTI_SubscriberListener_i (void)
+      {
+        CIAO_TRACE ("RTI_SubscriberListener_i::~RTI_SubscriberListener_i");
+      }
+
+      void
+      RTI_SubscriberListener_i::on_data_on_readers (
+          ::DDSSubscriber* the_subscriber)
+      {
+        CIAO_TRACE ("RTI_SubscriberListener_i::on_data_on_readers");
+
+        ::DDS::Subscriber_var sub = new RTI_Subscriber_i ();
+        RTI_Subscriber_i *s = dynamic_cast < RTI_Subscriber_i *> (sub.in ());
+        s->set_impl (the_subscriber);
+        this->impl_->on_data_on_readers (sub.in ());
+        the_subscriber->notify_datareaders ();
+      }
+
+      void
+      RTI_SubscriberListener_i::on_requested_deadline_missed (
+        ::DDSDataReader* the_reader,
+        const ::DDS_RequestedDeadlineMissedStatus & status)
+      {
+        CIAO_TRACE ("RTI_SubscriberListener_i::on_requested_deadline_missed");
+
+        ::DDS::RequestedDeadlineMissedStatus ddsstatus;
+        ddsstatus <<= status;
+        ::DDS::DataReader_var dds_reader = new RTI_DataReader_i ();
+        RTI_DataReader_i *rti_dr = dynamic_cast < RTI_DataReader_i *>(dds_reader.in ());
+        rti_dr->set_impl (the_reader);
+
+        this->impl_->on_requested_deadline_missed (dds_reader.in (), ddsstatus);
+      }
+
+      void
+      RTI_SubscriberListener_i::on_requested_incompatible_qos (
+        ::DDSDataReader* the_reader,
+        const ::DDS_RequestedIncompatibleQosStatus & status)
+      {
+        CIAO_TRACE ("RTI_SubscriberListener_i::on_requested_incompatible_qos");
+
+        ::DDS::RequestedIncompatibleQosStatus ddsstatus;
+        ddsstatus <<= status;
+        ::DDS::DataReader_var dds_reader = new RTI_DataReader_i ();
+        RTI_DataReader_i *rti_dr = dynamic_cast < RTI_DataReader_i *>(dds_reader.in ());
+        rti_dr->set_impl (the_reader);
+        this->impl_->on_requested_incompatible_qos (dds_reader.in (), ddsstatus);
+      }
+
+      void
+      RTI_SubscriberListener_i::on_sample_rejected (
+        ::DDSDataReader* the_reader,
+        const ::DDS_SampleRejectedStatus & status)
+      {
+        CIAO_TRACE ("RTI_SubscriberListener_i::on_sample_rejected");
+
+        ::DDS::SampleRejectedStatus ddsstatus;
+        ddsstatus <<= status;
+        ::DDS::DataReader_var dds_reader = new RTI_DataReader_i ();
+        RTI_DataReader_i *rti_dr = dynamic_cast < RTI_DataReader_i *>(dds_reader.in ());
+        rti_dr->set_impl (the_reader);
+        this->impl_->on_sample_rejected (dds_reader.in (), ddsstatus);
+      }
+
+      void
+      RTI_SubscriberListener_i::on_liveliness_changed (
+        ::DDSDataReader* the_reader,
+        const ::DDS_LivelinessChangedStatus & status)
+      {
+        CIAO_TRACE ("RTI_SubscriberListener_i::on_liveliness_changed");
+
+        ::DDS::LivelinessChangedStatus ddsstatus;
+        ddsstatus <<= status;
+        ::DDS::DataReader_var dds_reader = new RTI_DataReader_i ();
+        RTI_DataReader_i *rti_dr = dynamic_cast < RTI_DataReader_i *>(dds_reader.in ());
+        rti_dr->set_impl (the_reader);
+        this->impl_->on_liveliness_changed (dds_reader.in (), ddsstatus);
+      }
+
+      void
+      RTI_SubscriberListener_i::on_data_available (
+        ::DDSDataReader* the_reader)
+      {
+        CIAO_TRACE ("RTI_SubscriberListener_i::on_data_available");
+
+        ::DDS::DataReader_var dds_reader = new RTI_DataReader_i ();
+        RTI_DataReader_i *rti_dr = dynamic_cast < RTI_DataReader_i *>(dds_reader.in ());
+        rti_dr->set_impl (the_reader);
+        this->impl_->on_data_available (dds_reader.in ());
+      }
+
+      void
+      RTI_SubscriberListener_i::on_subscription_matched (
+        ::DDSDataReader* the_reader,
+        const ::DDS_SubscriptionMatchedStatus & status)
+      {
+        CIAO_TRACE ("RTI_SubscriberListener_i::on_subscription_matched");
+
+        ::DDS::SubscriptionMatchedStatus ddsstatus;
+        ddsstatus <<= status;
+        ::DDS::DataReader_var dds_reader = new RTI_DataReader_i ();
+        RTI_DataReader_i *rti_dr = dynamic_cast < RTI_DataReader_i *>(dds_reader.in ());
+        rti_dr->set_impl (the_reader);
+        this->impl_->on_subscription_matched (dds_reader.in (), ddsstatus);
+      }
+
+      void
+      RTI_SubscriberListener_i::on_sample_lost (
+        ::DDSDataReader* the_reader,
+        const ::DDS_SampleLostStatus & status)
+      {
+        CIAO_TRACE ("RTI_SubscriberListener_i::on_sample_lost");
+
+        ::DDS::SampleLostStatus ddsstatus;
+        ddsstatus <<= status;
+        ::DDS::DataReader_var dds_reader = new RTI_DataReader_i ();
+        RTI_DataReader_i *rti_dr = dynamic_cast < RTI_DataReader_i *>(dds_reader.in ());
+        rti_dr->set_impl (the_reader);
+        this->impl_->on_sample_lost (dds_reader.in (), ddsstatus);
+      }
+
+      ::DDS::SubscriberListener_ptr
+      RTI_SubscriberListener_i::get_subscriber_listener (void)
+      {
+        return ::DDS::SubscriberListener::_duplicate (this->impl_.in ());
+      }
     }
   }
 }
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.h b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.h
index 6ccfa187656..d645deb217e 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener.h
@@ -7,86 +7,75 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_SUBSCRIBERLISTENER_H
-#define DDS4CCM_SUBSCRIBERLISTENER_H
+#ifndef CIAO_RTI_SUBSCRIBERLISTENER_H
+#define CIAO_RTI_SUBSCRIBERLISTENER_H
 
 #include "dds4ccm/idl/dds_rtf2_dcpsEC.h"
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h"
 
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 #include "ndds/ndds_cpp.h"
-#endif
-
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::SubscriberListener DDSSubscriberListener;
-typedef ::DDS::DataReader DDSDataReader;
-typedef ::DDS::Subscriber DDSSubscriber;
-typedef ::DDS::RequestedDeadlineMissedStatus DDS_RequestedDeadlineMissedStatus;
-typedef ::DDS::LivelinessChangedStatus DDS_LivelinessChangedStatus;
-typedef ::DDS::RequestedIncompatibleQosStatus DDS_RequestedIncompatibleQosStatus;
-typedef ::DDS::SampleRejectedStatus DDS_SampleRejectedStatus;
-typedef ::DDS::SubscriptionMatchedStatus DDS_SubscriptionMatchedStatus;
-typedef ::DDS::SampleLostStatus DDS_SampleLostStatus;
-#endif
 
 namespace CIAO
 {
   namespace DDS4CCM
   {
-    class DDS4CCM_NDDS_IMPL_Export CCM_DDS_SubscriberListener_i :
-      public virtual ::DDSSubscriberListener
+    namespace RTI
     {
-    public:
-      /// Constructor
-      CCM_DDS_SubscriberListener_i ( ::DDS::SubscriberListener_ptr s);
-
-      /// Destructor
-      virtual ~CCM_DDS_SubscriberListener_i (void);
-
-      virtual void
-      on_requested_deadline_missed (
-        ::DDSDataReader* the_reader,
-        const ::DDS_RequestedDeadlineMissedStatus & status);
-
-      virtual void
-      on_requested_incompatible_qos (
-        ::DDSDataReader* the_reader,
-        const ::DDS_RequestedIncompatibleQosStatus & status);
-
-      virtual void
-      on_sample_rejected (
-        ::DDSDataReader* the_reader,
-        const ::DDS_SampleRejectedStatus & status);
-
-      virtual void
-      on_liveliness_changed (
-        ::DDSDataReader* the_reader,
-        const ::DDS_LivelinessChangedStatus & status);
-
-      virtual void
-      on_data_available (
-        ::DDSDataReader* the_reader);
-
-      virtual void
-      on_subscription_matched (
-        ::DDSDataReader* the_reader,
-        const ::DDS_SubscriptionMatchedStatus & status);
-
-      virtual void
-      on_sample_lost (
-        ::DDSDataReader* the_reader,
-        const ::DDS_SampleLostStatus & status);
-
-      virtual void
-      on_data_on_readers (
-        ::DDSSubscriber* the_subscriber);
-
-      ::DDS::SubscriberListener_ptr get_subscriber_listener (void);
-    private:
-      ::DDS::SubscriberListener_var impl_;
-    };
+      class DDS4CCM_NDDS_IMPL_Export RTI_SubscriberListener_i :
+        public virtual ::DDSSubscriberListener
+      {
+      public:
+        // Constructor
+        RTI_SubscriberListener_i ( ::DDS::SubscriberListener_ptr s);
+
+        // Destructor
+        virtual ~RTI_SubscriberListener_i (void);
+
+        virtual void
+        on_requested_deadline_missed (
+          ::DDSDataReader* the_reader,
+          const ::DDS_RequestedDeadlineMissedStatus & status);
+
+        virtual void
+        on_requested_incompatible_qos (
+          ::DDSDataReader* the_reader,
+          const ::DDS_RequestedIncompatibleQosStatus & status);
+
+        virtual void
+        on_sample_rejected (
+          ::DDSDataReader* the_reader,
+          const ::DDS_SampleRejectedStatus & status);
+
+        virtual void
+        on_liveliness_changed (
+          ::DDSDataReader* the_reader,
+          const ::DDS_LivelinessChangedStatus & status);
+
+        virtual void
+        on_data_available (
+          ::DDSDataReader* the_reader);
+
+        virtual void
+        on_subscription_matched (
+          ::DDSDataReader* the_reader,
+          const ::DDS_SubscriptionMatchedStatus & status);
+
+        virtual void
+        on_sample_lost (
+          ::DDSDataReader* the_reader,
+          const ::DDS_SampleLostStatus & status);
+
+        virtual void
+        on_data_on_readers (
+          ::DDSSubscriber* the_subscriber);
+
+        ::DDS::SubscriberListener_ptr get_subscriber_listener (void);
+      private:
+        ::DDS::SubscriberListener_var impl_;
+      };
+    }
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp
index 1dd1b95f0c4..7a692c11d41 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener_T.cpp
@@ -2,205 +2,107 @@
 #include "dds4ccm/impl/ndds/Utils.h"
 
 #include "dds4ccm/impl/ndds/DataReader.h"
-#include "dds4ccm/impl/logger/Log_Macros.h"
-#include "dds4ccm/impl/ndds/DDSCallbackStatusHandler.h"
-#include "dds4ccm/impl/ndds/Utils.h"
+#include "ciao/Logger/Log_Macros.h"
+#include "dds4ccm/impl/ndds/DataReaderHandler_T.h"
 #include "tao/ORB_Core.h"
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 CIAO::DDS4CCM::SubscriberListener_T<DDS_TYPE, CCM_TYPE>::SubscriberListener_T (
-  ::CCM_DDS::ConnectorStatusListener_ptr error_listener,
-  ACE_Reactor* reactor)
-    : error_listener_ (::CCM_DDS::ConnectorStatusListener::_duplicate (error_listener)),
-      reactor_ (reactor)
+  typename CCM_TYPE::context_type::_ptr_type context,
+  ::CCM_DDS::ConnectorStatusListener_ptr error_listener)
+    : context_ (CCM_TYPE::context_type::_duplicate (context)),
+      error_listener_ (::CCM_DDS::ConnectorStatusListener::_duplicate (error_listener))
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::SubscriberListener_T::SubscriberListener_T");
+  CIAO_TRACE ("CIAO::DDS4CCM::SubscriberListener_T::SubscriberListener_T");
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 CIAO::DDS4CCM::SubscriberListener_T<DDS_TYPE, CCM_TYPE>::~SubscriberListener_T (void)
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::SubscriberListener_T::~SubscriberListener_T");
+  CIAO_TRACE ("CIAO::DDS4CCM::SubscriberListener_T::~SubscriberListener_T");
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 void
 CIAO::DDS4CCM::SubscriberListener_T<DDS_TYPE, CCM_TYPE>::on_requested_incompatible_qos (
-  ::DDS::DataReader_ptr reader,
+  ::DDS::DataReader_ptr the_reader,
   const ::DDS::RequestedIncompatibleQosStatus & status)
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::SubscriberListener_T::on_requested_incompatible_qos");
-
-  DDS4CCM_DEBUG (10, (LM_DEBUG, CLINFO
-              ACE_TEXT ("SubscriberListener_T::on_requested_incompatible_qos: ")
-              ACE_TEXT ("total count <%d> - total change <%d> - ")
-              ACE_TEXT ("last policy id <%d> - policies "),
-              status.total_count, status.total_count_change,
-              status.last_policy_id));
-  for (CORBA::ULong i = 0; i < status.policies.length (); ++i)
-    {
-      DDS4CCM_DEBUG (10, (LM_DEBUG,
-                  ACE_TEXT ("\t\tid <%d> - count <%d>\n"),
-                  status.policies[i].policy_id,
-                  status.policies[i].count));
-    }
+  CIAO_TRACE ("CIAO::DDS4CCM::SubscriberListener_T::on_requested_incompatible_qos");
 
-  if (!CORBA::is_nil (this->error_listener_))
+  try
     {
-      try
+      if (!CORBA::is_nil (this->error_listener_))
         {
-          if (this->reactor_)
-            {
-              ::CIAO::DDS4CCM::OnRequestedOncompatibleQosHandler* rh = 0;
-              ACE_NEW (rh,
-                       ::CIAO::DDS4CCM::OnRequestedOncompatibleQosHandler (
-                         this->error_listener_, reader, status));
-              ACE_Event_Handler_var safe_handler (rh);
-              if (this->reactor_->notify (rh) != 0)
-                {
-                  DDS4CCM_ERROR (1, (LM_ERROR, CLINFO
-                              ACE_TEXT ("SubscriberListener_T::on_requested_incompatible_qos: ")
-                              ACE_TEXT ("failed to use reactor.\n")));
-                }
-            }
-          else
-            {
-              this->error_listener_->on_requested_incompatible_qos (reader, status);
-            }
+          this->error_listener_->on_requested_incompatible_qos (the_reader, status);
         }
-      catch (...)
+      else
         {
-          DDS4CCM_DEBUG (6, (LM_DEBUG, ACE_TEXT ("SubscriberListener_T::on_requested_incompatible_qos: ")
-                                 ACE_TEXT ("DDS Exception caught\n")));
+          CIAO_DEBUG (6, (LM_DEBUG, CLINFO
+                      ACE_TEXT ("SubscriberListener_T::on_requested_incompatible_qos: ")
+                      ACE_TEXT ("No error listener connected\n")));
         }
     }
-  else
+  catch (...)
     {
-      DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO
-                  ACE_TEXT ("SubscriberListener_T::on_requested_incompatible_qos: ")
-                  ACE_TEXT ("No error listener connected\n")));
+      CIAO_DEBUG (6, (LM_DEBUG, ACE_TEXT ("SubscriberListener_T::on_requested_incompatible_qos: ")
+                             ACE_TEXT ("DDS Exception caught\n")));
     }
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 void
-CIAO::DDS4CCM::SubscriberListener_T<DDS_TYPE, CCM_TYPE>::on_unexpected_status (
-  ::DDS::Entity_ptr entity,
-  ::DDS::StatusKind status_kind)
+CIAO::DDS4CCM::SubscriberListener_T<DDS_TYPE, CCM_TYPE>::on_liveliness_changed(
+  ::DDS::DataReader* reader,
+  const ::DDS::LivelinessChangedStatus& /*status*/)
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::SubscriberListener_T::on_unexpected_status");
+  CIAO_TRACE ("CIAO::DDS4CCM::SubscriberListener_T::on_liveliness_changed");
 
-  if (!CORBA::is_nil (this->error_listener_))
+  try
     {
-      try
+      if (!CORBA::is_nil (this->error_listener_))
         {
-          if (this->reactor_)
-            {
-              ::CIAO::DDS4CCM::OnUnexpectedStatusHandler* rh = 0;
-              ACE_NEW (rh,
-                       ::CIAO::DDS4CCM::OnUnexpectedStatusHandler (
-                         this->error_listener_, entity, status_kind));
-              ACE_Event_Handler_var safe_handler (rh);
-              if (this->reactor_->notify (rh) != 0)
-                {
-                  DDS4CCM_ERROR (1, (LM_ERROR, CLINFO
-                              ACE_TEXT ("SubscriberListener_T::on_unexpected_status: ")
-                              ACE_TEXT ("failed to use reactor.\n")));
-                }
-            }
-          else
-            {
-              this->error_listener_->on_unexpected_status (entity, status_kind);
-            }
+          this->error_listener_->on_unexpected_status (reader, ::DDS::LIVELINESS_CHANGED_STATUS);
         }
-      catch (...)
+      else
         {
-          DDS4CCM_DEBUG (6, (LM_DEBUG,
-              ACE_TEXT ("SubscriberListener_T::on_unexpected_status: ")
-              ACE_TEXT ("DDS Exception caught\n")));
+          CIAO_DEBUG (6, (LM_DEBUG, CLINFO
+                      ACE_TEXT ("SubscriberListener_T::on_liveliness_changed: ")
+                      ACE_TEXT ("No error listener connected\n")));
         }
-   }
-  else
+    }
+  catch (...)
     {
-      DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO
-                  ACE_TEXT ("SubscriberListener_T::on_requested_incompatible_qos: ")
-                  ACE_TEXT ("No error listener connected\n")));
+      CIAO_DEBUG (6, (LM_DEBUG, ACE_TEXT ("SubscriberListener_T::on_liveliness_changed: ")
+                             ACE_TEXT ("DDS Exception caught\n")));
     }
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 void
-CIAO::DDS4CCM::SubscriberListener_T<DDS_TYPE, CCM_TYPE>::on_liveliness_changed (
+CIAO::DDS4CCM::SubscriberListener_T<DDS_TYPE, CCM_TYPE>::on_sample_rejected(
   ::DDS::DataReader* reader,
-  const ::DDS::LivelinessChangedStatus& status)
-{
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::SubscriberListener_T::on_liveliness_changed");
-
-  DDS4CCM_DEBUG (10, (LM_DEBUG, CLINFO
-              ACE_TEXT ("SubscriberListener_T::on_liveliness_changed: ")
-              ACE_TEXT ("alive count <%d> - not alive count <%d> - ")
-              ACE_TEXT ("alive count change <%d> - not alive count change <%d> ")
-              ACE_TEXT ("last publication handle <length <%d> - isValid <%d>\n"),
-              status.alive_count, status.not_alive_count,
-              status.alive_count_change, status.not_alive_count_change,
-              status.last_publication_handle.length,
-              status.last_publication_handle.isValid));
-
-  this->on_unexpected_status (reader, ::DDS::LIVELINESS_CHANGED_STATUS);
-}
-
-template <typename DDS_TYPE, typename CCM_TYPE>
-void
-CIAO::DDS4CCM::SubscriberListener_T<DDS_TYPE, CCM_TYPE>::on_sample_rejected (
-  ::DDS::DataReader_ptr reader,
   const ::DDS::SampleRejectedStatus& status)
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::SubscriberListener_T::on_sample_rejected");
+  CIAO_TRACE ("CIAO::DDS4CCM::SubscriberListener_T::on_sample_rejected");
 
-  DDS4CCM_DEBUG (10, (LM_DEBUG, CLINFO
-              ACE_TEXT ("SubscriberListener_T::on_sample_rejected: ")
-              ACE_TEXT ("total count <%d> - count change <%d> - ")
-              ACE_TEXT ("last reason <%C> - last instance handle ")
-              ACE_TEXT ("<length <%d> - isValid <%d>\n"),
-              status.total_count, status.total_count_change,
-              translate_rejectedstatuskind (status.last_reason),
-              status.last_instance_handle.length,
-              status.last_instance_handle.isValid));
-
-  if (!CORBA::is_nil (this->error_listener_))
+  try
     {
-      try
+      if (!CORBA::is_nil (this->error_listener_))
         {
-          if (this->reactor_)
-            {
-              ::CIAO::DDS4CCM::OnSampleRejectedHandler* rh = 0;
-              ACE_NEW (rh,
-                       ::CIAO::DDS4CCM::OnSampleRejectedHandler (
-                       this->error_listener_, reader, status));
-              ACE_Event_Handler_var safe_handler (rh);
-              if (this->reactor_->notify (rh) != 0)
-                {
-                  DDS4CCM_ERROR (1, (LM_ERROR, CLINFO
-                              ACE_TEXT ("SubscriberListener_T::on_sample_rejected: ")
-                              ACE_TEXT ("failed to use reactor.\n")));
-                }
-            }
-          else
-            {
-              this->error_listener_->on_sample_rejected (reader, status);
-            }
+          this->error_listener_->on_sample_rejected (reader, status);
         }
-      catch (...)
+      else
         {
-          DDS4CCM_DEBUG (6, (LM_DEBUG, ACE_TEXT ("SubscriberListener_T::on_sample_rejected: ")
-                                 ACE_TEXT ("DDS Exception caught\n")));
+          CIAO_DEBUG (6, (LM_DEBUG, CLINFO
+                      ACE_TEXT ("SubscriberListener_T::on_sample_rejected: ")
+                      ACE_TEXT ("No error listener connected\n")));
         }
     }
-  else
+  catch (...)
     {
-      DDS4CCM_DEBUG (6, (LM_DEBUG, CLINFO
-                  ACE_TEXT ("SubscriberListener_T::on_sample_rejected: ")
-                  ACE_TEXT ("No error listener connected\n")));
+      CIAO_DEBUG (6, (LM_DEBUG, ACE_TEXT ("SubscriberListener_T::on_sample_rejected: ")
+                             ACE_TEXT ("DDS Exception caught\n")));
     }
 }
 
@@ -208,70 +110,65 @@ template <typename DDS_TYPE, typename CCM_TYPE>
 void
 CIAO::DDS4CCM::SubscriberListener_T<DDS_TYPE, CCM_TYPE>::on_subscription_matched(
   ::DDS::DataReader* reader,
-  const ::DDS::SubscriptionMatchedStatus& status)
+  const ::DDS::SubscriptionMatchedStatus& /*status*/)
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::SubscriberListener_T::on_subscription_matched");
-
-  DDS4CCM_DEBUG (10, (LM_DEBUG, CLINFO
-              ACE_TEXT ("SubscriberListener_T::on_subscription_matched: ")
-              ACE_TEXT ("total count <%d> - count change <%d> - ")
-              ACE_TEXT ("current count <%d> - current count change <%d> ")
-              ACE_TEXT ("last publication handle <length <%d> - isValid <%d>\n"),
-              status.total_count, status.total_count_change,
-              status.current_count, status.current_count_change,
-              status.last_publication_handle.length,
-              status.last_publication_handle.isValid));
+  CIAO_TRACE ("CIAO::DDS4CCM::SubscriberListener_T::on_subscription_matched");
 
-  this->on_unexpected_status (reader, ::DDS::SUBSCRIPTION_MATCHED_STATUS);
+  try
+    {
+      if (!CORBA::is_nil (this->error_listener_))
+        {
+          this->error_listener_->on_unexpected_status (reader, ::DDS::SUBSCRIPTION_MATCHED_STATUS);
+        }
+      else
+        {
+          CIAO_DEBUG (6, (LM_DEBUG, CLINFO
+                      ACE_TEXT ("SubscriberListener_T::on_subscription_matched: ")
+                      ACE_TEXT ("No error listener connected\n")));
+        }
+    }
+  catch (...)
+    {
+      CIAO_DEBUG (6, (LM_DEBUG, ACE_TEXT ("SubscriberListener_T::on_subscription_matched: ")
+                             ACE_TEXT ("DDS Exception caught\n")));
+    }
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 void
 CIAO::DDS4CCM::SubscriberListener_T<DDS_TYPE, CCM_TYPE>::on_data_on_readers(
-  ::DDS::Subscriber *)
+  ::DDS::Subscriber* sub)
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::SubscriberListener_T::on_data_on_readers");
-  //do nothing by design
-}
+  CIAO_TRACE ("CIAO::DDS4CCM::SubscriberListener_T::on_data_on_readers");
 
-template <typename DDS_TYPE, typename CCM_TYPE>
-void
-CIAO::DDS4CCM::SubscriberListener_T<DDS_TYPE, CCM_TYPE>::on_requested_deadline_missed (
-  ::DDS::DataReader_ptr ,
-  const ::DDS::RequestedDeadlineMissedStatus & )
-{
-}
-
-template <typename DDS_TYPE, typename CCM_TYPE>
-void
-CIAO::DDS4CCM::SubscriberListener_T<DDS_TYPE, CCM_TYPE>::on_data_available (
-  ::DDS::DataReader_ptr )
-{
-}
-
-template <typename DDS_TYPE, typename CCM_TYPE>
-void
-CIAO::DDS4CCM::SubscriberListener_T<DDS_TYPE, CCM_TYPE>::on_sample_lost (
-  ::DDS::DataReader_ptr ,
-  const ::DDS::SampleLostStatus & )
-{
+  try
+    {
+      if (!CORBA::is_nil (this->error_listener_))
+        {
+          this->error_listener_->on_unexpected_status (sub, ::DDS::DATA_ON_READERS_STATUS);
+        }
+      else
+        {
+          CIAO_DEBUG (6, (LM_DEBUG, CLINFO
+                      ACE_TEXT ("SubscriberListener_T::on_data_on_readers: ")
+                      ACE_TEXT ("No error listener connected\n")));
+        }
+    }
+  catch (...)
+    {
+      CIAO_DEBUG (6, (LM_DEBUG, ACE_TEXT ("SubscriberListener_T::on_data_on_readers: ")
+                             ACE_TEXT ("DDS Exception caught\n")));
+    }
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 ::DDS::StatusMask
-CIAO::DDS4CCM::SubscriberListener_T<DDS_TYPE, CCM_TYPE>::get_mask (
-  ::CCM_DDS::ConnectorStatusListener_ptr csl)
+CIAO::DDS4CCM::SubscriberListener_T<DDS_TYPE, CCM_TYPE>::get_mask (void)
 {
-  if (!CORBA::is_nil (csl) || CIAO_debug_level >= 10)
-    {
-      return ::DDS::REQUESTED_INCOMPATIBLE_QOS_STATUS |
-             ::DDS::SAMPLE_REJECTED_STATUS |
-             ::DDS::LIVELINESS_CHANGED_STATUS |
-             ::DDS::SUBSCRIPTION_MATCHED_STATUS;
-    }
-  else
-    {
-      return 0;
-    }
+  return DDS_REQUESTED_INCOMPATIBLE_QOS_STATUS |
+         DDS_SAMPLE_REJECTED_STATUS |
+         DDS_LIVELINESS_CHANGED_STATUS |
+         DDS_SUBSCRIPTION_MATCHED_STATUS |
+         DDS_DATA_ON_READERS_STATUS;
 }
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener_T.h b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener_T.h
index 0243b894bd8..eed5184414e 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener_T.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberListener_T.h
@@ -13,8 +13,6 @@
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "ace/Copy_Disabled.h"
 
-class ACE_Reactor;
-
 namespace CIAO
 {
   namespace DDS4CCM
@@ -27,14 +25,14 @@ namespace CIAO
     public:
       /// Constructor
       SubscriberListener_T (
-        ::CCM_DDS::ConnectorStatusListener_ptr error_listener,
-        ACE_Reactor* reactor);
+        typename CCM_TYPE::context_type::_ptr_type context,
+        ::CCM_DDS::ConnectorStatusListener_ptr error_listener);
 
       /// Destructor
       virtual ~SubscriberListener_T (void);
 
       virtual void on_requested_incompatible_qos (
-        ::DDS::DataReader_ptr reader,
+        ::DDS::DataReader_ptr the_reader,
         const ::DDS::RequestedIncompatibleQosStatus & status);
 
       virtual void on_liveliness_changed(
@@ -52,30 +50,23 @@ namespace CIAO
       virtual void on_data_on_readers(
         ::DDS::Subscriber* subscriber);
 
-      virtual void on_requested_deadline_missed (
-        ::DDS::DataReader_ptr ,
-        const ::DDS::RequestedDeadlineMissedStatus & );
-
-      virtual void on_data_available (
-        ::DDS::DataReader_ptr );
-
-      virtual void on_sample_lost (
-        ::DDS::DataReader_ptr ,
-        const ::DDS::SampleLostStatus & );
+    virtual void
+    on_requested_deadline_missed (
+      ::DDS::DataReader_ptr ,
+      const ::DDS::RequestedDeadlineMissedStatus & ) {}
+    virtual void
+    on_data_available (
+      ::DDS::DataReader_ptr ) {}
+    virtual void
+    on_sample_lost (
+      ::DDS::DataReader_ptr ,
+      const ::DDS::SampleLostStatus & ) {}
 
-      static ::DDS::StatusMask get_mask (
-        ::CCM_DDS::ConnectorStatusListener_ptr csl);
+      static ::DDS::StatusMask get_mask (void);
 
     private:
-      typename CCM_TYPE::context_type::_var_type context_;
-
-      virtual void on_unexpected_status(
-        ::DDS::Entity_ptr entity,
-        ::DDS::StatusKind status_kind);
-
+    typename CCM_TYPE::context_type::_var_type context_;
       ::CCM_DDS::ConnectorStatusListener_var error_listener_;
-
-      ACE_Reactor* reactor_;
     };
   }
 }
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/SubscriberQos.h b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberQos.h
index 4121a2569e4..866e0e2d3ab 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/SubscriberQos.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/SubscriberQos.h
@@ -6,16 +6,11 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_SUBSCRIBERQOS_H
-#define DDS4CCM_SUBSCRIBERQOS_H
+#ifndef CIAO_RTI_SUBSCRIBERQOS_H
+#define CIAO_RTI_SUBSCRIBERQOS_H
 
 #include "EntityFactoryQosPolicy.h"
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::SubscriberQos DDS_SubscriberQos;
-#endif
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::SubscriberQos &ddsqos, const ::DDS_SubscriberQos & qos)
 {
@@ -51,6 +46,5 @@ operator>>= (const ::DDS::SubscriberQos &qos, ::DDS_SubscriberQos & ddsqos)
   ddsqos.group_data <<= qos.group_data;
   ddsqos.entity_factory <<= qos.entity_factory;
 }
-#endif
 
-#endif /* DDS4CCM_SUBSCRIBERQOS_H */
+#endif /* CIAO_RTI_SUBSCRIBERQOS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/SubscriptionMatchedStatus.h b/CIAO/connectors/dds4ccm/impl/ndds/SubscriptionMatchedStatus.h
index 01a6f04c5e7..0bfbfdbab4f 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/SubscriptionMatchedStatus.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/SubscriptionMatchedStatus.h
@@ -7,16 +7,11 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_SUBSCRIPTIONMATCHEDSTATUS_H
-#define DDS4CCM_SUBSCRIPTIONMATCHEDSTATUS_H
+#ifndef CIAO_RTI_SUBSCRIPTIONMATCHEDSTATUS_H
+#define CIAO_RTI_SUBSCRIPTIONMATCHEDSTATUS_H
 
 #include "InstanceHandle_t.h"
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::SubscriptionMatchedStatus DDS_SubscriptionMatchedStatus;
-#endif
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::SubscriptionMatchedStatus &ddsstatus, const ::DDS_SubscriptionMatchedStatus & status)
 {
@@ -56,7 +51,6 @@ operator>>= (const ::DDS::SubscriptionMatchedStatus &status, ::DDS_SubscriptionM
   ddsstatus.current_count_change = status.current_count_change;
   ddsstatus.last_publication_handle <<= status.last_publication_handle;
 }
-#endif
 
-#endif /* DDS4CCM_SUBSCRIPTIONMATCHEDSTATUS_H */
+#endif /* CIAO_RTI_SUBSCRIPTIONMATCHEDSTATUS_H */
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TimeBasedFilterQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/TimeBasedFilterQosPolicy.h
index 19aaaf31251..0e4bac3fb77 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/TimeBasedFilterQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/TimeBasedFilterQosPolicy.h
@@ -6,16 +6,11 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_TIMEBASEDFILTERQOSPOLICY_H
-#define DDS4CCM_TIMEBASEDFILTERQOSPOLICY_H
+#ifndef CIAO_RTI_TIMEBASEDFILTERQOSPOLICY_H
+#define CIAO_RTI_TIMEBASEDFILTERQOSPOLICY_H
 
 #include "Duration_t.h"
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::TimeBasedFilterQosPolicy DDS_TimeBasedFilterQosPolicy;
-#endif
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::TimeBasedFilterQosPolicy &ddsqos, const ::DDS_TimeBasedFilterQosPolicy & qos)
 {
@@ -39,6 +34,5 @@ operator>>= (const ::DDS::TimeBasedFilterQosPolicy &qos, ::DDS_TimeBasedFilterQo
 {
   ddsqos.minimum_separation <<= qos.minimum_separation;
 }
-#endif
 
-#endif /* DDS4CCM_TIMEBASEDFILTERQOSPOLICY_H */
+#endif /* CIAO_RTI_TIMEBASEDFILTERQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TimeUtilities.h b/CIAO/connectors/dds4ccm/impl/ndds/TimeUtilities.h
index 1ebb682c1b9..bab4717bcec 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/TimeUtilities.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/TimeUtilities.h
@@ -15,7 +15,16 @@
 #define DDS4CCM_TIME_UTILITIES_H
 
 #include "ace/Time_Value.h"
-#include "dds4ccm/idl/dds_rtf2_dcpsC.h"
+
+/*
+  TIME_T
+  long sec;
+  unsigned long nanosec;
+
+  ACE_TIME_VALUE
+  time_t sec,
+  suseconds_t usec );
+*/
 
 inline void
 operator<<= (::DDS::Time_t & dds_time, const ::ACE_Time_Value & ace_time)
@@ -45,4 +54,6 @@ operator>>= (const ::ACE_Time_Value & ace_time, ::DDS::Time_t &dds_time)
   dds_time.nanosec = ace_time.usec () * 1000;
 }
 
+
+
 #endif /* DDS4CCM_TIME_UTILITIES_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Time_t.h b/CIAO/connectors/dds4ccm/impl/ndds/Time_t.h
index a78b01a4058..e1e7145c016 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Time_t.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Time_t.h
@@ -7,14 +7,9 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_TIME_T_H
-#define DDS4CCM_TIME_T_H
+#ifndef CIAO_RTI_TIME_T_H
+#define CIAO_RTI_TIME_T_H
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::Time_t DDS_Time_t;
-#endif
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::Time_t &ddstime, const ::DDS_Time_t & time)
 {
@@ -35,7 +30,6 @@ operator>>= (const ::DDS_Time_t &time, ::DDS::Time_t & ddstime)
   ddstime.sec = time.sec;
   ddstime.nanosec = time.nanosec;
 }
-#endif
 
-#endif /* DDS4CCM_TIME_T_H */
+#endif /* CIAO_RTI_TIME_T_H */
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Topic.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Topic.cpp
index d53e7e0cb17..97231aa0c9a 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Topic.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Topic.cpp
@@ -7,201 +7,141 @@
 #include "InstanceHandle_t.h"
 #include "InconsistentTopicStatus.h"
 #include "TopicQos.h"
-#include "dds4ccm/impl/logger/Log_Macros.h"
+#include "ciao/Logger/Log_Macros.h"
 
 namespace CIAO
 {
   namespace DDS4CCM
   {
-    CCM_DDS_Topic_i::CCM_DDS_Topic_i (DDSTopic* topic)
-      : impl_ (topic)
+    namespace RTI
     {
-    }
+      // Implementation skeleton constructor
+      RTI_Topic_i::RTI_Topic_i (void)
+        : impl_ (0)
+      {
+      }
 
-    CCM_DDS_Topic_i::~CCM_DDS_Topic_i (void)
-    {
-    }
+      // Implementation skeleton destructor
+      RTI_Topic_i::~RTI_Topic_i (void)
+      {
+      }
 
-    ::DDS::ReturnCode_t
-    CCM_DDS_Topic_i::set_qos (const ::DDS::TopicQos &qos)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ::DDS_TopicQos ddsqos;
-      ddsqos <<= qos;
-      return this->impl ()->set_qos (ddsqos);
-#else
-      return this->impl ()->set_qos (qos);
-#endif
-    }
+      ::DDS::ReturnCode_t
+      RTI_Topic_i::set_qos (const ::DDS::TopicQos &qos)
+      {
+        ::DDS_TopicQos ddsqos;
+        ddsqos <<= qos;
+        return this->impl ()->set_qos (ddsqos);
+      }
 
-    ::DDS::ReturnCode_t
-    CCM_DDS_Topic_i::get_qos (::DDS::TopicQos &qos)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ::DDS_TopicQos ddsqos;
-      ::DDS_ReturnCode_t const retval = this->impl ()->get_qos (ddsqos);
-      qos <<= ddsqos;
-      return retval;
-#else
-      return this->impl ()->get_qos (qos);
-#endif
-    }
+      ::DDS::ReturnCode_t
+      RTI_Topic_i::get_qos (::DDS::TopicQos &qos)
+      {
+        ::DDS_TopicQos ddsqos;
+        ::DDS_ReturnCode_t const retval = this->impl ()->get_qos (ddsqos);
+        qos <<= ddsqos;
+        return retval;
+      }
 
-    ::DDS::ReturnCode_t
-    CCM_DDS_Topic_i::set_listener (
-      ::DDS::TopicListener_ptr a_listener,
-      ::DDS::StatusMask mask)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_Topic_i::set_listener");
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      CCM_DDS_TopicListener_i *rti_impl_list = 0;
-      if (!CORBA::is_nil (a_listener))
-        {
-          ACE_NEW_THROW_EX (rti_impl_list,
-                            CCM_DDS_TopicListener_i (a_listener),
-                            CORBA::NO_MEMORY ());
-        }
-      return this->impl ()->set_listener (rti_impl_list, mask);
-#else
-      return this->impl ()->set_listener (a_listener, mask);
-#endif
-    }
+      ::DDS::ReturnCode_t
+      RTI_Topic_i::set_listener (::DDS::TopicListener_ptr a_listener,
+                                 ::DDS::StatusMask mask)
+      {
+        CIAO_TRACE ("RTI_Topic_i::set_listener");
+        RTI_TopicListener_i* rti_impl_list = new RTI_TopicListener_i (a_listener);
+        return this->impl ()->set_listener (rti_impl_list, mask);
+      }
 
-    ::DDS::TopicListener_ptr
-    CCM_DDS_Topic_i::get_listener (void)
-    {
-      DDS4CCM_TRACE ("CCM_DDS_Topic_i::get_listener");
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      DDSTopicListener *rti_topic_list = this->impl ()->get_listener ();
-      CCM_DDS_TopicListener_i *list_proxy = dynamic_cast <CCM_DDS_TopicListener_i *> (rti_topic_list);
-      if (!list_proxy)
-        {
-          DDS4CCM_DEBUG (6, (LM_DEBUG, "CCM_DDS_Topic_i::get_listener - "
-                                    "DDS returned a NIL listener.\n"));
-          return ::DDS::TopicListener::_nil ();
-        }
-      return list_proxy->get_topiclistener ();
-#else
-      return this->impl ()->get_listener ();
-#endif
-    }
+      ::DDS::TopicListener_ptr
+      RTI_Topic_i::get_listener (void)
+      {
+        CIAO_TRACE ("RTI_Topic_i::get_listener");
+        throw CORBA::NO_IMPLEMENT ();
+      }
 
-    ::DDS::ReturnCode_t
-    CCM_DDS_Topic_i::get_inconsistent_topic_status (
-      ::DDS::InconsistentTopicStatus & a_status)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      DDS_InconsistentTopicStatus ddsstatus;
-      ddsstatus <<= a_status;
-      return this->impl ()->get_inconsistent_topic_status (ddsstatus);
-#else
-      return this->impl ()->get_inconsistent_topic_status (a_status);
-#endif
-    }
+      ::DDS::ReturnCode_t
+      RTI_Topic_i::get_inconsistent_topic_status (::DDS::InconsistentTopicStatus & a_status)
+      {
+        DDS_InconsistentTopicStatus ddsstatus;
+        ddsstatus <<= a_status;
+        return this->impl ()->get_inconsistent_topic_status (ddsstatus);
+      }
 
-    ::DDS::ReturnCode_t
-    CCM_DDS_Topic_i::enable (void)
-    {
-      return this->impl ()->enable ();
-    }
+      ::DDS::ReturnCode_t
+      RTI_Topic_i::enable (void)
+      {
+        return this->impl ()->enable ();
+      }
 
-    ::DDS::StatusCondition_ptr
-    CCM_DDS_Topic_i::get_statuscondition (void)
-    {
-      ::DDS::StatusCondition_var retval = ::DDS::StatusCondition::_nil ();
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      DDSStatusCondition* sc = this->impl ()->get_statuscondition ();
-      ACE_NEW_THROW_EX (retval,
-                        CCM_DDS_StatusCondition_i (sc),
-                        CORBA::NO_MEMORY ());
-#else
-      ::DDS::StatusCondition_var sc = this->impl ()->get_statuscondition ();
-      ACE_NEW_THROW_EX (retval,
-                        CCM_DDS_StatusCondition_i (sc.in ()),
-                        CORBA::NO_MEMORY ());
-#endif
-      return retval._retn ();
-    }
+      ::DDS::StatusCondition_ptr
+      RTI_Topic_i::get_statuscondition (void)
+      {
+        DDSStatusCondition* sc = this->impl ()->get_statuscondition ();
+        ::DDS::StatusCondition_var retval = new RTI_StatusCondition_i ();
+        RTI_StatusCondition_i *rti_sc = dynamic_cast < RTI_StatusCondition_i *> (retval.in ());
+        rti_sc->set_impl (sc);
+        return retval._retn ();
+      }
 
-    ::DDS::StatusMask
-    CCM_DDS_Topic_i::get_status_changes (void)
-    {
-      return this->impl ()->get_status_changes ();
-    }
+      ::DDS::StatusMask
+      RTI_Topic_i::get_status_changes (void)
+      {
+        return this->impl ()->get_status_changes ();
+      }
 
-    ::DDS::InstanceHandle_t
-    CCM_DDS_Topic_i::get_instance_handle (void)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ::DDS_InstanceHandle_t const rtihandle = this->impl ()->get_instance_handle ();
-      ::DDS::InstanceHandle_t handle;
-      handle <<= rtihandle;
-      return handle;
-#else
-      return this->impl ()->get_instance_handle ();
-#endif
-    }
+      ::DDS::InstanceHandle_t
+      RTI_Topic_i::get_instance_handle (void)
+      {
+        ::DDS_InstanceHandle_t const rtihandle = this->impl ()->get_instance_handle ();
+        ::DDS::InstanceHandle_t handle;
+        handle <<= rtihandle;
+        return handle;
+      }
 
-    char *
-    CCM_DDS_Topic_i::get_type_name (void)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      return CORBA::string_dup (this->impl ()->get_type_name ());
-#else
-      return this->impl ()->get_type_name ();
-#endif
-    }
+      char *
+      RTI_Topic_i::get_type_name (void)
+      {
+        return CORBA::string_dup (this->impl ()->get_type_name ());
+      }
 
-    char *
-    CCM_DDS_Topic_i::get_name (void)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      return CORBA::string_dup (this->impl ()->get_name ());
-#else
-      return this->impl ()->get_name ();
-#endif
-    }
+      char *
+      RTI_Topic_i::get_name (void)
+      {
+        return CORBA::string_dup (this->impl ()->get_name ());
+      }
 
-    ::DDS::DomainParticipant_ptr
-    CCM_DDS_Topic_i::get_participant (void)
-    {
-      ::DDS::DomainParticipant_var retval = ::DDS::DomainParticipant::_nil ();
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      DDSDomainParticipant* p = this->impl ()->get_participant ();
-      ACE_NEW_THROW_EX (retval,
-                        CCM_DDS_DomainParticipant_i (p),
-                        CORBA::NO_MEMORY ());
-#else
-      ::DDS::DomainParticipant_var p = this->impl ()->get_participant ();
-      ACE_NEW_THROW_EX (retval,
-                        CCM_DDS_DomainParticipant_i (p.in ()),
-                        CORBA::NO_MEMORY ());
-#endif
-      return retval._retn ();
-    }
+      ::DDS::DomainParticipant_ptr
+      RTI_Topic_i::get_participant (void)
+      {
+        DDSDomainParticipant* p = this->impl ()->get_participant ();
+        ::DDS::DomainParticipant_var retval = new RTI_DomainParticipant_i ();
+        RTI_DomainParticipant_i *rti_dp = dynamic_cast < RTI_DomainParticipant_i *> (retval.in ());
+        rti_dp->set_impl (p);
+        return retval._retn ();
+      }
 
-    DDSTopic *
-    CCM_DDS_Topic_i::get_impl (void)
-    {
-      return this->impl_;
-    }
+      DDSTopic *
+      RTI_Topic_i::get_impl (void)
+      {
+        return this->impl_;
+      }
 
-    void
-    CCM_DDS_Topic_i::set_impl (DDSTopic * topic)
-    {
-      this->impl_ = topic;
-    }
+      void
+      RTI_Topic_i::set_impl (DDSTopic * topic)
+      {
+        this->impl_ = topic;
+      }
 
-    DDSTopic *
-    CCM_DDS_Topic_i::impl (void)
-    {
-      if (!this->impl_)
-        {
-          throw ::CORBA::BAD_INV_ORDER ();
-        }
-      return this->impl_;
+      DDSTopic *
+      RTI_Topic_i::impl (void)
+      {
+        if (!this->impl_)
+          {
+            throw ::CORBA::BAD_INV_ORDER ();
+          }
+        return this->impl_;
       }
+
+    }
   }
 }
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Topic.h b/CIAO/connectors/dds4ccm/impl/ndds/Topic.h
index 20b40839cd9..aad858028fa 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Topic.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Topic.h
@@ -15,68 +15,70 @@
 #include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h"
 #include "tao/LocalObject.h"
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::Topic DDSTopic;
-#endif
-
 namespace CIAO
 {
   namespace DDS4CCM
   {
-    class DDS4CCM_NDDS_IMPL_Export CCM_DDS_Topic_i :
-      public virtual ::DDS::CCM_Topic,
-      public virtual ::CORBA::LocalObject
+    namespace RTI
     {
-    public:
-      /// Constructor
-      CCM_DDS_Topic_i (DDSTopic* topic);
+      class DDS4CCM_NDDS_IMPL_Export RTI_Topic_i :
+        public virtual ::DDS::CCM_Topic,
+        public virtual ::CORBA::LocalObject
+      {
+      public:
+        // Constructor
+        RTI_Topic_i (void);
 
-      /// Destructor
-      virtual ~CCM_DDS_Topic_i (void);
+        // Destructor
+        virtual ~RTI_Topic_i (void);
 
-      virtual ::DDS::ReturnCode_t set_qos (const ::DDS::TopicQos & qos);
+        virtual
+          ::DDS::ReturnCode_t set_qos (const ::DDS::TopicQos & qos);
 
-      virtual ::DDS::ReturnCode_t get_qos (::DDS::TopicQos & qos);
+        virtual
+          ::DDS::ReturnCode_t get_qos (::DDS::TopicQos & qos);
 
-      virtual ::DDS::ReturnCode_t set_listener (
-        ::DDS::TopicListener_ptr a_listener,
-        ::DDS::StatusMask mask);
+        virtual
+          ::DDS::ReturnCode_t set_listener (::DDS::TopicListener_ptr a_listener,
+                                            ::DDS::StatusMask mask);
 
-      virtual ::DDS::TopicListener_ptr get_listener (void);
+        virtual
+          ::DDS::TopicListener_ptr get_listener (void);
 
-      virtual ::DDS::ReturnCode_t get_inconsistent_topic_status (
-        ::DDS::InconsistentTopicStatus & a_status);
+        virtual
+          ::DDS::ReturnCode_t get_inconsistent_topic_status (::DDS::InconsistentTopicStatus & a_status);
 
-      virtual
-        ::DDS::ReturnCode_t enable (void);
+        virtual
+          ::DDS::ReturnCode_t enable (void);
 
-      virtual
-        ::DDS::StatusCondition_ptr get_statuscondition (void);
+        virtual
+          ::DDS::StatusCondition_ptr get_statuscondition (void);
 
-      virtual
-        ::DDS::StatusMask get_status_changes (void);
+        virtual
+          ::DDS::StatusMask get_status_changes (void);
 
-      virtual
-        ::DDS::InstanceHandle_t get_instance_handle (void);
+        virtual
+          ::DDS::InstanceHandle_t get_instance_handle (void);
 
-      virtual
-        char * get_type_name (void);
+        virtual
+          char * get_type_name (void);
 
-      virtual
-        char * get_name (void);
+        virtual
+          char * get_name (void);
 
-      virtual
-        ::DDS::DomainParticipant_ptr get_participant (void);
+        virtual
+          ::DDS::DomainParticipant_ptr get_participant (void);
 
-      DDSTopic * get_impl (void);
+        DDSTopic * get_impl (void);
 
-      void set_impl (DDSTopic* topic);
+        void set_impl (DDSTopic * topic);
 
-    private:
-      DDSTopic * impl_;
+      private:
+        DDSTopic * impl_;
 
-      DDSTopic * impl (void);
-    };
+        DDSTopic * impl (void);
+      };
+    }
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TopicDataQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/TopicDataQosPolicy.h
index 0769149068f..8d71f724e71 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/TopicDataQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/TopicDataQosPolicy.h
@@ -6,14 +6,9 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_TOPICDATAQOSPOLICY_H
-#define DDS4CCM_TOPICDATAQOSPOLICY_H
+#ifndef CIAO_RTI_TOPICDATAQOSPOLICY_H
+#define CIAO_RTI_TOPICDATAQOSPOLICY_H
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::TopicDataQosPolicy DDS_TopicDataQosPolicy;
-#endif
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::TopicDataQosPolicy &ddsqos, const ::DDS_TopicDataQosPolicy & qos)
 {
@@ -46,6 +41,5 @@ operator>>= (const ::DDS::TopicDataQosPolicy &qos, ::DDS_TopicDataQosPolicy & dd
   ACE_UNUSED_ARG (qos);
 //  ddsqos.value = qos.value;
 }
-#endif
 
-#endif /* DDS4CCM_TOPICDATAQOSPOLICY_H */
+#endif /* CIAO_RTI_TOPICDATAQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.cpp b/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.cpp
index f9f8fc37b4c..136fbd65ab4 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.cpp
@@ -5,79 +5,69 @@
 
 #include "dds4ccm/idl/dds4ccm_BaseC.h"
 
-#include "dds4ccm/impl/logger/Log_Macros.h"
+#include "ciao/Logger/Log_Macros.h"
 
 namespace CIAO
 {
   namespace DDS4CCM
   {
-    CCM_DDS_TopicDescription_i::CCM_DDS_TopicDescription_i (
-      DDSTopicDescription * rc) : impl_ (rc)
+    namespace RTI
     {
-    }
+      // Implementation skeleton constructor
+      RTI_TopicDescription_i::RTI_TopicDescription_i (void)
+        : impl_ (0)
+      {
+      }
 
-    CCM_DDS_TopicDescription_i::~CCM_DDS_TopicDescription_i (void)
-    {
-    }
+      // Implementation skeleton destructor
+      RTI_TopicDescription_i::~RTI_TopicDescription_i (void)
+      {
+      }
 
-    char *
-    CCM_DDS_TopicDescription_i::get_type_name (void)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      return CORBA::string_dup (this->impl ()->get_type_name ());
-#else
-      return this->impl ()->get_type_name ();
-#endif
-    }
+      char *
+      RTI_TopicDescription_i::get_type_name (void)
+      {
+        return CORBA::string_dup (this->impl ()->get_type_name ());
+      }
 
-    char *
-    CCM_DDS_TopicDescription_i::get_name (void)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      return CORBA::string_dup (this->impl ()->get_name ());
-#else
-      return this->impl ()->get_name ();
-#endif
-    }
+      char *
+      RTI_TopicDescription_i::get_name (void)
+      {
+        return CORBA::string_dup (this->impl ()->get_name ());
+      }
 
-    ::DDS::DomainParticipant_ptr
-    CCM_DDS_TopicDescription_i::get_participant (void)
-    {
-      ::DDS::DomainParticipant_var retval = ::DDS::DomainParticipant::_nil ();
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      DDSDomainParticipant* p = this->impl ()->get_participant ();
-      ACE_NEW_THROW_EX (retval,
-                        CCM_DDS_DomainParticipant_i (p),
-                        CORBA::NO_MEMORY ());
-#else
-      ::DDS::DomainParticipant_var p = this->impl ()->get_participant ();
-      ACE_NEW_THROW_EX (retval,
-                        CCM_DDS_DomainParticipant_i (p.in ()),
-                        CORBA::NO_MEMORY ());
-#endif
-      return retval._retn ();
-    }
+      ::DDS::DomainParticipant_ptr
+      RTI_TopicDescription_i::get_participant (void)
+      {
+        DDSDomainParticipant* p = this->impl ()->get_participant ();
+        ::DDS::DomainParticipant_var retval = new RTI_DomainParticipant_i ();
+        RTI_DomainParticipant_i *rti_dp = dynamic_cast < RTI_DomainParticipant_i *> (retval.in ());
+        rti_dp->set_impl (p);
+        return retval._retn ();
+      }
 
-    DDSTopicDescription *
-    CCM_DDS_TopicDescription_i::get_impl (void)
-    {
-      return this->impl_;
-    }
+      DDSTopicDescription *
+      RTI_TopicDescription_i::get_impl (void)
+      {
+        return this->impl_;
+      }
 
-    void
-    CCM_DDS_TopicDescription_i::set_impl (DDSTopicDescription * rc)
-    {
-      this->impl_ = rc;
-    }
+      void
+      RTI_TopicDescription_i::set_impl (DDSTopicDescription * rc)
+      {
+        this->impl_ = rc;
+      }
+
+      DDSTopicDescription *
+      RTI_TopicDescription_i::impl (void)
+      {
+        if (!this->impl_)
+          {
+            throw ::CORBA::BAD_INV_ORDER ();
+          }
+        return this->impl_;
+      }
 
-    DDSTopicDescription *
-    CCM_DDS_TopicDescription_i::impl (void)
-    {
-      if (!this->impl_)
-        {
-          throw ::CORBA::BAD_INV_ORDER ();
-        }
-      return this->impl_;
     }
   }
 }
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.h b/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.h
index e00754ba14e..314b59416fa 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/TopicDescription.h
@@ -7,8 +7,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef CIAO_DDS4CCM_TOPICDESCRIPTION_H
-#define CIAO_DDS4CCM_TOPICDESCRIPTION_H
+#ifndef CIAO_RTI_TOPICDESCRIPTION_H
+#define CIAO_RTI_TOPICDESCRIPTION_H
 
 #include "tao/LocalObject.h"
 
@@ -17,47 +17,46 @@
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "dds4ccm/impl/ndds/dds4ccm_ndds_impl_export.h"
 
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 #include "ndds/ndds_cpp.h"
-#endif
-
 #include "tao/LocalObject.h"
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::TopicDescription DDSTopicDescription;
-#endif
-
 namespace CIAO
 {
   namespace DDS4CCM
   {
-    class DDS4CCM_NDDS_IMPL_Export CCM_DDS_TopicDescription_i :
-      public virtual ::DDS::CCM_TopicDescription,
-      public virtual ::CORBA::LocalObject
+    namespace RTI
     {
-    public:
-      /// Constructor
-      CCM_DDS_TopicDescription_i (DDSTopicDescription * rc);
+      class DDS4CCM_NDDS_IMPL_Export RTI_TopicDescription_i :
+        public virtual ::DDS::CCM_TopicDescription,
+        public virtual ::CORBA::LocalObject
+      {
+      public:
+        // Constructor
+        RTI_TopicDescription_i (void);
 
-      /// Destructor
-      virtual ~CCM_DDS_TopicDescription_i (void);
+        // Destructor
+        virtual ~RTI_TopicDescription_i (void);
 
-      virtual char * get_type_name (void);
+        virtual char *
+        get_type_name (void);
 
-      virtual char * get_name (void);
+        virtual char *
+          get_name (void);
 
-      virtual ::DDS::DomainParticipant_ptr get_participant (void);
+        virtual ::DDS::DomainParticipant_ptr
+          get_participant (void);
 
-      DDSTopicDescription * get_impl (void);
+        DDSTopicDescription * get_impl (void);
 
-      void set_impl (DDSTopicDescription * rc);
+        void set_impl (DDSTopicDescription * rc);
 
-    private:
-      DDSTopicDescription * impl_;
+      private:
+        DDSTopicDescription * impl_;
 
-      DDSTopicDescription * impl (void);
-    };
+        DDSTopicDescription * impl (void);
+      };
+    }
   }
 }
 
-#endif /* CIAO_DDS4CCM_TOPICDESCRIPTION_H */
+#endif /* CIAO_RTI_TOPICDESCRIPTION_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TopicListener.cpp b/CIAO/connectors/dds4ccm/impl/ndds/TopicListener.cpp
index 6f25052d232..6e9af8c839b 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/TopicListener.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/TopicListener.cpp
@@ -6,45 +6,41 @@
 
 #include "dds4ccm/idl/dds4ccm_BaseC.h"
 
-#include "dds4ccm/impl/logger/Log_Macros.h"
+#include "ciao/Logger/Log_Macros.h"
 
 namespace CIAO
 {
   namespace DDS4CCM
   {
-    CCM_DDS_TopicListener_i::CCM_DDS_TopicListener_i (::DDS::TopicListener_ptr p)
-      : impl_ (::DDS::TopicListener::_duplicate (p))
+    namespace RTI
     {
-    }
-
-    CCM_DDS_TopicListener_i::~CCM_DDS_TopicListener_i (void)
-    {
-    }
-
-    void
-    CCM_DDS_TopicListener_i::on_inconsistent_topic (
-      ::DDSTopic* the_topic,
-      const ::DDS_InconsistentTopicStatus & status)
-    {
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-      ::DDS::InconsistentTopicStatus ddsstatus;
-      ddsstatus <<= status;
-      ::DDS::Topic_var dds_topic = ::DDS::Topic::_nil ();
-      ACE_NEW (dds_topic,
-               CCM_DDS_Topic_i (the_topic));
-      this->impl_->on_inconsistent_topic (dds_topic.in (), ddsstatus);
-#else
-      ::DDS::Topic_var dds_topic = ::DDS::Topic::_nil ();
-      ACE_NEW (dds_topic,
-               CCM_DDS_Topic_i (the_topic));
-      this->impl_->on_inconsistent_topic (dds_topic.in (), status);
-#endif
-    }
-
-    ::DDS::TopicListener_ptr
-    CCM_DDS_TopicListener_i::get_topiclistener (void)
-    {
-      return ::DDS::TopicListener::_duplicate (this->impl_.in ());
+      RTI_TopicListener_i::RTI_TopicListener_i (::DDS::TopicListener_ptr p)
+        : impl_ (::DDS::TopicListener::_duplicate (p))
+      {
+      }
+
+      RTI_TopicListener_i::~RTI_TopicListener_i (void)
+      {
+      }
+
+      void
+      RTI_TopicListener_i::on_inconsistent_topic (
+        ::DDSTopic* the_topic,
+        const ::DDS_InconsistentTopicStatus & status)
+      {
+        ::DDS::InconsistentTopicStatus ddsstatus;
+        ddsstatus <<= status;
+        ::DDS::Topic_var dds_topic = new RTI_Topic_i ();
+        RTI_Topic_i *tp = dynamic_cast < RTI_Topic_i *> (dds_topic.in ());
+        tp->set_impl (the_topic);
+        this->impl_->on_inconsistent_topic (dds_topic.in (), ddsstatus);
+      }
+
+      ::DDS::TopicListener_ptr
+      RTI_TopicListener_i::get_topiclistener (void)
+      {
+        return ::DDS::TopicListener::_duplicate (this->impl_.in ());
+      }
     }
   }
 }
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TopicListener.h b/CIAO/connectors/dds4ccm/impl/ndds/TopicListener.h
index e991ac8257e..bcad3854c4f 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/TopicListener.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/TopicListener.h
@@ -6,47 +6,41 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_TOPICLISTENER_H
-#define DDS4CCM_TOPICLISTENER_H
+#ifndef CIAO_RTI_TOPICLISTENER_H
+#define CIAO_RTI_TOPICLISTENER_H
 
 #include "tao/LocalObject.h"
 
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "dds4ccm_ndds_impl_export.h"
 
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-# include "ndds/ndds_cpp.h"
-#endif
-
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::TopicListener DDSTopicListener;
-typedef ::DDS::Topic DDSTopic;
-typedef ::DDS::InconsistentTopicStatus DDS_InconsistentTopicStatus;
-#endif
+#include "ndds/ndds_cpp.h"
 
 namespace CIAO
 {
   namespace DDS4CCM
   {
-    class DDS4CCM_NDDS_IMPL_Export CCM_DDS_TopicListener_i :
-      public virtual ::DDSTopicListener
+    namespace RTI
     {
-    public:
-      /// Constructor
-      CCM_DDS_TopicListener_i (::DDS::TopicListener_ptr p);
-
-      /// Destructor
-      virtual ~CCM_DDS_TopicListener_i (void);
-
-      virtual void on_inconsistent_topic(
-        ::DDSTopic* topic,
-        const ::DDS_InconsistentTopicStatus& status);
-
-      ::DDS::TopicListener_ptr get_topiclistener (void);
-    private:
-      ::DDS::TopicListener_var impl_;
-    };
+      class DDS4CCM_NDDS_IMPL_Export RTI_TopicListener_i :
+        public virtual ::DDSTopicListener
+      {
+      public:
+        // Constructor
+        RTI_TopicListener_i (::DDS::TopicListener_ptr p);
+
+        // Destructor
+        virtual ~RTI_TopicListener_i (void);
+
+        virtual void on_inconsistent_topic(::DDSTopic* topic,
+          const ::DDS_InconsistentTopicStatus& status);
+
+        ::DDS::TopicListener_ptr get_topiclistener (void);
+      private:
+        ::DDS::TopicListener_var impl_;
+      };
+    }
   }
 }
 
-#endif /* DDS4CCM_TOPICLISTENER_H */
+#endif /* CIAO_RTI_TOPICLISTENER_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TopicListener_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/TopicListener_T.cpp
index 2f018babcf5..f8728c70457 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/TopicListener_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/TopicListener_T.cpp
@@ -2,23 +2,20 @@
 #include "dds4ccm/impl/ndds/Utils.h"
 
 #include "dds4ccm/impl/ndds/Topic.h"
-#include "dds4ccm/impl/ndds/DDSCallbackStatusHandler.h"
-#include "dds4ccm/impl/logger/Log_Macros.h"
+#include "ciao/Logger/Log_Macros.h"
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 CIAO::DDS4CCM::TopicListener_T<DDS_TYPE, CCM_TYPE>::TopicListener_T (
-  ::CCM_DDS::ConnectorStatusListener_ptr error_listener,
-  ACE_Reactor* reactor) :
-    error_listener_ (::CCM_DDS::ConnectorStatusListener::_duplicate (error_listener)),
-    reactor_ (reactor)
+  ::CCM_DDS::ConnectorStatusListener_ptr error_listener) :
+    error_listener_ (::CCM_DDS::ConnectorStatusListener::_duplicate (error_listener))
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::TopicListener_T::TopicListener_T");
+  CIAO_TRACE ("CIAO::DDS4CCM::TopicListener_T::TopicListener_T");
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 CIAO::DDS4CCM::TopicListener_T<DDS_TYPE, CCM_TYPE>::~TopicListener_T (void)
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::TopicListener_T::~TopicListener_T");
+  CIAO_TRACE ("CIAO::DDS4CCM::TopicListener_T::~TopicListener_T");
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE>
@@ -27,52 +24,20 @@ CIAO::DDS4CCM::TopicListener_T<DDS_TYPE, CCM_TYPE>::on_inconsistent_topic (
   ::DDS::Topic_ptr the_topic,
   const ::DDS::InconsistentTopicStatus & status)
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::TopicListener_T::on_inconsistent_topic");
-
-  DDS4CCM_DEBUG (10, (LM_DEBUG, CLINFO
-              ACE_TEXT ("TopicListener_T::on_inconsistent_topic: ")
-              ACE_TEXT ("total count <%d> - total change <%d> - "),
-              status.total_count, status.total_count_change));
+  CIAO_TRACE ("CIAO::DDS4CCM::TopicListener_T::on_inconsistent_topic");
 
   if (!CORBA::is_nil (this->error_listener_.in ()))
     {
-      if (this->reactor_)
-        {
-          ::CIAO::DDS4CCM::OnInconsistentTopicHandler* rh = 0;
-          ACE_NEW (rh,
-                   ::CIAO::DDS4CCM::OnInconsistentTopicHandler (
-                     this->error_listener_,
-                     the_topic,
-                     status));
-          ACE_Event_Handler_var safe_handler (rh);
-          if (this->reactor_->notify (rh) != 0)
-            {
-              DDS4CCM_ERROR (1, (LM_ERROR, CLINFO
-                          ACE_TEXT ("TopicListener_T::on_inconsistent_topic: ")
-                          ACE_TEXT ("failed to use reactor.\n")));
-            }
-        }
-      else
-        {
-          this->error_listener_->on_inconsistent_topic (the_topic, status);
-        }
+      this->error_listener_->on_inconsistent_topic (the_topic, status);
     }
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 ::DDS::StatusMask
-CIAO::DDS4CCM::TopicListener_T<DDS_TYPE, CCM_TYPE>::get_mask (
-  CCM_DDS::ConnectorStatusListener_ptr error_listener)
+CIAO::DDS4CCM::TopicListener_T<DDS_TYPE, CCM_TYPE>::get_mask (void)
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::TopicListener_T::get_mask");
+  CIAO_TRACE ("CIAO::DDS4CCM::TopicListener_T::get_mask");
 
-  if (!CORBA::is_nil (error_listener) || CIAO_debug_level >= 10)
-    {
-      return ::DDS::INCONSISTENT_TOPIC_STATUS;
-    }
-  else
-    {
-      return 0;
-    }
+  return DDS_INCONSISTENT_TOPIC_STATUS;
 }
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TopicListener_T.h b/CIAO/connectors/dds4ccm/impl/ndds/TopicListener_T.h
index 867f9057826..32b15f44b9c 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/TopicListener_T.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/TopicListener_T.h
@@ -9,8 +9,6 @@
 #include "dds4ccm/idl/dds_rtf2_dcpsC.h"
 #include "ace/Copy_Disabled.h"
 
-class ACE_Reactor;
-
 namespace CIAO
 {
   namespace DDS4CCM
@@ -22,8 +20,7 @@ namespace CIAO
     {
     public:
       /// Constructor
-      TopicListener_T (::CCM_DDS::ConnectorStatusListener_ptr error_listener,
-                       ACE_Reactor* reactor);
+      TopicListener_T (::CCM_DDS::ConnectorStatusListener_ptr error_listener);
 
       /// Destructor
       virtual ~TopicListener_T (void);
@@ -32,12 +29,10 @@ namespace CIAO
         ::DDS::Topic_ptr the_topic,
         const ::DDS::InconsistentTopicStatus & status);
 
-      static ::DDS::StatusMask get_mask (
-        CCM_DDS::ConnectorStatusListener_ptr error_listener);
+      static ::DDS::StatusMask get_mask (void);
 
     private:
-      CCM_DDS::ConnectorStatusListener_var error_listener_;
-      ACE_Reactor* reactor_;
+      CCM_DDS::ConnectorStatusListener_var  error_listener_;
     };
   }
 }
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TopicQos.h b/CIAO/connectors/dds4ccm/impl/ndds/TopicQos.h
index f26f376dd6c..661fd33da86 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/TopicQos.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/TopicQos.h
@@ -6,8 +6,8 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_TOPICQOS_H
-#define DDS4CCM_TOPICQOS_H
+#ifndef CIAO_RTI_TOPICQOS_H
+#define CIAO_RTI_TOPICQOS_H
 
 #include "TopicDataQosPolicy.h"
 #include "DurabilityQosPolicy.h"
@@ -23,11 +23,6 @@
 #include "LifespanQosPolicy.h"
 #include "OwnershipQosPolicy.h"
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::TopicQos DDS_TopicQos;
-#endif
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::TopicQos &ddsqos, const ::DDS_TopicQos & qos)
 {
@@ -99,6 +94,5 @@ operator>>= (const ::DDS::TopicQos &qos, ::DDS_TopicQos & ddsqos)
   ddsqos.lifespan <<= qos.lifespan;
   ddsqos.ownership <<= qos.ownership;
 }
-#endif
 
-#endif /* DDS4CCM_TOPICQOS_H */
+#endif /* CIAO_RTI_TOPICQOS_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/TransportPriorityQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/TransportPriorityQosPolicy.h
index 7778cdce0d5..a3c25147030 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/TransportPriorityQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/TransportPriorityQosPolicy.h
@@ -6,14 +6,9 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_TRANSPORTPRIOTITYQOSPOLICY_H
-#define DDS4CCM_TRANSPORTPRIOTITYQOSPOLICY_H
+#ifndef CIAO_RTI_TRANSPORTPRIOTITYQOSPOLICY_H
+#define CIAO_RTI_TRANSPORTPRIOTITYQOSPOLICY_H
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::TransportPriorityQosPolicy DDS_TransportPriorityQosPolicy;
-#endif
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::TransportPriorityQosPolicy &ddsqos, const ::DDS_TransportPriorityQosPolicy & qos)
 {
@@ -37,6 +32,5 @@ operator>>= (const ::DDS::TransportPriorityQosPolicy &qos, ::DDS_TransportPriori
 {
   ddsqos.value <<= qos.value;
 }
-#endif
 
-#endif /* DDS4CCM_TRANSPORTPRIOTITYQOSPOLICY_H */
+#endif /* CIAO_RTI_TRANSPORTPRIOTITYQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Updater_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Updater_T.cpp
index da03259c7ab..8788aadc312 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Updater_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Updater_T.cpp
@@ -3,67 +3,67 @@
 #include "dds4ccm/impl/ndds/DataWriter.h"
 #include "dds4ccm/impl/ndds/Utils.h"
 #include "dds4ccm/impl/ndds/Coherent_Changes_Guard.h"
-#include "dds4ccm/impl/logger/Log_Macros.h"
+#include "ciao/Logger/Log_Macros.h"
 
 template <typename DDS_TYPE, typename CCM_TYPE>
-CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE>::Updater_T (void)
+CIAO::DDS4CCM::RTI::Updater_T<DDS_TYPE, CCM_TYPE>::Updater_T (void)
   : InstanceHandleManager_T<DDS_TYPE, CCM_TYPE, typename CCM_TYPE::updater_type> (),
     is_global_scope_ (false),
     is_coherent_write_ (false)
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::Updater_T");
+  CIAO_TRACE ("CIAO::DDS4CCM::RTI::Updater_T::Updater_T");
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE>
-CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE>::~Updater_T (void)
+CIAO::DDS4CCM::RTI::Updater_T<DDS_TYPE, CCM_TYPE>::~Updater_T (void)
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::~Updater_T");
+  CIAO_TRACE ("CIAO::DDS4CCM::RTI::Updater_T::~Updater_T");
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 bool
-CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE>::is_global_scope ()
+CIAO::DDS4CCM::RTI::Updater_T<DDS_TYPE, CCM_TYPE>::is_global_scope ()
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::is_global_scope");
+  CIAO_TRACE ("CIAO::DDS4CCM::RTI::Updater_T::is_global_scope");
   return this->is_global_scope_;
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 bool
-CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE>::is_coherent_write ()
+CIAO::DDS4CCM::RTI::Updater_T<DDS_TYPE, CCM_TYPE>::is_coherent_write ()
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::is_coherent_write");
+  CIAO_TRACE ("CIAO::DDS4CCM::RTI::Updater_T::is_coherent_write");
   return this->is_coherent_write_;
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 void
-CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE>::is_coherent_write (bool value)
+CIAO::DDS4CCM::RTI::Updater_T<DDS_TYPE, CCM_TYPE>::is_coherent_write (bool value)
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::is_coherent_write");
+  CIAO_TRACE ("CIAO::DDS4CCM::RTI::Updater_T::is_coherent_write");
   this->is_coherent_write_ = value;
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 void
-CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE>::create_i (
+CIAO::DDS4CCM::RTI::Updater_T<DDS_TYPE, CCM_TYPE>::create_i (
   const typename DDS_TYPE::value_type & an_instance,
   ::CCM_DDS::DataNumber_t index)
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::create_i");
+  CIAO_TRACE ("CIAO::DDS4CCM::RTI::Updater_T::create_i");
   DDS_InstanceHandle_t const hnd = this->impl ()->register_instance (an_instance);
   if (DDS_InstanceHandle_equals (&hnd, &::DDS_HANDLE_NIL))
     {
-      DDS4CCM_ERROR (1, (LM_ERROR,
-                  ACE_TEXT ("CIAO::DDS4CCM::Updater_T::create_i: ")
+      ACE_ERROR ((LM_ERROR,
+                  ACE_TEXT ("CIAO::DDS4CCM::RTI::Updater_T::create_i: ")
                   ACE_TEXT ("Unable to unregister instance, nil handle.\n")));
       throw CCM_DDS::InternalError (::DDS_RETCODE_ERROR, index);
     }
   ::DDS_ReturnCode_t const result  = this->impl ()->write (an_instance, hnd);
   if (result != DDS_RETCODE_OK)
     {
-      DDS4CCM_ERROR (1, (LM_ERROR,
-                  ACE_TEXT ("CIAO::DDS4CCM::Updater_T::create_i: ")
+      ACE_ERROR ((LM_ERROR,
+                  ACE_TEXT ("CIAO::DDS4CCM::RTI::Updater_T::create_i: ")
                   ACE_TEXT ("Unable to update data, error %C.\n"),
                   translate_retcode (result)));
       throw CCM_DDS::InternalError (result, index);
@@ -72,10 +72,10 @@ CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE>::create_i (
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 void
-CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE>::create_one (
+CIAO::DDS4CCM::RTI::Updater_T<DDS_TYPE, CCM_TYPE>::create_one (
   const typename DDS_TYPE::value_type & an_instance)
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::create_one");
+  CIAO_TRACE ("CIAO::DDS4CCM::RTI::Updater_T::create_one");
   DDS_InstanceHandle_t const hnd = this->impl ()->lookup_instance (an_instance);
   if (!DDS_InstanceHandle_equals (&hnd, &::DDS_HANDLE_NIL))
     {
@@ -87,19 +87,19 @@ CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE>::create_one (
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 void
-CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE>::update_i (
+CIAO::DDS4CCM::RTI::Updater_T<DDS_TYPE, CCM_TYPE>::update_i (
   const typename DDS_TYPE::value_type & an_instance,
   const ::DDS::InstanceHandle_t & instance_handle,
   ::CCM_DDS::DataNumber_t index)
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::update_i");
+  CIAO_TRACE ("CIAO::DDS4CCM::RTI::Updater_T::update_i");
   DDS_InstanceHandle_t hnd = ::DDS_HANDLE_NIL;
   hnd <<= instance_handle;
   ::DDS_ReturnCode_t const result  = this->impl ()->write (an_instance, hnd);
   if (result != DDS_RETCODE_OK)
     {
-      DDS4CCM_ERROR (1, (LM_ERROR,
-                  ACE_TEXT ("CIAO::DDS4CCM::Updater_T::update_i: ")
+      ACE_ERROR ((LM_ERROR,
+                  ACE_TEXT ("CIAO::DDS4CCM::RTI::Updater_T::update_i: ")
                   ACE_TEXT ("Unable to update data, error %C.\n"),
                   translate_retcode (result)));
       throw CCM_DDS::InternalError (result, index);
@@ -108,11 +108,11 @@ CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE>::update_i (
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 void
-CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE>::update_one (
+CIAO::DDS4CCM::RTI::Updater_T<DDS_TYPE, CCM_TYPE>::update_one (
   const typename DDS_TYPE::value_type & an_instance,
   const ::DDS::InstanceHandle_t & instance_handle)
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::update_one");
+  CIAO_TRACE ("CIAO::DDS4CCM::RTI::Updater_T::update_one");
   DDS_InstanceHandle_t hnd = ::DDS_HANDLE_NIL;
   hnd <<= instance_handle;
   if (DDS_InstanceHandle_equals (&hnd, &::DDS_HANDLE_NIL))
@@ -140,19 +140,19 @@ CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE>::update_one (
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 void
-CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE>::delete_i (
+CIAO::DDS4CCM::RTI::Updater_T<DDS_TYPE, CCM_TYPE>::delete_i (
   const typename DDS_TYPE::value_type & an_instance,
   const ::DDS::InstanceHandle_t & instance_handle,
   ::CCM_DDS::DataNumber_t index)
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::delete_i");
+  CIAO_TRACE ("CIAO::DDS4CCM::RTI::Updater_T::delete_i");
   DDS_InstanceHandle_t hnd = ::DDS_HANDLE_NIL;
   hnd <<= instance_handle;
   ::DDS_ReturnCode_t result = this->impl ()->dispose (an_instance, hnd);
   if (result != DDS_RETCODE_OK)
     {
-      DDS4CCM_ERROR (1, (LM_ERROR,
-                  ACE_TEXT ("CIAO::DDS4CCM::Updater_T::delete_i: ")
+      ACE_ERROR ((LM_ERROR,
+                  ACE_TEXT ("CIAO::DDS4CCM::RTI::Updater_T::delete_i: ")
                   ACE_TEXT ("Unable to dispose instance, error %C.\n"),
                   translate_retcode (result)));
       throw CCM_DDS::InternalError (result, index);
@@ -161,8 +161,8 @@ CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE>::delete_i (
     this->impl ()->unregister_instance (an_instance, hnd);
   if (result != DDS_RETCODE_OK)
     {
-      DDS4CCM_ERROR (1, (LM_ERROR,
-                  ACE_TEXT ("CIAO::DDS4CCM::Updater_T::delete_i: ")
+      ACE_ERROR ((LM_ERROR,
+                  ACE_TEXT ("CIAO::DDS4CCM::RTI::Updater_T::delete_i: ")
                   ACE_TEXT ("Unable to unregister instance, error %C.\n"),
                   translate_retcode (result)));
       throw CCM_DDS::InternalError (result, index);
@@ -171,11 +171,11 @@ CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE>::delete_i (
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 void
-CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE>::delete_one (
+CIAO::DDS4CCM::RTI::Updater_T<DDS_TYPE, CCM_TYPE>::delete_one (
   const typename DDS_TYPE::value_type & an_instance,
   const ::DDS::InstanceHandle_t & instance_handle)
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::delete_one");
+  CIAO_TRACE ("CIAO::DDS4CCM::RTI::Updater_T::delete_one");
   DDS_InstanceHandle_t hnd = ::DDS_HANDLE_NIL;
   hnd <<= instance_handle;
   if (DDS_InstanceHandle_equals (&hnd, &::DDS_HANDLE_NIL))
@@ -203,10 +203,10 @@ CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE>::delete_one (
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 void
-CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE>::create_many (
+CIAO::DDS4CCM::RTI::Updater_T<DDS_TYPE, CCM_TYPE>::create_many (
   const typename CCM_TYPE::seq_type& data)
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::create_many");
+  CIAO_TRACE ("CIAO::DDS4CCM::RTI::Updater_T::create_many");
 
   // Check for existance of instances
   this->check_already_created (data);
@@ -222,7 +222,7 @@ CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE>::create_many (
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 void
-CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE>::check_existent (
+CIAO::DDS4CCM::RTI::Updater_T<DDS_TYPE, CCM_TYPE>::check_existent (
   const typename CCM_TYPE::seq_type& data)
 {
   ::CCM_DDS::NonExistent exception;
@@ -245,7 +245,7 @@ CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE>::check_existent (
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 void
-CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE>::check_already_created (
+CIAO::DDS4CCM::RTI::Updater_T<DDS_TYPE, CCM_TYPE>::check_already_created (
   const typename CCM_TYPE::seq_type& data)
 {
   ::CCM_DDS::AlreadyCreated exception;
@@ -268,10 +268,10 @@ CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE>::check_already_created (
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 void
-CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE>::update_many (
+CIAO::DDS4CCM::RTI::Updater_T<DDS_TYPE, CCM_TYPE>::update_many (
   const typename CCM_TYPE::seq_type& data)
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::update_many");
+  CIAO_TRACE ("CIAO::DDS4CCM::RTI::Updater_T::update_many");
 
   // Check for existance of instances
   this->check_existent (data);
@@ -286,10 +286,10 @@ CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE>::update_many (
 
 template <typename DDS_TYPE, typename CCM_TYPE>
 void
-CIAO::DDS4CCM::Updater_T<DDS_TYPE, CCM_TYPE>::delete_many (
+CIAO::DDS4CCM::RTI::Updater_T<DDS_TYPE, CCM_TYPE>::delete_many (
   const typename CCM_TYPE::seq_type& data)
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::Updater_T::delete_many");
+  CIAO_TRACE ("CIAO::DDS4CCM::RTI::Updater_T::delete_many");
 
   // Check for existance of instances
   this->check_existent (data);
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Updater_T.h b/CIAO/connectors/dds4ccm/impl/ndds/Updater_T.h
index 49ab380604e..130f642dd3c 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Updater_T.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Updater_T.h
@@ -17,67 +17,70 @@ namespace CIAO
 {
   namespace DDS4CCM
   {
-    template <typename DDS_TYPE, typename CCM_TYPE>
-    class Updater_T :
-      public InstanceHandleManager_T <DDS_TYPE, CCM_TYPE, typename CCM_TYPE::updater_type>
+    namespace RTI
     {
-    public:
-      /// Constructor
-      Updater_T (void);
+      template <typename DDS_TYPE, typename CCM_TYPE>
+      class Updater_T :
+        public InstanceHandleManager_T <DDS_TYPE, CCM_TYPE, typename CCM_TYPE::updater_type>
+      {
+      public:
+        /// Constructor
+        Updater_T (void);
 
-      /// Destructor
-      virtual ~Updater_T (void);
+        /// Destructor
+        virtual ~Updater_T (void);
 
-      virtual void create_one (
-        const typename DDS_TYPE::value_type& an_instance);
+        virtual void create_one (
+          const typename DDS_TYPE::value_type& an_instance);
 
-      virtual void update_one (
-        const typename DDS_TYPE::value_type& an_instance,
-        const ::DDS::InstanceHandle_t & instance_handle);
+        virtual void update_one (
+          const typename DDS_TYPE::value_type& an_instance,
+          const ::DDS::InstanceHandle_t & instance_handle);
 
-      virtual void delete_one (
-        const typename DDS_TYPE::value_type& an_instance,
-        const ::DDS::InstanceHandle_t & instance_handle);
+        virtual void delete_one (
+          const typename DDS_TYPE::value_type& an_instance,
+          const ::DDS::InstanceHandle_t & instance_handle);
 
-      virtual void create_many (
-        const typename CCM_TYPE::seq_type& data);
+        virtual void create_many (
+          const typename CCM_TYPE::seq_type& data);
 
-      virtual void update_many (
-        const typename CCM_TYPE::seq_type& data);
+        virtual void update_many (
+          const typename CCM_TYPE::seq_type& data);
 
-      virtual void delete_many (
-        const typename CCM_TYPE::seq_type& data);
+        virtual void delete_many (
+          const typename CCM_TYPE::seq_type& data);
 
-      virtual bool is_global_scope ();
+        virtual bool is_global_scope ();
 
-      virtual bool is_coherent_write ();
+        virtual bool is_coherent_write ();
 
-      virtual void is_coherent_write (bool value_);
+        virtual void is_coherent_write (bool value_);
 
-    private:
-      void create_i (
-        const typename DDS_TYPE::value_type& an_instance,
-        ::CCM_DDS::DataNumber_t index);
+      private:
+        void create_i (
+          const typename DDS_TYPE::value_type& an_instance,
+          ::CCM_DDS::DataNumber_t index);
 
-      void update_i (
-        const typename DDS_TYPE::value_type& an_instance,
-        const ::DDS::InstanceHandle_t & instance_handle,
-        ::CCM_DDS::DataNumber_t index);
+        void update_i (
+          const typename DDS_TYPE::value_type& an_instance,
+          const ::DDS::InstanceHandle_t & instance_handle,
+          ::CCM_DDS::DataNumber_t index);
 
-      void delete_i (
-        const typename DDS_TYPE::value_type& an_instance,
-        const ::DDS::InstanceHandle_t & instance_handle,
-        ::CCM_DDS::DataNumber_t index);
+        void delete_i (
+          const typename DDS_TYPE::value_type& an_instance,
+          const ::DDS::InstanceHandle_t & instance_handle,
+          ::CCM_DDS::DataNumber_t index);
 
-      void check_existent (
-        const typename CCM_TYPE::seq_type& data);
+        void check_existent (
+          const typename CCM_TYPE::seq_type& data);
 
-      void check_already_created (
-        const typename CCM_TYPE::seq_type& data);
+        void check_already_created (
+          const typename CCM_TYPE::seq_type& data);
 
-      bool is_global_scope_;
-      bool is_coherent_write_;
-    };
+        bool is_global_scope_;
+        bool is_coherent_write_;
+      };
+    }
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/UserDataQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/UserDataQosPolicy.h
index aaa0950e1bf..bc34253a6bf 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/UserDataQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/UserDataQosPolicy.h
@@ -6,20 +6,17 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_USERDATAQOSPOLICY_H
-#define DDS4CCM_USERDATAQOSPOLICY_H
+#ifndef CIAO_RTI_USERDATAQOSPOLICY_H
+#define CIAO_RTI_USERDATAQOSPOLICY_H
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::UserDataQosPolicy DDS_UserDataQosPolicy;
-#endif
+/// @todo
 
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::UserDataQosPolicy &ddsqos, const ::DDS_UserDataQosPolicy & qos)
 {
   ACE_UNUSED_ARG (ddsqos);
   ACE_UNUSED_ARG (qos);
-//   ACE_OS::memcpy (ddsqos.value, qos.value, sizeof (qos.value));
+//  ddsqos.value <<= qos.value;
 }
 
 inline void
@@ -27,7 +24,7 @@ operator<<= (::DDS_UserDataQosPolicy &ddsqos, const ::DDS::UserDataQosPolicy & q
 {
   ACE_UNUSED_ARG (ddsqos);
   ACE_UNUSED_ARG (qos);
-//   ACE_OS::memcpy (ddsqos.value, qos.value, sizeof (qos.value));
+//  ddsqos.value <<= qos.value;
 }
 
 inline void
@@ -35,7 +32,7 @@ operator>>= (const ::DDS_UserDataQosPolicy &qos, ::DDS::UserDataQosPolicy & ddsq
 {
   ACE_UNUSED_ARG (ddsqos);
   ACE_UNUSED_ARG (qos);
-//   ACE_OS::memcpy (ddsqos.value, qos.value, sizeof (qos.value));
+//  ddsqos.value <<= qos.value;
 }
 
 inline void
@@ -43,8 +40,7 @@ operator>>= (const ::DDS::UserDataQosPolicy &qos, ::DDS_UserDataQosPolicy & ddsq
 {
   ACE_UNUSED_ARG (ddsqos);
   ACE_UNUSED_ARG (qos);
-//   ACE_OS::memcpy (qos.value, ddsqos.value, sizeof (ddsqos.value));
+//  ddsqos.value <<= qos.value;
 }
-#endif
 
-#endif /* DDS4CCM_USERDATAQOSPOLICY_H */
+#endif /* CIAO_RTI_USERDATAQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Utils.h b/CIAO/connectors/dds4ccm/impl/ndds/Utils.h
index 5401a887ce1..cafec4f8dda 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Utils.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Utils.h
@@ -20,68 +20,52 @@ namespace CIAO
     inline const char * translate_retcode (::DDS::ReturnCode_t ret)
     {
 #define RTI_DDS_RETCODE(X) case X: return #X
-      switch (ret)
-        {
-          RTI_DDS_RETCODE (DDS::RETCODE_OK);
-          RTI_DDS_RETCODE (DDS::RETCODE_ERROR);
-          RTI_DDS_RETCODE (DDS::RETCODE_UNSUPPORTED);
-          RTI_DDS_RETCODE (DDS::RETCODE_BAD_PARAMETER);
-          RTI_DDS_RETCODE (DDS::RETCODE_PRECONDITION_NOT_MET);
-          RTI_DDS_RETCODE (DDS::RETCODE_OUT_OF_RESOURCES);
-          RTI_DDS_RETCODE (DDS::RETCODE_NOT_ENABLED);
-          RTI_DDS_RETCODE (DDS::RETCODE_IMMUTABLE_POLICY);
-          RTI_DDS_RETCODE (DDS::RETCODE_INCONSISTENT_POLICY);
-          RTI_DDS_RETCODE (DDS::RETCODE_ALREADY_DELETED);
-          RTI_DDS_RETCODE (DDS::RETCODE_TIMEOUT);
-          RTI_DDS_RETCODE (DDS::RETCODE_NO_DATA);
-          RTI_DDS_RETCODE (DDS::RETCODE_ILLEGAL_OPERATION);
-        }
-      return "***Unknown enum value, update RTI::translate_retcode()";
+        switch (ret)
+          {
+            RTI_DDS_RETCODE (DDS::RETCODE_OK);
+            RTI_DDS_RETCODE (DDS::RETCODE_ERROR);
+            RTI_DDS_RETCODE (DDS::RETCODE_UNSUPPORTED);
+            RTI_DDS_RETCODE (DDS::RETCODE_BAD_PARAMETER);
+            RTI_DDS_RETCODE (DDS::RETCODE_PRECONDITION_NOT_MET);
+            RTI_DDS_RETCODE (DDS::RETCODE_OUT_OF_RESOURCES);
+            RTI_DDS_RETCODE (DDS::RETCODE_NOT_ENABLED);
+            RTI_DDS_RETCODE (DDS::RETCODE_IMMUTABLE_POLICY);
+            RTI_DDS_RETCODE (DDS::RETCODE_INCONSISTENT_POLICY);
+            RTI_DDS_RETCODE (DDS::RETCODE_ALREADY_DELETED);
+            RTI_DDS_RETCODE (DDS::RETCODE_TIMEOUT);
+            RTI_DDS_RETCODE (DDS::RETCODE_NO_DATA);
+            RTI_DDS_RETCODE (DDS::RETCODE_ILLEGAL_OPERATION);
+          }
+        return "***Unknown enum value, update RTI::translate_retcode()";
 #undef RTI_DDS_RETCODE
     }
 
     inline const char * translate_statuskind (DDS::StatusKind ret)
-    {
-#define RTI_DDS_RETCODE(X) case X: return #X
-      switch (ret)
-        {
-          RTI_DDS_RETCODE (DDS::INCONSISTENT_TOPIC_STATUS);
-          RTI_DDS_RETCODE (DDS::OFFERED_DEADLINE_MISSED_STATUS);
-          RTI_DDS_RETCODE (DDS::REQUESTED_DEADLINE_MISSED_STATUS);
-          RTI_DDS_RETCODE (DDS::OFFERED_INCOMPATIBLE_QOS_STATUS);
-          RTI_DDS_RETCODE (DDS::REQUESTED_INCOMPATIBLE_QOS_STATUS);
-          RTI_DDS_RETCODE (DDS::SAMPLE_LOST_STATUS);
-          RTI_DDS_RETCODE (DDS::SAMPLE_REJECTED_STATUS);
-          RTI_DDS_RETCODE (DDS::DATA_ON_READERS_STATUS);
-          RTI_DDS_RETCODE (DDS::DATA_AVAILABLE_STATUS);
-          RTI_DDS_RETCODE (DDS::LIVELINESS_LOST_STATUS);
-          RTI_DDS_RETCODE (DDS::LIVELINESS_CHANGED_STATUS);
-          RTI_DDS_RETCODE (DDS::PUBLICATION_MATCHED_STATUS);
-          RTI_DDS_RETCODE (DDS::SUBSCRIPTION_MATCHED_STATUS);
-          //RTI_DDS_RETCODE (DDS::RELIABLE_WRITER_CACHE_CHANGED_STATUS);
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
-          RTI_DDS_RETCODE (DDS::RELIABLE_READER_ACTIVITY_CHANGED_STATUS);
-#endif  
-          //RTI_DDS_RETCODE (DDS::DATA_WRITER_CACHE_STATUS);
-          //RTI_DDS_RETCODE (DDS::DATA_WRITER_PROTOCOL_STATUS);
-          //RTI_DDS_RETCODE (DDS::DATA_READER_CACHE_STATUS);
-          //RTI_DDS_RETCODE (DDS::DATA_READER_PROTOCOL_STATUS);
-        }
-      return "***Unknown enum value, update RTI::translate_statuskind()";
-#undef RTI_DDS_RETCODE
-    }
-
-    inline const char * translate_rejectedstatuskind (DDS::SampleRejectedStatusKind ret)
-    {
+      {
 #define RTI_DDS_RETCODE(X) case X: return #X
-      switch (ret)
-        {
-          RTI_DDS_RETCODE (DDS::NOT_REJECTED);
-          RTI_DDS_RETCODE (DDS::REJECTED_BY_INSTANCES_LIMIT);
-          RTI_DDS_RETCODE (DDS::REJECTED_BY_SAMPLES_LIMIT);
-          RTI_DDS_RETCODE (DDS::REJECTED_BY_SAMPLES_PER_INSTANCE_LIMIT);
-        }
-      return "***Unknown enum value, update RTI::translate_rejectedstatuskind()";
+        switch (ret)
+          {
+            RTI_DDS_RETCODE (DDS::INCONSISTENT_TOPIC_STATUS);
+            RTI_DDS_RETCODE (DDS::OFFERED_DEADLINE_MISSED_STATUS);
+            RTI_DDS_RETCODE (DDS::REQUESTED_DEADLINE_MISSED_STATUS);
+            RTI_DDS_RETCODE (DDS::OFFERED_INCOMPATIBLE_QOS_STATUS);
+            RTI_DDS_RETCODE (DDS::REQUESTED_INCOMPATIBLE_QOS_STATUS);
+            RTI_DDS_RETCODE (DDS::SAMPLE_LOST_STATUS);
+            RTI_DDS_RETCODE (DDS::SAMPLE_REJECTED_STATUS);
+            RTI_DDS_RETCODE (DDS::DATA_ON_READERS_STATUS);
+            RTI_DDS_RETCODE (DDS::DATA_AVAILABLE_STATUS);
+            RTI_DDS_RETCODE (DDS::LIVELINESS_LOST_STATUS);
+            RTI_DDS_RETCODE (DDS::LIVELINESS_CHANGED_STATUS);
+            RTI_DDS_RETCODE (DDS::PUBLICATION_MATCHED_STATUS);
+            RTI_DDS_RETCODE (DDS::SUBSCRIPTION_MATCHED_STATUS);
+            //RTI_DDS_RETCODE (DDS::RELIABLE_WRITER_CACHE_CHANGED_STATUS);
+            //RTI_DDS_RETCODE (DDS::RELIABLE_READER_ACTIVITY_CHANGED_STATUS);
+            //RTI_DDS_RETCODE (DDS::DATA_WRITER_CACHE_STATUS);
+            //RTI_DDS_RETCODE (DDS::DATA_WRITER_PROTOCOL_STATUS);
+            //RTI_DDS_RETCODE (DDS::DATA_READER_CACHE_STATUS);
+            //RTI_DDS_RETCODE (DDS::DATA_READER_PROTOCOL_STATUS);
+          }
+        return "***Unknown enum value, update RTI::translate_statuskind()";
 #undef RTI_DDS_RETCODE
     }
   }
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/WriterDataLifecycleQosPolicy.h b/CIAO/connectors/dds4ccm/impl/ndds/WriterDataLifecycleQosPolicy.h
index 09b32871a32..8bf3954347d 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/WriterDataLifecycleQosPolicy.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/WriterDataLifecycleQosPolicy.h
@@ -6,14 +6,9 @@
  * Wrapper facade for NDDS.
  */
 
-#ifndef DDS4CCM_WRITERDATALIFECYCLEQOSPOLICY_H
-#define DDS4CCM_WRITERDATALIFECYCLEQOSPOLICY_H
+#ifndef CIAO_RTI_WRITERDATALIFECYCLEQOSPOLICY_H
+#define CIAO_RTI_WRITERDATALIFECYCLEQOSPOLICY_H
 
-#if defined (CIAO_DDS4CCM_OPENDDS) && (CIAO_DDS4CCM_OPENDDS==1)
-typedef ::DDS::WriterDataLifecycleQosPolicy DDS_WriterDataLifecycleQosPolicy;
-#endif
-
-#if defined (CIAO_DDS4CCM_NDDS) && (CIAO_DDS4CCM_NDDS==1)
 inline void
 operator<<= (::DDS::WriterDataLifecycleQosPolicy &ddsqos, const ::DDS_WriterDataLifecycleQosPolicy & qos)
 {
@@ -37,6 +32,5 @@ operator>>= (const ::DDS::WriterDataLifecycleQosPolicy &qos, ::DDS_WriterDataLif
 {
   ddsqos.autodispose_unregistered_instances = qos.autodispose_unregistered_instances;
 }
-#endif
 
-#endif /* DDS4CCM_WRITERDATALIFECYCLEQOSPOLICY_H */
+#endif /* CIAO_RTI_WRITERDATALIFECYCLEQOSPOLICY_H */
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Writer_T.cpp b/CIAO/connectors/dds4ccm/impl/ndds/Writer_T.cpp
index e0a83492589..419748a4ac2 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Writer_T.cpp
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Writer_T.cpp
@@ -4,30 +4,32 @@
 #include "dds4ccm/impl/ndds/Utils.h"
 #include "dds4ccm/impl/ndds/Coherent_Changes_Guard.h"
 #include "dds4ccm/impl/ndds/InstanceHandle_t.h"
-#include "dds4ccm/impl/logger/Log_Macros.h"
+#include "ciao/Logger/Log_Macros.h"
 
+// Implementation skeleton constructor
 template <typename DDS_TYPE, typename CCM_TYPE >
-CIAO::DDS4CCM::Writer_T<DDS_TYPE, CCM_TYPE>::Writer_T (void)
+CIAO::DDS4CCM::RTI::Writer_T<DDS_TYPE, CCM_TYPE>::Writer_T (void)
   : InstanceHandleManager_T<DDS_TYPE, CCM_TYPE, typename CCM_TYPE::writer_type> (),
     is_coherent_write_ (false)
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::Writer_T::Writer_T");
+  CIAO_TRACE ("CIAO::DDS4CCM::RTI::Writer_T::Writer_T");
 }
 
+// Implementation skeleton destructor
 template <typename DDS_TYPE, typename CCM_TYPE >
-CIAO::DDS4CCM::Writer_T<DDS_TYPE, CCM_TYPE>::~Writer_T (void)
+CIAO::DDS4CCM::RTI::Writer_T<DDS_TYPE, CCM_TYPE>::~Writer_T (void)
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::Writer_T::~Writer_T");
+  CIAO_TRACE ("CIAO::DDS4CCM::RTI::Writer_T::~Writer_T");
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE >
 void
-CIAO::DDS4CCM::Writer_T<DDS_TYPE, CCM_TYPE>::write_i (
+CIAO::DDS4CCM::RTI::Writer_T<DDS_TYPE, CCM_TYPE>::write_i (
   const typename DDS_TYPE::value_type& datum,
   const ::DDS::InstanceHandle_t& instance_handle,
   ::CCM_DDS::DataNumber_t index)
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::Writer_T::write_i");
+  CIAO_TRACE ("CIAO::DDS4CCM::RTI::Writer_T::write_i");
 
   ::DDS_InstanceHandle_t handle = ::DDS_HANDLE_NIL;
   handle <<= instance_handle;
@@ -35,7 +37,7 @@ CIAO::DDS4CCM::Writer_T<DDS_TYPE, CCM_TYPE>::write_i (
 
   if (retval != DDS_RETCODE_OK)
     {
-      DDS4CCM_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::Writer_T::write_i - "
+      CIAO_ERROR (1, (LM_ERROR, CLINFO "CIAO::DDS4CCM::RTI::Writer_T::write_i - "
                    "Write unsuccessful, received error code %C\n",
                    translate_retcode (retval)));
       throw CCM_DDS::InternalError (retval, index);
@@ -44,29 +46,29 @@ CIAO::DDS4CCM::Writer_T<DDS_TYPE, CCM_TYPE>::write_i (
 
 template <typename DDS_TYPE, typename CCM_TYPE >
 void
-CIAO::DDS4CCM::Writer_T<DDS_TYPE, CCM_TYPE>::write_one (
+CIAO::DDS4CCM::RTI::Writer_T<DDS_TYPE, CCM_TYPE>::write_one (
   const typename DDS_TYPE::value_type & an_instance,
   const ::DDS::InstanceHandle_t & instance_handle)
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::Writer_T::write_one");
+  CIAO_TRACE ("CIAO::DDS4CCM::RTI::Writer_T::write_one");
 
   this->write_i (an_instance, instance_handle, 0);
 
-  DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CIAO::DDS4CCM::Writer_T::write_one - "
+  CIAO_DEBUG (9, (LM_TRACE, CLINFO "CIAO::DDS4CCM::RTI::Writer_T::write_one - "
                "Write successful\n"));
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE >
 void
-CIAO::DDS4CCM::Writer_T<DDS_TYPE, CCM_TYPE>::write_many (
+CIAO::DDS4CCM::RTI::Writer_T<DDS_TYPE, CCM_TYPE>::write_many (
   const typename CCM_TYPE::seq_type& instances)
 {
-  DDS4CCM_TRACE ("CIAO::DDS4CCM::Writer_T::write_many");
+  CIAO_TRACE ("CIAO::DDS4CCM::RTI::Writer_T::write_many");
 
   Coherent_Changes_Guard guard (this->impl ()->get_publisher(),
                                 this->is_coherent_write_);
 
-  DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CIAO::DDS4CCM::Writer_T::write_many - "
+  CIAO_DEBUG (9, (LM_TRACE, CLINFO "CIAO::DDS4CCM::RTI::Writer_T::write_many - "
                "Preparing to write to DDS\n"));
 
   for (typename CCM_TYPE::seq_type::size_type index = 0;
@@ -76,20 +78,20 @@ CIAO::DDS4CCM::Writer_T<DDS_TYPE, CCM_TYPE>::write_many (
       this->write_i (instances[index], ::DDS::HANDLE_NIL, index);
     }
 
-  DDS4CCM_DEBUG (9, (LM_TRACE, CLINFO "CIAO::DDS4CCM::Writer_T::write_many - "
+  CIAO_DEBUG (9, (LM_TRACE, CLINFO "CIAO::DDS4CCM::RTI::Writer_T::write_many - "
                "Write successful\n"));
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE >
 ::CORBA::Boolean
-CIAO::DDS4CCM::Writer_T<DDS_TYPE, CCM_TYPE>::is_coherent_write (void)
+CIAO::DDS4CCM::RTI::Writer_T<DDS_TYPE, CCM_TYPE>::is_coherent_write (void)
 {
   return this->is_coherent_write_;
 }
 
 template <typename DDS_TYPE, typename CCM_TYPE >
 void
-CIAO::DDS4CCM::Writer_T<DDS_TYPE, CCM_TYPE>::is_coherent_write (
+CIAO::DDS4CCM::RTI::Writer_T<DDS_TYPE, CCM_TYPE>::is_coherent_write (
   ::CORBA::Boolean value)
 {
   this->is_coherent_write_ = value;
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/Writer_T.h b/CIAO/connectors/dds4ccm/impl/ndds/Writer_T.h
index 2565f8337e8..4d94259cca1 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/Writer_T.h
+++ b/CIAO/connectors/dds4ccm/impl/ndds/Writer_T.h
@@ -18,35 +18,38 @@ namespace CIAO
 {
   namespace DDS4CCM
   {
-    template <typename DDS_TYPE, typename CCM_TYPE>
-    class Writer_T :
-      public InstanceHandleManager_T <DDS_TYPE, CCM_TYPE, typename CCM_TYPE::writer_type>
+    namespace RTI
     {
-    public:
-      /// Constructor
-      Writer_T (void);
+      template <typename DDS_TYPE, typename CCM_TYPE>
+      class Writer_T :
+        public InstanceHandleManager_T <DDS_TYPE, CCM_TYPE, typename CCM_TYPE::writer_type>
+      {
+      public:
+        /// Constructor
+        Writer_T (void);
 
-      /// Destructor
-      virtual ~Writer_T (void);
+        /// Destructor
+        virtual ~Writer_T (void);
 
-      virtual void write_one (
-        const typename DDS_TYPE::value_type& an_instance,
-        const ::DDS::InstanceHandle_t & instance_handle);
+        virtual void write_one (
+          const typename DDS_TYPE::value_type& an_instance,
+          const ::DDS::InstanceHandle_t & instance_handle);
 
-      virtual void write_many (
-        const typename CCM_TYPE::seq_type& instances);
+        virtual void write_many (
+          const typename CCM_TYPE::seq_type& instances);
 
-      virtual ::CORBA::Boolean is_coherent_write (void);
+        virtual ::CORBA::Boolean is_coherent_write (void);
 
-      virtual void is_coherent_write ( ::CORBA::Boolean value);
+        virtual void is_coherent_write ( ::CORBA::Boolean value);
 
-    private:
-      void write_i (const typename DDS_TYPE::value_type& datum,
-                    const ::DDS::InstanceHandle_t& instance_handle,
-                    ::CCM_DDS::DataNumber_t index);
+      private:
+        void write_i (const typename DDS_TYPE::value_type& datum,
+                      const ::DDS::InstanceHandle_t& instance_handle,
+                      ::CCM_DDS::DataNumber_t index);
 
-      bool is_coherent_write_;
-    };
+        bool is_coherent_write_;
+      };
+    }
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/impl/ndds/ndds_impl.mpc b/CIAO/connectors/dds4ccm/impl/ndds/ndds_impl.mpc
index 1edb2b0195d..db587767a6a 100644
--- a/CIAO/connectors/dds4ccm/impl/ndds/ndds_impl.mpc
+++ b/CIAO/connectors/dds4ccm/impl/ndds/ndds_impl.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(CIAO_DDS4CCM_NDDS_Impl) : dds4ccm_skel, taolib, ciao_output, ccm_stub, ciao_logger {
+project(CIAO_DDS4CCM_NDDS_Impl) : dds4ccm_skel, taolib, ciao_output, nddslib, ccm_stub, ciao_logger {
 
   after += DDS4CCM_lem_stub
   libs += DDS4CCM_lem_stub
@@ -36,6 +36,5 @@ project(CIAO_DDS4CCM_NDDS_Impl) : dds4ccm_skel, taolib, ciao_output, ccm_stub, c
     QueryCondition.cpp
     Utils.cpp
     TopicListener.cpp
-    DDSCallbackStatusHandler.cpp
   }
 }
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.idl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.idl
index 01ada988648..440941e210c 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.idl
@@ -8,22 +8,19 @@
 #ifndef PERF_KEYED_TEST_BASE_IDL
 #define PERF_KEYED_TEST_BASE_IDL
 
-#pragma ndds typesupport "Base/Perf_Keyed_Test_BaseSupport.h"
-
-// Flag used to indicate message is used for initialization only
-const unsigned long INITIALIZE_SIZE = 1234;
-// Flag used to indicate end of test
-const unsigned long FINISHED_SIZE = 1235;
-const unsigned long OVERHEAD_BYTES = 31;
+//const long KEY_SIZE = 4;
 
 struct PerfKeyedTest {
   string key; //@key
-  long entity_id;  //id of subscriber/publisher
   unsigned long seq_num;
   long latency_ping;
-  string bin_data;
-  unsigned long data_len;
-  unsigned long long nanotime;
+  unsigned long iteration;
+  unsigned long timestamp_ccm_sec;
+  long timestamp_ccm_usec;
+  //long timestamp_dds_sec;
+  //unsigned long timestamp_dds_usec;
+  //long duration_dds_sec;
+  //unsigned long duration_dds_usec;
 };
 
 typedef sequence<PerfKeyedTest> PerfKeyedTest_Seq;
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.mpc b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.mpc
index 1dce8c89cc5..f2c91f30ae4 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Base/Perf_Keyed_Test_Base.mpc
@@ -1,25 +1,75 @@
 // $Id$
+// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n Perf_Keyed_Test_Base"
 
-project (DDS_Perf_Keyed_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
-  sharedname = DDS_Perf_Keyed_Test_Base_stub
-  dynamicflags += PERF_KEYED_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Gxhst -Sci \
+project(DDS_Perf_Keyed_Test_Base_idl_gen) : taoidldefaults, anytypecode {
+  custom_only = 1
+  idlflags -= -St -Sa
+  idlflags += -SS -Gxhst \
               -Wb,stub_export_macro=PERF_KEYED_TEST_BASE_STUB_Export \
               -Wb,stub_export_include=Perf_Keyed_Test_Base_stub_export.h
 
   IDL_Files {
     Perf_Keyed_Test_Base.idl
   }
+}
 
-  opendds_ts_flags += --export=PERF_KEYED_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
+project(DDS_Perf_Keyed_Test_Base_ndds_ts_gen) : ndds_ts_defaults   {
+  custom_only = 1
+  after += DDS_Perf_Keyed_Test_Base_idl_gen
+  
+  NDDSTypeSupport_Files {
     Perf_Keyed_Test_Base.idl
   }
+}
+
+project(DDS_Perf_Keyed_Test_Base_NDDS_TS) : nddslib, taolib {
+  after += DDS_Perf_Keyed_Test_Base_ndds_ts_gen DDS_Perf_Keyed_Test_Base_stub
+  libs += DDS_Perf_Keyed_Test_Base_stub
+  libout = ../lib
+  libpaths    += ../lib
+  sharedname = DDS_Perf_Keyed_Test_Base_NDDS_TS
+  dynamicflags = NDDS_USER_DLL_EXPORT
+
+  verbatim(gnuace, macros) {
+    override no_hidden_visibility = 1
+  }
 
   Source_Files {
+    Perf_Keyed_Test_Base.cxx
+    Perf_Keyed_Test_BasePlugin.cxx
+    Perf_Keyed_Test_BaseSupport.cxx
+  }
+
+  Header_Files {
+    Perf_Keyed_Test_Base.h
+    Perf_Keyed_Test_BasePlugin.h
+    Perf_Keyed_Test_BaseSupport.h
+  }
+
+  Inline_Files {
   }
 }
 
+project(DDS_Perf_Keyed_Test_Base_stub) : ccm_stub {
+  after += DDS_Perf_Keyed_Test_Base_idl_gen
+  libout = ../lib
+  libpaths += ../lib
+  sharedname = DDS_Perf_Keyed_Test_Base_stub
+  dynamicflags = PERF_KEYED_TEST_BASE_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    Perf_Keyed_Test_BaseC.cpp
+  }
+
+  Header_Files {
+    Perf_Keyed_Test_BaseC.h
+    Perf_Keyed_Test_Base_stub_export.h
+  }
+
+  Inline_Files {
+    Perf_Keyed_Test_BaseC.inl
+  }
+}
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc
index afa92e6a20c..fb33537a552 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_Perf_Keyed_Test_Base -l .. -o ../lib -u DDS Perf_Keyed_Test_Connector"
 
-project(DDS_Perf_Keyed_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
+project(DDS_Perf_Keyed_Test_Connector_idl_gen) : connectoridldefaults {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=PERF_KEYED_TEST_CONNECTOR_STUB_Export \
@@ -10,8 +10,8 @@ project(DDS_Perf_Keyed_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
               -Wb,skel_export_include=Perf_Keyed_Test_Connector_svnt_export.h \
               -Wb,svnt_export_macro=PERF_KEYED_TEST_CONNECTOR_SVNT_Export \
               -Wb,svnt_export_include=Perf_Keyed_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=PERF_KEYED_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Perf_Keyed_Test_Connector_conn_export.h \
+              -Wb,exec_export_macro=PERF_KEYED_TEST_CONNECTOR_EXEC_Export \
+              -Wb,exec_export_include=Perf_Keyed_Test_Connector_exec_export.h \
               -I ..
 
   IDL_Files {
@@ -19,7 +19,7 @@ project(DDS_Perf_Keyed_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   }
 }
 
-project(DDS_Perf_Keyed_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_Perf_Keyed_Test_Connector_lem_gen) : ciaoidldefaults {
   custom_only = 1
   after += DDS_Perf_Keyed_Test_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=PERF_KEYED_TEST_CONNECTOR_LEM_STUB_Export \
@@ -32,7 +32,7 @@ project(DDS_Perf_Keyed_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
   }
 }
 
-project(DDS_PK_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_base {
+project(DDS_PK_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_base   {
   after += DDS_Perf_Keyed_Test_Connector_lem_gen DDS_Perf_Keyed_Test_Connector_stub DDS_Perf_Keyed_Test_Base_stub DDS4CCM_lem_stub
   libs  += DDS_Perf_Keyed_Test_Base_stub DDS_Perf_Keyed_Test_Connector_stub DDS4CCM_lem_stub
   libpaths += ../lib
@@ -58,7 +58,7 @@ project(DDS_PK_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_base {
   }
 }
 
-project(DDS_Perf_Keyed_Test_Connector_stub) : ccm_stub, dds4ccm_base {
+project(DDS_Perf_Keyed_Test_Connector_stub) : ccm_stub, dds4ccm_base   {
   after += DDS_Perf_Keyed_Test_Connector_idl_gen DDS_Perf_Keyed_Test_Base_stub
   libs  += DDS_Perf_Keyed_Test_Base_stub
   libpaths += ../lib
@@ -85,24 +85,24 @@ project(DDS_Perf_Keyed_Test_Connector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_Perf_Keyed_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_PK_Test_Connector_lem_stub DDS_Perf_Keyed_Test_Connector_stub DDS4CCM_lem_stub
+  after   += DDS_PK_Test_Connector_lem_stub DDS_Perf_Keyed_Test_Connector_stub DDS4CCM_lem_stub CIAO_DDS4CCM_NDDS_Impl DDS_Perf_Keyed_Test_Base_NDDS_TS
   sharedname = DDS_Perf_Keyed_Test_Connector_exec
-  libs += DDS_Perf_Keyed_Test_Connector_stub DDS_PK_Test_Connector_lem_stub DDS_Perf_Keyed_Test_Base_stub DDS4CCM_lem_stub
+  libs += DDS_Perf_Keyed_Test_Connector_stub DDS_PK_Test_Connector_lem_stub DDS_Perf_Keyed_Test_Base_stub CIAO_DDS4CCM_NDDS_Impl DDS4CCM_lem_stub DDS_Perf_Keyed_Test_Base_NDDS_TS
   libpaths += ../lib
   libout = ../lib
   includes += ..
-  dynamicflags   = PERF_KEYED_TEST_CONNECTOR_CONN_BUILD_DLL
+  dynamicflags   = PERF_KEYED_TEST_CONNECTOR_EXEC_BUILD_DLL
 
   IDL_Files {
   }
 
   Source_Files {
-    Perf_Keyed_Test_Connector_conn.cpp
+    Perf_Keyed_Test_Connector_exec.cpp
   }
 
   Header_Files {
-    Perf_Keyed_Test_Connector_conn.h
-    Perf_Keyed_Test_Connector_conn_export.h
+    Perf_Keyed_Test_Connector_exec.h
+    Perf_Keyed_Test_Connector_exec_export.h
   }
 
   Inline_Files {
@@ -110,7 +110,7 @@ project(DDS_Perf_Keyed_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
 }
 
 
-project(DDS_Perf_Keyed_Test_Connector_svnt) : ciao_servant, dds4ccm_skel {
+project(DDS_Perf_Keyed_Test_Connector_svnt) : ciao_servant, dds4ccm_skel, nddslib {
   after      += DDS_PK_Test_Connector_lem_stub DDS_Perf_Keyed_Test_Connector_exec DDS_Perf_Keyed_Test_Connector_stub DDS4CCM_lem_stub
   sharedname  = DDS_Perf_Keyed_Test_Connector_svnt
   libs       += DDS_Perf_Keyed_Test_Connector_stub \
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector_exec.cpp b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector_exec.cpp
new file mode 100644
index 00000000000..4b8f4f9ad28
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector_exec.cpp
@@ -0,0 +1,30 @@
+// -*- C++ -*-
+// $Id$
+
+#include "Perf_Keyed_Test_Connector_exec.h"
+
+namespace CIAO_Perf_Keyed_Test_Perf_Keyed_Test_Connector_Impl
+{
+  Perf_Keyed_Test_Connector_exec_i::Perf_Keyed_Test_Connector_exec_i (void)
+    : DDS_Event_Connector_T<PerfKeyedTest_DDS_Traits, PerfKeyedTest_Connector_Traits> ()
+  {
+  }
+
+  Perf_Keyed_Test_Connector_exec_i::~Perf_Keyed_Test_Connector_exec_i (void)
+  {
+  }
+
+  extern "C" PERF_KEYED_TEST_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_Perf_Keyed_Test_Perf_Keyed_Test_Connector_Impl (void)
+  {
+    ::Components::EnterpriseComponent_ptr retval =
+      ::Components::EnterpriseComponent::_nil ();
+
+    ACE_NEW_NORETURN (
+      retval,
+      Perf_Keyed_Test_Connector_exec_i ());
+
+    return retval;
+  }
+}
+
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector_exec.h b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector_exec.h
new file mode 100644
index 00000000000..b35301c7a08
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Connector/Perf_Keyed_Test_Connector_exec.h
@@ -0,0 +1,61 @@
+// -*- C++ -*-
+// $Id$
+
+#ifndef PERF_KEYED_TEST_CONNECTOR_EXEC_H_
+#define PERF_KEYED_TEST_CONNECTOR_EXEC_H_
+
+#include /**/ "ace/pre.h"
+
+#include "Perf_Keyed_Test_ConnectorEC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "Perf_Keyed_Test_Connector_exec_export.h"
+#include "tao/LocalObject.h"
+
+#include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
+#include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
+
+#include "Base/Perf_Keyed_Test_BaseSupport.h"
+
+namespace CIAO_Perf_Keyed_Test_Perf_Keyed_Test_Connector_Impl
+{
+
+  // @from use of PerfKeyedTest as a parameter
+  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+    PerfKeyedTest,
+    PerfKeyedTestSeq,
+    PerfKeyedTestTypeSupport,
+    PerfKeyedTestDataWriter,
+    PerfKeyedTestDataReader > PerfKeyedTest_DDS_Traits;
+
+  typedef CIAO::DDS4CCM::Connector_Traits <
+    ::CIAO_Perf_Keyed_Test_Perf_Keyed_Test_Connector_Impl::Perf_Keyed_Test_Connector_Exec,
+    PerfKeyedTest_Seq,
+    ::CCM_DDS::PerfKeyedTest::CCM_Writer,
+    ::CCM_DDS::PerfKeyedTest::CCM_Updater,
+    ::CCM_DDS::PerfKeyedTest::CCM_Getter,
+    ::CCM_DDS::PerfKeyedTest::CCM_Reader,
+    ::Perf_Keyed_Test::CCM_Perf_Keyed_Test_Connector_Context,
+    ::CCM_DDS::PerfKeyedTest::Listener,
+    ::CCM_DDS::PerfKeyedTest::StateListener,
+    ::CCM_DDS::ConnectorStatusListener> PerfKeyedTest_Connector_Traits;
+
+  class PERF_KEYED_TEST_CONNECTOR_EXEC_Export Perf_Keyed_Test_Connector_exec_i :
+    public DDS_Event_Connector_T <PerfKeyedTest_DDS_Traits, PerfKeyedTest_Connector_Traits>
+  {
+  public:
+    Perf_Keyed_Test_Connector_exec_i (void);
+    virtual ~Perf_Keyed_Test_Connector_exec_i (void);
+  };
+
+  extern "C" PERF_KEYED_TEST_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_Perf_Keyed_Test_Perf_Keyed_Test_Connector_Impl (void);
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.idl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.idl
index d8ccb2bb116..88e3375688d 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.idl
@@ -17,6 +17,9 @@ module Perf_Keyed_Test
     port CCM_DDS::PerfKeyedTest::DDS_Listen info_listen;
     provides CCM_DDS::ConnectorStatusListener info_listen_connector_status;
     port CCM_DDS::PerfKeyedTest::DDS_Write write_ping;
+
+    attribute unsigned short keys;
+    attribute unsigned short iterations;
   };
 };
 
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.mpc
index 70f081b32d5..da08b3d01eb 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_Perf_Keyed_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_Perf_Keyed_Test_Receiver_idl_gen) : componentidldefaults {
   custom_only = 1
   after += DDS_Perf_Keyed_Test_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
@@ -17,7 +17,7 @@ project(DDS_Perf_Keyed_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_Perf_Keyed_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_Perf_Keyed_Test_Receiver_lem_gen) : ciaoidldefaults {
   after += DDS_Perf_Keyed_Test_Receiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
@@ -114,7 +114,7 @@ project(DDS_Perf_Keyed_Test_Receiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_Perf_Keyed_Test_Receiver_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_Perf_Keyed_Test_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      +=   DDS_Perf_Keyed_Test_Receiver_lem_stub DDS_Perf_Keyed_Test_Base_stub \
                   DDS_Perf_Keyed_Test_Connector_stub DDS_Perf_Keyed_Test_Connector_svnt \
                   DDS_Perf_Keyed_Test_Receiver_exec DDS_PK_Test_Connector_lem_stub \
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.cpp
index 00a8d081bc0..8e4fcceef7d 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.cpp
@@ -4,7 +4,9 @@
 
 #include "Perf_Keyed_Test_Receiver_exec.h"
 #include "ciao/Logger/Log_Macros.h"
-#include "ace/High_Res_Timer.h"
+#include "ace/OS_NS_sys_time.h"
+#include "ace/OS_NS_unistd.h"
+
 
 namespace CIAO_Perf_Keyed_Test_Receiver_Impl
 {
@@ -26,18 +28,33 @@ namespace CIAO_Perf_Keyed_Test_Receiver_Impl
                                   const PerfKeyedTest & an_instance,
                                   const ::CCM_DDS::ReadInfo & /*info*/)
   {
-   
-    // Record time, not for ping messages , already pinged back.
-    if (an_instance.latency_ping != -1L)
-    {
-      this->callback_.record_time (an_instance.data_len);
-    }
+    ACE_OS::sleep(1); //temporarily set to 1 sec for testing time results, if not set 
+                      // time now (in usec) == time ccm (in usec) -> duration = 0 . 
+                      // TO DO:  solve this by using other/more data and lesser measure points for statistic purposes.
+    ACE_Time_Value now = ACE_OS::gettimeofday ();
+    ACE_Time_Value ccm_rec (an_instance.timestamp_ccm_sec,
+                            an_instance.timestamp_ccm_usec);
+    ACE_DEBUG ((LM_DEBUG, "RECEIVER PerfKeyedTest_Listener_exec_i::on_one_data:\n "
+                            "key <%C> - iteration <%d> - latency_ping <%d>\n, ccm_sec %u, ccm_usec %u\n",
+                            an_instance.key.in (),
+                            an_instance.iteration,
+                            an_instance.latency_ping,
+                            an_instance.timestamp_ccm_sec,
+                            an_instance.timestamp_ccm_usec));
+    this->callback_.record_time (now, ccm_rec);
+    ACE_OS::sleep(1); //temporarily set to 1 sec for testing time results
 
-    // Send back a packet if this is a ping
+     // Send back a packet if this is a ping
     if (an_instance.latency_ping == 1L)
       {
+        //printf("send ping back\n");
         this->callback_.write_one(an_instance);
       }
+    else
+      {
+ //      printf("send no back\n");
+ 
+      }
   }
 
   void
@@ -50,7 +67,9 @@ namespace CIAO_Perf_Keyed_Test_Receiver_Impl
   //============================================================
   // ConnectorStatusListener_exec_i
   //============================================================
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (void)
+  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (
+            Receiver_exec_i &callback)
+    : callback_ (callback)
   {
   }
 
@@ -90,70 +109,88 @@ namespace CIAO_Perf_Keyed_Test_Receiver_Impl
 
   void ConnectorStatusListener_exec_i::on_unexpected_status(
     ::DDS::Entity_ptr ,
-    ::DDS::StatusKind /*status_kind*/)
+    ::DDS::StatusKind  status_kind)
   {
+    if (status_kind == ::DDS::DATA_ON_READERS_STATUS)
+      {
+//        printf("data on readers\n");
+        this->callback_.start ();
+      }
   }
 
   //============================================================
   // Receiver_exec_i
   //============================================================
   Receiver_exec_i::Receiver_exec_i (void)
-    : count_ (0L),
-      interval_time_(0L),
-      interval_messages_received_(0L),
-      messages_received_(0L),
-      interval_bytes_received_(0L),
-      bytes_received_(0L),
-      interval_data_length_(0L),
-      first_time_ (0L), 
-      finished_(false) 
+    : tv_total_ (0L),
+      tv_max_ (0L),
+      tv_min_ (0L),
+      count_ (0L),
+      started_ (false),
+      iterations_ (10),
+      keys_ (5)
   {
   }
 
   Receiver_exec_i::~Receiver_exec_i (void)
   {
   }
-
   void
-  Receiver_exec_i::write_one ( PerfKeyedTest an_instance)
+  Receiver_exec_i::write_one ( const PerfKeyedTest & an_instance)
   {
-    an_instance.latency_ping = -1L;
-    this->writer_->write_one (an_instance, ::DDS::HANDLE_NIL);
+     PerfKeyedTest * dup_ =  new PerfKeyedTest;
+     dup_->iteration = an_instance.iteration;
+     dup_->key = CORBA::string_dup(an_instance.key);
+     dup_->seq_num = an_instance.seq_num;
+     dup_->timestamp_ccm_sec = an_instance.timestamp_ccm_sec;
+     dup_->timestamp_ccm_usec = an_instance.timestamp_ccm_usec;
+     dup_->latency_ping = -1L;
+
+     this->writer_->write_one (*dup_, ::DDS::HANDLE_NIL);
   }
 
   void
   Receiver_exec_i::start ()
   {
-    ::CCM_DDS::DataListenerControl_var dlc =
+    if (!this->started_.value ())
+      {
+        this->started_ = true;
+        ::CCM_DDS::DataListenerControl_var dlc =
             this->context_->get_connection_info_listen_data_control ();
-    dlc->mode (::CCM_DDS::ONE_BY_ONE);
+        dlc->mode (::CCM_DDS::ONE_BY_ONE);
+      }
   }
 
+
   void 
-  Receiver_exec_i::record_time (unsigned long datalen)
+  Receiver_exec_i::record_time (const ACE_Time_Value &now,
+                                const ACE_Time_Value &ccm)
   {
+    //printf("COUNT voor = %lu, now sec % u and usec %u \n",this->count_.value (),static_cast <CORBA::Long>(now.sec()),now.usec());
+    //printf("COUNT voor = %lu, ccm sec % u and usec %u \n",this->count_.value (),static_cast <CORBA::Long>(ccm.sec()),ccm.usec());
+    ACE_Time_Value dur = now - ccm;
     ++this->count_;
-    if( datalen == INITIALIZE_SIZE)
-      {  
-        // store the info for this interval
-        ACE_High_Res_Timer::gettimeofday_hr ().to_usec (this->first_time_);
-        this->messages_received_=1;
-      }
-    else if ( datalen == FINISHED_SIZE)
-      {  // store the info for this interval
-        ACE_UINT64 last_time; 
-        ACE_High_Res_Timer::gettimeofday_hr ().to_usec (last_time);
-        this->interval_time_ =  (last_time  - this->first_time_);
-        this->interval_messages_received_ = ++this->messages_received_;
-        this->interval_bytes_received_ = this->bytes_received_;
-        this->finished_ = true;
-      }
-    else
-      {
-        ++this->messages_received_;
-        this->interval_data_length_ = datalen + OVERHEAD_BYTES;
-        this->bytes_received_ += datalen + OVERHEAD_BYTES;
-      }
+    //printf("COUNT na = %lu , dur sec % u and usec %u \n",this->count_.value (),static_cast <CORBA::Long>(dur.sec()),dur.usec());
+ 
+    long duration = dur.usec () + (static_cast <CORBA::Long>(dur.sec() * 1000000)); 
+    this->tv_total_ += duration;
+    if (duration > this->tv_max_.value ()|| (this->tv_max_.value () == 0))
+      this->tv_max_ = duration;
+    if (duration < this->tv_min_.value () || (this->tv_min_.value () == 0))
+      this->tv_min_ = duration;
+    double avg =  this->tv_total_.value () / this->count_.value ();
+
+
+      ACE_DEBUG((LM_ERROR, "=========\n RECEIVER: record_time\n "
+                           "samples <%u>\n - duration <%u> total time <%u>\n "
+                           "- avg <%6.01f>\n - min <%u>\n - max <%u>\n ================\n",
+                           this->count_.value (),
+                           duration, 
+                           this->tv_total_.value (),
+                           avg,
+                           this->tv_min_.value (),
+                           this->tv_max_.value ()));
+  
   }
 
   ::CCM_DDS::PerfKeyedTest::CCM_Listener_ptr
@@ -171,7 +208,31 @@ namespace CIAO_Perf_Keyed_Test_Receiver_Impl
   ::CCM_DDS::CCM_ConnectorStatusListener_ptr
   Receiver_exec_i::get_info_listen_connector_status (void)
   {
-    return new ConnectorStatusListener_exec_i ();
+    return new ConnectorStatusListener_exec_i (*this);
+  }
+
+  ::CORBA::UShort
+  Receiver_exec_i::iterations (void)
+  {
+    return this->iterations_;
+  }
+
+  void
+  Receiver_exec_i::iterations (::CORBA::UShort iterations)
+  {
+    this->iterations_ = iterations;
+  }
+
+  ::CORBA::UShort
+  Receiver_exec_i::keys (void)
+  {
+    return this->keys_;
+  }
+
+  void
+  Receiver_exec_i::keys (::CORBA::UShort keys)
+  {
+    this->keys_ = keys;
   }
 
   void
@@ -189,49 +250,34 @@ namespace CIAO_Perf_Keyed_Test_Receiver_Impl
   void
   Receiver_exec_i::configuration_complete (void)
   {
-    (void) ACE_High_Res_Timer::global_scale_factor ();
-    //enable the datalistener
-    this->start();
   }
 
   void
   Receiver_exec_i::ccm_activate (void)
   {
-     this->writer_ = this->context_->get_connection_write_ping_data ();
+    this->writer_ = this->context_->get_connection_write_ping_data ();
+
   }
 
   void
   Receiver_exec_i::ccm_passivate (void)
   {
-    if(!this->finished_.value())  //proces ended before received last message
-      {
-        ACE_UINT64 last_time; 
-        ACE_High_Res_Timer::gettimeofday_hr ().to_usec (last_time);
-        this->interval_time_ =  (last_time  - this->first_time_);
-        this->interval_messages_received_ = ++this->messages_received_;
-        this->interval_bytes_received_ = this->bytes_received_;
-      }
-    if ((this->count_.value () > 0) && (this->interval_time_ > 0))
-      {  
-         double per_sec = (double)1000000/ this->interval_time_;
-         double mbps =  (this->interval_bytes_received_.value()* per_sec)* (8.0/1000.0/1000.0);
-         ACE_DEBUG((LM_DEBUG, "SUMMARY RECEIVER:\n "
-                               "Data Length: %u  Messages: %u  Messages/s(ave): %6.01f,   Mbps(ave): %7.01f \n",
-                       this->interval_data_length_.value(), 
-                       this->interval_messages_received_.value(),
-                       this->interval_messages_received_.value()* per_sec,
-                       mbps));
-      }
-    else
-      {
-         ACE_DEBUG((LM_DEBUG, "SUMMARY RECEIVER:\n "
-                           "No samples received\n "));
-      }
+     double avg =  this->tv_total_.value () / this->count_.value ();
+     ACE_DEBUG((LM_ERROR, "SUMMARY RECEIVER:\n "
+                           "samples <%u>\n - total time <%u>\n "
+                           "- avg <%6.01f>\n - min <%u>\n - max <%u>\n",
+                           this->count_.value (),
+                           this->tv_total_.value (),
+                           avg,
+                           this->tv_min_.value (),
+                           this->tv_max_.value ()));
   }
 
   void
   Receiver_exec_i::ccm_remove (void)
   {
+    
+    
   }
 
   extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.h
index 612beb8b274..e76c8fb9ba1 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Receiver/Perf_Keyed_Test_Receiver_exec.h
@@ -24,7 +24,7 @@ namespace CIAO_Perf_Keyed_Test_Receiver_Impl
   typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::ULongLong> Atomic_ULongLong;
   typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::ULong> Atomic_ULong;
   typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, bool> Atomic_Bool;
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Long> Atomic_Long;
+    typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Long> Atomic_Long;
 
 
   //============================================================
@@ -58,7 +58,7 @@ namespace CIAO_Perf_Keyed_Test_Receiver_Impl
       public virtual ::CORBA::LocalObject
   {
   public:
-    ConnectorStatusListener_exec_i (void);
+    ConnectorStatusListener_exec_i (Receiver_exec_i &callback);
     virtual ~ConnectorStatusListener_exec_i (void);
 
     virtual
@@ -79,6 +79,8 @@ namespace CIAO_Perf_Keyed_Test_Receiver_Impl
     virtual
     void on_unexpected_status( ::DDS::Entity_ptr ,
                               ::DDS::StatusKind );
+  private:
+    Receiver_exec_i &callback_;
   };
 
   //============================================================
@@ -93,7 +95,16 @@ namespace CIAO_Perf_Keyed_Test_Receiver_Impl
     virtual ~Receiver_exec_i (void);
 
     void start ();
-    void record_time (unsigned long datalen);
+    void record_time (const ACE_Time_Value &now,
+                      const ACE_Time_Value &ccm);
+
+    virtual ::CORBA::UShort iterations (void);
+
+    virtual void iterations (::CORBA::UShort iterations);
+
+    virtual ::CORBA::UShort keys (void);
+
+    virtual void keys (::CORBA::UShort keys);
 
     virtual ::CCM_DDS::PerfKeyedTest::CCM_Listener_ptr
     get_info_listen_data_listener (void);
@@ -109,26 +120,25 @@ namespace CIAO_Perf_Keyed_Test_Receiver_Impl
       ::Components::SessionContext_ptr ctx);
 
     virtual void configuration_complete (void);
+
     virtual void ccm_activate (void);
     virtual void ccm_passivate (void);
     virtual void ccm_remove (void);
-
-    void write_one (PerfKeyedTest an_instance);
+  
+    void write_one (const PerfKeyedTest & an_instance);
+   
 
   private:
     ::Perf_Keyed_Test::CCM_Receiver_Context_var context_;
     CCM_DDS::PerfKeyedTest::Writer_var writer_;
 
+    Atomic_Long  tv_total_;
+    Atomic_Long  tv_max_;
+    Atomic_Long  tv_min_;
     Atomic_ULong  count_;
-    ACE_UINT64 interval_time_;
-    Atomic_Long interval_messages_received_;
-    Atomic_Long messages_received_;
-    Atomic_Long interval_bytes_received_;
-    Atomic_Long bytes_received_;
-    Atomic_Long interval_data_length_;
-    ACE_UINT64 first_time_;
-    Atomic_Bool   finished_;
-
+    Atomic_Bool   started_;
+    CORBA::UShort iterations_;
+    CORBA::UShort keys_;
   };
 
   extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.idl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.idl
index b5ac3c307cb..e9d70245afe 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.idl
+++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.idl
@@ -18,15 +18,15 @@ module Perf_Keyed_Test
   component Sender
   {
     port CCM_DDS::PerfKeyedTest::DDS_Write info_write;
-    attribute unsigned short keys;  
-    attribute unsigned long iterations;
-    attribute unsigned short latency_count; //number of samples sent before a latency ping packet is sent. default 100000, < sample_count
-    attribute unsigned short sleep; //time in ms to sleep between each send
-    attribute unsigned short spin;
-    attribute unsigned short datalen; //minimal 32
-    attribute unsigned short number_of_sub; //number of subscribers
+    attribute unsigned short keys;
+    attribute unsigned short iterations;
+    attribute unsigned short latency_count; //number of samples sent before  a latency ping packet is sent. default 100000, < sample_count
+    attribute unsigned short sleep; //time to sleep between each send
     provides CCM_DDS::ConnectorStatusListener connector_status;
     port CCM_DDS::PerfKeyedTest::DDS_Listen ping_listen;
+  //  attribute unsigned short sample_count;
+  //  attribute unsigned short latency_count; 
+  //  
   };
 };
 
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.mpc b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.mpc
index ef148c28cd1..1a241527111 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_Perf_Keyed_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(DDS_Perf_Keyed_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_Perf_Keyed_Test_Sender_idl_gen) : componentidldefaults   {
   after += DDS_Perf_Keyed_Test_Connector_idl_gen DDS_Starter_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_Perf_Keyed_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_Perf_Keyed_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_Perf_Keyed_Test_Sender_lem_gen) : ciaoidldefaults {
   after += DDS_Perf_Keyed_Test_Sender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
@@ -31,7 +31,7 @@ project(DDS_Perf_Keyed_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
   }
 }
 
-project(DDS_Perf_Keyed_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
+project(DDS_Perf_Keyed_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base   {
   after += DDS_Perf_Keyed_Test_Sender_lem_gen DDS_Perf_Keyed_Test_Sender_stub \
            DDS_Perf_Keyed_Test_Base_stub
   libs  += DDS_Perf_Keyed_Test_Base_stub Sender_stub
@@ -58,7 +58,7 @@ project(DDS_Perf_Keyed_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
   }
 }
 
-project(DDS_Perf_Keyed_Test_Sender_stub) : ccm_stub, dds4ccm_base {
+project(DDS_Perf_Keyed_Test_Sender_stub) : ccm_stub, dds4ccm_base   {
   after += DDS_Perf_Keyed_Test_Sender_idl_gen DDS_Perf_Keyed_Test_Base_stub \
            DDS_Perf_Keyed_Test_Connector_stub
   libs  += DDS_Perf_Keyed_Test_Base_stub DDS_Perf_Keyed_Test_Connector_stub
@@ -85,7 +85,7 @@ project(DDS_Perf_Keyed_Test_Sender_stub) : ccm_stub, dds4ccm_base {
   }
 }
 
-project(DDS_Perf_Keyed_Test_Sender_exec) : ciao_executor, dds4ccm_base {
+project(DDS_Perf_Keyed_Test_Sender_exec) : ciao_executor, dds4ccm_base   {
   after   += DDS_Perf_Keyed_Test_Sender_lem_stub DDS_Perf_Keyed_Test_Sender_stub \
              DDS_PK_Test_Connector_lem_stub DDS_Perf_Keyed_Test_Connector_stub \
              DDS4CCM_lem_stub
@@ -115,7 +115,7 @@ project(DDS_Perf_Keyed_Test_Sender_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_Perf_Keyed_Test_Sender_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_Perf_Keyed_Test_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      += DDS_Perf_Keyed_Test_Base_stub  DDS_Perf_Keyed_Test_Sender_lem_stub \
                 DDS4CCM_lem_stub DDS4CCM_skel DDS_Perf_Keyed_Test_Connector_stub \
                 DDS_Perf_Keyed_Test_Connector_svnt DDS_PK_Test_Connector_lem_stub
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp
index be2f37f3e59..7e57aecef90 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.cpp
@@ -5,10 +5,8 @@
 #include "ace/Guard_T.h"
 #include "ciao/Logger/Log_Macros.h"
 #include "tao/ORB_Core.h"
-#include "ace/Timer_Queue.h"
 #include "ace/Reactor.h"
-#include "ace/High_Res_Timer.h"
-
+#include "ace/OS_NS_sys_time.h"
 
 namespace CIAO_Perf_Keyed_Test_Sender_Impl
 {
@@ -31,10 +29,20 @@ namespace CIAO_Perf_Keyed_Test_Sender_Impl
                                   const PerfKeyedTest & an_instance,
                                   const ::CCM_DDS::ReadInfo & /*info*/)
   {
-    //only interested in messages received with a latency_ping = -1 ('ping'messages)
+    //time now
+    ACE_Time_Value now = ACE_OS::gettimeofday ();
+    //set time in message to an ACE_TIME_VAlue
+    ACE_Time_Value ccm_rec (an_instance.timestamp_ccm_sec,
+                            an_instance.timestamp_ccm_usec);
+//    ACE_DEBUG ((LM_DEBUG, "SENDER: PerfKeyedTest_Listener_exec_i::on_one_data: \n"
+//                            "key <%C> - iteration <%d> - latency_ping <%d>\n",
+//                            an_instance.key.in (),
+//                            an_instance.iteration,
+//                            an_instance.latency_ping));
+
     if( an_instance.latency_ping == -1)
-    {     
-      this->callback_.record_time (an_instance.nanotime);
+    {
+       this->callback_.record_time (now, ccm_rec);
     }
   }
 
@@ -47,10 +55,9 @@ namespace CIAO_Perf_Keyed_Test_Sender_Impl
   //============================================================
   // Facet Executor Implementation Class: ConnectorStatusListener_exec_i
   //============================================================
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (Atomic_Boolean &matched, int number_of_subscribers, Sender_exec_i &callback)
-   : callback_ (callback),
-    matched_ (matched),
-    number_of_subscribers_ (number_of_subscribers) 
+  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (Atomic_Boolean &matched, int number_of_subscribers)
+   : matched_ (matched),
+     number_of_subscribers_ (number_of_subscribers) 
   {
   }
 
@@ -78,13 +85,13 @@ namespace CIAO_Perf_Keyed_Test_Sender_Impl
   void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
      ::DDS::DataWriter_ptr /*the_writer*/,
      const DDS::OfferedDeadlineMissedStatus & /*status*/)  {
-    }
+       }
 
   void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
      ::DDS::DataWriter_ptr /*the_writer*/,
      const DDS::OfferedIncompatibleQosStatus & /*status*/)  {
     }
-//- In ::on_unexpected_status a dynamic_cast is done, this is a corba reference, a corba narrow should be used, also this can return nil
+
   void ConnectorStatusListener_exec_i::on_unexpected_status(
     ::DDS::Entity_ptr the_entity,
     ::DDS::StatusKind  status_kind)  {
@@ -92,16 +99,15 @@ namespace CIAO_Perf_Keyed_Test_Sender_Impl
       if((!CORBA::is_nil(the_entity)) && (kind==DDS::PUBLICATION_MATCHED_STATUS))
         {
           ::DDS::PublicationMatchedStatus_var stat;
-          ::DDS::DataWriter::_narrow(the_entity)->get_publication_matched_status(stat.out()); 
-          if((stat.in().current_count >= this->number_of_subscribers_)  && !this->matched_.value())      
-            {  
-              this->matched_ = true;
-              this->callback_.start();
-            }
-         }
+         (dynamic_cast <DDS::DataWriter_ptr> (the_entity))->get_publication_matched_status(stat.out()); 
+          //printf("stat.current_count = %ld\n", stat.in().current_count);
+          //printf("stat.total_count = %ld\n", stat.in().total_count);
+          if(stat.in().current_count >= this->number_of_subscribers_)       
+            this->matched_ = true;
+        }
       }
   //============================================================
-  // WriteTickerHandler
+  // WriteManyHandler
   //============================================================
   WriteTicker::WriteTicker (Sender_exec_i &callback)
     : callback_ (callback)
@@ -115,25 +121,37 @@ namespace CIAO_Perf_Keyed_Test_Sender_Impl
     this->callback_.write_one ();
     return 0;
   }
- 
+
+  //============================================================
+  // WriteManyHandler
+  //============================================================
+  WriteManyHandler::WriteManyHandler (Sender_exec_i &callback)
+    : callback_ (callback)
+  {
+  }
+
+  int
+  WriteManyHandler::handle_exception (ACE_HANDLE)
+  {
+    this->callback_.write_one ();
+    return 0;
+  }
+
+
   //============================================================
   // Component Executor Implementation Class: Sender_exec_i
   //============================================================
   Sender_exec_i::Sender_exec_i (void)
-    : iterations_ (1000),
-      keys_ (1),
-      latency_count_(100),
+    : iterations_ (10),
+      keys_ (5),
+      latency_count_(10000),
       sleep_(10),
-      spin_(100),
-      datalen_(100),
       matched_(false),
       number_of_subscribers_(1),
       tv_total_ (0L),
       tv_max_ (0L),
       tv_min_ (0L),
-      count_ (0),  //number of returned pings
-      number_of_msg_(0), //number of sent messages
-      timer_(false)
+      count_ (0)
   {
     this->ticker_ = new WriteTicker (*this);
   }
@@ -145,49 +163,32 @@ namespace CIAO_Perf_Keyed_Test_Sender_Impl
   void
   Sender_exec_i::write_one (void)
   {
-    if( this->number_of_msg_ == 0)
-    {
-      //first message
-      this->last_key_->second->data_len = INITIALIZE_SIZE;
-      this->last_key_->second->bin_data = CORBA::string_alloc(0);
-
-    }
-    else if((this->iterations_ != 0) && (this->number_of_msg_ == ((this->iterations_ * this->keys_) -1)))
-    {
-      //last message
-      this->last_key_->second->data_len = FINISHED_SIZE;
-      this->last_key_->second->bin_data = CORBA::string_alloc(0);
-
-    }
-    else
-    {
-      this->last_key_->second->data_len = this->datalen_;
-      this->last_key_->second->bin_data = CORBA::string_alloc(this->datalen_);
-    }
-    
-    if((this->iterations_ != 0) && (this->number_of_msg_ >= (this->iterations_ * this->keys_)))
-    {  
-      this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->cancel_timer (this->ticker_);
-      this->timer_ = false;
-    }
-    else
+    if (this->last_key_ != this->samples_.end ())
       {
         try
           {
-            this->last_key_->second->seq_num =  this->number_of_msg_;
+            ACE_Time_Value now = ACE_OS::gettimeofday();
+      //    suseconds_t  a = now.usec();
+      //     time_t b = ynow.sec() -> sec since 1970
+            ++this->last_key_->second->iteration;
+            this->last_key_->second->timestamp_ccm_sec = static_cast <CORBA::ULong>(now.sec());
+            this->last_key_->second->timestamp_ccm_usec = now.usec();
+
             //send some messages (latency_ping = 1L) with indicator that message has to be returned by the subscriber
-            // TO DO : use other selection if more then one key is used.  
-            if (( this->number_of_msg_ % this->latency_count_) == 0)
-              {
-                 this->last_key_->second->latency_ping = 1L;
-                 ACE_High_Res_Timer::gettimeofday_hr ().to_usec (this->last_key_->second->nanotime);
-              }
-            else
-              {
-                this->last_key_->second->latency_ping = 0L;
-              }
+            // TO DO : use other selection 
+            if ((this->last_key_->second->iteration % 2) == 0)
+             {
+                this->last_key_->second->latency_ping = 1L;
+             }
+             else
+             {
+               this->last_key_->second->latency_ping = 0L;
+             }
 
             this->writer_->write_one (this->last_key_->second, ::DDS::HANDLE_NIL);
+            ACE_DEBUG ((LM_DEBUG, "Written key <%C> - <%u>\n",
+                          this->last_key_->second->key.in (),
+                          this->last_key_->second->iteration));
           }
         catch (const CCM_DDS::InternalError& )
           {
@@ -196,89 +197,34 @@ namespace CIAO_Perf_Keyed_Test_Sender_Impl
                           this->last_key_->first.c_str ()));
           }
         ++this->last_key_;
-        ++this->number_of_msg_;
-
-        if (this->last_key_ == this->samples_.end ())
-          {
-            //start over again.
-            this->last_key_ = this->samples_.begin ();
-          }
       }
- }
-
-  void
-  Sender_exec_i::write_one_with_spin (void)
-  {
-    double ad, bd, cd;
-    volatile double * a, * b, * c;
-
-    a = &ad;
-    b = &bd;
-    c = &cd;
-
-    for (long loop=0; (this->iterations_ == 0)||(loop <this->iterations_); ++loop ) 
-      { 
-        if ( this->spin_ > 0 )
+    else
+      {
+        //onto the next iteration
+        this->last_key_ = this->samples_.begin ();
+        while (this->last_key_ != this->samples_.end ())
           {
-             // spin, spin, spin
-            for (int m=0; m<this->spin_; ++m) {
-              *a = 1.1;
-              *b = 3.1415;
-              *c = *a/(*b)*m;
-            }                    
-          }
-          if( this->number_of_msg_ == 0)
-            {
-              //first message
-              this->last_key_->second->data_len = INITIALIZE_SIZE;
-              this->last_key_->second->bin_data = CORBA::string_alloc(0);
-
-            }
-            else if( (this->iterations_ != 0) && (this->number_of_msg_ == ((this->iterations_ * this->keys_) -1)))
-            {
-              //last message
-              this->last_key_->second->data_len = FINISHED_SIZE;
-              this->last_key_->second->bin_data = CORBA::string_alloc(0);
-
-            }
+            if (this->last_key_->second->iteration == this->iterations_)
+              {
+                //next key
+                ++this->last_key_;
+              }
             else
-            {
-              this->last_key_->second->data_len = this->datalen_;
-              this->last_key_->second->bin_data = CORBA::string_alloc(this->datalen_);
-            }
-            try
-          {
-            this->last_key_->second->seq_num = loop;
-            this->last_key_->second->latency_ping = 0L;
-
-            //if ping required
-            if (( this->number_of_msg_ % this->latency_count_) == 0)
-            {
-              //send some messages (latency_ping = 1L) with indicator that message has to be returned by the subscriber
-              this->last_key_->second->latency_ping = 1L;
-              ACE_High_Res_Timer::gettimeofday_hr ().to_usec (this->last_key_->second->nanotime);
-            }
-            this->writer_->write_one (this->last_key_->second, ::DDS::HANDLE_NIL);
+              {
+                break;
+              }
           }
-          catch (const CCM_DDS::InternalError& )
+        if (this->last_key_ == this->samples_.end ())
           {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                        ACE_TEXT ("while updating writer info for <%C>.\n"),
-                        this->last_key_->first.c_str ()));
-          }
-          ++this->last_key_;
-          if (this->last_key_ == this->samples_.end ())
-          {       //onto the next iteration
+            //start over again.
             this->last_key_ = this->samples_.begin ();
           }
-          ++this->number_of_msg_;
-         }
+      }
   }
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
+ ::CCM_DDS::CCM_ConnectorStatusListener_ptr
   Sender_exec_i::get_connector_status (void)
   {
-    return new ConnectorStatusListener_exec_i (this->matched_, this->number_of_subscribers_, *this);
+    return new ConnectorStatusListener_exec_i (this->matched_, this->number_of_subscribers_);
   }
 
   ::CCM_DDS::PerfKeyedTest::CCM_Listener_ptr
@@ -298,81 +244,72 @@ namespace CIAO_Perf_Keyed_Test_Sender_Impl
   {
     ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard,
                         this->mutex_, CORBA::INTERNAL ());
+
     for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i)
       {
         char key[7];
         PerfKeyedTest *new_key = new PerfKeyedTest;
         ACE_OS::sprintf (key, "KEY_%d", i);
         new_key->key = CORBA::string_dup(key);
-        new_key->seq_num = 0;
-        ::CORBA::ULong length = this->datalen_;
-        new_key->data_len = length;
-        new_key->bin_data = CORBA::string_alloc(length);
+        new_key->iteration = 0;
+
         this->samples_[key] = new_key;
       }
-    this->last_key_ = this->samples_.begin ();
-    //this->sleep_ is in ms
-    unsigned int sec = this->sleep_/1000;
-    unsigned int usec = (this->sleep_ % 1000) * 1000;
- 
-    //if sleep and spin both > 0, use sleep value and ignore spin value
-    if(this->sleep_ > 0) //use reactor timer to sleep  
+   this->last_key_ = this->samples_.begin ();
+   if (this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->schedule_timer (
+                this->ticker_,
+                0,
+                ACE_Time_Value (5, 50000),
+                ACE_Time_Value (3, 50000)) == -1)
       {
-        (void) ACE_High_Res_Timer::global_scale_factor ();
-        this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->timer_queue()->gettimeofday (&ACE_High_Res_Timer::gettimeofday_hr);
-        if (this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->schedule_timer(
-                    this->ticker_,
-                    0,
-                    ACE_Time_Value (5, 0),
-                    ACE_Time_Value (sec, usec)) == -1)
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                                  ACE_TEXT ("Error scheduling timer")));
-          }
-          this->timer_ = true; 
+        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
+                              ACE_TEXT ("Error scheduling timer")));
       }
-    else //use spin i.o sleep
-    {
-      ACE_OS::sleep(5);
-      this->write_one_with_spin();
-    }
   }
-
 void 
-Sender_exec_i::record_time (unsigned long long nanotime)
+  Sender_exec_i::record_time (const ACE_Time_Value &now,
+                              const ACE_Time_Value &ccm)
   {
-    ACE_UINT64 testend;
-    ACE_High_Res_Timer::gettimeofday_hr ().to_usec (testend);
-    ACE_UINT64 interval =  (testend  - nanotime);
-    
+    ACE_Time_Value dur = now - ccm;
     ++this->count_;
-    long duration = static_cast <CORBA::Long>(interval); 
+    //printf("Sender Na count = %u\n",this->count_.value ());
+//    printf(" Sender in record_time  now sec = %lu ,now -usec %lu \n",now.sec(), now.usec());
+//    printf(" sender in record_time  ccm sec = %lu ,ccm -usec %lu \n",ccm.sec(),ccm.usec());
+//    printf(" sender in record_time  dur sec = %lu ,ccm -usec %lu \n",dur.sec(),dur.usec());
+ 
+    long duration =  static_cast <CORBA::Long>(dur.sec() * 1000 * 1000) + dur.usec();  //total duration in usec 
+//    printf(" sender in record_time  duration = %lu \n",duration);
+
     this->tv_total_ += duration;
     if (duration > this->tv_max_.value ()|| (this->tv_max_.value () == 0L))
       this->tv_max_ = duration;
     if (duration < this->tv_min_.value () || (this->tv_min_.value () == 0L))
       this->tv_min_ = duration;
-
-  /*  double avg = this->tv_total_.value () / this->count_.value ();
-       ACE_DEBUG ((LM_ERROR, "Sender Listener_exec_i::on_one_data:\n"
-                          " duration = %u\n total.value <%u>,\nthis->count <%u>\n,Avg <%6.01f>\nMin <%u>\nMax <%u> \n",
+    double avg = this->tv_total_.value () / this->count_.value ();
+                
+  
+    ACE_DEBUG ((LM_ERROR, "++++++++++++\nPerfKeyedTest_Sender Listener_exec_i::on_one_data:\n"
+                          " dur sec =  <%u> usec = %u , duration = %u\n total.value <%u>,\nthis->count <%u>\n,Avg <%6.01f>\nMin <%u>\nMax <%u> \n ++++++++++++++++++\n",
+                            static_cast <CORBA::Long>(dur.sec ()), dur.usec (),
                             duration,
-                            this->tv_total_.value ()/2,
+                            this->tv_total_.value (),
                             this->count_.value (),
-                            avg/2,
-                            this->tv_min_.value ()/2,
-                            this->tv_max_.value ()/2));
-*/
-  }
+                            avg,
+                            //this->tv_total_.value () / this->count_.value (),
+                            this->tv_min_.value (),
+                            this->tv_max_.value ()));
 
-  ::CORBA::ULong
+
+  
+  }
+  ::CORBA::UShort
   Sender_exec_i::iterations (void)
   {
     return this->iterations_;
   }
 
   void
-  Sender_exec_i::iterations (::CORBA::ULong iterations)
+  Sender_exec_i::iterations (::CORBA::UShort iterations)
   {
     this->iterations_ = iterations;
   }
@@ -400,7 +337,6 @@ Sender_exec_i::record_time (unsigned long long nanotime)
   {
     this->latency_count_ = latency_count;
   }
-
   ::CORBA::UShort
   Sender_exec_i::sleep (void)
   {
@@ -413,56 +349,6 @@ Sender_exec_i::record_time (unsigned long long nanotime)
     this->sleep_ = sleep;
   }
 
-  ::CORBA::UShort
-  Sender_exec_i::spin (void)
-  {
-    return this->spin_;
-  }
-
-  void
-  Sender_exec_i::spin (::CORBA::UShort spin)
-  {
-    this->spin_ = spin;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::number_of_sub (void)
-  {
-    return this->number_of_subscribers_;
-  }
-
-  void
-  Sender_exec_i::number_of_sub (::CORBA::UShort number_of_sub)
-  {
-    if (number_of_sub > 0)
-      {
-        this->number_of_subscribers_ = number_of_sub;
-      }
-    else
-      {
-        this->number_of_subscribers_ = 1;
-      }
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::datalen (void)
-  {
-    return this->datalen_;
-  }
-
-  void
-  Sender_exec_i::datalen (::CORBA::UShort datalen)
-  {
-    if(datalen <= OVERHEAD_BYTES)
-    {
-       ACE_ERROR ((LM_ERROR, 
-          ACE_TEXT ("ERROR: datalen has to be bigger as %u\n"), OVERHEAD_BYTES));
-       throw ::CORBA::BAD_PARAM ();
-    }
-    this->datalen_ = datalen - OVERHEAD_BYTES;
-  }
-
-
   void
   Sender_exec_i::set_session_context (::Components::SessionContext_ptr ctx)
   {
@@ -486,10 +372,17 @@ Sender_exec_i::record_time (unsigned long long nanotime)
     try
       {
         this->writer_ = this->context_->get_connection_info_write_data ();
-        ::CCM_DDS::DataListenerControl_var dlc =
+   //     wait_for_readers(1); 
+                ::CCM_DDS::DataListenerControl_var dlc =
             this->context_->get_connection_ping_listen_data_control ();
-        dlc->mode (::CCM_DDS::ONE_BY_ONE);
-    }
+            dlc->mode (::CCM_DDS::ONE_BY_ONE);
+
+        if (this->matched_.value())
+          {  
+            start ();
+    
+        }
+      }
     catch (const CORBA::Exception& ex)
       {
         ex._tao_print_exception ("Exception caught:");
@@ -503,37 +396,43 @@ Sender_exec_i::record_time (unsigned long long nanotime)
       }
   }
 
+   void 
+   Sender_exec_i::wait_for_readers(int /*numSubscribers*/)
+   {
+      //DDS_PublicationMatchedStatus status;
+  //   DDS::PublicationMatchedStatus status;
+  //    while (true)
+  //      {
+        //    this->writer_->  ->get_publication_matched_status(status);
+  //          if (status.current_count >= numSubscribers)
+  //          {
+  //              break;
+  //          }
+            //perftest_cpp::MilliSleep(1000);
+   //     }
+    }
+
+
   void
   Sender_exec_i::ccm_passivate (void)
   {
-    if (this->timer_.value ())
-     this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->cancel_timer (this->ticker_);
- 
+    this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->cancel_timer (this->ticker_);
   }
 
   void
   Sender_exec_i::ccm_remove (void)
   {
      
-   ACE_DEBUG ((LM_DEBUG, "SUMMARY SENDER number of messages sent: %u\n",
-                          (this->number_of_msg_ + 1)));
-
-   if( this->count_.value () > 0)
-     {
-       double avg = this->tv_total_.value () / this->count_.value ();
-       ACE_DEBUG ((LM_DEBUG, "SUMMARY SENDER latency time-one way,in usec :\n"
-                            "Total time<%u>,\nNumber of latency messages <%u>,\nAvg <%6.01f>,\nMin <%u>,\nMax <%u>.\n",
-                            this->tv_total_.value ()/2, 
+   
+   
+      double avg = this->tv_total_.value () / this->count_.value ();
+     ACE_DEBUG ((LM_ERROR, "SUMMARY SENDER latency time:\n "
+                            "Total <%u>\n , Count <%u>\n, Avg <%6.01f>\nMin <%u>\nMax <%u> \n",
+                            this->tv_total_.value (), 
                             this->count_.value (),
-                            avg/2,
-                            this->tv_min_.value ()/2,
-                            this->tv_max_.value ()/2));
-   }
-   else
-   {
-      ACE_ERROR ((LM_ERROR, "SUMMARY SENDER latency time:\n "
-                            "No samples reveived back.\n"));
-   }
+                            avg,
+                            this->tv_min_.value (),
+                            this->tv_max_.value ()));
   }
 
   extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.h
index 3dea80ac530..a43579338ea 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/Sender/Perf_Keyed_Test_Sender_exec.h
@@ -51,7 +51,7 @@ class SENDER_EXEC_Export ConnectorStatusListener_exec_i
       public virtual ::CORBA::LocalObject
   {
   public:
-    ConnectorStatusListener_exec_i (Atomic_Boolean &, int,  Sender_exec_i &callback_);
+    ConnectorStatusListener_exec_i (Atomic_Boolean &, int);
     virtual ~ConnectorStatusListener_exec_i (void);
     
     virtual
@@ -74,7 +74,6 @@ class SENDER_EXEC_Export ConnectorStatusListener_exec_i
                                ::DDS::StatusKind  status_kind);
 
   private:
-    Sender_exec_i &callback_;
     Atomic_Boolean &matched_;
     int number_of_subscribers_; 
   
@@ -93,6 +92,20 @@ class SENDER_EXEC_Export ConnectorStatusListener_exec_i
     Sender_exec_i &callback_;
   };
 
+  //============================================================
+  // WriteManyHandler
+  //============================================================
+  class WriteManyHandler :
+    public ACE_Event_Handler
+  {
+  public:
+    WriteManyHandler (Sender_exec_i &callback);
+    virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
+  private:
+    /// Maintains a handle that actually process the event
+    Sender_exec_i &callback_;
+  };
+
   class Sender_exec_i
     : public virtual Sender_Exec,
       public virtual ::CORBA::LocalObject
@@ -101,19 +114,22 @@ class SENDER_EXEC_Export ConnectorStatusListener_exec_i
     Sender_exec_i (void);
     virtual ~Sender_exec_i (void);
 
+    virtual ::CORBA::UShort iterations (void);
+     
     virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
     get_connector_status (void);
-
+    
     virtual ::CCM_DDS::PerfKeyedTest::CCM_Listener_ptr
     get_ping_listen_data_listener (void);
 
     virtual ::CCM_DDS::CCM_PortStatusListener_ptr
     get_ping_listen_status (void);
 
-    void record_time (unsigned long long nanotime);
 
-    virtual ::CORBA::ULong iterations (void);
-    virtual void iterations (::CORBA::ULong iterations);
+   void record_time (const ACE_Time_Value &now,
+                     const ACE_Time_Value &ccm);
+
+    virtual void iterations (::CORBA::UShort iterations);
 
     virtual ::CORBA::UShort keys (void);
     virtual void keys (::CORBA::UShort keys);
@@ -124,14 +140,8 @@ class SENDER_EXEC_Export ConnectorStatusListener_exec_i
     virtual ::CORBA::UShort sleep (void);
     virtual void sleep (::CORBA::UShort sleep);
 
-    virtual ::CORBA::UShort spin (void);
-    virtual void spin (::CORBA::UShort spin);
-
-    virtual ::CORBA::UShort number_of_sub (void);
-    virtual void number_of_sub (::CORBA::UShort number_of_sub);
-
-    virtual ::CORBA::UShort datalen (void);
-    virtual void datalen (::CORBA::UShort datalen);
+    virtual void wait_for_readers(int numSubscribers);
+ 
 
     virtual void set_session_context (::Components::SessionContext_ptr ctx);
 
@@ -143,7 +153,6 @@ class SENDER_EXEC_Export ConnectorStatusListener_exec_i
 
     void start (void);
     void write_one (void);
-    void write_one_with_spin (void);
 
   private:
     ::Perf_Keyed_Test::CCM_Sender_Context_var context_;
@@ -156,17 +165,14 @@ class SENDER_EXEC_Export ConnectorStatusListener_exec_i
 
     CORBA::UShort latency_count_;
     CORBA::UShort sleep_;
-    CORBA::UShort spin_;
-    CORBA::UShort datalen_;
 
     Atomic_Boolean matched_;
-    CORBA::UShort number_of_subscribers_;
+    int number_of_subscribers_;
     Atomic_Long  tv_total_;
     Atomic_Long  tv_max_;
     Atomic_Long  tv_min_;
     Atomic_Long  count_;
-    CORBA::UShort number_of_msg_;
-    Atomic_Boolean timer_;
+
 
     TAO_SYNCH_MUTEX mutex_;
     typedef std::map<ACE_CString, PerfKeyedTest_var> Writer_Table;
@@ -180,3 +186,4 @@ class SENDER_EXEC_Export ConnectorStatusListener_exec_i
 }
 
 #endif /* ifndef */
+
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan.cdp
index aa691ea5714..c557077916a 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan.cdp
+++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan.cdp
@@ -166,6 +166,28 @@
     <!-- hostname -->
     <source/>
     <implementation xmi:idref="ReceiverComponentImplementation" />
+    <configProperty>
+      <name>keys</name>
+      <value>
+        <type>
+          <kind>tk_ushort</kind>
+        </type>
+        <value>
+          <ushort>5</ushort>
+        </value>
+      </value>
+    </configProperty>
+    <configProperty>
+      <name>iterations</name>
+      <value>
+        <type>
+          <kind>tk_ushort</kind>
+        </type>
+        <value>
+          <ushort>10</ushort>
+        </value>
+      </value>
+    </configProperty>
   </instance>
   <instance xmi:id="Perf_Keyed_Test_ConnectorComponentInstance">
     <name>Perf_Keyed_Test_ConnectorComponent</name>
@@ -238,7 +260,7 @@
           <kind>tk_ushort</kind>
         </type>
         <value>
-          <ushort>1</ushort>
+          <ushort>5</ushort>
         </value>
       </value>
     </configProperty>
@@ -246,10 +268,10 @@
       <name>iterations</name>
       <value>
         <type>
-          <kind>tk_ulong</kind>
+          <kind>tk_ushort</kind>
         </type>
         <value>
-          <ulong>10000</ulong>
+          <ushort>1000</ushort>
         </value>
       </value>
     </configProperty>
@@ -275,28 +297,6 @@
         </value>
       </value>
     </configProperty>
-    <configProperty>
-      <name>spin</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>datalen</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>999</ushort>
-        </value>
-      </value>
-    </configProperty>
   </instance>
 
   <connection>
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub.cdp b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub.cdp
deleted file mode 100644
index ed332d52d62..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub.cdp
+++ /dev/null
@@ -1,344 +0,0 @@
-<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">
-  <label>Perf_Keyed_Test_Depl_1</label>
-  <UUID>Perf_Keyed_Test_Depl_1</UUID>
-
-  
-  <implementation xmi:id="Perf_Keyed_Test_ConnectorComponentImplementation">
-    <name>Perf_Keyed_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Perf_Keyed_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="Perf_Keyed_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Perf_Keyed_Test_Perf_Keyed_Test_Connector_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Perf_Keyed_Test_Perf_Keyed_Test_Connector_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Perf_Keyed_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Perf_Keyed_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Perf_Keyed_Test_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Perf_Keyed_Test_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="Perf_Keyed_Test_ConnectorComponentInstance">
-    <name>Perf_Keyed_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Perf_Keyed_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Perf_Keyed_Test</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>HelloTest_Library#LatencyQoS</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>1</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>0</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>latency_count</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>100</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>sleep</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>2</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>spin</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>1000</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-    <name>number_of_sub</name>
-    <value>
-      <type>
-        <kind>tk_ushort</kind>
-      </type>
-      <value>
-        <ushort>1</ushort>
-      </value>
-    </value>
-    </configProperty>
-    <configProperty>
-      <name>datalen</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>999</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  
-  
-  <connection>
-    <name>info_listen_data_pub</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>ping_listen_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Perf_Keyed_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>ping_listen_data_control</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>ping_listen_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Perf_Keyed_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Perf_Keyed_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  
-  <connection>
-    <name>connector_status_sender</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Perf_Keyed_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="Perf_Keyed_Test_Connector_ExecArtifact">
-    <name>Perf_Keyed_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Perf_Keyed_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Perf_Keyed_Test_Connector_SvntArtifact">
-    <name>Perf_Keyed_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Perf_Keyed_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Perf_Keyed_Test_Connector_StubArtifact">
-    <name>Perf_Keyed_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Perf_Keyed_Test_Connector_stub</location>
-  </artifact>
- </Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub3.cdp b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub3.cdp
deleted file mode 100644
index 8c61cdb7348..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub3.cdp
+++ /dev/null
@@ -1,344 +0,0 @@
-<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">
-  <label>Perf_Keyed_Test_Depl_1</label>
-  <UUID>Perf_Keyed_Test_Depl_1</UUID>
-
-  
-  <implementation xmi:id="Perf_Keyed_Test_ConnectorComponentImplementation">
-    <name>Perf_Keyed_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Perf_Keyed_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="Perf_Keyed_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Perf_Keyed_Test_Perf_Keyed_Test_Connector_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Perf_Keyed_Test_Perf_Keyed_Test_Connector_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Perf_Keyed_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Perf_Keyed_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Perf_Keyed_Test_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Perf_Keyed_Test_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="Perf_Keyed_Test_ConnectorComponentInstance">
-    <name>Perf_Keyed_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Perf_Keyed_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Perf_Keyed_Test</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>HelloTest_Library#LatencyQoS</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>1</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>0</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>latency_count</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>100</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>sleep</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>10</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>spin</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>1000</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-    <name>number_of_sub</name>
-    <value>
-      <type>
-        <kind>tk_ushort</kind>
-      </type>
-      <value>
-        <ushort>3</ushort>
-      </value>
-    </value>
-    </configProperty>
-    <configProperty>
-      <name>datalen</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>999</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  
-  
-  <connection>
-    <name>info_listen_data_pub</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>ping_listen_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Perf_Keyed_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>ping_listen_data_control</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>ping_listen_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Perf_Keyed_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Perf_Keyed_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  
-  <connection>
-    <name>connector_status_sender</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Perf_Keyed_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="Perf_Keyed_Test_Connector_ExecArtifact">
-    <name>Perf_Keyed_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Perf_Keyed_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Perf_Keyed_Test_Connector_SvntArtifact">
-    <name>Perf_Keyed_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Perf_Keyed_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Perf_Keyed_Test_Connector_StubArtifact">
-    <name>Perf_Keyed_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Perf_Keyed_Test_Connector_stub</location>
-  </artifact>
- </Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub_BE.cdp b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub_BE.cdp
deleted file mode 100644
index ddc3cd9a87f..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_pub_BE.cdp
+++ /dev/null
@@ -1,344 +0,0 @@
-<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">
-  <label>Perf_Keyed_Test_Depl_1</label>
-  <UUID>Perf_Keyed_Test_Depl_1</UUID>
-
-  
-  <implementation xmi:id="Perf_Keyed_Test_ConnectorComponentImplementation">
-    <name>Perf_Keyed_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Perf_Keyed_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="Perf_Keyed_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Perf_Keyed_Test_Perf_Keyed_Test_Connector_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Perf_Keyed_Test_Perf_Keyed_Test_Connector_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Perf_Keyed_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Perf_Keyed_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Perf_Keyed_Test_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Perf_Keyed_Test_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="Perf_Keyed_Test_ConnectorComponentInstance">
-    <name>Perf_Keyed_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Perf_Keyed_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Perf_Keyed_Test</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>HelloTest_Library#BestEffortQoS</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>1</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>10000</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>latency_count</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>100</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>sleep</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>2</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>spin</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>1000</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>number_of_sub</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>3</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>datalen</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>999</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  
-  
-  <connection>
-    <name>info_listen_data_pub</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>ping_listen_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Perf_Keyed_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>ping_listen_data_control</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>ping_listen_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Perf_Keyed_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Perf_Keyed_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  
-  <connection>
-    <name>connector_status_sender</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Perf_Keyed_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="Perf_Keyed_Test_Connector_ExecArtifact">
-    <name>Perf_Keyed_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Perf_Keyed_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Perf_Keyed_Test_Connector_SvntArtifact">
-    <name>Perf_Keyed_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Perf_Keyed_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Perf_Keyed_Test_Connector_StubArtifact">
-    <name>Perf_Keyed_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Perf_Keyed_Test_Connector_stub</location>
-  </artifact>
- </Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_sub.cdp b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_sub.cdp
deleted file mode 100644
index bec0768e8b8..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_sub.cdp
+++ /dev/null
@@ -1,266 +0,0 @@
-<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">
-  <label>Perf_Keyed_Test_Depl_1</label>
-  <UUID>Perf_Keyed_Test_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Perf_Keyed_Test_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Perf_Keyed_Test_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Perf_Keyed_Test_ConnectorComponentImplementation">
-    <name>Perf_Keyed_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Perf_Keyed_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="Perf_Keyed_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Perf_Keyed_Test_Perf_Keyed_Test_Connector_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Perf_Keyed_Test_Perf_Keyed_Test_Connector_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Perf_Keyed_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Perf_Keyed_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-  </instance>
-   <instance xmi:id="Perf_Keyed_Test_ConnectorComponentInstance2">
-    <name>Perf_Keyed_Test_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Perf_Keyed_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Perf_Keyed_Test</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>HelloTest_Library#LatencyQoS</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
- 
-  <connection>
-    <name>info_listen_connector_status_receiver</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Perf_Keyed_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_listen_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Perf_Keyed_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_listen_data_control</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Perf_Keyed_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection_sub</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>write_ping_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Perf_Keyed_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  
-
-  <artifact xmi:id="Perf_Keyed_Test_Connector_ExecArtifact">
-    <name>Perf_Keyed_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Perf_Keyed_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Perf_Keyed_Test_Connector_SvntArtifact">
-    <name>Perf_Keyed_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Perf_Keyed_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Perf_Keyed_Test_Connector_StubArtifact">
-    <name>Perf_Keyed_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Perf_Keyed_Test_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_sub_BE.cdp b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_sub_BE.cdp
deleted file mode 100644
index a5388e7cc30..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/Plan_sub_BE.cdp
+++ /dev/null
@@ -1,267 +0,0 @@
-<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">
-  <label>Perf_Keyed_Test_Depl_1</label>
-  <UUID>Perf_Keyed_Test_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Perf_Keyed_Test_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Perf_Keyed_Test_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Perf_Keyed_Test_ConnectorComponentImplementation">
-    <name>Perf_Keyed_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Perf_Keyed_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="Perf_Keyed_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Perf_Keyed_Test_Perf_Keyed_Test_Connector_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Perf_Keyed_Test_Perf_Keyed_Test_Connector_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Perf_Keyed_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Perf_Keyed_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-  </instance>
-   <instance xmi:id="Perf_Keyed_Test_ConnectorComponentInstance2">
-    <name>Perf_Keyed_Test_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Perf_Keyed_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Perf_Keyed_Test</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>HelloTest_Library#BestEffortQoS</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
- 
-  <connection>
-    <name>info_listen_connector_status_receiver</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Perf_Keyed_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_listen_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Perf_Keyed_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  
-  
-  <connection>
-    <name>info_listen_data_control</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Perf_Keyed_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection_sub</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>write_ping_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Perf_Keyed_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  
-
-  <artifact xmi:id="Perf_Keyed_Test_Connector_ExecArtifact">
-    <name>Perf_Keyed_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Perf_Keyed_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Perf_Keyed_Test_Connector_SvntArtifact">
-    <name>Perf_Keyed_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Perf_Keyed_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Perf_Keyed_Test_Connector_StubArtifact">
-    <name>Perf_Keyed_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Perf_Keyed_Test_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/README b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/README
deleted file mode 100644
index 5c60c72c2ab..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/README
+++ /dev/null
@@ -1,24 +0,0 @@
-
-These tests test the performance with different options.
-
--	test one publisher and one subscriber in 1 process:
-	run_test.pl with resp. Plan.cdp
-
-
--	default test (RELIABLE) , separate publisher and  subscriber:
-	run_pub.pl and run_sub.pl with resp. Plan_pub.cdp and Plan_sub.cdp .
-
--	test with one publisher and three separate subscribers:
-	run_pub3.pl with Plan_pub3.cdp  and run_sub.pl, run_sub2.pl, run_sub3.pl all with Plan_sub.cdp .
-
--	BEST_EFFORT test, separate publisher and  subscriber:
-	run_pub_BE.pl and run_sub_BE.pl with resp.  Plan_pub_BE.cdp and Plan_sub_BE.cdp .
-
-
-To test changes in the next attributes, changes this values in the publisher cdp-files:
-latency_count : indicates the number of messages minus 1 between two latency messages
-iterations : the number of messages from one instance to send. 0 = INFINITY .
-datalen: the datalen of a message (minimal 32). 
-sleep:  time in ms to sleep before writing the next message 
-spin: number of times to do a code loop before writing the next message, sleep has to be 0 . 
-keys: number of instances. (default 1) MORE THEN 1 NOT IMPLEMENTED YET.  
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/USER_QOS_PROFILES.xml
index 9b472b3f879..391422a33ba 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/USER_QOS_PROFILES.xml
+++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/USER_QOS_PROFILES.xml
@@ -27,99 +27,97 @@ RTI Data Distribution Service user manual.
         -->
     <qos_profile name="LatencyQoS" is_default_qos="true">
       <!-- QoS used to configure the data writer created in the example code -->
+
       <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>DURATION_INFINITE_SEC</sec>
-            <nanosec>DURATION_INFINITE_NSEC</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
+        <!--
+        The number of samples for which the middleware will set aside space.
+        See the comments above for more information.
+        -->
         <resource_limits>
-          <max_instances>1</max_instances>
-          <initial_instances>1</initial_instances>
+          <max_instances>1000</max_instances>
+          <initial_instances>1000</initial_instances>
           <max_samples>LENGTH_UNLIMITED</max_samples>
           <initial_samples>100</initial_samples>
           <max_samples_per_instance>LENGTH_UNLIMITED</max_samples_per_instance>
         </resource_limits>
+        <!--
+        The behavioral contract under which the DataWriter will carry out the
+        reliability protocol. See the comments above for more information.
+        -->
         <protocol>
           <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
+            <low_watermark>10</low_watermark>
+            <high_watermark>100</high_watermark>
+            <heartbeats_per_max_samples>1000</heartbeats_per_max_samples>
+            <heartbeat_period>
+              <sec>DURATION_ZERO_SEC</sec>
+              <nanosec>10000000</nanosec>
+            </heartbeat_period>
+            <fast_heartbeat_period>
+              <sec>DURATION_ZERO_SEC</sec>
+              <nanosec>1000000</nanosec>
+            </fast_heartbeat_period>
+            <late_joiner_heartbeat_period>
+              <sec>DURATION_ZERO_SEC</sec>
+              <nanosec>10000000</nanosec>
+            </late_joiner_heartbeat_period>
+            <max_heartbeat_retries>LENGTH_UNLIMITED</max_heartbeat_retries>
+            <min_nack_response_delay>
+              <sec>DURATION_ZERO_SEC</sec>
+              <nanosec>DURATION_ZERO_NSEC</nanosec>
+            </min_nack_response_delay>
+            <max_nack_response_delay>
+              <sec>DURATION_ZERO_SEC</sec>
+              <nanosec>DURATION_ZERO_NSEC</nanosec>
+            </max_nack_response_delay>
           </rtps_reliable_writer>
         </protocol>
+
+        <writer_data_lifecycle>
+          <autodispose_unregistered_instances>false</autodispose_unregistered_instances>
+        </writer_data_lifecycle>
+
       </datawriter_qos>
+     
       <!-- QoS used to configure the data reader created in the example code -->
       <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <resource_limits>
-          <initial_samples>100</initial_samples>
-          <initial_instances>1</initial_instances>
-          <max_samples>LENGTH_UNLIMITED</max_samples>
-          <max_instances>1</max_instances>
-          <max_samples_per_instance>LENGTH_UNLIMITED</max_samples_per_instance>
-        </resource_limits>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-      
-    </qos_profile>
-    <qos_profile name="BestEffortQoS" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-        <reliability>
-          <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-         </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
+        <!--
+        The number of samples for which the middleware will set aside space.
+        See the comments above for more information.
+        -->
         <resource_limits>
-          <max_instances>1</max_instances>
-          <initial_instances>1</initial_instances>
-          <max_samples>LENGTH_UNLIMITED</max_samples>
+          <max_instances>1000</max_instances>
+          <initial_instances>10</initial_instances>
+          <max_samples>100</max_samples>
           <initial_samples>100</initial_samples>
-          <max_samples_per_instance>LENGTH_UNLIMITED</max_samples_per_instance>
+          <max_samples_per_instance>100</max_samples_per_instance>
         </resource_limits>
+        <reader_resource_limits>
+          <max_samples_per_remote_writer>100</max_samples_per_remote_writer>
+        </reader_resource_limits>
+
+        <!--
+        The behavioral contract under which the DataReader will carry out the
+        reliability protocol. See the comments above for more information.
+        -->
         <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
+          <rtps_reliable_reader>
+            <min_heartbeat_response_delay>
+              <sec>DURATION_ZERO_SEC</sec>
+              <nanosec>DURATION_ZERO_NSEC</nanosec>
+            </min_heartbeat_response_delay>
+            <max_heartbeat_response_delay>
+              <sec>DURATION_ZERO_SEC</sec>
+              <nanosec>DURATION_ZERO_NSEC</nanosec>
+            </max_heartbeat_response_delay>
+            <heartbeat_suppression_duration>
+              <sec>DURATION_ZERO_SEC</sec>
+              <nanosec>DURATION_ZERO_NSEC</nanosec>
+            </heartbeat_suppression_duration>
+          </rtps_reliable_reader>
         </protocol>
-      </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <reliability>
-          <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <resource_limits>
-          <initial_samples>100</initial_samples>
-          <initial_instances>1</initial_instances>
-          <max_samples>LENGTH_UNLIMITED</max_samples>
-          <max_instances>1</max_instances>
-          <max_samples_per_instance>LENGTH_UNLIMITED</max_samples_per_instance>
-        </resource_limits>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
       </datareader_qos>
+      
     </qos_profile>
   </qos_library>
-
 </dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub.pl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub.pl
deleted file mode 100644
index 72c16054137..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub.pl
+++ /dev/null
@@ -1,226 +0,0 @@
-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 = 1;
-@ports = ( 60001 );
-@iorbases = ( "Sender.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode" );
-
-# ior files other than daemon
-# 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_pub.cdp";
-
-$ENV{"DANCE_TRACE_ENABLE"} = 0;
-$ENV{"CIAO_TRACE_ENABLE"} = 0;
-$ENV{"CIAO_LOG_LEVEL"} = 5;
-$ENV{"DANCE_LOG_LEVEL"} = 5;
-# $ENV{"DDS4CCM_NDDS_LOG_VERBOSITY"} =  31;
-
-
-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 deamon $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);
-    }
-}
-
-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 = "$CIAO_ROOT/bin/ciao_componentserver";
-
-        $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/Naming_Service", "-m 1 -ORBEndpoint iiop://localhost:60004 -o $ior_nsfile");
-
-$NS->Spawn ();
-
-print STDERR "Starting Naming Service with -m 1 -ORBEndpoint iiop://localhost:60004 -o ns.ior\n";
-
-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:60004/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->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;
-}
-
-$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");
-$E->SpawnWaitKill (2*$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;
-    }
-}
-
-print "Sleeping 180 seconds to allow task to complete\n";
-sleep (180);
-
-# 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 -q\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -q");
-$E->SpawnWaitKill ($tg_executor->ProcessStopWaitInterval ());
-
-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/dds4ccm/performance-tests/Keyed/descriptors/run_pub3.pl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub3.pl
deleted file mode 100644
index 670e9c5e9ea..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub3.pl
+++ /dev/null
@@ -1,226 +0,0 @@
-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 = 1;
-@ports = ( 60001 );
-@iorbases = ( "Sender.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode" );
-
-# ior files other than daemon
-# 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_pub3.cdp";
-
-$ENV{"DANCE_TRACE_ENABLE"} = 0;
-$ENV{"CIAO_TRACE_ENABLE"} = 0;
-$ENV{"CIAO_LOG_LEVEL"} = 5;
-$ENV{"DANCE_LOG_LEVEL"} = 5;
-# $ENV{"DDS4CCM_NDDS_LOG_VERBOSITY"} =  31;
-
-
-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 deamon $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);
-    }
-}
-
-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 = "$CIAO_ROOT/bin/ciao_componentserver";
-
-        $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/Naming_Service", "-m 1 -ORBEndpoint iiop://localhost:60004 -o $ior_nsfile");
-
-$NS->Spawn ();
-
-print STDERR "Starting Naming Service with -m 1 -ORBEndpoint iiop://localhost:60004 -o ns.ior\n";
-
-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:60004/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->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;
-}
-
-$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");
-$E->SpawnWaitKill (2*$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;
-    }
-}
-
-print "Sleeping 180 seconds to allow task to complete\n";
-sleep (180);
-
-# 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 -q\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -q");
-$E->SpawnWaitKill ($tg_executor->ProcessStopWaitInterval ());
-
-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/dds4ccm/performance-tests/Keyed/descriptors/run_pub_BE.pl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub_BE.pl
deleted file mode 100644
index 424bcb0d749..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_pub_BE.pl
+++ /dev/null
@@ -1,226 +0,0 @@
-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 = 1;
-@ports = ( 60001 );
-@iorbases = ( "Sender.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode" );
-
-# ior files other than daemon
-# 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_pub_BE.cdp";
-
-$ENV{"DANCE_TRACE_ENABLE"} = 0;
-$ENV{"CIAO_TRACE_ENABLE"} = 0;
-$ENV{"CIAO_LOG_LEVEL"} = 5;
-$ENV{"DANCE_LOG_LEVEL"} = 5;
-# $ENV{"DDS4CCM_NDDS_LOG_VERBOSITY"} =  31;
-
-
-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 deamon $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);
-    }
-}
-
-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 = "$CIAO_ROOT/bin/ciao_componentserver";
-
-        $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/Naming_Service", "-m 1 -ORBEndpoint iiop://localhost:60004 -o $ior_nsfile");
-
-$NS->Spawn ();
-
-print STDERR "Starting Naming Service with -m 1 -ORBEndpoint iiop://localhost:60004 -o ns.ior\n";
-
-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:60004/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->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;
-}
-
-$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");
-$E->SpawnWaitKill (2*$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;
-    }
-}
-
-print "Sleeping 180 seconds to allow task to complete\n";
-sleep (180);
-
-# 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 -q\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -q");
-$E->SpawnWaitKill ($tg_executor->ProcessStopWaitInterval ());
-
-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/dds4ccm/performance-tests/Keyed/descriptors/run_sub.pl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub.pl
deleted file mode 100644
index dae8581f1d5..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub.pl
+++ /dev/null
@@ -1,226 +0,0 @@
-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 = 1;
-@ports = ( 60002 );
-@iorbases = ( "Receiver.ior" );
-@iorfiles = 0;
-@nodenames = ( "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns1.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM1.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_sub.cdp";
-
-$ENV{"DANCE_TRACE_ENABLE"} = 0;
-$ENV{"CIAO_TRACE_ENABLE"} = 0;
-$ENV{"CIAO_LOG_LEVEL"} = 5;
-$ENV{"DANCE_LOG_LEVEL"} = 5;
-# $ENV{"DDS4CCM_NDDS_LOG_VERBOSITY"} =  31;
-
-
-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 deamon $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);
-    }
-}
-
-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 = "$CIAO_ROOT/bin/ciao_componentserver";
-
-        $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/Naming_Service", "-m 1 -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$NS->Spawn ();
-
-print STDERR "Starting Naming Service with -m 1 -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-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->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;
-}
-
-$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");
-$E->SpawnWaitKill (2*$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;
-    }
-}
-
-print "Sleeping 180 seconds to allow task to complete\n";
-sleep (180);
-
-# 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 -q\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -q");
-$E->SpawnWaitKill ($tg_executor->ProcessStopWaitInterval ());
-
-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/dds4ccm/performance-tests/Keyed/descriptors/run_sub2.pl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub2.pl
deleted file mode 100644
index ed0e4e307ca..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub2.pl
+++ /dev/null
@@ -1,226 +0,0 @@
-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 = 1;
-@ports = ( 60005 );
-@iorbases = ( "Receiver.ior" );
-@iorfiles = 0;
-@nodenames = ( "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns1.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM2.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_sub.cdp";
-
-$ENV{"DANCE_TRACE_ENABLE"} = 0;
-$ENV{"CIAO_TRACE_ENABLE"} = 0;
-$ENV{"CIAO_LOG_LEVEL"} = 5;
-$ENV{"DANCE_LOG_LEVEL"} = 5;
-# $ENV{"DDS4CCM_NDDS_LOG_VERBOSITY"} =  31;
-
-
-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 deamon $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);
-    }
-}
-
-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 = "$CIAO_ROOT/bin/ciao_componentserver";
-
-        $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/Naming_Service", "-m 1 -ORBEndpoint iiop://localhost:60006 -o $ior_nsfile");
-
-$NS->Spawn ();
-
-print STDERR "Starting Naming Service with -m 1 -ORBEndpoint iiop://localhost:60006 -o ns.ior\n";
-
-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:60006/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->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;
-}
-
-$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");
-$E->SpawnWaitKill (2*$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;
-    }
-}
-
-print "Sleeping 180 seconds to allow task to complete\n";
-sleep (180);
-
-# 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 -q\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -q");
-$E->SpawnWaitKill ($tg_executor->ProcessStopWaitInterval ());
-
-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/dds4ccm/performance-tests/Keyed/descriptors/run_sub3.pl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub3.pl
deleted file mode 100644
index ac188a024d8..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub3.pl
+++ /dev/null
@@ -1,226 +0,0 @@
-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 = 1;
-@ports = ( 60007 );
-@iorbases = ( "Receiver.ior" );
-@iorfiles = 0;
-@nodenames = ( "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns1.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM3.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_sub.cdp";
-
-$ENV{"DANCE_TRACE_ENABLE"} = 0;
-$ENV{"CIAO_TRACE_ENABLE"} = 0;
-$ENV{"CIAO_LOG_LEVEL"} = 5;
-$ENV{"DANCE_LOG_LEVEL"} = 5;
-# $ENV{"DDS4CCM_NDDS_LOG_VERBOSITY"} =  31;
-
-
-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 deamon $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);
-    }
-}
-
-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 = "$CIAO_ROOT/bin/ciao_componentserver";
-
-        $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/Naming_Service", "-m 1 -ORBEndpoint iiop://localhost:60008 -o $ior_nsfile");
-
-$NS->Spawn ();
-
-print STDERR "Starting Naming Service with -m 1 -ORBEndpoint iiop://localhost:60008 -o ns.ior\n";
-
-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:60008/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->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;
-}
-
-$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");
-$E->SpawnWaitKill (2*$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;
-    }
-}
-
-print "Sleeping 180 seconds to allow task to complete\n";
-sleep (180);
-
-# 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 -q\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -q");
-$E->SpawnWaitKill ($tg_executor->ProcessStopWaitInterval ());
-
-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/dds4ccm/performance-tests/Keyed/descriptors/run_sub_BE.pl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub_BE.pl
deleted file mode 100644
index 22ac79d6086..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_sub_BE.pl
+++ /dev/null
@@ -1,226 +0,0 @@
-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 = 1;
-@ports = ( 60002 );
-@iorbases = ( "Receiver.ior" );
-@iorfiles = 0;
-@nodenames = ( "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns1.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM1.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_sub_BE.cdp";
-
-$ENV{"DANCE_TRACE_ENABLE"} = 0;
-$ENV{"CIAO_TRACE_ENABLE"} = 0;
-$ENV{"CIAO_LOG_LEVEL"} = 5;
-$ENV{"DANCE_LOG_LEVEL"} = 5;
-# $ENV{"DDS4CCM_NDDS_LOG_VERBOSITY"} =  31;
-
-
-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 deamon $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);
-    }
-}
-
-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 = "$CIAO_ROOT/bin/ciao_componentserver";
-
-        $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/Naming_Service", "-m 1 -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$NS->Spawn ();
-
-print STDERR "Starting Naming Service with -m 1 -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-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->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;
-}
-
-$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");
-$E->SpawnWaitKill (2*$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;
-    }
-}
-
-print "Sleeping 180 seconds to allow task to complete\n";
-sleep (180);
-
-# 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 -q\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -q");
-$E->SpawnWaitKill ($tg_executor->ProcessStopWaitInterval ());
-
-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/dds4ccm/performance-tests/Keyed/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_test.pl
index 5ed32dfb116..253001cc07f 100644
--- a/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/performance-tests/Keyed/descriptors/run_test.pl
@@ -107,8 +107,6 @@ sub kill_open_processes {
     if ($ns_running == 1) {
         $NS->Kill (); $NS->TimedWait (1);
     }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
 }
 
 sub run_node_daemons {
@@ -208,8 +206,8 @@ for ($i = 0; $i < $nr_daemon; ++$i) {
     }
 }
 
-print "Sleeping 120 seconds to allow task to complete\n";
-sleep (120);
+print "Sleeping 30 seconds to allow task to complete\n";
+sleep (30);
 
 # Invoke executor - stop the application -.
 print "Invoking executor - stop the application -\n";
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.idl b/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.idl
deleted file mode 100644
index 737864b741c..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-// $Id$
-
-/**
- * @file Latency_Test_Base.idl
- * @author Marijke Hengstmengel <mhengstmengel@remedy.nl>
- */
-
-#ifndef LATENCY_TEST_BASE_IDL
-#define LATENCY_TEST_BASE_IDL
-
-#pragma ndds typesupport "Base/Latency_Test_BaseSupport.h"
-
-const short MAX_DATA_SEQUENCE_LENGTH = 8192;
-typedef sequence<octet> OctetSeq;
-
-struct LatencyTest {
-  string key;
-  long seq_num;
-  long ping;
-  OctetSeq data;
- };
- //key is temporarily to prevent compile errors, has to be removed
- //ping  is temporarily, has to be solved in QoS file
-
-typedef sequence<LatencyTest> LatencyTest_Seq;
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.mpc b/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.mpc
deleted file mode 100644
index c297a36867e..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Base/Latency_Test_Base.mpc
+++ /dev/null
@@ -1,25 +0,0 @@
-// $Id$
-
-project (DDS_Latency_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
-  sharedname = DDS_Latency_Test_Base_stub
-  dynamicflags += LATENCY_KEYED_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Gxhst -Sci \
-              -Wb,stub_export_macro=LATENCY_KEYED_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=Latency_Keyed_Test_Base_stub_export.h
-
-  IDL_Files {
-    Latency_Test_Base.idl
-  }
-
-  opendds_ts_flags += --export=LATENCY_KEYED_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    Latency_Test_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector.idl b/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector.idl
deleted file mode 100644
index 257fdb4a0a8..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector.idl
+++ /dev/null
@@ -1,31 +0,0 @@
-// $Id$
-
-/**
- * @file Latency_Test_Connector.idl
- * @author Marijke Hengstmengel <mhengstmengel@remedy.nl>
- *
- * by-hand translation of the idl3p.
- */
-
-#ifndef LATENCY_TEST_CONNECTOR_IDL_
-#define LATENCY_TEST_CONNECTOR_IDL_
-
-#include  <Components.idl>
-#include "Base/Latency_Test_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
-
-#pragma ciao lem "Connector/Latency_Test_ConnectorE.idl"
-
-module CCM_DDS
-{
-  module ::CCM_DDS::Typed < ::LatencyTest, ::LatencyTest_Seq> LatencyTest;
-};
-
-module Latency_Test
-{
-  connector Latency_Test_Connector : ::CCM_DDS::LatencyTest::DDS_Event
-  {
-  };
-};
-
-#endif /* Latency_Test_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector.mpc b/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector.mpc
deleted file mode 100644
index 1ec88bff520..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Connector/Latency_Test_Connector.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-// $Id$
-// This file is generated with "generate_component_mpc.pl -p DDS_Latency_Test_Base -l .. -o ../lib -u DDS Latency_Test_Connector"
-
-project(DDS_Latency_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=LATENCY_TEST_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=Latency_Test_Connector_stub_export.h \
-              -Wb,skel_export_macro=LATENCY_TEST_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=Latency_Test_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=LATENCY_TEST_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=Latency_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=LATENCY_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Latency_Test_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Latency_Test_Connector.idl
-  }
-}
-
-project(DDS_Latency_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_Latency_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=LATENCY_TEST_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=Latency_Test_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
-
-  IDL_Files {
-    Latency_Test_ConnectorE.idl
-  }
-}
-
-project(DDS_Lat_Test_Connector_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_Latency_Test_Connector_lem_gen DDS_Latency_Test_Connector_stub DDS_Latency_Test_Base_stub DDS4CCM_lem_stub
-  libs  += DDS_Latency_Test_Base_stub DDS_Latency_Test_Connector_stub DDS4CCM_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Lat_Test_Connector_lem_stub
-  dynamicflags   = LATENCY_TEST_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Latency_Test_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    Latency_Test_ConnectorEC.h
-    Latency_Test_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Latency_Test_ConnectorEC.inl
-  }
-}
-
-project(DDS_Latency_Test_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_Latency_Test_Connector_idl_gen DDS_Latency_Test_Base_stub
-  libs  += DDS_Latency_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Latency_Test_Connector_stub
-  dynamicflags   = LATENCY_TEST_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Latency_Test_ConnectorC.cpp
-  }
-
-  Header_Files {
-    Latency_Test_ConnectorC.h
-    Latency_Test_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    Latency_Test_ConnectorC.inl
-  }
-}
-
-project(DDS_Latency_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_Lat_Test_Connector_lem_stub DDS_Latency_Test_Connector_stub DDS4CCM_lem_stub
-  sharedname = DDS_Latency_Test_Connector_exec
-  libs += DDS_Latency_Test_Connector_stub DDS_Lat_Test_Connector_lem_stub DDS_Latency_Test_Base_stub DDS4CCM_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags   = LATENCY_TEST_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Latency_Test_Connector_conn.cpp
-  }
-
-  Header_Files {
-    Latency_Test_Connector_conn.h
-    Latency_Test_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_Latency_Test_Connector_svnt) : ciao_servant, dds4ccm_skel {
-  after      += DDS_Lat_Test_Connector_lem_stub DDS_Latency_Test_Connector_exec DDS_Latency_Test_Connector_stub DDS4CCM_lem_stub
-  sharedname  = DDS_Latency_Test_Connector_svnt
-  libs       += DDS_Latency_Test_Connector_stub \
-                DDS_Lat_Test_Connector_lem_stub  \
-                DDS_Latency_Test_Base_stub \
-                DDS_Latency_Test_Connector_exec \
-                DDS4CCM_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags = LATENCY_TEST_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Latency_Test_ConnectorS.cpp
-    Latency_Test_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    Latency_Test_ConnectorS.h
-    Latency_Test_Connector_svnt.h
-    Latency_Test_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-    Latency_Test_ConnectorS.inl
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver.idl b/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver.idl
deleted file mode 100644
index 650dbfa7271..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-// $Id$
-
-/**
- * @file
- * @author Marijke Hengstmengel <mhengstmengel@remedy.nl>
- */
-
-#ifndef RECEIVER_IDL
-#define RECEIVER_IDL
-
-#include "Connector/Latency_Test_Connector.idl"
-
-module Latency_Test
-{
-  component Receiver
-  {
-    port CCM_DDS::LatencyTest::DDS_Listen info_listen;
-    provides CCM_DDS::ConnectorStatusListener info_listen_connector_status;
-    port CCM_DDS::LatencyTest::DDS_Write write_ping;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver.mpc
deleted file mode 100644
index e6a9d688078..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver.mpc
+++ /dev/null
@@ -1,151 +0,0 @@
-// $Id$
-
-project(DDS_Latency_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_Latency_Test_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
-              -Wb,stub_export_include=Receiver_stub_export.h \
-              -Wb,skel_export_macro=RECEIVER_SVNT_Export \
-              -Wb,skel_export_include=Receiver_svnt_export.h \
-              -Wb,svnt_export_macro=RECEIVER_SVNT_Export \
-              -Wb,svnt_export_include=Receiver_svnt_export.h \
-              -Wb,exec_export_macro=RECEIVER_EXEC_Export \
-              -Wb,exec_export_include=Receiver_exec_export.h -I..
-
-  IDL_Files {
-    Latency_Test_Receiver.idl
-  }
-}
-
-project(DDS_Latency_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_Latency_Test_Receiver_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
-              -Wb,stub_export_include=Receiver_lem_stub_export.h \
-              -SS -Gxhst -I..
-
-  IDL_Files {
-    Latency_Test_ReceiverE.idl
-  }
-}
-
-project(DDS_Latency_Test_Receiver_lem_stub) : ccm_svnt, dds4ccm_base  {
-  after += DDS_Latency_Test_Receiver_lem_gen DDS_Latency_Test_Receiver_stub  \
-           DDS_Latency_Test_Connector_stub DDS_Latency_Test_Base_stub
-  libs  +=  Receiver_stub DDS_Latency_Test_Connector_stub \
-            DDS_Latency_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_lem_stub
-  dynamicflags   = RECEIVER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Latency_Test_ReceiverEC.cpp
-  }
-
-  Header_Files {
-    Latency_Test_ReceiverEC.h
-    Receiver_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Latency_Test_ReceiverEC.inl
-  }
-}
-
-project(DDS_Latency_Test_Receiver_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_Latency_Test_Receiver_idl_gen  DDS_Latency_Test_Connector_stub \
-           DDS_Latency_Test_Base_stub DDS_Latency_Test_Connector_lem_gen
-  libs  += DDS_Latency_Test_Connector_stub DDS_Latency_Test_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Receiver_stub
-  dynamicflags   = RECEIVER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Latency_Test_ReceiverC.cpp
-  }
-
-  Header_Files {
-    Latency_Test_ReceiverC.h
-    Receiver_stub_export.h
-  }
-
-  Inline_Files {
-    Latency_Test_ReceiverC.inl
-  }
-}
-
-project(DDS_Latency_Test_Receiver_exec) : ciao_executor, dds4ccm_base {
-  after   += DDS_Latency_Test_Receiver_lem_stub DDS_Latency_Test_Receiver_stub \
-             DDS_Latency_Test_Base_stub DDS_Latency_Test_Connector_stub \
-             DDS_Lat_Test_Connector_lem_stub DDS4CCM_lem_stub
-  sharedname = Receiver_exec
-  libs += Receiver_stub Receiver_lem_stub DDS_Latency_Test_Base_stub \
-          DDS_Latency_Test_Connector_stub DDS_Lat_Test_Connector_lem_stub \
-          DDS4CCM_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags   = RECEIVER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Latency_Test_Receiver_exec.cpp
-  }
-
-  Header_Files {
-    Latency_Test_Receiver_exec.h
-    Receiver_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_Latency_Test_Receiver_svnt) : ciao_servant, dds4ccm_base {
-  after      +=   DDS_Latency_Test_Receiver_lem_stub DDS_Latency_Test_Base_stub \
-                  DDS_Latency_Test_Connector_stub DDS_Latency_Test_Connector_svnt \
-                  DDS_Latency_Test_Receiver_exec DDS_Lat_Test_Connector_lem_stub \
-                  DDS4CCM_lem_stub DDS4CCM_skel
-  sharedname  = Receiver_svnt
-  libs       += Receiver_stub Receiver_lem_stub DDS_Latency_Test_Base_stub \
-                DDS_Latency_Test_Connector_stub DDS_Latency_Test_Connector_svnt \
-                Receiver_exec DDS_Lat_Test_Connector_lem_stub DDS4CCM_lem_stub \
-                DDS4CCM_skel
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags = RECEIVER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Latency_Test_ReceiverS.cpp
-    Latency_Test_Receiver_svnt.cpp
-  }
-
-  Header_Files {
-    Latency_Test_ReceiverS.h
-    Latency_Test_Receiver_svnt.h
-    Receiver_svnt_export.h
-  }
-
-  Inline_Files {
-    Latency_Test_ReceiverS.inl
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver_exec.cpp
deleted file mode 100644
index 5952a6ff9ad..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver_exec.cpp
+++ /dev/null
@@ -1,189 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-#include "Latency_Test_Receiver_exec.h"
-#include "ciao/Logger/Log_Macros.h"
-#include "ace/High_Res_Timer.h"
-
-namespace CIAO_Latency_Test_Receiver_Impl
-{
-  //============================================================
-  // LatencyTest_Listener_exec_i
-  //============================================================
-  LatencyTest_Listener_exec_i::LatencyTest_Listener_exec_i (
-            Receiver_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  LatencyTest_Listener_exec_i::~LatencyTest_Listener_exec_i (void)
-  {
-  }
-
-  void
-  LatencyTest_Listener_exec_i::on_one_data (
-                                  const LatencyTest & an_instance,
-                                  const ::CCM_DDS::ReadInfo & /*info*/)
-  {
-    // Send back a packet if this is a ping
-    if (an_instance.ping == 1L)
-      {
-         this->callback_.write_one(an_instance);
-      }
-  }
-
-  void
-  LatencyTest_Listener_exec_i::on_many_data (
-                                  const LatencyTest_Seq & /*an_instance*/,
-                                  const ::CCM_DDS::ReadInfoSeq & /*info*/)
-  {
-  }
-
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (void)
-  {
-  }
-
-  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic(
-     ::DDS::Topic_ptr ,
-     const DDS::InconsistentTopicStatus & )
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos(
-    ::DDS::DataReader_ptr ,
-     const DDS::RequestedIncompatibleQosStatus & )
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected(
-     ::DDS::DataReader_ptr ,
-     const DDS::SampleRejectedStatus & )
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
-     ::DDS::DataWriter_ptr ,
-     const DDS::OfferedDeadlineMissedStatus & )
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
-     ::DDS::DataWriter_ptr ,
-     const DDS::OfferedIncompatibleQosStatus & )
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status(
-    ::DDS::Entity_ptr ,
-    ::DDS::StatusKind /*status_kind*/)
-  {
-  }
-
-  //============================================================
-  // Receiver_exec_i
-  //============================================================
-  Receiver_exec_i::Receiver_exec_i (void)
-    : count_ (0L)
-  {
-  }
-
-  Receiver_exec_i::~Receiver_exec_i (void)
-  {
-  }
-
-  void
-  Receiver_exec_i::write_one ( LatencyTest an_instance)
-  {
-    ++this->count_;
-    //change ping , so this receiever doesn't sent this message back again
-    an_instance.ping = 0L;
-    this->writer_->write_one (an_instance, ::DDS::HANDLE_NIL);
-  }
-
-  void
-  Receiver_exec_i::start ()
-  {
-    ::CCM_DDS::DataListenerControl_var dlc =
-            this->context_->get_connection_info_listen_data_control ();
-    dlc->mode (::CCM_DDS::ONE_BY_ONE);
-  }
-
-  
-
-  ::CCM_DDS::LatencyTest::CCM_Listener_ptr
-  Receiver_exec_i::get_info_listen_data_listener (void)
-  {
-    return new LatencyTest_Listener_exec_i (*this);
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_listen_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Receiver_exec_i::get_info_listen_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i ();
-  }
-
-  void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::Latency_Test::CCM_Receiver_Context::_narrow (ctx);
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
-  }
-
-  void
-  Receiver_exec_i::configuration_complete (void)
-  {
-    //enable the datalistener
-    this->start();
-  }
-
-  void
-  Receiver_exec_i::ccm_activate (void)
-  {
-     this->writer_ = this->context_->get_connection_write_ping_data ();
-  }
-
-  void
-  Receiver_exec_i::ccm_passivate (void)
-  {
-     ACE_DEBUG((LM_DEBUG, "SUMMARY RECEIVER:\n "
-                           "Messages sent back: %u \n",
-                           this->count_.value()));
-  }
-
-  void
-  Receiver_exec_i::ccm_remove (void)
-  {
-  }
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Latency_Test_Receiver_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Receiver_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver_exec.h
deleted file mode 100644
index 358173ad6fa..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Receiver/Latency_Test_Receiver_exec.h
+++ /dev/null
@@ -1,125 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#ifndef CIAO_RECEIVER_EXEC_H_
-#define CIAO_RECEIVER_EXEC_H_
-
-#include "Latency_Test_ReceiverEC.h"
-
-#include /**/ "Receiver_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-#include "ace/Reactor.h"
-#include "ace/Task.h"
-
-#include <map>
-
-namespace CIAO_Latency_Test_Receiver_Impl
-{
-  class Receiver_exec_i;
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::ULong> Atomic_ULong;
-
-  //============================================================
-  // LatencyTest_Listener_exec_i
-  //============================================================
-  class RECEIVER_EXEC_Export LatencyTest_Listener_exec_i
-    : public virtual ::CCM_DDS::LatencyTest::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    LatencyTest_Listener_exec_i (Receiver_exec_i &callback);
-    virtual ~LatencyTest_Listener_exec_i (void);
-
-    virtual void
-    on_one_data (
-      const LatencyTest & an_instance,
-      const ::CCM_DDS::ReadInfo & info);
-    virtual void
-    on_many_data (
-      const LatencyTest_Seq & an_instance,
-      const ::CCM_DDS::ReadInfoSeq & info);
-  private:
-    Receiver_exec_i &callback_;
-  };
-
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  class RECEIVER_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (void);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
-    virtual
-    void on_inconsistent_topic( ::DDS::Topic_ptr ,
-                              const DDS::InconsistentTopicStatus & );
-    virtual
-    void on_requested_incompatible_qos( ::DDS::DataReader_ptr ,
-                              const DDS::RequestedIncompatibleQosStatus & );
-    virtual
-    void on_sample_rejected( ::DDS::DataReader_ptr ,
-                              const DDS::SampleRejectedStatus & );
-    virtual
-    void on_offered_deadline_missed( ::DDS::DataWriter_ptr ,
-                              const DDS::OfferedDeadlineMissedStatus & );
-    virtual
-    void on_offered_incompatible_qos( ::DDS::DataWriter_ptr ,
-                              const DDS::OfferedIncompatibleQosStatus & );
-    virtual
-    void on_unexpected_status( ::DDS::Entity_ptr ,
-                              ::DDS::StatusKind );
-  };
-
-  //============================================================
-  // Receiver_exec_i
-  //============================================================
-  class RECEIVER_EXEC_Export Receiver_exec_i
-    : public virtual Receiver_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-
-    void start ();
-    void record_time (unsigned long datalen);
-
-    virtual ::CCM_DDS::LatencyTest::CCM_Listener_ptr
-    get_info_listen_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_listen_status (void);
-
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_info_listen_connector_status (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);
-
-    void write_one (LatencyTest an_instance);
-
-  private:
-    ::Latency_Test::CCM_Receiver_Context_var context_;
-    CCM_DDS::LatencyTest::Writer_var writer_;
-
-    Atomic_ULong  count_;
-  };
-
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Latency_Test_Receiver_Impl (void);
-}
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender.idl b/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender.idl
deleted file mode 100644
index a8b44055aa4..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender.idl
+++ /dev/null
@@ -1,31 +0,0 @@
-// $Id$
-
-/**
- * @file
- * @author Marijke Hengstmengel <mhengstmengel@remedy.nl>
- *
- * by-hand idl3 translation of sender components.
- */
-
-#ifndef DDS_LATENCY_TEST_SENDER_IDL
-#define DDS_LATENCY_TEST_SENDER_IDL
-
-#include "Connector/Latency_Test_Connector.idl"
-
-
-module Latency_Test
-{
-  component Sender
-  {
-    port CCM_DDS::LatencyTest::DDS_Write info_write;
-    attribute unsigned short keys;  
-    attribute unsigned long iterations;
-    attribute unsigned short sleep; 
-    attribute unsigned short datalen; //minimal 32
-    attribute unsigned short number_of_sub; //number of subscribers
-    provides CCM_DDS::ConnectorStatusListener connector_status;
-    port CCM_DDS::LatencyTest::DDS_Listen ping_listen;
-  };
-};
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender.mpc b/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender.mpc
deleted file mode 100644
index 862af257568..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender.mpc
+++ /dev/null
@@ -1,148 +0,0 @@
-// $Id$
-// This file is generated with "generate_component_mpc.pl -p DDS_Latency_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
-
-project(DDS_Latency_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_Latency_Test_Connector_idl_gen DDS_Starter_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
-              -Wb,stub_export_include=Sender_stub_export.h \
-              -Wb,skel_export_macro=SENDER_SVNT_Export \
-              -Wb,skel_export_include=Sender_svnt_export.h \
-              -Wb,svnt_export_macro=SENDER_SVNT_Export \
-              -Wb,svnt_export_include=Sender_svnt_export.h \
-              -Wb,exec_export_macro=SENDER_EXEC_Export \
-              -Wb,exec_export_include=Sender_exec_export.h \
-              -I ..
-
-  IDL_Files {
-    Latency_Test_Sender.idl
-  }
-}
-
-project(DDS_Latency_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
-  after += DDS_Latency_Test_Sender_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
-              -Wb,stub_export_include=Sender_lem_stub_export.h \
-              -SS -Gxhst -I $CIAO_ROOT/connectors -I ..
-
-  IDL_Files {
-    Latency_Test_SenderE.idl
-  }
-}
-
-project(DDS_Latency_Test_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_Latency_Test_Sender_lem_gen DDS_Latency_Test_Sender_stub \
-           DDS_Latency_Test_Base_stub
-  libs  += DDS_Latency_Test_Base_stub Sender_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = Sender_lem_stub
-  dynamicflags   = SENDER_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Latency_Test_SenderEC.cpp
-  }
-
-  Header_Files {
-    Latency_Test_SenderEC.h
-    Sender_lem_stub_export.h
-  }
-
-  Inline_Files {
-    Latency_Test_SenderEC.inl
-  }
-}
-
-project(DDS_Latency_Test_Sender_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_Latency_Test_Sender_idl_gen DDS_Latency_Test_Base_stub \
-           DDS_Latency_Test_Connector_stub
-  libs  += DDS_Latency_Test_Base_stub DDS_Latency_Test_Connector_stub
-  includes += ..
-  libpaths += ../lib
-  libout = ../lib
-  sharedname = Sender_stub
-  dynamicflags   = SENDER_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Latency_Test_SenderC.cpp
-  }
-
-  Header_Files {
-    Latency_Test_SenderC.h
-    Sender_stub_export.h
-  }
-
-  Inline_Files {
-    Latency_Test_SenderC.inl
-  }
-}
-
-project(DDS_Latency_Test_Sender_exec) : ciao_executor, dds4ccm_base {
-  after   += DDS_Latency_Test_Sender_lem_stub DDS_Latency_Test_Sender_stub \
-             DDS_Lat_Test_Connector_lem_stub DDS_Latency_Test_Connector_stub \
-             DDS4CCM_lem_stub
-  sharedname = Sender_exec
-  libs    += Sender_stub Sender_lem_stub DDS_Latency_Test_Base_stub \
-             DDS_Lat_Test_Connector_lem_stub DDS_Latency_Test_Connector_stub \
-             DDS4CCM_lem_stub
-  libpaths += ../lib
-  includes += ..
-  libout = ../lib
-  dynamicflags   = SENDER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Latency_Test_Sender_exec.cpp
-  }
-
-  Header_Files {
-    Latency_Test_Sender_exec.h
-    Sender_exec_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-project(DDS_Latency_Test_Sender_svnt) : ciao_servant, dds4ccm_base {
-  after      += DDS_Latency_Test_Base_stub  DDS_Latency_Test_Sender_lem_stub \
-                DDS4CCM_lem_stub DDS4CCM_skel DDS_Latency_Test_Connector_stub \
-                DDS_Latency_Test_Connector_svnt DDS_Lat_Test_Connector_lem_stub
-  sharedname  = Sender_svnt
-  libs       += Sender_stub Sender_lem_stub DDS_Latency_Test_Base_stub DDS4CCM_lem_stub \
-                DDS4CCM_skel DDS_Latency_Test_Connector_stub DDS_Latency_Test_Connector_svnt \
-                DDS_Lat_Test_Connector_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags = SENDER_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Latency_Test_SenderS.cpp
-    Latency_Test_Sender_svnt.cpp
-  }
-
-  Header_Files {
-    Latency_Test_SenderS.h
-    Latency_Test_Sender_svnt.h
-    Sender_svnt_export.h
-  }
-
-  Inline_Files {
-    Latency_Test_SenderS.inl
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.cpp
deleted file mode 100644
index 66ae2f02a67..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.cpp
+++ /dev/null
@@ -1,429 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#include "Latency_Test_Sender_exec.h"
-#include "ace/Guard_T.h"
-#include "ciao/Logger/Log_Macros.h"
-#include "tao/ORB_Core.h"
-#include "ace/Timer_Queue.h"
-#include "ace/Reactor.h"
-#include "ace/High_Res_Timer.h"
-
-namespace CIAO_Latency_Test_Sender_Impl
-{
-  //============================================================
-  // LatencyTest_Listener_exec_i
-  //============================================================
-  LatencyTest_Listener_exec_i::LatencyTest_Listener_exec_i (
-            Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  LatencyTest_Listener_exec_i::~LatencyTest_Listener_exec_i (void)
-  {
-  }
-
-  //read messages.
-  void
-  LatencyTest_Listener_exec_i::on_one_data (
-                                  const LatencyTest & an_instance,
-                                  const ::CCM_DDS::ReadInfo &)
-  {
-    ACE_UINT64  receive_time = 0;
-
-    //only interested in messages received with a latency_ping = 0 (messages sent beck by receiver)
-    if( an_instance.ping == 0)
-    {
-      ACE_High_Res_Timer::gettimeofday_hr ().to_usec ( receive_time);
-      this->callback_.read(an_instance, receive_time);
-    }
-  }
-
-  void
-  LatencyTest_Listener_exec_i::on_many_data (
-                                  const LatencyTest_Seq & /*an_instance*/,
-                                  const ::CCM_DDS::ReadInfoSeq & /*info*/)
-  {
-  }
-  //============================================================
-  // Facet Executor Implementation Class: ConnectorStatusListener_exec_i
-  //============================================================
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (Atomic_Boolean &matched, int number_of_subscribers, Sender_exec_i &callback)
-   : callback_ (callback),
-    matched_ (matched),
-    number_of_subscribers_ (number_of_subscribers)
-  {
-  }
-
-  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
-  {
-  }
-
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic(
-     ::DDS::Topic_ptr /*the_topic*/,
-     const DDS::InconsistentTopicStatus & /*status*/)
-    {
-    }
-
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos(
-    ::DDS::DataReader_ptr /*the_reader*/,
-     const DDS::RequestedIncompatibleQosStatus & /*status*/)  {
-    }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected(
-     ::DDS::DataReader_ptr /*the_reader*/,
-     const DDS::SampleRejectedStatus & /*status*/)  {
-    }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
-     ::DDS::DataWriter_ptr /*the_writer*/,
-     const DDS::OfferedDeadlineMissedStatus & /*status*/)  {
-    }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
-     ::DDS::DataWriter_ptr /*the_writer*/,
-     const DDS::OfferedIncompatibleQosStatus & /*status*/)  {
-    }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status(
-    ::DDS::Entity_ptr the_entity,
-    ::DDS::StatusKind  status_kind)  {
-      CORBA::ULong kind = status_kind;
-      if((!CORBA::is_nil(the_entity)) && (kind==DDS::PUBLICATION_MATCHED_STATUS))
-        {
-          ::DDS::PublicationMatchedStatus_var stat;
-          ::DDS::DataWriter::_narrow(the_entity)->get_publication_matched_status(stat.out());
-          if((stat.in().current_count >= (this->number_of_subscribers_ + 1))  && !this->matched_.value())
-            {
-              this->matched_ = true;
-              this->callback_.start();
-            }
-         }
-      }
-  //============================================================
-  // WriteTickerHandler
-  //============================================================
-  WriteTicker::WriteTicker (Sender_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  WriteTicker::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    // Notify the subscribers
-    this->callback_.write_one ();
-    return 0;
-  }
-
-  //============================================================
-  // Component Executor Implementation Class: Sender_exec_i
-  //============================================================
-  Sender_exec_i::Sender_exec_i (void)
-    : iterations_ (1000),
-      keys_ (1),
-      datalen_(100),
-      sleep_(10),
-      matched_(false),
-      number_of_subscribers_(1),
-      tv_total_ (0L),
-      tv_max_ (0L),
-      tv_min_ (0L),
-      count_ (0),  //number of returned messages
-      number_of_msg_(0), //number of sent messages
-      timer_(false),
-      received_(false),
-      seq_num_(0)
-  {
-    this->ticker_ = new WriteTicker (*this);
-  }
-
-  Sender_exec_i::~Sender_exec_i (void)
-  {
-  }
-
-  void
-  Sender_exec_i::write_one (void)
-  {
-    //first message sent always, next messages only as previous sent message is received back
-    // TO DO: what if a message is lost?
-    if( (this->number_of_msg_ == 0) || ( this->received_.value()))
-    {
-      // all messages send, stop timer
-      if((this->iterations_ != 0) && (this->number_of_msg_ >= (this->iterations_ * this->keys_)))
-        {
-          this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->cancel_timer (this->ticker_);
-          this->timer_ = false;
-        }
-      else
-        {
-        try
-          {
-            //send messages with indicator (ping = 1L) so that subscriber knows that this message has to sent back.
-            this->last_key_->second->ping = 1L;
-            this->last_key_->second->seq_num = this->number_of_msg_;
-
-            //keep last sent seq_num, in order to control if message is sent back.
-            this->seq_num_ = this->number_of_msg_;
-
-             ACE_High_Res_Timer::gettimeofday_hr ().to_usec (this->start_time_);
-             this->writer_->write_one (this->last_key_->second, ::DDS::HANDLE_NIL);
-           }
-        catch (const CCM_DDS::InternalError& )
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Internal Error ")
-                        ACE_TEXT ("while updating writer info for <%C>.\n"),
-                          this->last_key_->first.c_str ()));
-          }
-        ++this->number_of_msg_;
-       }
-    }
-  }
-
-  void
-    Sender_exec_i::read(LatencyTest an_instance,ACE_UINT64  receive_time)
-  {
-    if (an_instance.seq_num == this->seq_num_.value())
-    {
-      this->record_time( receive_time);
-      this->received_ = true;
-    }
-  }
-
-  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-  Sender_exec_i::get_connector_status (void)
-  {
-    return new ConnectorStatusListener_exec_i (
-      this->matched_,
-      this->number_of_subscribers_,
-      *this);
-  }
-
-  ::CCM_DDS::LatencyTest::CCM_Listener_ptr
-  Sender_exec_i::get_ping_listen_data_listener (void)
-  {
-    return new LatencyTest_Listener_exec_i (*this);
-  }
-
-   ::CCM_DDS::CCM_PortStatusListener_ptr
-  Sender_exec_i::get_ping_listen_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  void
-  Sender_exec_i::start (void)
-  {
-    ACE_GUARD_THROW_EX (TAO_SYNCH_MUTEX, _guard,
-                        this->mutex_, CORBA::INTERNAL ());
-    for (CORBA::UShort i = 1; i < this->keys_ + 1; ++i)
-      {
-        char key[7];
-        LatencyTest *new_key = new LatencyTest;
-        ACE_OS::sprintf (key, "KEY_%d", i);
-        new_key->key = CORBA::string_dup(key);
-        new_key->seq_num = 0;
-        new_key->data.allocbuf(this->datalen_);
-        // to do : freebuf, where ?
-        this->samples_[key] = new_key;
-      }
-    this->last_key_ = this->samples_.begin ();
-
-    //this->sleep_ is in ms
-    unsigned int sec = this->sleep_/1000;
-    unsigned int usec = (this->sleep_ % 1000) * 1000;
-    (void) ACE_High_Res_Timer::global_scale_factor ();
-    this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->timer_queue()->gettimeofday (&ACE_High_Res_Timer::gettimeofday_hr);
-    if (this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->schedule_timer(
-                    this->ticker_,
-                    0,
-                    ACE_Time_Value (5, 0),
-                    ACE_Time_Value (sec, usec)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                              ACE_TEXT ("Error scheduling timer")));
-      }
-      this->timer_ = true;
-   }
-
-void
-Sender_exec_i::record_time (ACE_UINT64  receive_time)
-  {
-     ACE_UINT64 interval =  ( receive_time  - this->start_time_);
-     ++this->count_;
-    long duration = static_cast <CORBA::Long>(interval);
-    this->tv_total_ += duration;
-    if (duration > this->tv_max_.value ()|| (this->tv_max_.value () == 0L))
-      this->tv_max_ = duration;
-    if (duration < this->tv_min_.value () || (this->tv_min_.value () == 0L))
-      this->tv_min_ = duration;
-  }
-
-  ::CORBA::ULong
-  Sender_exec_i::iterations (void)
-  {
-    return this->iterations_;
-  }
-
-  void
-  Sender_exec_i::iterations (::CORBA::ULong iterations)
-  {
-    this->iterations_ = iterations;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::keys (void)
-  {
-    return this->keys_;
-  }
-
-  void
-  Sender_exec_i::keys (::CORBA::UShort keys)
-  {
-    this->keys_ = keys;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::sleep (void)
-  {
-    return this->sleep_;
-  }
-
-  void
-  Sender_exec_i::sleep (::CORBA::UShort sleep)
-  {
-    this->sleep_ = sleep;
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::number_of_sub (void)
-  {
-    return this->number_of_subscribers_;
-  }
-
-  void
-  Sender_exec_i::number_of_sub (::CORBA::UShort number_of_sub)
-  {
-    if (number_of_sub > 0)
-      {
-        this->number_of_subscribers_ = number_of_sub;
-      }
-    else
-      {
-        this->number_of_subscribers_ = 1;
-      }
-  }
-
-  ::CORBA::UShort
-  Sender_exec_i::datalen (void)
-  {
-    return this->datalen_;
-  }
-
-  void
-  Sender_exec_i::datalen (::CORBA::UShort datalen)
-  {
-    // 7 is length of key, has to be removed
-    int overhead_size = sizeof(CORBA::ULong) + sizeof(CORBA::ULong) + 7;
-    if((datalen <= overhead_size) || (datalen > MAX_DATA_SEQUENCE_LENGTH))
-    {
-       ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("ERROR: datalen has to be bigger as %u and smaller as %u\n"), overhead_size, MAX_DATA_SEQUENCE_LENGTH));
-       throw ::CORBA::BAD_PARAM ();
-    }
-    this->datalen_ = datalen - overhead_size;
-  }
-
-
-  void
-  Sender_exec_i::set_session_context (::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::Latency_Test::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)
-  {
-    try
-      {
-        this->writer_ = this->context_->get_connection_info_write_data ();
-        ::CCM_DDS::DataListenerControl_var dlc =
-            this->context_->get_connection_ping_listen_data_control ();
-        dlc->mode (::CCM_DDS::ONE_BY_ONE);
-    }
-    catch (const CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("Exception caught:");
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Sender_exec_i::ccm_activate: Exception caught\n")));
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Sender_exec_i::ccm_activate: Unknown exception caught\n")));
-      }
-  }
-
-  void
-  Sender_exec_i::ccm_passivate (void)
-  {
-    if (this->timer_.value ())
-    this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->cancel_timer (this->ticker_);
-  }
-
-  void
-  Sender_exec_i::ccm_remove (void)
-  {
-
-   ACE_DEBUG ((LM_DEBUG, "SUMMARY SENDER number of messages sent: %u\n",
-                          (this->number_of_msg_ + 1)));
-
-   if( this->count_.value () > 0)
-     {
-       double avg = this->tv_total_.value () / this->count_.value ();
-       ACE_DEBUG ((LM_DEBUG,"Collecting statistics on %d samples with message size %u.\n"
-         " TO DO: calculate stdev, 50%%,90%%,99%% and 99.99%%\n"
-         "This is the roundtrip time, *not* the one-way-latency\n"
-         "bytes ,stdev us,ave us, min us, 50%% us, 90%% us, 99%% us, 99.99%%, max us\n"
-         "------,-------,-------,-------,-------,-------,-------,-------,-------\n"
-         "%6d,-------,%7.1f,%7u,-------,-------,-------,-------,%7u\n",
-         this->count_.value (),
-         this->datalen_,
-         this->datalen_,
-         avg,
-         this->tv_min_.value (),
-         this->tv_max_.value ()));
-     }
-   else
-     {
-       ACE_ERROR ((LM_ERROR, "SUMMARY SENDER latency time:\n "
-                            "No samples reveived back.\n"));
-     }
-  }
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Latency_Test_Sender_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_NORETURN (
-      retval,
-      Sender_exec_i);
-
-    return retval;
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.h
deleted file mode 100644
index 407b8524f07..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/Sender/Latency_Test_Sender_exec.h
+++ /dev/null
@@ -1,176 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#ifndef CIAO_SENDER_EXEC_H_
-#define CIAO_SENDER_EXEC_H_
-
-
-#include "Latency_Test_SenderEC.h"
-
-#include /**/ "Sender_exec_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-#include <map>
-
-namespace CIAO_Latency_Test_Sender_Impl
-{
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Long > Atomic_Long;
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Long > Atomic_ULong;
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
-
-  class Sender_exec_i;
-  //============================================================
-  // LatencyTest_Listener_exec_i
-  //============================================================
-  class SENDER_EXEC_Export LatencyTest_Listener_exec_i
-    : public virtual ::CCM_DDS::LatencyTest::CCM_Listener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    LatencyTest_Listener_exec_i (Sender_exec_i &callback);
-    virtual ~LatencyTest_Listener_exec_i (void);
-
-    virtual void
-    on_one_data (
-      const LatencyTest & an_instance,
-      const ::CCM_DDS::ReadInfo & info);
-    virtual void
-    on_many_data (
-      const LatencyTest_Seq & an_instance,
-      const ::CCM_DDS::ReadInfoSeq & info);
-  private:
-    Sender_exec_i &callback_;
-  };
-
-class SENDER_EXEC_Export ConnectorStatusListener_exec_i
-    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ConnectorStatusListener_exec_i (Atomic_Boolean &, int,  Sender_exec_i &callback_);
-    virtual ~ConnectorStatusListener_exec_i (void);
-    
-    virtual
-    void on_inconsistent_topic( ::DDS::Topic_ptr the_topic, 
-                                const DDS::InconsistentTopicStatus & status);
-    virtual
-    void on_requested_incompatible_qos( ::DDS::DataReader_ptr the_reader,
-                                        const DDS::RequestedIncompatibleQosStatus & status);
-    virtual
-    void on_sample_rejected( ::DDS::DataReader_ptr the_reader, 
-                             const DDS::SampleRejectedStatus & status);
-    virtual
-    void on_offered_deadline_missed( ::DDS::DataWriter_ptr the_writer,
-                                     const DDS::OfferedDeadlineMissedStatus & status);
-    virtual
-    void on_offered_incompatible_qos( ::DDS::DataWriter_ptr the_writer, 
-                                      const DDS::OfferedIncompatibleQosStatus & status);
-    virtual
-    void on_unexpected_status( ::DDS::Entity_ptr the_entity,
-                               ::DDS::StatusKind  status_kind);
-
-  private:
-    Sender_exec_i &callback_;
-    Atomic_Boolean &matched_;
-    int number_of_subscribers_; 
-  
-  };
-  //============================================================
-  // WriteTicker
-  //============================================================
-  class WriteTicker :
-    public ACE_Event_Handler
-  {
-  public:
-    WriteTicker (Sender_exec_i &callback);
-    int handle_timeout (const ACE_Time_Value &, const void *);
-  private:
-    /// Maintains a handle that actually process the event
-    Sender_exec_i &callback_;
-  };
-
-  class Sender_exec_i
-    : public virtual Sender_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    Sender_exec_i (void);
-    virtual ~Sender_exec_i (void);
-
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_connector_status (void);
-
-    virtual ::CCM_DDS::LatencyTest::CCM_Listener_ptr
-    get_ping_listen_data_listener (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_ping_listen_status (void);
-
-    void record_time (ACE_UINT64 receive_time);
-
-    virtual ::CORBA::ULong iterations (void);
-    virtual void iterations (::CORBA::ULong iterations);
-
-    virtual ::CORBA::UShort keys (void);
-    virtual void keys (::CORBA::UShort keys);
-
-    virtual ::CORBA::UShort sleep (void);
-    virtual void sleep (::CORBA::UShort sleep);
-
-    virtual ::CORBA::UShort number_of_sub (void);
-    virtual void number_of_sub (::CORBA::UShort number_of_sub);
-
-    virtual ::CORBA::UShort datalen (void);
-    virtual void datalen (::CORBA::UShort datalen);
-
-    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);
-
-    void start (void);
-    void write_one (void);
-    void read(LatencyTest instance,ACE_UINT64 receive_time);
-
-  private:
-    ::Latency_Test::CCM_Sender_Context_var context_;
-    CCM_DDS::LatencyTest::Writer_var writer_;
-    WriteTicker *ticker_;
-
-    CORBA::UShort iterations_;
-    CORBA::UShort keys_;
-
-    CORBA::UShort datalen_;
-    CORBA::UShort sleep_;
-    Atomic_Boolean matched_;
-    CORBA::UShort number_of_subscribers_;
-    Atomic_Long  tv_total_;
-    Atomic_Long  tv_max_;
-    Atomic_Long  tv_min_;
-    Atomic_Long  count_;
-    CORBA::UShort number_of_msg_;
-    Atomic_Boolean timer_;
-    Atomic_Boolean received_;
-    Atomic_ULong seq_num_; 
-    ACE_UINT64 start_time_;
-
-    TAO_SYNCH_MUTEX mutex_;
-    typedef std::map<ACE_CString, LatencyTest_var> Writer_Table;
-    Writer_Table samples_;
-
-    Writer_Table::iterator last_key_;
- };
-
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Latency_Test_Sender_Impl (void);
-}
-
-#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan.cdp
deleted file mode 100644
index 33145eef113..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan.cdp
+++ /dev/null
@@ -1,490 +0,0 @@
-<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">
-  <label>Latency_Test_Depl_1</label>
-  <UUID>Latency_Test_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Latency_Test_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Latency_Test_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Latency_Test_ConnectorComponentImplementation">
-    <name>Latency_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Latency_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="Latency_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Latency_Test_Latency_Test_Connector_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Latency_Test_Latency_Test_Connector_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Latency_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Latency_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Latency_Test_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Latency_Test_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-  </instance>
-  <instance xmi:id="Latency_Test_ConnectorComponentInstance">
-    <name>Latency_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Latency_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Latency_Test</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>HelloTest_Library#LatencyQoS</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="Latency_Test_ConnectorComponentInstance2">
-    <name>Latency_Test_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Latency_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Latency_Test</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>HelloTest_Library#LatencyQoS</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>1</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>10000</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>sleep</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>2</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>datalen</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>999</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>info_listen_connector_status_receiver</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Latency_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_listen_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Latency_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  
-  <connection>
-    <name>info_listen_data_pub</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>ping_listen_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Latency_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>ping_listen_data_control</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>ping_listen_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Latency_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>info_listen_data_control</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Latency_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Latency_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>writer_connection_sub</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>write_ping_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Latency_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>connector_status_sender</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Latency_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="Latency_Test_Connector_ExecArtifact">
-    <name>Latency_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Latency_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Latency_Test_Connector_SvntArtifact">
-    <name>Latency_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Latency_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Latency_Test_Connector_StubArtifact">
-    <name>Latency_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Latency_Test_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_pub.cdp b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_pub.cdp
deleted file mode 100644
index 2bd8d98972b..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_pub.cdp
+++ /dev/null
@@ -1,322 +0,0 @@
-<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">
-  <label>Latency_Test_Depl_1</label>
-  <UUID>Latency_Test_Depl_1</UUID>
-
-  
-  <implementation xmi:id="Latency_Test_ConnectorComponentImplementation">
-    <name>Latency_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Latency_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="Latency_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Latency_Test_Latency_Test_Connector_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Latency_Test_Latency_Test_Connector_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Latency_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Latency_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <implementation xmi:id="SenderComponentImplementation">
-    <name>SenderComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Sender_ExecArtifact" />
-    <artifact xmi:idref="Sender_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Latency_Test_Sender_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Latency_Test_Sender_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="Latency_Test_ConnectorComponentInstance">
-    <name>Latency_Test_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Latency_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Lat_Test</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>HelloTest_Library#LatencyQoS</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="SenderComponentInstance">
-    <name>SenderComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="SenderComponentImplementation" />
-    <configProperty>
-      <name>keys</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>1</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>iterations</name>
-      <value>
-        <type>
-          <kind>tk_ulong</kind>
-        </type>
-        <value>
-          <ulong>10000</ulong>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>sleep</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>2</ushort>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-    <name>number_of_sub</name>
-    <value>
-      <type>
-        <kind>tk_ushort</kind>
-      </type>
-      <value>
-        <ushort>1</ushort>
-      </value>
-    </value>
-    </configProperty>
-    <configProperty>
-      <name>datalen</name>
-      <value>
-        <type>
-          <kind>tk_ushort</kind>
-        </type>
-        <value>
-          <ushort>999</ushort>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  
-  
-  <connection>
-    <name>info_listen_data_pub</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>ping_listen_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Latency_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  <connection>
-    <name>ping_listen_data_control</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>ping_listen_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Latency_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  
-
-  <connection>
-    <name>writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_write_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Latency_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-  
-  <connection>
-    <name>connector_status_sender</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Latency_Test_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="Sender_ExecArtifact">
-    <name>Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Sender_exec</location>
-  </artifact>
-  <artifact xmi:id="Sender_SvntArtifact">
-    <name>Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Sender_svnt</location>
-  </artifact>
-  <artifact xmi:id="Sender_StubArtifact">
-    <name>Sender_stub</name>
-    <source/>
-    <node/>
-    <location>Sender_stub</location>
-  </artifact>
-  <artifact xmi:id="Latency_Test_Connector_ExecArtifact">
-    <name>Latency_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Latency_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Latency_Test_Connector_SvntArtifact">
-    <name>Latency_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Latency_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Latency_Test_Connector_StubArtifact">
-    <name>Latency_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Latency_Test_Connector_stub</location>
-  </artifact>
- </Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_sub.cdp b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_sub.cdp
deleted file mode 100644
index 5d8e36c520a..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/Plan_sub.cdp
+++ /dev/null
@@ -1,266 +0,0 @@
-<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">
-  <label>Latency_Test_Depl_1</label>
-  <UUID>Latency_Test_Depl_1</UUID>
-
-  <implementation xmi:id="ReceiverComponentImplementation">
-    <name>ReceiverComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Receiver_ExecArtifact" />
-    <artifact xmi:idref="Receiver_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Latency_Test_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Latency_Test_Receiver_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="Latency_Test_ConnectorComponentImplementation">
-    <name>Latency_Test_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Latency_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="Latency_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Latency_Test_Latency_Test_Connector_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Latency_Test_Latency_Test_Connector_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Latency_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Latency_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-  <instance xmi:id="ReceiverComponentInstance">
-    <name>ReceiverComponent</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="ReceiverComponentImplementation" />
-  </instance>
-   <instance xmi:id="Latency_Test_ConnectorComponentInstance2">
-    <name>Latency_Test_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Latency_Test_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Lat_Test</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>HelloTest_Library#LatencyQoS</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
- 
-  <connection>
-    <name>info_listen_connector_status_receiver</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_connector_status</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>error_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Latency_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_listen_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data_listener</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_listener</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="Latency_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>info_listen_data_control</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_listen_data_control</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data_control</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Latency_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>writer_connection_sub</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>write_ping_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Latency_Test_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-  
-
-  <artifact xmi:id="Latency_Test_Connector_ExecArtifact">
-    <name>Latency_Test_Connector_exec</name>
-    <source/>
-    <node/>
-    <location>DDS_Latency_Test_Connector_exec</location>
-  </artifact>
-  <artifact xmi:id="Latency_Test_Connector_SvntArtifact">
-    <name>Latency_Test_Connector_svnt</name>
-    <source/>
-    <node/>
-    <location>DDS_Latency_Test_Connector_svnt</location>
-  </artifact>
-  <artifact xmi:id="Latency_Test_Connector_StubArtifact">
-    <name>Latency_Test_Connector_stub</name>
-    <source/>
-    <node/>
-    <location>DDS_Latency_Test_Connector_stub</location>
-  </artifact>
-  <artifact xmi:id="Receiver_ExecArtifact">
-    <name>Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Receiver_exec</location>
-  </artifact>
-  <artifact xmi:id="Receiver_SvntArtifact">
-    <name>Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Receiver_svnt</location>
-  </artifact>
-  <artifact xmi:id="Receiver_StubArtifact">
-    <name>Receiver_stub</name>
-    <source/>
-    <node/>
-    <location>Receiver_stub</location>
-  </artifact>
-</Deployment:DeploymentPlan>
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index 9b472b3f879..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-
-Description
-XML QoS Profile 
-
-The QoS configuration of the DDS entities in the generated example is 
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the enviroment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the 
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.4d/scripts/../resource/rtiddsgen/../qos_profiles_4.4d/schema/rti_dds_qos_profiles.xsd" version="4.4d">
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-        A QoS library is a named set of QoS profiles.
-    -->
-  <qos_library name="HelloTest_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter 
-             and DataReader created in the example code.
-
-             A QoS profile groups a set of related QoS.
-        -->
-    <qos_profile name="LatencyQoS" is_default_qos="true">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-          <max_blocking_time>
-            <sec>DURATION_INFINITE_SEC</sec>
-            <nanosec>DURATION_INFINITE_NSEC</nanosec>
-          </max_blocking_time>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <resource_limits>
-          <max_instances>1</max_instances>
-          <initial_instances>1</initial_instances>
-          <max_samples>LENGTH_UNLIMITED</max_samples>
-          <initial_samples>100</initial_samples>
-          <max_samples_per_instance>LENGTH_UNLIMITED</max_samples_per_instance>
-        </resource_limits>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <resource_limits>
-          <initial_samples>100</initial_samples>
-          <initial_instances>1</initial_instances>
-          <max_samples>LENGTH_UNLIMITED</max_samples>
-          <max_instances>1</max_instances>
-          <max_samples_per_instance>LENGTH_UNLIMITED</max_samples_per_instance>
-        </resource_limits>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-      
-    </qos_profile>
-    <qos_profile name="BestEffortQoS" is_default_qos="false">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-        <reliability>
-          <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-         </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <resource_limits>
-          <max_instances>1</max_instances>
-          <initial_instances>1</initial_instances>
-          <max_samples>LENGTH_UNLIMITED</max_samples>
-          <initial_samples>100</initial_samples>
-          <max_samples_per_instance>LENGTH_UNLIMITED</max_samples_per_instance>
-        </resource_limits>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>10</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-      </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <reliability>
-          <kind>BEST_EFFORT_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_ALL_HISTORY_QOS</kind>
-        </history>
-        <resource_limits>
-          <initial_samples>100</initial_samples>
-          <initial_instances>1</initial_instances>
-          <max_samples>LENGTH_UNLIMITED</max_samples>
-          <max_instances>1</max_instances>
-          <max_samples_per_instance>LENGTH_UNLIMITED</max_samples_per_instance>
-        </resource_limits>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_pub.pl b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_pub.pl
deleted file mode 100644
index 72c16054137..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_pub.pl
+++ /dev/null
@@ -1,226 +0,0 @@
-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 = 1;
-@ports = ( 60001 );
-@iorbases = ( "Sender.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode" );
-
-# ior files other than daemon
-# 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_pub.cdp";
-
-$ENV{"DANCE_TRACE_ENABLE"} = 0;
-$ENV{"CIAO_TRACE_ENABLE"} = 0;
-$ENV{"CIAO_LOG_LEVEL"} = 5;
-$ENV{"DANCE_LOG_LEVEL"} = 5;
-# $ENV{"DDS4CCM_NDDS_LOG_VERBOSITY"} =  31;
-
-
-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 deamon $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);
-    }
-}
-
-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 = "$CIAO_ROOT/bin/ciao_componentserver";
-
-        $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/Naming_Service", "-m 1 -ORBEndpoint iiop://localhost:60004 -o $ior_nsfile");
-
-$NS->Spawn ();
-
-print STDERR "Starting Naming Service with -m 1 -ORBEndpoint iiop://localhost:60004 -o ns.ior\n";
-
-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:60004/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->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;
-}
-
-$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");
-$E->SpawnWaitKill (2*$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;
-    }
-}
-
-print "Sleeping 180 seconds to allow task to complete\n";
-sleep (180);
-
-# 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 -q\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -q");
-$E->SpawnWaitKill ($tg_executor->ProcessStopWaitInterval ());
-
-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/dds4ccm/performance-tests/Latency/descriptors/run_sub.pl b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_sub.pl
deleted file mode 100644
index dae8581f1d5..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_sub.pl
+++ /dev/null
@@ -1,226 +0,0 @@
-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 = 1;
-@ports = ( 60002 );
-@iorbases = ( "Receiver.ior" );
-@iorfiles = 0;
-@nodenames = ( "ReceiverNode" );
-
-# ior files other than daemon
-# ior files other than daemon
-$ior_nsbase = "ns1.ior";
-$ior_nsfile = 0;
-$ior_embase = "EM1.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_sub.cdp";
-
-$ENV{"DANCE_TRACE_ENABLE"} = 0;
-$ENV{"CIAO_TRACE_ENABLE"} = 0;
-$ENV{"CIAO_LOG_LEVEL"} = 5;
-$ENV{"DANCE_LOG_LEVEL"} = 5;
-# $ENV{"DDS4CCM_NDDS_LOG_VERBOSITY"} =  31;
-
-
-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 deamon $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);
-    }
-}
-
-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 = "$CIAO_ROOT/bin/ciao_componentserver";
-
-        $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/Naming_Service", "-m 1 -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$NS->Spawn ();
-
-print STDERR "Starting Naming Service with -m 1 -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-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->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;
-}
-
-$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");
-$E->SpawnWaitKill (2*$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;
-    }
-}
-
-print "Sleeping 180 seconds to allow task to complete\n";
-sleep (180);
-
-# 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 -q\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -q");
-$E->SpawnWaitKill ($tg_executor->ProcessStopWaitInterval ());
-
-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/dds4ccm/performance-tests/Latency/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_test.pl
deleted file mode 100644
index 5ed32dfb116..00000000000
--- a/CIAO/connectors/dds4ccm/performance-tests/Latency/descriptors/run_test.pl
+++ /dev/null
@@ -1,228 +0,0 @@
-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 = ( 60001, 60002 );
-@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
-@iorfiles = 0;
-@nodenames = ( "SenderNode", "ReceiverNode" );
-
-# ior files other than daemon
-# 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";
-
-$ENV{"DANCE_TRACE_ENABLE"} = 0;
-$ENV{"CIAO_TRACE_ENABLE"} = 0;
-$ENV{"CIAO_LOG_LEVEL"} = 5;
-$ENV{"DANCE_LOG_LEVEL"} = 5;
-# $ENV{"DDS4CCM_NDDS_LOG_VERBOSITY"} =  31;
-
-
-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 deamon $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 ('ciao_componentserver');
-}
-
-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 = "$CIAO_ROOT/bin/ciao_componentserver";
-
-        $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/Naming_Service", "-m 1 -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-
-$NS->Spawn ();
-
-print STDERR "Starting Naming Service with -m 1 -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
-
-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->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;
-}
-
-$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");
-$E->SpawnWaitKill (2*$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;
-    }
-}
-
-print "Sleeping 120 seconds to allow task to complete\n";
-sleep (120);
-
-# 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 -q\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -q");
-$E->SpawnWaitKill ($tg_executor->ProcessStopWaitInterval ());
-
-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/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.idl b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.idl
index b828a207ed8..9bf58ce75b3 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.idl
@@ -1,20 +1,18 @@
 // $Id$
 
 /**
- * @file   CSL_DeadlineTest_Base.idl
+ * @file   CSL_DeadlineTest_Base.idl 
  * @author Marijke Hengstmengel <mhengstmengel@remedy.nl>
  */
 
 #ifndef CSL_DEADLINETEST_BASE_IDL
 #define CSL_DEADLINETEST_BASE_IDL
 
-#pragma ndds typesupport "Base/CSL_DeadlineTest_BaseSupport.h"
-
-struct TestTopic {
-  string key; //@key
-  long x;
-};
 
+  struct TestTopic {
+    string key; //@key
+    long x;
+   };
 typedef sequence<TestTopic> TestTopic_Seq;
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc
index c59af4ade6f..0f7bd175447 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Base/CSL_DeadlineTest_Base.mpc
@@ -1,25 +1,76 @@
 // $Id$
+// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n CSL_DeadlineTest_Base"
 
-project (DDS_CSL_DeadlineTest_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
-  sharedname = DDS_CSL_DeadlineTest_Base_stub
-  dynamicflags += CSL_DEADLINETEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Gxhst -Sci \
+project(DDS_CSL_DeadlineTest_Base_idl_gen) : taoidldefaults, anytypecode {
+  custom_only = 1
+  idlflags -= -St -Sa
+  idlflags += -SS -Gxhst \
               -Wb,stub_export_macro=CSL_DEADLINETEST_BASE_STUB_Export \
               -Wb,stub_export_include=CSL_DeadlineTest_Base_stub_export.h
 
   IDL_Files {
     CSL_DeadlineTest_Base.idl
   }
+}
 
-  opendds_ts_flags += --export=CSL_DEADLINETEST_BASE_STUB_Export
+project(DDS_CSL_DeadlineTest_Base_ndds_ts_gen) : ndds_ts_defaults {
+  custom_only = 1
+  after += DDS_CSL_DeadlineTest_Base_idl_gen
 
-  DDSGenerator_Files {
+  NDDSTypeSupport_Files {
     CSL_DeadlineTest_Base.idl
   }
+}
+
+project(DDS_CSL_DeadlineTest_Base_NDDS_TS) : nddslib, taolib {
+  after += DDS_CSL_DeadlineTest_Base_ndds_ts_gen DDS_CSL_DeadlineTest_Base_stub
+  libs += DDS_CSL_DeadlineTest_Base_stub
+  libout = ../lib
+  libpaths    += ../lib
+  sharedname = DDS_CSL_DeadlineTest_Base_NDDS_TS
+  dynamicflags = NDDS_USER_DLL_EXPORT
+
+  verbatim(gnuace, macros) {
+    override no_hidden_visibility = 1
+  }
 
   Source_Files {
+    CSL_DeadlineTest_Base.cxx
+    CSL_DeadlineTest_BasePlugin.cxx
+    CSL_DeadlineTest_BaseSupport.cxx
+  }
+
+  Header_Files {
+    CSL_DeadlineTest_Base.h
+    CSL_DeadlineTest_BasePlugin.h
+    CSL_DeadlineTest_BaseSupport.h
+  }
+
+  Inline_Files {
+  }
+}
+
+project(DDS_CSL_DeadlineTest_Base_stub) : ccm_stub {
+  after += DDS_CSL_DeadlineTest_Base_idl_gen
+  libout = ../lib
+  libpaths += ../lib
+  sharedname = DDS_CSL_DeadlineTest_Base_stub
+  dynamicflags = CSL_DEADLINETEST_BASE_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    CSL_DeadlineTest_BaseC.cpp
+  }
+
+  Header_Files {
+    CSL_DeadlineTest_BaseC.h
+    CSL_DeadlineTest_Base_stub_export.h
+  }
+
+  Inline_Files {
+    CSL_DeadlineTest_BaseC.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.idl b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.idl
index 221d573ec60..959e0a8c59f 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.idl
@@ -14,10 +14,14 @@
 
 #pragma ciao lem "Connector/CSL_DeadlineTest_ConnectorE.idl"
 
+module CCM_DDS
+{
+  module ::CCM_DDS::Typed < ::TestTopic, ::TestTopic_Seq> TestTopic;
+};
+
 module CSL_DeadlineTest
 {
-  module ::CCM_DDS::Typed < ::TestTopic, ::TestTopic_Seq> TestTopicConn;
-  connector CSL_DeadlineTest_Connector : TestTopicConn::DDS_Event
+  connector CSL_DeadlineTest_Connector : ::CCM_DDS::TestTopic::DDS_Event
   {
   };
 };
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc
index 520f2c0c924..468605ee180 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_CSL_DeadlineTest_Base -l .. -o ../lib -u DDS CSL_DeadlineTest_Connector"
 
-project(DDS_CSL_DT_Connector_idl_gen) : connectoridldefaults, dds4ccm {
+project(DDS_CSL_DT_Connector_idl_gen) : connectoridldefaults {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=CSL_DEADLINETEST_CONNECTOR_STUB_Export \
@@ -10,8 +10,8 @@ project(DDS_CSL_DT_Connector_idl_gen) : connectoridldefaults, dds4ccm {
               -Wb,skel_export_include=CSL_DeadlineTest_Connector_svnt_export.h \
               -Wb,svnt_export_macro=CSL_DEADLINETEST_CONNECTOR_SVNT_Export \
               -Wb,svnt_export_include=CSL_DeadlineTest_Connector_svnt_export.h \
-              -Wb,conn_export_macro=CSL_DEADLINETEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=CSL_DeadlineTest_Connector_conn_export.h \
+              -Wb,exec_export_macro=CSL_DEADLINETEST_CONNECTOR_EXEC_Export \
+              -Wb,exec_export_include=CSL_DeadlineTest_Connector_exec_export.h \
               -I ..
 
   IDL_Files {
@@ -19,7 +19,7 @@ project(DDS_CSL_DT_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   }
 }
 
-project(DDS_CSL_DT_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_CSL_DT_Connector_lem_gen) : ciaoidldefaults {
   custom_only = 1
   after += DDS_CSL_DT_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=CSL_DEADLINETEST_CONNECTOR_LEM_STUB_Export \
@@ -85,24 +85,24 @@ project(DDS_CSL_DeadlineTest_Connector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_CSL_DeadlineTest_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_CSL_DT_Connector_lem_stub DDS_CSL_DeadlineTest_Connector_stub DDS4CCM_lem_stub
+  after   += DDS_CSL_DT_Connector_lem_stub DDS_CSL_DeadlineTest_Connector_stub DDS4CCM_lem_stub DDS_CSL_DeadlineTest_Base_NDDS_TS
   sharedname = DDS_CSL_DeadlineTest_Connector_exec
-  libs += DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DT_Connector_lem_stub DDS_CSL_DeadlineTest_Base_stub DDS4CCM_lem_stub
+  libs += DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DT_Connector_lem_stub DDS_CSL_DeadlineTest_Base_stub DDS4CCM_lem_stub DDS_CSL_DeadlineTest_Base_NDDS_TS
   libpaths += ../lib
   libout = ../lib
   includes += ..
-  dynamicflags   = CSL_DEADLINETEST_CONNECTOR_CONN_BUILD_DLL
+  dynamicflags   = CSL_DEADLINETEST_CONNECTOR_EXEC_BUILD_DLL
 
   IDL_Files {
   }
 
   Source_Files {
-    CSL_DeadlineTest_Connector_conn.cpp
+    CSL_DeadlineTest_Connector_exec.cpp
   }
 
   Header_Files {
-    CSL_DeadlineTest_Connector_conn.h
-    CSL_DeadlineTest_Connector_conn_export.h
+    CSL_DeadlineTest_Connector_exec.h
+    CSL_DeadlineTest_Connector_exec_export.h
   }
 
   Inline_Files {
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector_exec.cpp
new file mode 100644
index 00000000000..7125686ea74
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector_exec.cpp
@@ -0,0 +1,30 @@
+// -*- C++ -*-
+// $Id$
+
+#include "CSL_DeadlineTest_Connector_exec.h"
+
+namespace CIAO_CSL_DeadlineTest_CSL_DeadlineTest_Connector_Impl
+{
+  CSL_DeadlineTest_Connector_exec_i::CSL_DeadlineTest_Connector_exec_i (void)
+    : DDS_Event_Connector_T<TestTopic_DDS_Traits, TestTopic_Connector_Traits> ()
+  {
+  }
+
+  CSL_DeadlineTest_Connector_exec_i::~CSL_DeadlineTest_Connector_exec_i (void)
+  {
+  }
+
+  extern "C" CSL_DEADLINETEST_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_CSL_DeadlineTest_CSL_DeadlineTest_Connector_Impl (void)
+  {
+    ::Components::EnterpriseComponent_ptr retval =
+      ::Components::EnterpriseComponent::_nil ();
+
+    ACE_NEW_NORETURN (
+      retval,
+      CSL_DeadlineTest_Connector_exec_i ()); //should be set by dep. plan.
+
+    return retval;
+  }
+}
+
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector_exec.h
new file mode 100644
index 00000000000..9273a38827f
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Connector/CSL_DeadlineTest_Connector_exec.h
@@ -0,0 +1,62 @@
+// -*- C++ -*-
+// $Id$
+
+#ifndef CSL_DEADLINETEST_CONNECTOR_EXEC_H_
+#define CSL_DEADLINETEST_CONNECTOR_EXEC_H_
+
+#include /**/ "ace/pre.h"
+
+#include "CSL_DeadlineTest_ConnectorEC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "CSL_DeadlineTest_Connector_exec_export.h"
+#include "tao/LocalObject.h"
+
+#include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
+#include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
+
+
+#include "Base/CSL_DeadlineTest_BaseSupport.h"
+
+namespace CIAO_CSL_DeadlineTest_CSL_DeadlineTest_Connector_Impl
+{
+
+  // @from use of CSL_DeadlineTest as a parameter
+  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+    TestTopic,
+    TestTopicSeq,
+    TestTopicTypeSupport,
+    TestTopicDataWriter,
+    TestTopicDataReader > TestTopic_DDS_Traits;
+
+  typedef CIAO::DDS4CCM::Connector_Traits <
+    ::CIAO_CSL_DeadlineTest_CSL_DeadlineTest_Connector_Impl::CSL_DeadlineTest_Connector_Exec,
+    TestTopic_Seq,
+    ::CCM_DDS::TestTopic::CCM_Writer,
+    ::CCM_DDS::TestTopic::CCM_Updater,
+    ::CCM_DDS::TestTopic::CCM_Getter,
+    ::CCM_DDS::TestTopic::CCM_Reader,
+    ::CSL_DeadlineTest::CCM_CSL_DeadlineTest_Connector_Context,
+    ::CCM_DDS::TestTopic::Listener,
+    ::CCM_DDS::TestTopic::StateListener,
+    ::CCM_DDS::ConnectorStatusListener> TestTopic_Connector_Traits;
+
+  class CSL_DEADLINETEST_CONNECTOR_EXEC_Export CSL_DeadlineTest_Connector_exec_i :
+    public DDS_Event_Connector_T <TestTopic_DDS_Traits, TestTopic_Connector_Traits>
+  {
+  public:
+    CSL_DeadlineTest_Connector_exec_i (void);
+    virtual ~CSL_DeadlineTest_Connector_exec_i (void);
+  };
+
+  extern "C" CSL_DEADLINETEST_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_CSL_DeadlineTest_CSL_DeadlineTest_Connector_Impl (void);
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.idl b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.idl
index 9779bddbc23..32bba48370b 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.idl
@@ -14,7 +14,7 @@ module CSL_DeadlineTest
 {
   component Receiver
   {
-    port TestTopicConn::DDS_Listen info_out;
+    port CCM_DDS::TestTopic::DDS_Listen info_out;
     provides CCM_DDS::ConnectorStatusListener info_out_connector_status;
    };
 };
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc
index d617b0cbbaf..9924ed4a847 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_CSL_DeadlineTest_Receiver_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_CSL_DeadlineTest_Receiver_idl_gen) : componentidldefaults {
   custom_only = 1
   after += DDS_CSL_DT_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
@@ -17,7 +17,7 @@ project(DDS_CSL_DeadlineTest_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_CSL_DeadlineTest_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_CSL_DeadlineTest_Receiver_lem_gen) : ciaoidldefaults {
   after += DDS_CSL_DeadlineTest_Receiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
@@ -107,7 +107,7 @@ project(DDS_CSL_DeadlineTest_Receiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_CSL_DeadlineTest_Receiver_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_CSL_DeadlineTest_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      +=   DDS_CSL_DT_Receiver_lem_stub DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Connector_svnt DDS_CSL_DeadlineTest_Receiver_exec DDS_CSL_DT_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
   sharedname  = Receiver_svnt
   libs       += Receiver_stub Receiver_lem_stub DDS_CSL_DeadlineTest_Base_stub DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Connector_svnt Receiver_exec DDS_CSL_DT_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp
index d19c922da3b..252a809898c 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.cpp
@@ -8,59 +8,56 @@
 namespace CIAO_CSL_DeadlineTest_Receiver_Impl
 {
 
+//============================================================
+  // Facet Executor Implementation Class: ConnectorStatusListener_exec_i
   //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (Atomic_Boolean &deadline_missed)
-    : deadline_missed_ (deadline_missed)
+
+  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (Atomic_Boolean &incompatible)
+   : incompatible_ (incompatible)
   {
   }
 
   ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
   {
-  }
 
-  // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic (
-    ::DDS::Topic_ptr /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
   }
 
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
+  // Operations from ::CCM_DDS::ConnectorStatusListener
+  void ConnectorStatusListener_exec_i::on_inconsistent_topic(
+     ::DDS::Topic_ptr /*the_topic*/,
+     const DDS::InconsistentTopicStatus & /*status*/){
+    }
 
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
+  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos(
     ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed (
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-    this->deadline_missed_ = true;
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos (
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status (
+     const DDS::RequestedIncompatibleQosStatus & /*status*/)  {
+    }
+
+  void ConnectorStatusListener_exec_i::on_sample_rejected(
+     ::DDS::DataReader_ptr /*the_reader*/,
+     const DDS::SampleRejectedStatus & /*status*/)  {
+    }
+
+  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
+     ::DDS::DataWriter_ptr /*the_writer*/,
+     const DDS::OfferedDeadlineMissedStatus & /*status*/)  {
+     this->incompatible_ = true;
+    }
+
+  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
+     ::DDS::DataWriter_ptr /*the_writer*/,
+     const DDS::OfferedIncompatibleQosStatus & /*status*/)  {
+   }
+
+  void ConnectorStatusListener_exec_i::on_unexpected_status(
     ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind /*status_kind*/)
-  {
-  }
+    ::DDS::StatusKind /*status_kind*/)  {
+    }
 
   //============================================================
-  // TestTopic_RawListener_exec_i
+  // Facet Executor Implementation Class: TestTopic_RawListener_exec_i
   //============================================================
+
   TestTopic_RawListener_exec_i::TestTopic_RawListener_exec_i (Atomic_ULong &received)
       : received_ (received)
   {
@@ -90,12 +87,39 @@ namespace CIAO_CSL_DeadlineTest_Receiver_Impl
     const ::CCM_DDS::ReadInfoSeq & /* info */)
   {
   }
+  //============================================================
+  // Facet Executor Implementation Class: PortStatusListener_exec_i
+  //============================================================
+
+  PortStatusListener_exec_i::PortStatusListener_exec_i (void)
+  {
+  }
+
+  PortStatusListener_exec_i::~PortStatusListener_exec_i (void)
+  {
+  }
+
+  // Operations from ::CCM_DDS::PortStatusListener
+
+  void
+    PortStatusListener_exec_i::on_requested_deadline_missed (
+    ::DDS::DataReader_ptr /* the_reader */,
+    const ::DDS::RequestedDeadlineMissedStatus & /* status */)
+  {
+  }
+
+  void
+  PortStatusListener_exec_i::on_sample_lost (
+    ::DDS::DataReader_ptr /* the_reader */,
+    const ::DDS::SampleLostStatus & /* status */)
+  {
+  }
 
   //============================================================
-  // Receiver_exec_i
+  // Component Executor Implementation Class: Receiver_exec_iTestTopic_RawListener_exec_i ();
   //============================================================
   Receiver_exec_i::Receiver_exec_i (void)
-    : deadline_missed_ (false)
+    : incompatible_ (false)
   {
   }
 
@@ -106,7 +130,7 @@ namespace CIAO_CSL_DeadlineTest_Receiver_Impl
   // Supported operations and attributes.
   // Component attributes.
   // Port operations.
-  ::CSL_DeadlineTest::TestTopicConn::CCM_Listener_ptr
+  ::CCM_DDS::TestTopic::CCM_Listener_ptr
   Receiver_exec_i::get_info_out_data_listener (void)
   {
     ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new TestTopic RAW listener\n")));
@@ -117,13 +141,13 @@ namespace CIAO_CSL_DeadlineTest_Receiver_Impl
   Receiver_exec_i::get_info_out_status (void)
   {
     ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new PortStatuslistener\n")));
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
+    return new PortStatusListener_exec_i ();
   }
 
   ::CCM_DDS::CCM_ConnectorStatusListener_ptr
   Receiver_exec_i::get_info_out_connector_status (void)
   {
-    return new ConnectorStatusListener_exec_i (this->deadline_missed_);
+    return new ConnectorStatusListener_exec_i (this->incompatible_);
   }
 
   // Operations from Components::SessionComponent.
@@ -142,6 +166,7 @@ namespace CIAO_CSL_DeadlineTest_Receiver_Impl
   void
   Receiver_exec_i::configuration_complete (void)
   {
+
   }
 
   void
@@ -166,15 +191,17 @@ namespace CIAO_CSL_DeadlineTest_Receiver_Impl
   void
   Receiver_exec_i::ccm_remove (void)
   {
-     if (!this->deadline_missed_.value ())
+     if(this->incompatible_.value ())
       {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("RECEIVER OK: Didn't receive ")
-                              ACE_TEXT ("'on_offered_deadline_missed'\n")));
+         ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: did receive the unexpected ")
+                               ACE_TEXT (" error 'on_offered_deadline_missed' in Receiver")
+                    ));
       }
     else
       {
-         ACE_ERROR ((LM_ERROR, ACE_TEXT ("RECEIVER ERROR: Received the unexpected ")
-                               ACE_TEXT ("'on_offered_deadline_missed'\n")));
+        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK : Haven't received the un-expected ")
+                              ACE_TEXT ("'on_offered_deadline_missed' in Receiver\n")
+                    ));
       }
   }
 
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.h
index f76bd30783a..8915db73972 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Receiver/CSL_DeadlineTest_Receiver_exec.h
@@ -13,80 +13,92 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/LocalObject.h"
-#include "ace/OS_NS_Thread.h"
-#include "ace/Reactor.h"
 #include "ace/Task.h"
+#include "ace/Reactor.h"
 
 namespace CIAO_CSL_DeadlineTest_Receiver_Impl
 {
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::ULong> Atomic_ULong;
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean> Atomic_Boolean;
+  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::ULong > Atomic_ULong;
+  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
 
+  
   class Receiver_exec_i;
-
-  //============================================================
-  // TestTopic_RawListener_exec_i
-  //============================================================
+  
   class RECEIVER_EXEC_Export TestTopic_RawListener_exec_i
-    : public virtual ::CSL_DeadlineTest::TestTopicConn::CCM_Listener,
+    : public virtual ::CCM_DDS::TestTopic::CCM_Listener,
       public virtual ::CORBA::LocalObject
   {
   public:
     TestTopic_RawListener_exec_i (Atomic_ULong &);
     virtual ~TestTopic_RawListener_exec_i (void);
 
+   
     virtual void
     on_one_data (
       const TestTopic & an_instance,
       const ::CCM_DDS::ReadInfo & info);
 
+
     virtual void
     on_many_data (
       const ::TestTopic_Seq & data,
-      const ::CCM_DDS::ReadInfoSeq & info);
+      const ::CCM_DDS::ReadInfoSeq & info );
 
   private:
     Atomic_ULong &received_;
   };
-
-
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  class RECEIVER_EXEC_Export ConnectorStatusListener_exec_i
+  
+  
+class RECEIVER_EXEC_Export ConnectorStatusListener_exec_i
     : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
       public virtual ::CORBA::LocalObject
   {
   public:
     ConnectorStatusListener_exec_i (Atomic_Boolean &);
-
     virtual ~ConnectorStatusListener_exec_i (void);
-
+    
     virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
+    void on_inconsistent_topic( ::DDS::Topic_ptr the_topic, 
                                 const DDS::InconsistentTopicStatus & status);
     virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
+    void on_requested_incompatible_qos( ::DDS::DataReader_ptr the_reader,
                                         const DDS::RequestedIncompatibleQosStatus & status);
     virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
+    void on_sample_rejected( ::DDS::DataReader_ptr the_reader, 
                              const DDS::SampleRejectedStatus & status);
     virtual
-      void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                       const DDS::OfferedDeadlineMissedStatus & status);
+      void on_offered_deadline_missed( ::DDS::DataWriter_ptr the_writer,
+                                     const DDS::OfferedDeadlineMissedStatus & status);
     virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
+    void on_offered_incompatible_qos( ::DDS::DataWriter_ptr the_writer, 
                                       const DDS::OfferedIncompatibleQosStatus & status);
     virtual
-    void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                                ::DDS::StatusKind  status_kind);
-  private:
-    Atomic_Boolean &deadline_missed_;
+      void on_unexpected_status( ::DDS::Entity_ptr the_entity,
+       ::DDS::StatusKind  status_kind);
+    private:
+    Atomic_Boolean &incompatible_;
+  
+  };
+  
+class RECEIVER_EXEC_Export PortStatusListener_exec_i
+    : public virtual ::CCM_DDS::CCM_PortStatusListener,
+      public virtual ::CORBA::LocalObject
+  {
+  public:
+    PortStatusListener_exec_i (void);
+    virtual ~PortStatusListener_exec_i (void);
+
+    virtual void
+    on_requested_deadline_missed (
+      ::DDS::DataReader_ptr the_reader,
+      const ::DDS::RequestedDeadlineMissedStatus & status);
+
+    virtual void
+    on_sample_lost (
+      ::DDS::DataReader_ptr the_reader,
+      const ::DDS::SampleLostStatus & status);
   };
 
-  //============================================================
-  // Receiver_exec_i
-  //============================================================
   class RECEIVER_EXEC_Export Receiver_exec_i
     : public virtual Receiver_Exec,
       public virtual ::CORBA::LocalObject
@@ -95,8 +107,12 @@ namespace CIAO_CSL_DeadlineTest_Receiver_Impl
     Receiver_exec_i (void);
     virtual ~Receiver_exec_i (void);
 
+  //  virtual ::CORBA::Boolean raw_listen (void);
+
+  //  virtual void raw_listen (::CORBA::Boolean raw_listen);
+
     // Port operations.
-    virtual ::CSL_DeadlineTest::TestTopicConn::CCM_Listener_ptr
+    virtual ::CCM_DDS::TestTopic::CCM_Listener_ptr
     get_info_out_data_listener (void);
 
     virtual ::CCM_DDS::CCM_PortStatusListener_ptr
@@ -105,6 +121,7 @@ namespace CIAO_CSL_DeadlineTest_Receiver_Impl
     virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
     get_info_out_connector_status (void);
 
+
     // Operations from Components::SessionComponent.
     virtual void
     set_session_context (
@@ -119,7 +136,7 @@ namespace CIAO_CSL_DeadlineTest_Receiver_Impl
   private:
     ::CSL_DeadlineTest::CCM_Receiver_Context_var context_;
     Atomic_ULong received_;
-    Atomic_Boolean deadline_missed_;
+    Atomic_Boolean incompatible_;
   };
 
   extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.idl b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.idl
index 78837331b98..e881ebf348e 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.idl
@@ -16,7 +16,7 @@ module CSL_DeadlineTest
 {
   component Sender
   {
-     port TestTopicConn::DDS_Write test_topic_write;
+     port CCM_DDS::TestTopic::DDS_Write test_topic_write;
      provides CCM_DDS::ConnectorStatusListener test_topic_connector_status;
   };
 };
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc
index a35d1f4f89d..61318d090ce 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_CSL_DeadlineTest_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(DDS_CSL_DeadlineTest_Sender_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_CSL_DeadlineTest_Sender_idl_gen) : componentidldefaults {
   after += DDS_CSL_DT_Connector_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_CSL_DeadlineTest_Sender_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_CSL_DeadlineTest_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_CSL_DeadlineTest_Sender_lem_gen) : ciaoidldefaults {
   after += DDS_CSL_DeadlineTest_Sender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
@@ -109,7 +109,7 @@ project(DDS_CSL_DeadlineTest_Sender_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_CSL_DeadlineTest_Sender_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_CSL_DeadlineTest_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      += DDS_CSL_DeadlineTest_Base_stub  DDS_CSL_DeadlineTest_Sender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_CSL_DeadlineTest_Connector_stub DDS_CSL_DeadlineTest_Connector_svnt DDS_CSL_DT_Connector_lem_stub
   sharedname  = Sender_svnt
   libs       += Sender_stub Sender_lem_stub  \
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp
index 8b0f957a4e7..4845d972418 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.cpp
@@ -13,67 +13,59 @@ namespace CIAO_CSL_DeadlineTest_Sender_Impl
 {
 
   //============================================================
-  // ConnectorStatusListener_exec_i
+  // Facet Executor Implementation Class: ConnectorStatusListener_exec_i
   //============================================================
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (Atomic_Boolean &deadline_missed,
-                                                                  Atomic_ThreadId &thread_id)
-    : deadline_missed_ (deadline_missed),
-      thread_id_ (thread_id)
+
+  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (Atomic_Boolean &deadline_missed)
+   : deadline_missed_ (deadline_missed)
   {
   }
 
   ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
   {
+
   }
 
   // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic (
+  void ConnectorStatusListener_exec_i::on_inconsistent_topic(
     ::DDS::Topic_ptr /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
+     const DDS::InconsistentTopicStatus & /*status*/){
+    }
 
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
+  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos(
     ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
+     const DDS::RequestedIncompatibleQosStatus & /*status*/)  {
+    }
 
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
+  void ConnectorStatusListener_exec_i::on_sample_rejected(
+     ::DDS::DataReader_ptr /*the_reader*/,
+     const DDS::SampleRejectedStatus & /*status*/)  {
+    }
 
   void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
-    ::DDS::DataWriter_ptr the_writer,
-    const DDS::OfferedDeadlineMissedStatus & status)
-  {
-    this->thread_id_ = ACE_Thread::self ();
-    if(status.last_instance_handle.isValid && !CORBA::is_nil (the_writer))
-      {
-        this->deadline_missed_ = true;
-      }
-  }
-
+     ::DDS::DataWriter_ptr the_writer,
+     const DDS::OfferedDeadlineMissedStatus & status)  {
+       if(status.last_instance_handle.isValid && (!CORBA::is_nil (the_writer)))
+       {
+         this->deadline_missed_ = true;
+       }
+    }
+ 
   void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
+     ::DDS::DataWriter_ptr /*the_writer*/,
+     const DDS::OfferedIncompatibleQosStatus & /*status*/)  {
+    }
 
   void ConnectorStatusListener_exec_i::on_unexpected_status(
     ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind  /*status_kind*/)
-  {
-  }
-
+    ::DDS::StatusKind  /*status_kind*/)  {
+    }
   //============================================================
-  // Sender_exec_i
+  // Component Executor Implementation Class: Sender_exec_i
   //============================================================
+
   Sender_exec_i::Sender_exec_i (void)
-    : deadline_missed_ (false),
-      thread_id_listener_ (0)
+    : deadline_missed_ (false)
   {
   }
 
@@ -84,11 +76,11 @@ namespace CIAO_CSL_DeadlineTest_Sender_Impl
   ::CCM_DDS::CCM_ConnectorStatusListener_ptr
   Sender_exec_i::get_test_topic_connector_status (void)
   {
-    return new ConnectorStatusListener_exec_i (this->deadline_missed_,
-                                               this->thread_id_listener_);
+    return new ConnectorStatusListener_exec_i (this->deadline_missed_);
   }
 
   // Supported operations and attributes.
+
   void
   Sender_exec_i::set_session_context (::Components::SessionContext_ptr ctx)
   {
@@ -112,24 +104,23 @@ namespace CIAO_CSL_DeadlineTest_Sender_Impl
     //to force an 'offered_deadline_missed'  write the topics with a pause of 2 sec in between and
     //in the profile the deadline is set to 1 sec.
     for (CSL_QoSTest_Table::iterator i = this->_ktests_.begin ();
-         i != this->_ktests_.end ();
-         ++i)
+            i != this->_ktests_.end ();
+            ++i)
+    {
+      try
       {
-        try
-          {
-            if (!CORBA::is_nil (this->writer_) )
-            {
-              ACE_OS::sleep (2);
-              ::DDS::InstanceHandle_t hnd = this->writer_->register_instance (i->second);
-              this->writer_->write_one(i->second,hnd);
-            }
-          }
-        catch (const CCM_DDS::InternalError& )
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while writing topic for <%C>.\n"),
-                          i->first.c_str ()));
-          }
+        if (!CORBA::is_nil (this->writer_) ) {
+          ACE_OS::sleep (2);
+          ::DDS::InstanceHandle_t hnd = this->writer_->register_instance (i->second);
+          this->writer_->write_one(i->second,hnd);
+        }
       }
+      catch (const CCM_DDS::InternalError& )
+      {
+        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while writing topic for <%C>.\n"),
+                        i->first.c_str ()));
+      }
+    }
   }
 
  void
@@ -140,7 +131,6 @@ namespace CIAO_CSL_DeadlineTest_Sender_Impl
     new_key->x = x;
     this->_ktests_[key] = new_key;
   }
-
   void
   Sender_exec_i::ccm_activate (void)
   {
@@ -160,62 +150,20 @@ namespace CIAO_CSL_DeadlineTest_Sender_Impl
   void
   Sender_exec_i::ccm_remove (void)
   {
-    if (this->deadline_missed_.value ())
+
+    if(!this->deadline_missed_.value ())
       {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("SENDER OK: Received the expected ")
-                              ACE_TEXT ("'on_offered_deadline_missed'\n")
+        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: did not receive the expected ")
+                               ACE_TEXT ("warning 'on_offered_deadline_missed' in Sender\n")
                     ));
       }
     else
       {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("SENDER ERROR: did not receive the expected ")
-                              ACE_TEXT ("error 'on_offered_deadline_missed'\n")
+        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Received the expected ")
+                               ACE_TEXT ("'on_offered_deadline_missed' in Sender\n")
                     ));
       }
-    if (this->thread_id_listener_.value () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: "
-                              "Thread ID for ConnectorStatusListener not set!\n"));
-      }
-    #if defined (CIAO_DDS4CCM_CONTEXT_SWITCH) && (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (ACE_OS::thr_equal (this->thread_id_listener_.value (),
-                                ACE_Thread::self ()))
-      {
-        ACE_DEBUG ((LM_DEBUG, "SENDER OK: "
-                              "Thread switch for ConnectorStatusListener seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_.value (),
-                              ACE_Thread::self ()));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: "
-                              "Thread switch for ConnectorStatusListener "
-                              "doesn't seem to work! "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_.value (),
-                              ACE_Thread::self ()));
-      }
-    #else
-    else if (ACE_OS::thr_equal (this->thread_id_listener_.value (),
-                                ACE_Thread::self ()))
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: ConnectorStatusListener: "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_.value (),
-                              ACE_Thread::self ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "SENDER OK: ConnectorStatusListener: "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_.value (),
-                              ACE_Thread::self ()));
-      }
-    #endif
+
   }
 
   extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.h
index 8638d2f3332..75558a74b47 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/Sender/CSL_DeadlineTest_Sender_exec.h
@@ -20,48 +20,40 @@
 namespace CIAO_CSL_DeadlineTest_Sender_Impl
 {
   typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, ACE_thread_t> Atomic_ThreadId;
 
   class Sender_exec_i;
 
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  class SENDER_EXEC_Export ConnectorStatusListener_exec_i
+class SENDER_EXEC_Export ConnectorStatusListener_exec_i
     : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
       public virtual ::CORBA::LocalObject
   {
   public:
-    ConnectorStatusListener_exec_i (Atomic_Boolean &,
-                                    Atomic_ThreadId &);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
+    ConnectorStatusListener_exec_i (Atomic_Boolean &);
+   virtual ~ConnectorStatusListener_exec_i (void);
+    
     virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
+    void on_inconsistent_topic( ::DDS::Topic_ptr the_topic, 
                                 const DDS::InconsistentTopicStatus & status);
     virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
+    void on_requested_incompatible_qos( ::DDS::DataReader_ptr the_reader,
                                         const DDS::RequestedIncompatibleQosStatus & status);
     virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
+    void on_sample_rejected( ::DDS::DataReader_ptr the_reader, 
                              const DDS::SampleRejectedStatus & status);
     virtual
-      void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                       const DDS::OfferedDeadlineMissedStatus & status);
+      void on_offered_deadline_missed( ::DDS::DataWriter_ptr the_writer,
+                                     const DDS::OfferedDeadlineMissedStatus & status);
     virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
+    void on_offered_incompatible_qos( ::DDS::DataWriter_ptr the_writer, 
                                       const DDS::OfferedIncompatibleQosStatus & status);
     virtual
-      void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                                 ::DDS::StatusKind status_kind);
-  private:
+      void on_unexpected_status( ::DDS::Entity_ptr the_entity,
+       ::DDS::StatusKind  status_kind);
+     private:
     Atomic_Boolean &deadline_missed_;
-    Atomic_ThreadId &thread_id_;
+  
   };
 
-//============================================================
-  // Sender_exec_i
-  //============================================================
   class Sender_exec_i
     : public virtual Sender_Exec,
       public virtual ::CORBA::LocalObject
@@ -69,6 +61,8 @@ namespace CIAO_CSL_DeadlineTest_Sender_Impl
   public:
     Sender_exec_i (void);
     virtual ~Sender_exec_i (void);
+    virtual void add_instance_of_topic (const char *, int x );
+    virtual void write (void);
 
     virtual void set_session_context (::Components::SessionContext_ptr ctx);
     virtual void configuration_complete (void);
@@ -77,21 +71,15 @@ namespace CIAO_CSL_DeadlineTest_Sender_Impl
     virtual void ccm_remove (void);
     // Port operations.
     virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_test_topic_connector_status(void);
+      get_test_topic_connector_status(void);
 
   private:
     ::CSL_DeadlineTest::CCM_Sender_Context_var context_;
-    ::CSL_DeadlineTest::TestTopicConn::Writer_var writer_;
-
     Atomic_Boolean deadline_missed_;
-    Atomic_ThreadId thread_id_listener_;
-
+    CCM_DDS::TestTopic::Writer_var writer_;
     TAO_SYNCH_MUTEX mutex_;
     typedef std::map<ACE_CString, TestTopic_var> CSL_QoSTest_Table;
     CSL_QoSTest_Table _ktests_;
-
-    void add_instance_of_topic (const char *, int x );
-    void write (void);
  };
 
   extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
diff --git a/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl
index a625ecd9216..dc0c34941c6 100755
--- a/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/CSLDeadline/descriptors/run_test.pl
@@ -100,8 +100,6 @@ sub kill_open_processes {
     if ($ns_running == 1) {
         $NS->Kill (); $NS->TimedWait (1);
     }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
 }
 
 sub run_node_daemons {
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.idl b/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.idl
index ac1d1683816..2eaeedd842a 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.idl
@@ -1,20 +1,18 @@
 // $Id$
 
 /**
- * @file   CSL_QoSTest_Base.idl
+ * @file   CSL_QoSTest_Base.idl 
  * @author Marijke Hengstmengel <mhengstmengel@remedy.nl>
  */
 
 #ifndef CSL_QOSTEST_BASE_IDL
 #define CSL_QOSTEST_BASE_IDL
 
-#pragma ndds typesupport "Base/CSL_QoSTest_BaseSupport.h"
-
-struct TestTopic {
-  string key; //@key
-  long x;
-};
 
+  struct TestTopic {
+    string key; //@key
+    long x;
+   };
 typedef sequence<TestTopic> TestTopic_Seq;
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc b/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc
index 051332cbc91..265c9d28574 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Base/CSL_QoSTest_Base.mpc
@@ -1,25 +1,76 @@
 // $Id$
+// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n CSL_QoSTest_Base"
 
-project (DDS_CSL_QoSTest_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
-  sharedname = DDS_CSL_QoSTest_Base_stub
-  dynamicflags += CSL_QOSTEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Gxhst -Sci \
+project(DDS_CSL_QoSTest_Base_idl_gen) : taoidldefaults, anytypecode {
+  custom_only = 1
+  idlflags -= -St -Sa
+  idlflags += -SS -Gxhst \
               -Wb,stub_export_macro=CSL_QOSTEST_BASE_STUB_Export \
               -Wb,stub_export_include=CSL_QoSTest_Base_stub_export.h
 
   IDL_Files {
     CSL_QoSTest_Base.idl
   }
+}
 
-  opendds_ts_flags += --export=CSL_QOSTEST_BASE_STUB_Export
+project(DDS_CSL_QoSTest_Base_ndds_ts_gen) : ndds_ts_defaults {
+  custom_only = 1
+  after += DDS_CSL_QoSTest_Base_idl_gen
 
-  DDSGenerator_Files {
+  NDDSTypeSupport_Files {
     CSL_QoSTest_Base.idl
   }
+}
+
+project(DDS_CSL_QoSTest_Base_NDDS_TS) : nddslib, taolib {
+  after += DDS_CSL_QoSTest_Base_ndds_ts_gen DDS_CSL_QoSTest_Base_stub
+  libs += DDS_CSL_QoSTest_Base_stub
+  libout = ../lib
+  libpaths    += ../lib
+  sharedname = DDS_CSL_QoSTest_Base_NDDS_TS
+  dynamicflags = NDDS_USER_DLL_EXPORT
+
+  verbatim(gnuace, macros) {
+    override no_hidden_visibility = 1
+  }
 
   Source_Files {
+    CSL_QoSTest_Base.cxx
+    CSL_QoSTest_BasePlugin.cxx
+    CSL_QoSTest_BaseSupport.cxx
+  }
+
+  Header_Files {
+    CSL_QoSTest_Base.h
+    CSL_QoSTest_BasePlugin.h
+    CSL_QoSTest_BaseSupport.h
+  }
+
+  Inline_Files {
+  }
+}
+
+project(DDS_CSL_QoSTest_Base_stub) : ccm_stub {
+  after += DDS_CSL_QoSTest_Base_idl_gen
+  libout = ../lib
+  libpaths += ../lib
+  sharedname = DDS_CSL_QoSTest_Base_stub
+  dynamicflags = CSL_QOSTEST_BASE_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    CSL_QoSTest_BaseC.cpp
+  }
+
+  Header_Files {
+    CSL_QoSTest_BaseC.h
+    CSL_QoSTest_Base_stub_export.h
+  }
+
+  Inline_Files {
+    CSL_QoSTest_BaseC.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.idl b/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.idl
index 4644de2e774..8c04bc2b7f9 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.idl
@@ -14,10 +14,14 @@
 
 #pragma ciao lem "Connector/CSL_QoSTest_ConnectorE.idl"
 
+module CCM_DDS
+{
+  module ::CCM_DDS::Typed < ::TestTopic, ::TestTopic_Seq> TestTopic;
+};
+
 module CSL_QoSTest
 {
-  module ::CCM_DDS::Typed < ::TestTopic, ::TestTopic_Seq> TestTopicConn;
-  connector CSL_QoSTest_Connector : TestTopicConn::DDS_Event
+  connector CSL_QoSTest_Connector : ::CCM_DDS::TestTopic::DDS_Event
   {
   };
 };
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc
index 69e9c5ad3e0..0bfcd26909b 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_CSL_QoSTest_Base -l .. -o ../lib -u DDS CSL_QoSTest_Connector"
 
-project(DDS_CSL_QoSTest_Connector_idl_gen) : connectoridldefaults, dds4ccm {
+project(DDS_CSL_QoSTest_Connector_idl_gen) : connectoridldefaults {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=CSL_QOSTEST_CONNECTOR_STUB_Export \
@@ -10,8 +10,8 @@ project(DDS_CSL_QoSTest_Connector_idl_gen) : connectoridldefaults, dds4ccm {
               -Wb,skel_export_include=CSL_QoSTest_Connector_svnt_export.h \
               -Wb,svnt_export_macro=CSL_QOSTEST_CONNECTOR_SVNT_Export \
               -Wb,svnt_export_include=CSL_QoSTest_Connector_svnt_export.h \
-              -Wb,conn_export_macro=CSL_QOSTEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=CSL_QoSTest_Connector_conn_export.h \
+              -Wb,exec_export_macro=CSL_QOSTEST_CONNECTOR_EXEC_Export \
+              -Wb,exec_export_include=CSL_QoSTest_Connector_exec_export.h \
               -I ..
 
   IDL_Files {
@@ -19,7 +19,7 @@ project(DDS_CSL_QoSTest_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   }
 }
 
-project(DDS_CSL_QoSTest_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_CSL_QoSTest_Connector_lem_gen) : ciaoidldefaults {
   custom_only = 1
   after += DDS_CSL_QoSTest_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=CSL_QOSTEST_CONNECTOR_LEM_STUB_Export \
@@ -85,24 +85,24 @@ project(DDS_CSL_QoSTest_Connector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_CSL_QoSTest_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_CSL_QoSTest_Connector_lem_stub DDS_CSL_QoSTest_Connector_stub DDS4CCM_lem_stub
+  after   += DDS_CSL_QoSTest_Connector_lem_stub DDS_CSL_QoSTest_Connector_stub DDS4CCM_lem_stub DDS_CSL_QoSTest_Base_NDDS_TS
   sharedname = DDS_CSL_QoSTest_Connector_exec
-  libs += DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Connector_lem_stub DDS_CSL_QoSTest_Base_stub DDS4CCM_lem_stub
+  libs += DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Connector_lem_stub DDS_CSL_QoSTest_Base_stub DDS4CCM_lem_stub DDS_CSL_QoSTest_Base_NDDS_TS
   libpaths += ../lib
   libout = ../lib
   includes += ..
-  dynamicflags   = CSL_QOSTEST_CONNECTOR_CONN_BUILD_DLL
+  dynamicflags   = CSL_QOSTEST_CONNECTOR_EXEC_BUILD_DLL
 
   IDL_Files {
   }
 
   Source_Files {
-    CSL_QoSTest_Connector_conn.cpp
+    CSL_QoSTest_Connector_exec.cpp
   }
 
   Header_Files {
-    CSL_QoSTest_Connector_conn.h
-    CSL_QoSTest_Connector_conn_export.h
+    CSL_QoSTest_Connector_exec.h
+    CSL_QoSTest_Connector_exec_export.h
   }
 
   Inline_Files {
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector_exec.cpp
new file mode 100644
index 00000000000..0a8052b7019
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector_exec.cpp
@@ -0,0 +1,27 @@
+// -*- C++ -*-
+// $Id$
+
+#include "CSL_QoSTest_Connector_exec.h"
+
+namespace CIAO_CSL_QoSTest_CSL_QoSTest_Connector_Impl
+{
+  CSL_QoSTest_Connector_exec_i::CSL_QoSTest_Connector_exec_i (void)
+    : DDS_Event_Connector_T<TestTopic_DDS_Traits, TestTopic_Connector_Traits> ()
+  {
+  }
+
+  CSL_QoSTest_Connector_exec_i::~CSL_QoSTest_Connector_exec_i (void)
+  {
+  }
+
+  extern "C" CSL_QOSTEST_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_CSL_QoSTest_CSL_QoSTest_Connector_Impl (void)
+  {
+    ::Components::EnterpriseComponent_ptr retval =
+      ::Components::EnterpriseComponent::_nil ();
+    ACE_NEW_NORETURN (
+      retval,
+      CSL_QoSTest_Connector_exec_i ());
+    return retval;
+  }
+}
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector_exec.h
new file mode 100644
index 00000000000..695c9bdebc4
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Connector/CSL_QoSTest_Connector_exec.h
@@ -0,0 +1,62 @@
+// -*- C++ -*-
+// $Id$
+
+#ifndef CSL_QOSTEST_CONNECTOR_EXEC_H_
+#define CSL_QOSTEST_CONNECTOR_EXEC_H_
+
+#include /**/ "ace/pre.h"
+
+#include "CSL_QoSTest_ConnectorEC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "CSL_QoSTest_Connector_exec_export.h"
+#include "tao/LocalObject.h"
+
+#include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
+#include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
+
+
+#include "Base/CSL_QoSTest_BaseSupport.h"
+
+namespace CIAO_CSL_QoSTest_CSL_QoSTest_Connector_Impl
+{
+
+  // @from use of CSL_QoSTest as a parameter
+  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+    TestTopic,
+    TestTopicSeq,
+    TestTopicTypeSupport,
+    TestTopicDataWriter,
+    TestTopicDataReader > TestTopic_DDS_Traits;
+
+  typedef CIAO::DDS4CCM::Connector_Traits <
+    ::CIAO_CSL_QoSTest_CSL_QoSTest_Connector_Impl::CSL_QoSTest_Connector_Exec,
+    TestTopic_Seq,
+    ::CCM_DDS::TestTopic::CCM_Writer,
+    ::CCM_DDS::TestTopic::CCM_Updater,
+    ::CCM_DDS::TestTopic::CCM_Getter,
+    ::CCM_DDS::TestTopic::CCM_Reader,
+    ::CSL_QoSTest::CCM_CSL_QoSTest_Connector_Context,
+    ::CCM_DDS::TestTopic::Listener,
+    ::CCM_DDS::TestTopic::StateListener,
+    ::CCM_DDS::ConnectorStatusListener> TestTopic_Connector_Traits;
+
+  class CSL_QOSTEST_CONNECTOR_EXEC_Export CSL_QoSTest_Connector_exec_i :
+    public DDS_Event_Connector_T <TestTopic_DDS_Traits, TestTopic_Connector_Traits>
+  {
+  public:
+    CSL_QoSTest_Connector_exec_i (void);
+    virtual ~CSL_QoSTest_Connector_exec_i (void);
+  };
+
+  extern "C" CSL_QOSTEST_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_CSL_QoSTest_CSL_QoSTest_Connector_Impl (void);
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.idl b/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.idl
index caf1bcab8ea..02610320583 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.idl
@@ -14,7 +14,7 @@ module CSL_QoSTest
 {
   component Receiver
   {
-    port TestTopicConn::DDS_Listen info_out;
+    port CCM_DDS::TestTopic::DDS_Listen info_out;
     provides CCM_DDS::ConnectorStatusListener info_out_connector_status;
    };
 };
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc
index ac0db3b58d2..0b224669db0 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_CSL_QoSTest_Receiver_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_CSL_QoSTest_Receiver_idl_gen) : componentidldefaults {
   custom_only = 1
   after += DDS_CSL_QoSTest_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
@@ -17,7 +17,7 @@ project(DDS_CSL_QoSTest_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_CSL_QoSTest_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_CSL_QoSTest_Receiver_lem_gen) : ciaoidldefaults {
   after += DDS_CSL_QoSTest_Receiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
@@ -107,7 +107,7 @@ project(DDS_CSL_QoSTest_Receiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_CSL_QoSTest_Receiver_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_CSL_QoSTest_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      +=   DDS_CSL_QoSTest_Receiver_lem_stub DDS_CSL_QoSTest_Base_stub DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Connector_svnt DDS_CSL_QoSTest_Receiver_exec DDS_CSL_QoSTest_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
   sharedname  = Receiver_svnt
   libs       += Receiver_stub Receiver_lem_stub DDS_CSL_QoSTest_Base_stub DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Connector_svnt Receiver_exec DDS_CSL_QoSTest_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp
index 71fdd66ac81..84415f26e19 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.cpp
@@ -11,12 +11,10 @@
 namespace CIAO_CSL_QoSTest_Receiver_Impl
 {
   //============================================================
-  // ConnectorStatusListener_exec_i
+  // Facet Executor Implementation Class: ConnectorStatusListener_exec_i
   //============================================================
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (Atomic_Boolean &incompatible,
-                                                                  Atomic_ThreadId &thread_id)
-    : incompatible_ (incompatible),
-      thread_id_ (thread_id)
+  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (Atomic_Boolean &incompatible)
+   : incompatible_ (incompatible)
   {
   }
 
@@ -26,51 +24,44 @@ namespace CIAO_CSL_QoSTest_Receiver_Impl
 
   // Operations from ::CCM_DDS::ConnectorStatusListener
   void ConnectorStatusListener_exec_i::on_inconsistent_topic(
-    ::DDS::Topic_ptr /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
+     ::DDS::Topic_ptr /*the_topic*/,
+     const DDS::InconsistentTopicStatus & /*status*/)
+    {
+    }
 
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
+  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos(
     ::DDS::DataReader_ptr the_reader,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-    this->thread_id_ = ACE_Thread::self ();
-    if(!CORBA::is_nil(the_reader))
-      {
-        this->incompatible_ = true;
-      }
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed (
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos (
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status (
+     const DDS::RequestedIncompatibleQosStatus & /*status*/)  {
+       if(!CORBA::is_nil(the_reader))
+         {
+           this->incompatible_ = true;
+         }
+    }
+  void ConnectorStatusListener_exec_i::on_sample_rejected(
+     ::DDS::DataReader_ptr /*the_reader*/,
+     const DDS::SampleRejectedStatus & /*status*/)  {
+    }
+
+  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
+     ::DDS::DataWriter_ptr /*the_writer*/,
+     const DDS::OfferedDeadlineMissedStatus & /*status*/)  {
+    }
+
+  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
+     ::DDS::DataWriter_ptr /*the_writer*/,
+     const DDS::OfferedIncompatibleQosStatus & /*status*/)  {
+    }
+
+  void ConnectorStatusListener_exec_i::on_unexpected_status(
     ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind /*status_kind */)
-  {
-  }
+    ::DDS::StatusKind /*status_kind */)  {
+    }
 
   //============================================================
-  // TestTopic_RawListener_exec_i
+  // Facet Executor Implementation Class: TestTopic_RawListener_exec_i
   //============================================================
   TestTopic_RawListener_exec_i::TestTopic_RawListener_exec_i (Atomic_ULong &received)
-    : received_ (received)
+      : received_ (received)
   {
   }
 
@@ -97,14 +88,40 @@ namespace CIAO_CSL_QoSTest_Receiver_Impl
     const ::CCM_DDS::ReadInfoSeq & /* info */)
   {
   }
+  //============================================================
+  // Facet Executor Implementation Class: PortStatusListener_exec_i
+  //============================================================
+
+  PortStatusListener_exec_i::PortStatusListener_exec_i (void)
+  {
+  }
+
+  PortStatusListener_exec_i::~PortStatusListener_exec_i (void)
+  {
+  }
+
+  // Operations from ::CCM_DDS::PortStatusListener
+
+  void
+    PortStatusListener_exec_i::on_requested_deadline_missed (
+    ::DDS::DataReader_ptr /* the_reader */,
+    const ::DDS::RequestedDeadlineMissedStatus & /* status */)
+  {
+  }
+
+  void
+  PortStatusListener_exec_i::on_sample_lost (
+    ::DDS::DataReader_ptr /* the_reader */,
+    const ::DDS::SampleLostStatus & /* status */)
+  {
+  }
 
   //============================================================
-  // Receiver_exec_i
+  // Component Executor Implementation Class: Receiver_exec_iTestTopic_RawListener_exec_i ();
   //============================================================
+
   Receiver_exec_i::Receiver_exec_i (void)
-    : incompatible_ (false),
-      received_ (0),
-      thread_id_listener_ (0)
+    : incompatible_ (false)
   {
   }
 
@@ -112,7 +129,10 @@ namespace CIAO_CSL_QoSTest_Receiver_Impl
   {
   }
 
-  ::CSL_QoSTest::TestTopicConn::CCM_Listener_ptr
+  // Supported operations and attributes.
+  // Component attributes.
+  // Port operations.
+  ::CCM_DDS::TestTopic::CCM_Listener_ptr
   Receiver_exec_i::get_info_out_data_listener (void)
   {
     ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new TestTopic RAW listener\n")));
@@ -123,14 +143,13 @@ namespace CIAO_CSL_QoSTest_Receiver_Impl
   Receiver_exec_i::get_info_out_status (void)
   {
     ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new PortStatuslistener\n")));
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
+    return new PortStatusListener_exec_i ();
   }
 
   ::CCM_DDS::CCM_ConnectorStatusListener_ptr
   Receiver_exec_i::get_info_out_connector_status (void)
   {
-    return new ConnectorStatusListener_exec_i (this->incompatible_,
-                                               this->thread_id_listener_);
+    return new ConnectorStatusListener_exec_i (this->incompatible_);
   }
 
   // Operations from Components::SessionComponent.
@@ -173,62 +192,18 @@ namespace CIAO_CSL_QoSTest_Receiver_Impl
   void
   Receiver_exec_i::ccm_remove (void)
   {
-    if (!this->incompatible_.value ())
+    if(!this->incompatible_.value ())
       {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("RECEIVER ERROR: did not receive the expected ")
+        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: did not receive the expected ")
                                ACE_TEXT ("error 'on_requested_incompatible_Qos' in Receiver\n")
                     ));
       }
     else
       {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("RECEIVER OK: Received the expected ")
+        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Received the expected ")
                                ACE_TEXT ("'on_requested_incompatible_Qos' in Receiver\n")
                     ));
       }
-    if (this->thread_id_listener_.value () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: "
-                              "Thread ID for ConnectorStatusListener not set!\n"));
-      }
-    #if defined (CIAO_DDS4CCM_CONTEXT_SWITCH) && (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (ACE_OS::thr_equal (this->thread_id_listener_.value (),
-                                ACE_Thread::self ()))
-      {
-        ACE_DEBUG ((LM_DEBUG, "RECEIVER OK: "
-                              "Thread switch for ConnectorStatusListener seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_.value (),
-                              ACE_Thread::self ()));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: "
-                              "Thread switch for ConnectorStatusListener "
-                              "doesn't seem to work! "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_.value (),
-                              ACE_Thread::self ()));
-      }
-    #else
-    else if (ACE_OS::thr_equal (this->thread_id_listener_.value (),
-                                ACE_Thread::self ()))
-      {
-        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: ConnectorStatusListener: "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_.value (),
-                              ACE_Thread::self ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "RECEIVER OK: ConnectorStatusListener: "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_.value (),
-                              ACE_Thread::self ()));
-      }
-    #endif
   }
 
   extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.h
index 166844c3902..d99f0b3df24 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Receiver/CSL_QoSTest_Receiver_exec.h
@@ -13,29 +13,24 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/LocalObject.h"
-#include "ace/OS_NS_Thread.h"
-#include "ace/Reactor.h"
 #include "ace/Task.h"
+#include "ace/Reactor.h"
 
 namespace CIAO_CSL_QoSTest_Receiver_Impl
 {
   typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::ULong > Atomic_ULong;
   typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, ACE_thread_t> Atomic_ThreadId;
-
+  
   class Receiver_exec_i;
-
-  //============================================================
-  // TestTopic_RawListener_exec_i
-  //============================================================
+  
   class RECEIVER_EXEC_Export TestTopic_RawListener_exec_i
-    : public virtual ::CSL_QoSTest::TestTopicConn::CCM_Listener,
+    : public virtual ::CCM_DDS::TestTopic::CCM_Listener,
       public virtual ::CORBA::LocalObject
   {
   public:
     TestTopic_RawListener_exec_i (Atomic_ULong &);
     virtual ~TestTopic_RawListener_exec_i (void);
-
+   
     virtual void
     on_one_data (
       const TestTopic & an_instance,
@@ -44,50 +39,61 @@ namespace CIAO_CSL_QoSTest_Receiver_Impl
     virtual void
     on_many_data (
       const ::TestTopic_Seq & data,
-      const ::CCM_DDS::ReadInfoSeq & info);
+      const ::CCM_DDS::ReadInfoSeq & info );
 
   private:
     Atomic_ULong &received_;
   };
-
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  class RECEIVER_EXEC_Export ConnectorStatusListener_exec_i
+  
+class RECEIVER_EXEC_Export ConnectorStatusListener_exec_i
     : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
       public virtual ::CORBA::LocalObject
   {
   public:
-    ConnectorStatusListener_exec_i (Atomic_Boolean &,
-                                    Atomic_ThreadId &);
+    ConnectorStatusListener_exec_i (Atomic_Boolean &);
     virtual ~ConnectorStatusListener_exec_i (void);
-
+    
     virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
+    void on_inconsistent_topic( ::DDS::Topic_ptr the_topic, 
                                 const DDS::InconsistentTopicStatus & status);
     virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
+    void on_requested_incompatible_qos( ::DDS::DataReader_ptr the_reader,
                                         const DDS::RequestedIncompatibleQosStatus & status);
     virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
+    void on_sample_rejected( ::DDS::DataReader_ptr the_reader, 
                              const DDS::SampleRejectedStatus & status);
     virtual
-    void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
+    void on_offered_deadline_missed( ::DDS::DataWriter_ptr the_writer,
                                      const DDS::OfferedDeadlineMissedStatus & status);
     virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
+    void on_offered_incompatible_qos( ::DDS::DataWriter_ptr the_writer, 
                                       const DDS::OfferedIncompatibleQosStatus & status);
     virtual
-    void on_unexpected_status (::DDS::Entity_ptr the_entity,
+    void on_unexpected_status( ::DDS::Entity_ptr the_entity,
                                ::DDS::StatusKind  status_kind);
-  private:
+    private:
     Atomic_Boolean &incompatible_;
-    Atomic_ThreadId &thread_id_;
+ };
+
+class RECEIVER_EXEC_Export PortStatusListener_exec_i
+    : public virtual ::CCM_DDS::CCM_PortStatusListener,
+      public virtual ::CORBA::LocalObject
+  {
+  public:
+    PortStatusListener_exec_i (void);
+    virtual ~PortStatusListener_exec_i (void);
+
+    virtual void
+    on_requested_deadline_missed (
+      ::DDS::DataReader_ptr the_reader,
+      const ::DDS::RequestedDeadlineMissedStatus & status);
+
+    virtual void
+    on_sample_lost (
+      ::DDS::DataReader_ptr the_reader,
+      const ::DDS::SampleLostStatus & status);
   };
 
-  //============================================================
-  // Receiver_exec_i
-  //============================================================
   class RECEIVER_EXEC_Export Receiver_exec_i
     : public virtual Receiver_Exec,
       public virtual ::CORBA::LocalObject
@@ -97,7 +103,7 @@ namespace CIAO_CSL_QoSTest_Receiver_Impl
     virtual ~Receiver_exec_i (void);
 
     // Port operations.
-    virtual ::CSL_QoSTest::TestTopicConn::CCM_Listener_ptr
+    virtual ::CCM_DDS::TestTopic::CCM_Listener_ptr
     get_info_out_data_listener (void);
 
     virtual ::CCM_DDS::CCM_PortStatusListener_ptr
@@ -118,9 +124,8 @@ namespace CIAO_CSL_QoSTest_Receiver_Impl
 
   private:
     ::CSL_QoSTest::CCM_Receiver_Context_var context_;
-    Atomic_Boolean incompatible_;
     Atomic_ULong received_;
-    Atomic_ThreadId thread_id_listener_;
+    Atomic_Boolean incompatible_;
   };
 
   extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc b/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc
index 19398ae21f6..37dfe0fecde 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_CSL_QoSTest_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(DDS_CSL_QoSTest_Sender_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_CSL_QoSTest_Sender_idl_gen) : componentidldefaults {
   after += DDS_CSL_QoSTest_Connector_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_CSL_QoSTest_Sender_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_CSL_QoSTest_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_CSL_QoSTest_Sender_lem_gen) : ciaoidldefaults {
   after += DDS_CSL_QoSTest_Sender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
@@ -109,7 +109,7 @@ project(DDS_CSL_QoSTest_Sender_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_CSL_QoSTest_Sender_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_CSL_QoSTest_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      += DDS_CSL_QoSTest_Base_stub  DDS_CSL_QoSTest_Sender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_CSL_QoSTest_Connector_stub DDS_CSL_QoSTest_Connector_svnt DDS_CSL_QoSTest_Connector_lem_stub
   sharedname  = Sender_svnt
   libs       += Sender_stub Sender_lem_stub  \
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp
index e0482530b76..5acba0e3d00 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.cpp
@@ -13,12 +13,11 @@ namespace CIAO_CSL_QoSTest_Sender_Impl
 {
 
   //============================================================
-  // ConnectorStatusListener_exec_i
+  // Facet Executor Implementation Class: ConnectorStatusListener_exec_i
   //============================================================
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (Atomic_Boolean &incompatible,
-                                                                  Atomic_ThreadId &thread_id)
-    : incompatible_ (incompatible),
-      thread_id_ (thread_id)
+
+  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (Atomic_Boolean &incompatible)
+   : incompatible_ (incompatible)
   {
   }
 
@@ -29,51 +28,44 @@ namespace CIAO_CSL_QoSTest_Sender_Impl
   // Operations from ::CCM_DDS::ConnectorStatusListener
   void ConnectorStatusListener_exec_i::on_inconsistent_topic(
     ::DDS::Topic_ptr /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
+     const DDS::InconsistentTopicStatus & /*status*/)
+    {
+    }
 
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
+  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos(
     ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed (
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos (
-    ::DDS::DataWriter_ptr the_writer,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-    this->thread_id_ = ACE_Thread::self ();
-    if(!CORBA::is_nil(the_writer))
-      {
-        this->incompatible_ = true;
-      }
-  }
-
-  void ConnectorStatusListener_exec_i::on_unexpected_status (
+     const DDS::RequestedIncompatibleQosStatus & /*status*/)  {
+    }
+
+  void ConnectorStatusListener_exec_i::on_sample_rejected(
+     ::DDS::DataReader_ptr /*the_reader*/,
+     const DDS::SampleRejectedStatus & /*status*/)  {
+    }
+
+  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
+     ::DDS::DataWriter_ptr /*the_writer*/,
+     const DDS::OfferedDeadlineMissedStatus & /*status*/)  {
+    }
+
+  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
+     ::DDS::DataWriter_ptr the_writer,
+     const DDS::OfferedIncompatibleQosStatus & /*status*/)  {
+       if(!CORBA::is_nil(the_writer))
+       {
+         this->incompatible_ = true;
+       }
+    }
+
+  void ConnectorStatusListener_exec_i::on_unexpected_status(
     ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind  /*status_kind*/)
-  {
-  }
+    ::DDS::StatusKind  /*status_kind*/)  {
+    }
   //============================================================
   // Component Executor Implementation Class: Sender_exec_i
   //============================================================
 
   Sender_exec_i::Sender_exec_i (void)
-    : incompatible_ (false),
-      thread_id_listener_ (0)
+    : incompatible_ (false)
   {
   }
 
@@ -84,8 +76,7 @@ namespace CIAO_CSL_QoSTest_Sender_Impl
   ::CCM_DDS::CCM_ConnectorStatusListener_ptr
   Sender_exec_i::get_test_topic_connector_status (void)
   {
-    return new ConnectorStatusListener_exec_i (this->incompatible_,
-                                               this->thread_id_listener_);
+    return new ConnectorStatusListener_exec_i (this->incompatible_);
   }
 
   // Supported operations and attributes.
@@ -120,62 +111,20 @@ namespace CIAO_CSL_QoSTest_Sender_Impl
   void
   Sender_exec_i::ccm_remove (void)
   {
-    if (!this->incompatible_.value ())
+    if(!this->incompatible_.value ())
       {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("SENDER ERROR: did not receive the expected ")
-                               ACE_TEXT ("error 'on_requested_incompatible_Qos'\n")
+        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: did not receive the expected ")
+                               ACE_TEXT ("error 'on_offered_incompatible_Qos' in Sender\n")
                     ));
       }
+
     else
       {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("SENDER OK: Received the expected ")
-                               ACE_TEXT ("'on_requested_incompatible_Qos'\n")
+        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Received the expected ")
+                               ACE_TEXT ("'on_offered_incompatible_qos' in Sender\n")
                     ));
       }
-    if (this->thread_id_listener_.value () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: "
-                              "Thread ID for ConnectorStatusListener not set!\n"));
-      }
-    #if defined (CIAO_DDS4CCM_CONTEXT_SWITCH) && (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (ACE_OS::thr_equal (this->thread_id_listener_.value (),
-                                ACE_Thread::self ()))
-      {
-        ACE_DEBUG ((LM_DEBUG, "SENDER OK: "
-                              "Thread switch for ConnectorStatusListener seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_.value (),
-                              ACE_Thread::self ()));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: "
-                              "Thread switch for ConnectorStatusListener "
-                              "doesn't seem to work! "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_.value (),
-                              ACE_Thread::self ()));
-      }
-    #else
-    else if (ACE_OS::thr_equal (this->thread_id_listener_.value (),
-                                ACE_Thread::self ()))
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: ConnectorStatusListener: "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_.value (),
-                              ACE_Thread::self ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "SENDER OK: ConnectorStatusListener: "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_.value (),
-                              ACE_Thread::self ()));
-      }
-    #endif
+
   }
 
   extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.h
index 4606c9ce5df..7a955200ce1 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/Sender/CSL_QoSTest_Sender_exec.h
@@ -20,48 +20,40 @@
 namespace CIAO_CSL_QoSTest_Sender_Impl
 {
   typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, ACE_thread_t> Atomic_ThreadId;
 
   class Sender_exec_i;
 
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  class SENDER_EXEC_Export ConnectorStatusListener_exec_i
+class SENDER_EXEC_Export ConnectorStatusListener_exec_i
     : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
       public virtual ::CORBA::LocalObject
   {
   public:
-    ConnectorStatusListener_exec_i (Atomic_Boolean &,
-                                    Atomic_ThreadId &);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
+    ConnectorStatusListener_exec_i (Atomic_Boolean &);
+   virtual ~ConnectorStatusListener_exec_i (void);
+    
     virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
+    void on_inconsistent_topic( ::DDS::Topic_ptr the_topic, 
                                 const DDS::InconsistentTopicStatus & status);
     virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
+    void on_requested_incompatible_qos( ::DDS::DataReader_ptr the_reader,
                                         const DDS::RequestedIncompatibleQosStatus & status);
     virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
+    void on_sample_rejected( ::DDS::DataReader_ptr the_reader, 
                              const DDS::SampleRejectedStatus & status);
     virtual
-      void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                       const DDS::OfferedDeadlineMissedStatus & status);
+      void on_offered_deadline_missed( ::DDS::DataWriter_ptr the_writer,
+                                     const DDS::OfferedDeadlineMissedStatus & status);
     virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
+    void on_offered_incompatible_qos( ::DDS::DataWriter_ptr the_writer, 
                                       const DDS::OfferedIncompatibleQosStatus & status);
     virtual
-      void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                                 ::DDS::StatusKind  status_kind);
-  private:
+      void on_unexpected_status( ::DDS::Entity_ptr the_entity,
+       ::DDS::StatusKind  status_kind);
+     private:
     Atomic_Boolean &incompatible_;
-    Atomic_ThreadId &thread_id_;
+  
   };
 
-  //============================================================
-  // Sender_exec_i
-  //============================================================
   class Sender_exec_i
     : public virtual Sender_Exec,
       public virtual ::CORBA::LocalObject
@@ -81,9 +73,7 @@ namespace CIAO_CSL_QoSTest_Sender_Impl
 
   private:
     ::CSL_QoSTest::CCM_Sender_Context_var context_;
-
     Atomic_Boolean incompatible_;
-    Atomic_ThreadId thread_id_listener_;
  };
 
   extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
diff --git a/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl
index a625ecd9216..dc0c34941c6 100755
--- a/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/CSLQoS/descriptors/run_test.pl
@@ -100,8 +100,6 @@ sub kill_open_processes {
     if ($ns_running == 1) {
         $NS->Kill (); $NS->TimedWait (1);
     }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
 }
 
 sub run_node_daemons {
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl
index e3d334d49c3..1ef1b99d9ee 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.idl
@@ -1,19 +1,18 @@
 // $Id$
 
 /**
- * @file   CSL_SRTest_Base.idl
+ * @file   CSL_SRTest_Base.idl 
  * @author Marijke Hengstmengel <mhengstmengel@remedy.nl>
  */
 
 #ifndef CSL_SRTEST_BASE_IDL
 #define CSL_SRTEST_BASE_IDL
 
-#pragma ndds typesupport "Base/CSL_SRTest_BaseSupport.h"
 
-struct TestTopic {
-  string key; //@key
-  long x;
-};
+  struct TestTopic {
+    string key; //@key
+    long x;
+   };
 typedef sequence<TestTopic> TestTopic_Seq;
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc
index 012f8b0cde3..9d46f751cef 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Base/CSL_SRTest_Base.mpc
@@ -1,25 +1,76 @@
 // $Id$
+// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n CSL_SRTest_Base"
 
-project (DDS_CSL_SRTest_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
-  sharedname = DDS_CSL_SRTest_Base_stub
-  dynamicflags += CSL_SRTEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Gxhst -Sci \
+project(DDS_CSL_SRTest_Base_idl_gen) : taoidldefaults, anytypecode {
+  custom_only = 1
+  idlflags -= -St -Sa
+  idlflags += -SS -Gxhst \
               -Wb,stub_export_macro=CSL_SRTEST_BASE_STUB_Export \
               -Wb,stub_export_include=CSL_SRTest_Base_stub_export.h
 
   IDL_Files {
     CSL_SRTest_Base.idl
   }
+}
 
-  opendds_ts_flags += --export=CSL_SRTEST_BASE_STUB_Export
+project(DDS_CSL_SRTest_Base_ndds_ts_gen) : ndds_ts_defaults {
+  custom_only = 1
+  after += DDS_CSL_SRTest_Base_idl_gen
 
-  DDSGenerator_Files {
+  NDDSTypeSupport_Files {
     CSL_SRTest_Base.idl
   }
+}
+
+project(DDS_CSL_SRTest_Base_NDDS_TS) : nddslib, taolib {
+  after += DDS_CSL_SRTest_Base_ndds_ts_gen DDS_CSL_SRTest_Base_stub
+  libs += DDS_CSL_SRTest_Base_stub
+  libout = ../lib
+  libpaths    += ../lib
+  sharedname = DDS_CSL_SRTest_Base_NDDS_TS
+  dynamicflags = NDDS_USER_DLL_EXPORT
+
+  verbatim(gnuace, macros) {
+    override no_hidden_visibility = 1
+  }
 
   Source_Files {
+    CSL_SRTest_Base.cxx
+    CSL_SRTest_BasePlugin.cxx
+    CSL_SRTest_BaseSupport.cxx
+  }
+
+  Header_Files {
+    CSL_SRTest_Base.h
+    CSL_SRTest_BasePlugin.h
+    CSL_SRTest_BaseSupport.h
+  }
+
+  Inline_Files {
+  }
+}
+
+project(DDS_CSL_SRTest_Base_stub) : ccm_stub {
+  after += DDS_CSL_SRTest_Base_idl_gen
+  libout = ../lib
+  libpaths += ../lib
+  sharedname = DDS_CSL_SRTest_Base_stub
+  dynamicflags = CSL_SRTEST_BASE_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    CSL_SRTest_BaseC.cpp
+  }
+
+  Header_Files {
+    CSL_SRTest_BaseC.h
+    CSL_SRTest_Base_stub_export.h
+  }
+
+  Inline_Files {
+    CSL_SRTest_BaseC.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.idl b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.idl
index 99582a8d95d..3674fc242db 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.idl
@@ -14,10 +14,14 @@
 
 #pragma ciao lem "Connector/CSL_SRTest_ConnectorE.idl"
 
+module CCM_DDS
+{
+  module ::CCM_DDS::Typed < ::TestTopic, ::TestTopic_Seq> TestTopic;
+};
+
 module CSL_SRTest
 {
-  module ::CCM_DDS::Typed < ::TestTopic, ::TestTopic_Seq> TestTopicConn;
-  connector CSL_SRTest_Connector : TestTopicConn::DDS_Event
+  connector CSL_SRTest_Connector : ::CCM_DDS::TestTopic::DDS_Event
   {
   };
 
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc
index 42a7770bb7c..a2604c0e5cf 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_CSL_SRTest_Base -l .. -o ../lib -u DDS CSL_SRTest_Connector"
 
-project(DDS_CSL_SRTest_Connector_idl_gen) : connectoridldefaults, dds4ccm {
+project(DDS_CSL_SRTest_Connector_idl_gen) : connectoridldefaults {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=CSL_SRTEST_CONNECTOR_STUB_Export \
@@ -10,8 +10,8 @@ project(DDS_CSL_SRTest_Connector_idl_gen) : connectoridldefaults, dds4ccm {
               -Wb,skel_export_include=CSL_SRTest_Connector_svnt_export.h \
               -Wb,svnt_export_macro=CSL_SRTEST_CONNECTOR_SVNT_Export \
               -Wb,svnt_export_include=CSL_SRTest_Connector_svnt_export.h \
-              -Wb,conn_export_macro=CSL_SRTEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=CSL_SRTest_Connector_conn_export.h \
+              -Wb,exec_export_macro=CSL_SRTEST_CONNECTOR_EXEC_Export \
+              -Wb,exec_export_include=CSL_SRTest_Connector_exec_export.h \
               -I ..
 
   IDL_Files {
@@ -19,7 +19,7 @@ project(DDS_CSL_SRTest_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   }
 }
 
-project(DDS_CSL_SRTest_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_CSL_SRTest_Connector_lem_gen) : ciaoidldefaults {
   custom_only = 1
   after += DDS_CSL_SRTest_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=CSL_SRTEST_CONNECTOR_LEM_STUB_Export \
@@ -85,24 +85,24 @@ project(DDS_CSL_SRTest_Connector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_CSL_SRTest_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_CSL_SRTest_Connector_lem_stub DDS_CSL_SRTest_Connector_stub DDS4CCM_lem_stub
+  after   += DDS_CSL_SRTest_Connector_lem_stub DDS_CSL_SRTest_Connector_stub DDS4CCM_lem_stub DDS_CSL_SRTest_Base_NDDS_TS
   sharedname = DDS_CSL_SRTest_Connector_exec
-  libs += DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Connector_lem_stub DDS_CSL_SRTest_Base_stub DDS4CCM_lem_stub
+  libs += DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Connector_lem_stub DDS_CSL_SRTest_Base_stub DDS4CCM_lem_stub DDS_CSL_SRTest_Base_NDDS_TS
   libpaths += ../lib
   libout = ../lib
   includes += ..
-  dynamicflags   = CSL_SRTEST_CONNECTOR_CONN_BUILD_DLL
+  dynamicflags   = CSL_SRTEST_CONNECTOR_EXEC_BUILD_DLL
 
   IDL_Files {
   }
 
   Source_Files {
-    CSL_SRTest_Connector_conn.cpp
+    CSL_SRTest_Connector_exec.cpp
   }
 
   Header_Files {
-    CSL_SRTest_Connector_conn.h
-    CSL_SRTest_Connector_conn_export.h
+    CSL_SRTest_Connector_exec.h
+    CSL_SRTest_Connector_exec_export.h
   }
 
   Inline_Files {
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector_exec.cpp
new file mode 100644
index 00000000000..b7606e6ee90
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector_exec.cpp
@@ -0,0 +1,29 @@
+// -*- C++ -*-
+// $Id$
+
+#include "CSL_SRTest_Connector_exec.h"
+
+namespace CIAO_CSL_SRTest_CSL_SRTest_Connector_Impl
+{
+  CSL_SRTest_Connector_exec_i::CSL_SRTest_Connector_exec_i (void)
+    : DDS_Event_Connector_T<TestTopic_DDS_Traits, TestTopic_Connector_Traits> ()
+  {
+  }
+
+  CSL_SRTest_Connector_exec_i::~CSL_SRTest_Connector_exec_i (void)
+  {
+  }
+
+  extern "C" CSL_SRTEST_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_CSL_SRTest_CSL_SRTest_Connector_Impl (void)
+  {
+    ::Components::EnterpriseComponent_ptr retval =
+      ::Components::EnterpriseComponent::_nil ();
+
+    ACE_NEW_NORETURN (
+      retval,
+      CSL_SRTest_Connector_exec_i ());
+
+    return retval;
+  }
+}
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector_exec.h
new file mode 100644
index 00000000000..f3be2d1e32f
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Connector/CSL_SRTest_Connector_exec.h
@@ -0,0 +1,62 @@
+// -*- C++ -*-
+// $Id$
+
+#ifndef CSL_SRTEST_CONNECTOR_EXEC_H_
+#define CSL_SRTEST_CONNECTOR_EXEC_H_
+
+#include /**/ "ace/pre.h"
+
+#include "CSL_SRTest_ConnectorEC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "CSL_SRTest_Connector_exec_export.h"
+#include "tao/LocalObject.h"
+
+#include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
+#include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
+
+
+#include "Base/CSL_SRTest_BaseSupport.h"
+
+namespace CIAO_CSL_SRTest_CSL_SRTest_Connector_Impl
+{
+
+  // @from use of CSL_SRTest as a parameter
+  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+    TestTopic,
+    TestTopicSeq,
+    TestTopicTypeSupport,
+    TestTopicDataWriter,
+    TestTopicDataReader > TestTopic_DDS_Traits;
+
+  typedef CIAO::DDS4CCM::Connector_Traits <
+    ::CIAO_CSL_SRTest_CSL_SRTest_Connector_Impl::CSL_SRTest_Connector_Exec,
+    TestTopic_Seq,
+    ::CCM_DDS::TestTopic::CCM_Writer,
+    ::CCM_DDS::TestTopic::CCM_Updater,
+    ::CCM_DDS::TestTopic::CCM_Getter,
+    ::CCM_DDS::TestTopic::CCM_Reader,
+    ::CSL_SRTest::CCM_CSL_SRTest_Connector_Context,
+    ::CCM_DDS::TestTopic::Listener,
+    ::CCM_DDS::TestTopic::StateListener,
+    ::CCM_DDS::ConnectorStatusListener> TestTopic_Connector_Traits;
+
+  class CSL_SRTEST_CONNECTOR_EXEC_Export CSL_SRTest_Connector_exec_i :
+    public DDS_Event_Connector_T <TestTopic_DDS_Traits, TestTopic_Connector_Traits>
+  {
+  public:
+    CSL_SRTest_Connector_exec_i (void);
+    virtual ~CSL_SRTest_Connector_exec_i (void);
+  };
+
+  extern "C" CSL_SRTEST_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_CSL_SRTest_CSL_SRTest_Connector_Impl (void);
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.idl b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.idl
index c8eb57ca52f..23dffe7863f 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.idl
@@ -14,7 +14,7 @@ module CSL_SRTest
 {
   component Receiver
   {
-    port TestTopicConn::DDS_Listen info_out;
+    port CCM_DDS::TestTopic::DDS_Listen info_out;
     provides CCM_DDS::ConnectorStatusListener info_out_connector_status;
     attribute unsigned long rate;
     attribute boolean read_data;//if true, read_all is invoked.
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc
index 3331208340b..8799cf3e86f 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_CSL_SRTest_Receiver_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_CSL_SRTest_Receiver_idl_gen) : componentidldefaults {
   custom_only = 1
   after += DDS_CSL_SRTest_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
@@ -17,7 +17,7 @@ project(DDS_CSL_SRTest_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_CSL_SRTest_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_CSL_SRTest_Receiver_lem_gen) : ciaoidldefaults {
   after += DDS_CSL_SRTest_Receiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
@@ -107,7 +107,7 @@ project(DDS_CSL_SRTest_Receiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_CSL_SRTest_Receiver_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_CSL_SRTest_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      +=   DDS_CSL_SRTest_Receiver_lem_stub DDS_CSL_SRTest_Base_stub DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Connector_svnt DDS_CSL_SRTest_Receiver_exec DDS_CSL_SRTest_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
   sharedname  = Receiver_svnt
   libs       += Receiver_stub Receiver_lem_stub DDS_CSL_SRTest_Base_stub DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Connector_svnt Receiver_exec DDS_CSL_SRTest_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp
index 382de258e7d..297554ab094 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.cpp
@@ -18,10 +18,8 @@ namespace CIAO_CSL_SRTest_Receiver_Impl
 //============================================================
   // Facet Executor Implementation Class: ConnectorStatusListener_exec_i
   //============================================================
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (Atomic_Boolean &rejected,
-                                                                  Atomic_ThreadId &thread_id)
-    : rejected_ (rejected),
-      thread_id_ (thread_id)
+  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (Atomic_Boolean &rejected)
+   : rejected_ (rejected)
   {
   }
 
@@ -30,47 +28,40 @@ namespace CIAO_CSL_SRTest_Receiver_Impl
   }
 
   // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic (
-    ::DDS::Topic_ptr /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
+  void ConnectorStatusListener_exec_i::on_inconsistent_topic(
+     ::DDS::Topic_ptr /*the_topic*/,
+     const DDS::InconsistentTopicStatus & /*status*/){
+    }
 
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
+  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos(
     ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr the_reader,
-    const DDS::SampleRejectedStatus & status)
-  {
-    this->thread_id_ = ACE_Thread::self ();
-    if (status.last_reason == DDS::REJECTED_BY_INSTANCES_LIMIT &&
-        !CORBA::is_nil(the_reader))
-      {
-        this->rejected_ = true;
-      }
-  }
+     const DDS::RequestedIncompatibleQosStatus & /*status*/)  {
+    }
+
+  void ConnectorStatusListener_exec_i::on_sample_rejected(
+     ::DDS::DataReader_ptr the_reader,
+     const DDS::SampleRejectedStatus & status)  {
+     if((status.last_reason == DDS::REJECTED_BY_INSTANCES_LIMIT) &&
+          (!CORBA::is_nil(the_reader)))
+       {
+         this->rejected_ = true;
+       }
+    }
 
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed (
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
+  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
+     ::DDS::DataWriter_ptr /*the_writer*/,
+     const DDS::OfferedDeadlineMissedStatus & /*status*/)  {
+    }
 
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos (
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
+  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
+     ::DDS::DataWriter_ptr /*the_writer*/,
+     const DDS::OfferedIncompatibleQosStatus & /*status*/)  {
+    }
 
-  void ConnectorStatusListener_exec_i::on_unexpected_status (
+  void ConnectorStatusListener_exec_i::on_unexpected_status(
     ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind /*status_kind*/)
-  {
-  }
+    ::DDS::StatusKind /*status_kind*/)  {
+    }
 
   read_action_Generator::read_action_Generator (Receiver_exec_i &callback)
     : pulse_callback_ (callback)
@@ -93,6 +84,7 @@ namespace CIAO_CSL_SRTest_Receiver_Impl
        }
     catch (...)
       {
+        // @todo
       }
     return 0;
   }
@@ -131,6 +123,34 @@ namespace CIAO_CSL_SRTest_Receiver_Impl
   }
 
   //============================================================
+  // Facet Executor Implementation Class: PortStatusListener_exec_i
+  //============================================================
+
+  PortStatusListener_exec_i::PortStatusListener_exec_i (void)
+  {
+  }
+
+  PortStatusListener_exec_i::~PortStatusListener_exec_i (void)
+  {
+  }
+
+  // Operations from ::CCM_DDS::PortStatusListener
+
+  void
+  PortStatusListener_exec_i::on_requested_deadline_missed (
+    ::DDS::DataReader_ptr /* the_reader */,
+    const ::DDS::RequestedDeadlineMissedStatus & /* status */)
+  {
+  }
+
+  void
+  PortStatusListener_exec_i::on_sample_lost (
+    ::DDS::DataReader_ptr /* the_reader */,
+    const ::DDS::SampleLostStatus & /* status */)
+  {
+  }
+
+  //============================================================
   // Component Executor Implementation Class: Receiver_exec_iTestTopic_Listener_exec_i ();
   //============================================================
 
@@ -139,8 +159,8 @@ namespace CIAO_CSL_SRTest_Receiver_Impl
       read_data_ (true),
       raw_listen_ (false),
       received_ (0),
-      rejected_(0),
-      thread_id_listener_ (0)
+      rejected_(0)
+
   {
     this->ticker_ = new read_action_Generator (*this);
   }
@@ -219,7 +239,7 @@ namespace CIAO_CSL_SRTest_Receiver_Impl
   }
 
   // Port operations.
-  ::CSL_SRTest::TestTopicConn::CCM_Listener_ptr
+  ::CCM_DDS::TestTopic::CCM_Listener_ptr
   Receiver_exec_i::get_info_out_data_listener (void)
   {
     ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new TestTopic RAW listener\n")));
@@ -229,14 +249,21 @@ namespace CIAO_CSL_SRTest_Receiver_Impl
   ::CCM_DDS::CCM_PortStatusListener_ptr
   Receiver_exec_i::get_info_out_status (void)
   {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
+    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new PortStatuslistener\n")));
+    return new PortStatusListener_exec_i ();
+  }
+
+  ::CCM_DDS::CCM_PortStatusListener_ptr
+  Receiver_exec_i::get_info_get_status (void)
+  {
+    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new PortStatuslistener\n")));
+    return new PortStatusListener_exec_i ();
   }
 
    ::CCM_DDS::CCM_ConnectorStatusListener_ptr
   Receiver_exec_i::get_info_out_connector_status (void)
   {
-    return new ConnectorStatusListener_exec_i (this->rejected_,
-                                               this->thread_id_listener_);
+    return new ConnectorStatusListener_exec_i (this->rejected_);
   }
 
   // Operations from Components::SessionComponent.
@@ -296,62 +323,19 @@ namespace CIAO_CSL_SRTest_Receiver_Impl
   void
   Receiver_exec_i::ccm_remove (void)
   {
-     if (this->rejected_.value ())
+     if(!this->rejected_.value ())
       {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("RECEIVER OK: Have received the expected ")
-                              ACE_TEXT ("'on_sample_rejected'\n")
+        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: did not receive the expected ")
+                               ACE_TEXT ("warning 'on_sample_rejected' in the Receiver\n")
                     ));
       }
+
     else
       {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("RECEIVER ERROR: did not receive the expected ")
-                              ACE_TEXT ("warning 'on_sample_rejected'\n")
+        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK : Have received the expected ")
+                               ACE_TEXT ("'on_sample_rejected' in the Receiver\n")
                     ));
       }
-    if (this->thread_id_listener_.value () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: "
-                              "Thread ID for ConnectorStatusListener not set!\n"));
-      }
-    #if defined (CIAO_DDS4CCM_CONTEXT_SWITCH) && (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (ACE_OS::thr_equal (this->thread_id_listener_.value (),
-                                ACE_Thread::self ()))
-      {
-        ACE_DEBUG ((LM_DEBUG, "RECEIVER OK: "
-                              "Thread switch for ConnectorStatusListener seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_.value (),
-                              ACE_Thread::self ()));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: "
-                              "Thread switch for ConnectorStatusListener "
-                              "doesn't seem to work! "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_.value (),
-                              ACE_Thread::self ()));
-      }
-    #else
-    else if (ACE_OS::thr_equal (this->thread_id_listener_.value (),
-                                ACE_Thread::self ()))
-      {
-        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: ConnectorStatusListener: "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_.value (),
-                              ACE_Thread::self ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "RECEIVER OK: ConnectorStatusListener: "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_.value (),
-                              ACE_Thread::self ()));
-      }
-    #endif
   }
 
 
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h
index 90525ccedf1..a67189955b4 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Receiver/CSL_SRTest_Receiver_exec.h
@@ -13,57 +13,47 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/LocalObject.h"
-#include "ace/OS_NS_Thread.h"
-#include "ace/Reactor.h"
 #include "ace/Task.h"
+#include "ace/Reactor.h"
 
 namespace CIAO_CSL_SRTest_Receiver_Impl
 {
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::ULong> Atomic_ULong;
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean> Atomic_Boolean;
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, ACE_thread_t> Atomic_ThreadId;
+  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::ULong > Atomic_ULong;
+  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
 
+  
   class Receiver_exec_i;
-
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
   class RECEIVER_EXEC_Export ConnectorStatusListener_exec_i
     : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
       public virtual ::CORBA::LocalObject
   {
   public:
-    ConnectorStatusListener_exec_i (Atomic_Boolean  &,
-                                    Atomic_ThreadId &);
+    ConnectorStatusListener_exec_i (Atomic_Boolean &);
     virtual ~ConnectorStatusListener_exec_i (void);
-
+    
     virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
+    void on_inconsistent_topic( ::DDS::Topic_ptr the_topic, 
                                 const DDS::InconsistentTopicStatus & status);
     virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
+    void on_requested_incompatible_qos( ::DDS::DataReader_ptr the_reader,
                                         const DDS::RequestedIncompatibleQosStatus & status);
     virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
+    void on_sample_rejected( ::DDS::DataReader_ptr the_reader, 
                              const DDS::SampleRejectedStatus & status);
     virtual
-      void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                       const DDS::OfferedDeadlineMissedStatus & status);
+      void on_offered_deadline_missed( ::DDS::DataWriter_ptr the_writer,
+                                     const DDS::OfferedDeadlineMissedStatus & status);
     virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
+    void on_offered_incompatible_qos( ::DDS::DataWriter_ptr the_writer, 
                                       const DDS::OfferedIncompatibleQosStatus & status);
     virtual
-      void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                                 ::DDS::StatusKind status_kind);
-  private:
+      void on_unexpected_status( ::DDS::Entity_ptr the_entity,
+       ::DDS::StatusKind  status_kind);
+    private:
     Atomic_Boolean &rejected_;
-    Atomic_ThreadId &thread_id_;
+  
   };
-
-  //============================================================
-  // read_action_Generator
-  //============================================================
-  class read_action_Generator
+   class read_action_Generator
     : public ACE_Event_Handler
   {
   public:
@@ -71,18 +61,18 @@ namespace CIAO_CSL_SRTest_Receiver_Impl
 
     ~read_action_Generator ();
 
+    /// Handle the timeout.
     virtual int handle_timeout (const ACE_Time_Value &tv,
                                 const void *arg);
 
   private:
+    /// Maintains a handle that actually process the event
     Receiver_exec_i &pulse_callback_;
+
   };
 
-  //============================================================
-  // TestTopic_Listener_exec_i
-  //============================================================
   class RECEIVER_EXEC_Export TestTopic_Listener_exec_i
-    : public virtual ::CSL_SRTest::TestTopicConn::CCM_Listener,
+    : public virtual ::CCM_DDS::TestTopic::CCM_Listener,
       public virtual ::CORBA::LocalObject
   {
   public:
@@ -101,9 +91,25 @@ namespace CIAO_CSL_SRTest_Receiver_Impl
     Atomic_ULong &received_;
   };
 
-  //============================================================
-  // Receiver_exec_i
-  //============================================================
+  class RECEIVER_EXEC_Export PortStatusListener_exec_i
+    : public virtual ::CCM_DDS::CCM_PortStatusListener,
+      public virtual ::CORBA::LocalObject
+  {
+  public:
+    PortStatusListener_exec_i (void);
+    virtual ~PortStatusListener_exec_i (void);
+
+    virtual void
+    on_requested_deadline_missed (
+      ::DDS::DataReader_ptr the_reader,
+      const ::DDS::RequestedDeadlineMissedStatus & status);
+
+    virtual void
+    on_sample_lost (
+      ::DDS::DataReader_ptr the_reader,
+      const ::DDS::SampleLostStatus & status);
+  };
+
   class RECEIVER_EXEC_Export Receiver_exec_i
     : public virtual Receiver_Exec,
       public virtual ::CORBA::LocalObject
@@ -129,13 +135,16 @@ namespace CIAO_CSL_SRTest_Receiver_Impl
     virtual void raw_listen (::CORBA::Boolean raw_listen);
 
     // Port operations.
-    virtual ::CSL_SRTest::TestTopicConn::CCM_Listener_ptr
+    virtual ::CCM_DDS::TestTopic::CCM_Listener_ptr
     get_info_out_data_listener (void);
 
     virtual ::CCM_DDS::CCM_PortStatusListener_ptr
     get_info_out_status (void);
 
-    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
+    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
+    get_info_get_status (void);
+
+      virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
     get_info_out_connector_status (void);
 
 
@@ -152,14 +161,13 @@ namespace CIAO_CSL_SRTest_Receiver_Impl
 
   private:
     ::CSL_SRTest::CCM_Receiver_Context_var context_;
-    ::CSL_SRTest::TestTopicConn::Reader_var reader_;
-
+    ::CCM_DDS::TestTopic::Reader_var reader_;
+ 
     read_action_Generator * ticker_;
     CORBA::ULong rate_;
-    CORBA::Boolean read_data_, raw_listen_;
+    CORBA::Boolean  read_data_, raw_listen_;
     Atomic_ULong received_;
     Atomic_Boolean rejected_;
-    Atomic_ThreadId thread_id_listener_;
   };
   extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
   create_CSL_SRTest_Receiver_Impl (void);
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.idl b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.idl
index e62d01f3594..3667cec3de1 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.idl
@@ -16,7 +16,7 @@ module CSL_SRTest
 {
   component Sender
   {
-     port TestTopicConn::DDS_Write test_topic_write;
+     port CCM_DDS::TestTopic::DDS_Write test_topic_write;
      provides CCM_DDS::ConnectorStatusListener test_topic_connector_status;
 
   };
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc
index ba7649d7040..30adc3ffb7a 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_CSL_SRTest_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(DDS_CSL_SRTest_Sender_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_CSL_SRTest_Sender_idl_gen) : componentidldefaults {
   after += DDS_CSL_SRTest_Connector_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_CSL_SRTest_Sender_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_CSL_SRTest_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_CSL_SRTest_Sender_lem_gen) : ciaoidldefaults {
   after += DDS_CSL_SRTest_Sender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
@@ -109,7 +109,7 @@ project(DDS_CSL_SRTest_Sender_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_CSL_SRTest_Sender_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_CSL_SRTest_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      += DDS_CSL_SRTest_Base_stub  DDS_CSL_SRTest_Sender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_CSL_SRTest_Connector_stub DDS_CSL_SRTest_Connector_svnt DDS_CSL_SRTest_Connector_lem_stub
   sharedname  = Sender_svnt
   libs       += Sender_stub Sender_lem_stub  \
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp
index b15959abf79..7958530c24e 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.cpp
@@ -15,12 +15,10 @@
 namespace CIAO_CSL_SRTest_Sender_Impl
 {
   //============================================================
-  // ConnectorStatusListener_exec_i
+  // Facet Executor Implementation Class: ConnectorStatusListener_exec_i
   //============================================================
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (Atomic_Boolean &rejected,
-                                                                  Atomic_ThreadId &thread_id)
-    : rejected_ (rejected),
-      thread_id_ (thread_id)
+  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (Atomic_Boolean &rejected)
+   : rejected_ (rejected)
   {
   }
 
@@ -29,50 +27,43 @@ namespace CIAO_CSL_SRTest_Sender_Impl
   }
 
   // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic (
+  void ConnectorStatusListener_exec_i::on_inconsistent_topic(
     ::DDS::Topic_ptr /*the_topic*/,
-     const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
+     const DDS::InconsistentTopicStatus & /*status*/){
+    }
 
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
+  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos(
     ::DDS::DataReader_ptr /*the_reader*/,
-     const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr the_reader,
-    const DDS::SampleRejectedStatus & status)
-  {
-    this->thread_id_ = ACE_Thread::self ();
-    if (status.last_reason == DDS::REJECTED_BY_INSTANCES_LIMIT &&
-        !CORBA::is_nil(the_reader))
-      {
-        this->rejected_ = true;
-      }
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed (
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos (
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
+     const DDS::RequestedIncompatibleQosStatus & /*status*/)  {
+    }
+
+  void ConnectorStatusListener_exec_i::on_sample_rejected(
+     ::DDS::DataReader_ptr the_reader,
+     const DDS::SampleRejectedStatus & status)  {
+       if((status.last_reason == DDS::REJECTED_BY_INSTANCES_LIMIT) &&
+          (!CORBA::is_nil(the_reader)))
+         {
+           this->rejected_ = true;
+         }
+    }
+
+  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
+     ::DDS::DataWriter_ptr /*the_writer*/,
+     const DDS::OfferedDeadlineMissedStatus & /*status*/)  {
+    }
+
+  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
+     ::DDS::DataWriter_ptr /*the_writer*/,
+     const DDS::OfferedIncompatibleQosStatus & /*status*/)  {
+   }
 
-  void ConnectorStatusListener_exec_i::on_unexpected_status (
+  void ConnectorStatusListener_exec_i::on_unexpected_status(
     ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind  /*status_kind*/)
-  {
-  }
+    ::DDS::StatusKind  /*status_kind*/)  {
+    }
 
   //============================================================
-  // pulse_Generator
+  // Pulse generator
   //============================================================
   pulse_Generator::pulse_Generator (Sender_exec_i &callback)
     : pulse_callback_ (callback)
@@ -86,14 +77,13 @@ namespace CIAO_CSL_SRTest_Sender_Impl
     this->pulse_callback_.tick ();
     return 0;
   }
-
   //============================================================
-  // Sender_exec_i
+  // Component Executor Implementation Class: Sender_exec_i
   //============================================================
+
   Sender_exec_i::Sender_exec_i (void)
     : rejected_ (false),
-      rate_ (100),
-      thread_id_listener_ (0)
+      rate_ (100)
   {
     this->ticker_ = new pulse_Generator (*this);
   }
@@ -105,8 +95,7 @@ namespace CIAO_CSL_SRTest_Sender_Impl
   ::CCM_DDS::CCM_ConnectorStatusListener_ptr
   Sender_exec_i::get_test_topic_connector_status (void)
   {
-    return new ConnectorStatusListener_exec_i (this->rejected_,
-                                               this->thread_id_listener_);
+    return new ConnectorStatusListener_exec_i (this->rejected_);
   }
 
   // Supported operations and attributes.
@@ -114,22 +103,21 @@ namespace CIAO_CSL_SRTest_Sender_Impl
   Sender_exec_i::tick ()
   {
     for (CSL_SRTest_Table::iterator i = this->_ktests_.begin ();
-         i != this->_ktests_.end ();
-         ++i)
+        i != this->_ktests_.end ();
+        ++i)
       {
-        try
-          {
-            if (!CORBA::is_nil (this->writer_))
-              {
-                this->writer_->write_one(i->second,::DDS::HANDLE_NIL);
-                i->second->x++;
-              }
-          }
-        catch (const CCM_DDS::InternalError& )
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while creating topic for <%C>.\n"),
+         try
+         {
+           if (!CORBA::is_nil (this->writer_) ) {
+              this->writer_->write_one(i->second,::DDS::HANDLE_NIL);
+              i->second->x++;
+           }
+         }
+         catch (const CCM_DDS::InternalError& )
+         {
+           ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while creating topic for <%C>.\n"),
                     i->first.c_str ()));
-          }
+         }
        }
   }
 
@@ -144,10 +132,10 @@ namespace CIAO_CSL_SRTest_Sender_Impl
                 0,
                 ACE_Time_Value (0, usec),
                 ACE_Time_Value (0, usec)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                              ACE_TEXT ("Error scheduling timer\n")));
-      }
+    {
+      ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
+                             ACE_TEXT ("Error scheduling timer")));
+    }
   }
 
   void
@@ -183,13 +171,12 @@ namespace CIAO_CSL_SRTest_Sender_Impl
     new_key->x = x;
     this->_ktests_[key] = new_key;
   }
-
   void
   Sender_exec_i::ccm_activate (void)
   {
     //add 2 different instances of topic
-    this->add_instance_of_topic ("ONE", 1);
-    this->add_instance_of_topic ("TWO", 2);
+    this->add_instance_of_topic ("ONE",1);
+    this->add_instance_of_topic ("TWO",2);
     this->start ();
   }
 
@@ -202,62 +189,18 @@ namespace CIAO_CSL_SRTest_Sender_Impl
   void
   Sender_exec_i::ccm_remove (void)
   {
-    if (!this->rejected_.value ())
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("SENDER ERROR: did not receive the expected ")
-                              ACE_TEXT ("warning 'on_sample_rejected'\n")
-                  ));
-      }
-    else
-      {
-         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("SENDER OK: ")
-                               ACE_TEXT ("Received the expected 'on_sample_rejected'\n")
-                   ));
-      }
-    if (this->thread_id_listener_.value () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: "
-                              "Thread ID for ConnectorStatusListener not set!\n"));
-      }
-    #if defined (CIAO_DDS4CCM_CONTEXT_SWITCH) && (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (ACE_OS::thr_equal (this->thread_id_listener_.value (),
-                                ACE_Thread::self ()))
-      {
-        ACE_DEBUG ((LM_DEBUG, "SENDER OK: "
-                              "Thread switch for ConnectorStatusListener seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_.value (),
-                              ACE_Thread::self ()));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: "
-                              "Thread switch for ConnectorStatusListener "
-                              "doesn't seem to work! "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_.value (),
-                              ACE_Thread::self ()));
-      }
-    #else
-    else if (ACE_OS::thr_equal (this->thread_id_listener_.value (),
-                                ACE_Thread::self ()))
+    if(!this->rejected_.value ())
       {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: ConnectorStatusListener: "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_.value (),
-                              ACE_Thread::self ()));
+        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: did not receive the expected ")
+                               ACE_TEXT ("warning 'on_sample_rejected' in Sender\n")
+                    ));
       }
     else
       {
-        ACE_DEBUG ((LM_DEBUG, "SENDER OK: ConnectorStatusListener: "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_.value (),
-                              ACE_Thread::self ()));
+         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Received the expected ")
+                               ACE_TEXT ("'on_sample_rejected' in Sender\n")
+                    ));
       }
-    #endif
   }
 
   extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.h
index d9998e05125..e79beb1145e 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/Sender/CSL_SRTest_Sender_exec.h
@@ -20,63 +20,53 @@
 namespace CIAO_CSL_SRTest_Sender_Impl
 {
   typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, ACE_thread_t> Atomic_ThreadId;
 
   class Sender_exec_i;
 
-  //============================================================
-  // pulse_Generator
-  //============================================================
   class pulse_Generator :
     public ACE_Event_Handler
   {
   public:
     pulse_Generator (Sender_exec_i &callback);
-
+    /// Handle the timeout.
     virtual int handle_timeout (const ACE_Time_Value &tv,
                                 const void *arg);
   private:
+    /// Maintains a handle that actually process the event
     Sender_exec_i &pulse_callback_;
   };
 
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  class SENDER_EXEC_Export ConnectorStatusListener_exec_i
+class SENDER_EXEC_Export ConnectorStatusListener_exec_i
     : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
       public virtual ::CORBA::LocalObject
   {
   public:
-    ConnectorStatusListener_exec_i (Atomic_Boolean &,
-                                    Atomic_ThreadId &);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
+    ConnectorStatusListener_exec_i (Atomic_Boolean &);
+   virtual ~ConnectorStatusListener_exec_i (void);
+    
     virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
+    void on_inconsistent_topic( ::DDS::Topic_ptr the_topic, 
                                 const DDS::InconsistentTopicStatus & status);
     virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
+    void on_requested_incompatible_qos( ::DDS::DataReader_ptr the_reader,
                                         const DDS::RequestedIncompatibleQosStatus & status);
     virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
+    void on_sample_rejected( ::DDS::DataReader_ptr the_reader, 
                              const DDS::SampleRejectedStatus & status);
     virtual
-    void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
+      void on_offered_deadline_missed( ::DDS::DataWriter_ptr the_writer,
                                      const DDS::OfferedDeadlineMissedStatus & status);
     virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
+    void on_offered_incompatible_qos( ::DDS::DataWriter_ptr the_writer, 
                                       const DDS::OfferedIncompatibleQosStatus & status);
     virtual
-    void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                               ::DDS::StatusKind  status_kind);
-  private:
+      void on_unexpected_status( ::DDS::Entity_ptr the_entity,
+       ::DDS::StatusKind  status_kind);
+     private:
     Atomic_Boolean &rejected_;
-    Atomic_ThreadId &thread_id_;
+  
   };
 
-  //============================================================
-  // Sender_exec_i
-  //============================================================
   class Sender_exec_i
     : public virtual Sender_Exec,
       public virtual ::CORBA::LocalObject
@@ -84,7 +74,7 @@ namespace CIAO_CSL_SRTest_Sender_Impl
   public:
     Sender_exec_i (void);
     virtual ~Sender_exec_i (void);
-
+    virtual void add_instance_of_topic (const char *, int x );
     void tick (void);
 
     virtual void set_session_context (::Components::SessionContext_ptr ctx);
@@ -95,25 +85,22 @@ namespace CIAO_CSL_SRTest_Sender_Impl
 
     // Port operations.
     virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_test_topic_connector_status (void);
+      get_test_topic_connector_status(void);
 
   private:
     void start (void);
     void stop (void);
 
-    ::CSL_SRTest::TestTopicConn::Writer_var writer_;
-    ::CSL_SRTest::CCM_Sender_Context_var context_;
+    CCM_DDS::TestTopic::Writer_var writer_;
+   ::CSL_SRTest::CCM_Sender_Context_var context_;
     pulse_Generator * ticker_;
-
+ 
     Atomic_Boolean rejected_;
     CORBA::ULong rate_;
-    Atomic_ThreadId thread_id_listener_;
-
+   
     TAO_SYNCH_MUTEX mutex_;
     typedef std::map<ACE_CString, TestTopic_var> CSL_SRTest_Table;
     CSL_SRTest_Table _ktests_;
-
-    void add_instance_of_topic (const char *, int x);
  };
 
   extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
diff --git a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl
index a625ecd9216..dc0c34941c6 100755
--- a/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/CSLSampleRejected/descriptors/run_test.pl
@@ -100,8 +100,6 @@ sub kill_open_processes {
     if ($ns_running == 1) {
         $NS->Kill (); $NS->TimedWait (1);
     }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
 }
 
 sub run_node_daemons {
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl
index d1980afbac4..2c65c635cc1 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.idl
@@ -1,19 +1,18 @@
 // $Id$
 
 /**
- * @file   CSL_USTest_Base.idl
+ * @file   CSL_USTest_Base.idl 
  * @author Marijke Hengstmengel <mhengstmengel@remedy.nl>
  */
 
 #ifndef CSL_USTEST_BASE_IDL
 #define CSL_USTEST_BASE_IDL
 
-#pragma ndds typesupport "Base/CSL_USTest_BaseSupport.h"
 
-struct TestTopic {
-  string key; //@key
-  long x;
-};
+  struct TestTopic {
+    string key; //@key
+    long x;
+   };
 typedef sequence<TestTopic> TestTopic_Seq;
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc
index cef5dad5e96..64b74a47a2a 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Base/CSL_USTest_Base.mpc
@@ -1,25 +1,76 @@
 // $Id$
+// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n CSL_USTest_Base"
 
-project (DDS_CSL_USTest_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
-  sharedname = DDS_CSL_USTest_Base_stub
-  dynamicflags += CSL_USTEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Gxhst -Sci \
+project(DDS_CSL_USTest_Base_idl_gen) : taoidldefaults, anytypecode {
+  custom_only = 1
+  idlflags -= -St -Sa
+  idlflags += -SS -Gxhst \
               -Wb,stub_export_macro=CSL_USTEST_BASE_STUB_Export \
               -Wb,stub_export_include=CSL_USTest_Base_stub_export.h
 
   IDL_Files {
     CSL_USTest_Base.idl
   }
+}
 
-  opendds_ts_flags += --export=CSL_USTEST_BASE_STUB_Export
+project(DDS_CSL_USTest_Base_ndds_ts_gen) : ndds_ts_defaults {
+  custom_only = 1
+  after += DDS_CSL_USTest_Base_idl_gen
 
-  DDSGenerator_Files {
+  NDDSTypeSupport_Files {
     CSL_USTest_Base.idl
   }
+}
+
+project(DDS_CSL_USTest_Base_NDDS_TS) : nddslib, taolib {
+  after += DDS_CSL_USTest_Base_ndds_ts_gen DDS_CSL_USTest_Base_stub
+  libs += DDS_CSL_USTest_Base_stub
+  libout = ../lib
+  libpaths    += ../lib
+  sharedname = DDS_CSL_USTest_Base_NDDS_TS
+  dynamicflags = NDDS_USER_DLL_EXPORT
+
+  verbatim(gnuace, macros) {
+    override no_hidden_visibility = 1
+  }
 
   Source_Files {
+    CSL_USTest_Base.cxx
+    CSL_USTest_BasePlugin.cxx
+    CSL_USTest_BaseSupport.cxx
+  }
+
+  Header_Files {
+    CSL_USTest_Base.h
+    CSL_USTest_BasePlugin.h
+    CSL_USTest_BaseSupport.h
+  }
+
+  Inline_Files {
+  }
+}
+
+project(DDS_CSL_USTest_Base_stub) : ccm_stub {
+  after += DDS_CSL_USTest_Base_idl_gen
+  libout = ../lib
+  libpaths += ../lib
+  sharedname = DDS_CSL_USTest_Base_stub
+  dynamicflags = CSL_USTEST_BASE_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    CSL_USTest_BaseC.cpp
+  }
+
+  Header_Files {
+    CSL_USTest_BaseC.h
+    CSL_USTest_Base_stub_export.h
+  }
+
+  Inline_Files {
+    CSL_USTest_BaseC.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.idl b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.idl
index a2e07a0e80b..0db935c2c87 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.idl
@@ -14,10 +14,14 @@
 
 #pragma ciao lem "Connector/CSL_USTest_ConnectorE.idl"
 
+module CCM_DDS
+{
+  module ::CCM_DDS::Typed < ::TestTopic, ::TestTopic_Seq> TestTopic;
+};
+
 module CSL_USTest
 {
-  module ::CCM_DDS::Typed < ::TestTopic, ::TestTopic_Seq> TestTopicConn;
-  connector CSL_USTest_Connector : TestTopicConn::DDS_Event
+  connector CSL_USTest_Connector : ::CCM_DDS::TestTopic::DDS_Event
   {
   };
 };
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc
index 0eb13d956d3..8dd7df7bafe 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_CSL_USTest_Base -l .. -o ../lib -u DDS CSL_USTest_Connector"
 
-project(DDS_CSL_USTest_Connector_idl_gen) : connectoridldefaults, dds4ccm {
+project(DDS_CSL_USTest_Connector_idl_gen) : connectoridldefaults {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=CSL_USTEST_CONNECTOR_STUB_Export \
@@ -10,8 +10,8 @@ project(DDS_CSL_USTest_Connector_idl_gen) : connectoridldefaults, dds4ccm {
               -Wb,skel_export_include=CSL_USTest_Connector_svnt_export.h \
               -Wb,svnt_export_macro=CSL_USTEST_CONNECTOR_SVNT_Export \
               -Wb,svnt_export_include=CSL_USTest_Connector_svnt_export.h \
-              -Wb,conn_export_macro=CSL_USTEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=CSL_USTest_Connector_conn_export.h \
+              -Wb,exec_export_macro=CSL_USTEST_CONNECTOR_EXEC_Export \
+              -Wb,exec_export_include=CSL_USTest_Connector_exec_export.h \
               -I ..
 
   IDL_Files {
@@ -19,7 +19,7 @@ project(DDS_CSL_USTest_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   }
 }
 
-project(DDS_CSL_USTest_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_CSL_USTest_Connector_lem_gen) : ciaoidldefaults {
   custom_only = 1
   after += DDS_CSL_USTest_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=CSL_USTEST_CONNECTOR_LEM_STUB_Export \
@@ -85,24 +85,24 @@ project(DDS_CSL_USTest_Connector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_CSL_USTest_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_CSL_USTest_Connector_lem_stub DDS_CSL_USTest_Connector_stub DDS4CCM_lem_stub
+  after   += DDS_CSL_USTest_Connector_lem_stub DDS_CSL_USTest_Connector_stub DDS4CCM_lem_stub DDS_CSL_USTest_Base_NDDS_TS
   sharedname = DDS_CSL_USTest_Connector_exec
-  libs += DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Connector_lem_stub DDS_CSL_USTest_Base_stub DDS4CCM_lem_stub
+  libs += DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Connector_lem_stub DDS_CSL_USTest_Base_stub DDS4CCM_lem_stub DDS_CSL_USTest_Base_NDDS_TS
   libpaths += ../lib
   libout = ../lib
   includes += ..
-  dynamicflags   = CSL_USTEST_CONNECTOR_CONN_BUILD_DLL
+  dynamicflags   = CSL_USTEST_CONNECTOR_EXEC_BUILD_DLL
 
   IDL_Files {
   }
 
   Source_Files {
-    CSL_USTest_Connector_conn.cpp
+    CSL_USTest_Connector_exec.cpp
   }
 
   Header_Files {
-    CSL_USTest_Connector_conn.h
-    CSL_USTest_Connector_conn_export.h
+    CSL_USTest_Connector_exec.h
+    CSL_USTest_Connector_exec_export.h
   }
 
   Inline_Files {
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector_exec.cpp
new file mode 100644
index 00000000000..d6dc5a06317
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector_exec.cpp
@@ -0,0 +1,29 @@
+// -*- C++ -*-
+// $Id$
+
+#include "CSL_USTest_Connector_exec.h"
+
+namespace CIAO_CSL_USTest_CSL_USTest_Connector_Impl
+{
+  CSL_USTest_Connector_exec_i::CSL_USTest_Connector_exec_i (void)
+    : DDS_Event_Connector_T<TestTopic_DDS_Traits, TestTopic_Connector_Traits> ()
+  {
+  }
+
+  CSL_USTest_Connector_exec_i::~CSL_USTest_Connector_exec_i (void)
+  {
+  }
+
+  extern "C" CSL_USTEST_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_CSL_USTest_CSL_USTest_Connector_Impl (void)
+  {
+    ::Components::EnterpriseComponent_ptr retval =
+      ::Components::EnterpriseComponent::_nil ();
+
+    ACE_NEW_NORETURN (
+      retval,
+      CSL_USTest_Connector_exec_i ()); 
+    return retval;
+  }
+}
+
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector_exec.h
new file mode 100644
index 00000000000..81072dacadc
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Connector/CSL_USTest_Connector_exec.h
@@ -0,0 +1,62 @@
+// -*- C++ -*-
+// $Id$
+
+#ifndef CSL_USTEST_CONNECTOR_EXEC_H_
+#define CSL_USTEST_CONNECTOR_EXEC_H_
+
+#include /**/ "ace/pre.h"
+
+#include "CSL_USTest_ConnectorEC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "CSL_USTest_Connector_exec_export.h"
+#include "tao/LocalObject.h"
+
+#include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
+#include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
+
+
+#include "Base/CSL_USTest_BaseSupport.h"
+
+namespace CIAO_CSL_USTest_CSL_USTest_Connector_Impl
+{
+
+  // @from use of CSL_USTest as a parameter
+  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+    TestTopic,
+    TestTopicSeq,
+    TestTopicTypeSupport,
+    TestTopicDataWriter,
+    TestTopicDataReader > TestTopic_DDS_Traits;
+
+  typedef CIAO::DDS4CCM::Connector_Traits <
+    ::CIAO_CSL_USTest_CSL_USTest_Connector_Impl::CSL_USTest_Connector_Exec,
+    TestTopic_Seq,
+    ::CCM_DDS::TestTopic::CCM_Writer,
+    ::CCM_DDS::TestTopic::CCM_Updater,
+    ::CCM_DDS::TestTopic::CCM_Getter,
+    ::CCM_DDS::TestTopic::CCM_Reader,
+    ::CSL_USTest::CCM_CSL_USTest_Connector_Context,
+    ::CCM_DDS::TestTopic::Listener,
+    ::CCM_DDS::TestTopic::StateListener,
+    ::CCM_DDS::ConnectorStatusListener> TestTopic_Connector_Traits;
+
+  class CSL_USTEST_CONNECTOR_EXEC_Export CSL_USTest_Connector_exec_i :
+    public DDS_Event_Connector_T <TestTopic_DDS_Traits, TestTopic_Connector_Traits>
+  {
+  public:
+    CSL_USTest_Connector_exec_i (void);
+    virtual ~CSL_USTest_Connector_exec_i (void);
+  };
+
+  extern "C" CSL_USTEST_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_CSL_USTest_CSL_USTest_Connector_Impl (void);
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.idl b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.idl
index 84a4fe8639a..82856d83afb 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.idl
@@ -14,8 +14,7 @@ module CSL_USTest
 {
   component Receiver
   {
-    port TestTopicConn::DDS_Listen info_out;
-    port TestTopicConn::DDS_Read info_read;
+    port CCM_DDS::TestTopic::DDS_Listen info_out;
     provides CCM_DDS::ConnectorStatusListener info_out_connector_status;
    };
 };
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc
index 275fd4533b3..1e7f140a816 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_CSL_USTest_Receiver_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_CSL_USTest_Receiver_idl_gen) : componentidldefaults {
   custom_only = 1
   after += DDS_CSL_USTest_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
@@ -17,7 +17,7 @@ project(DDS_CSL_USTest_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_CSL_USTest_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_CSL_USTest_Receiver_lem_gen) : ciaoidldefaults {
   after += DDS_CSL_USTest_Receiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
@@ -107,7 +107,7 @@ project(DDS_CSL_USTest_Receiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_CSL_USTest_Receiver_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_CSL_USTest_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      +=   DDS_CSL_USTest_Receiver_lem_stub DDS_CSL_USTest_Base_stub DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Connector_svnt DDS_CSL_USTest_Receiver_exec DDS_CSL_USTest_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
   sharedname  = Receiver_svnt
   libs       += Receiver_stub Receiver_lem_stub DDS_CSL_USTest_Base_stub DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Connector_svnt Receiver_exec DDS_CSL_USTest_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp
index 9d5da5e08a6..67717356932 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.cpp
@@ -10,40 +10,15 @@
 #include "ace/OS_NS_time.h"
 #include "dds4ccm/impl/ndds/Utils.h"
 
+
 namespace CIAO_CSL_USTest_Receiver_Impl
 {
+//============================================================
+  // Facet Executor Implementation Class: ConnectorStatusListener_exec_i
   //============================================================
-  // Pulser
-  //============================================================
-  Pulser::Pulser (Receiver_exec_i &callback)
-    : callback_ (callback)
-  {
-  }
-
-  int
-  Pulser::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    // Notify the subscribers
-    this->callback_.read_all ();
-    return 0;
-  }
-
-
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (Atomic_Boolean &subscription_matched_received,
-                                                                  Atomic_Boolean &publication_matched_received,
-                                                                  Atomic_Boolean &liveliness_changed_received,
-                                                                  Atomic_ThreadId &thread_id_subcription_matched,
-                                                                  Atomic_ThreadId &thread_id_publication_matched,
-                                                                  Atomic_ThreadId &thread_id_liveliness_changed)
-   : subscription_matched_received_ (subscription_matched_received),
-     publication_matched_received_ (publication_matched_received),
-     liveliness_changed_received_ (liveliness_changed_received),
-     thread_id_subcription_matched_ (thread_id_subcription_matched),
-     thread_id_publication_matched_ (thread_id_publication_matched),
-     thread_id_liveliness_changed_ (thread_id_liveliness_changed)
+  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (Atomic_Boolean &unexpected_matched,Atomic_Boolean &unexpected_liveliness)
+   : unexpected_matched_ (unexpected_matched),
+     unexpected_liveliness_ (unexpected_liveliness)
   {
   }
 
@@ -52,68 +27,51 @@ namespace CIAO_CSL_USTest_Receiver_Impl
   }
 
   // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic (
-    ::DDS::Topic_ptr /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
+  void ConnectorStatusListener_exec_i::on_inconsistent_topic(
+     ::DDS::Topic_ptr /*the_topic*/,
+     const DDS::InconsistentTopicStatus & /*status*/)
+    {
+    }
 
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
+  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos(
     ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
+     const DDS::RequestedIncompatibleQosStatus & /*status*/)  {
+    }
 
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
+  void ConnectorStatusListener_exec_i::on_sample_rejected(
+     ::DDS::DataReader_ptr /*the_reader*/,
+     const DDS::SampleRejectedStatus & /*status*/)  {
+    }
 
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed (
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
+  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
+     ::DDS::DataWriter_ptr /*the_writer*/,
+     const DDS::OfferedDeadlineMissedStatus & /*status*/)  {
+    }
 
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos (
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
+  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
+     ::DDS::DataWriter_ptr /*the_writer*/,
+     const DDS::OfferedIncompatibleQosStatus & /*status*/)  {
+    }
 
-  void ConnectorStatusListener_exec_i::on_unexpected_status (
+  void ConnectorStatusListener_exec_i::on_unexpected_status(
     ::DDS::Entity_ptr the_entity,
-    ::DDS::StatusKind status_kind)
-  {
-    ACE_DEBUG ((LM_DEBUG, "RECEIVER\tConnectorStatusListener_exec_i::on_unexpected_status: "
-                          "received <%C>\n",
-                          CIAO::DDS4CCM::translate_statuskind (status_kind)));
-
-    if (!CORBA::is_nil (the_entity) && status_kind == DDS::SUBSCRIPTION_MATCHED_STATUS)
-      {
-        this->subscription_matched_received_ = true;
-        this->thread_id_subcription_matched_ = ACE_Thread::self ();
-      }
-    else if (!CORBA::is_nil(the_entity) && status_kind == DDS::LIVELINESS_CHANGED_STATUS)
+    ::DDS::StatusKind  status_kind)  {
+      CORBA::ULong kind = status_kind;
+      if((!CORBA::is_nil(the_entity)) && (kind==DDS::SUBSCRIPTION_MATCHED_STATUS))
       {
-        this->liveliness_changed_received_ = true;
-        this->thread_id_liveliness_changed_ = ACE_Thread::self ();
+        this->unexpected_matched_ = true;
       }
-    else if (!CORBA::is_nil(the_entity) && status_kind == DDS::PUBLICATION_MATCHED_STATUS)
+      if((!CORBA::is_nil(the_entity)) &&(kind==DDS::LIVELINESS_CHANGED_STATUS))
       {
-        this->publication_matched_received_ = true;
-        this->thread_id_publication_matched_ = ACE_Thread::self ();
+        this->unexpected_liveliness_ = true;
       }
-  }
+    }
 
   //============================================================
-  // TestTopic_RawListener_exec_i
+  // Facet Executor Implementation Class: TestTopic_RawListener_exec_i
   //============================================================
-  TestTopic_RawListener_exec_i::TestTopic_RawListener_exec_i (Atomic_ULong &received,
-                                                              Receiver_exec_i &callback)
-      : received_ (received),
-        callback_ (callback)
+  TestTopic_RawListener_exec_i::TestTopic_RawListener_exec_i (Atomic_ULong &received)
+      : received_ (received)
   {
   }
 
@@ -132,8 +90,6 @@ namespace CIAO_CSL_USTest_Receiver_Impl
             ACE_TEXT ("received test_topic_info for <%C> at %u\n"),
             an_instance.key.in (),
             an_instance.x));
-    if (this->received_ == 10)
-      this->callback_.stop ();
   }
 
   void
@@ -142,57 +98,66 @@ namespace CIAO_CSL_USTest_Receiver_Impl
     const ::CCM_DDS::ReadInfoSeq & /* info */)
   {
   }
+  //============================================================
+  // Facet Executor Implementation Class: PortStatusListener_exec_i
+  //============================================================
+  PortStatusListener_exec_i::PortStatusListener_exec_i (void)
+  {
+  }
+
+  PortStatusListener_exec_i::~PortStatusListener_exec_i (void)
+  {
+  }
+
+  // Operations from ::CCM_DDS::PortStatusListener
+  void
+    PortStatusListener_exec_i::on_requested_deadline_missed (
+    ::DDS::DataReader_ptr /* the_reader */,
+    const ::DDS::RequestedDeadlineMissedStatus & /* status */)
+  {
+  }
+
+  void
+  PortStatusListener_exec_i::on_sample_lost (
+    ::DDS::DataReader_ptr /* the_reader */,
+    const ::DDS::SampleLostStatus & /* status */)
+  {
+  }
 
   //============================================================
-  // Receiver_exec_i
+  // Component Executor Implementation Class: Receiver_exec_iTestTopic_RawListener_exec_i ();
   //============================================================
   Receiver_exec_i::Receiver_exec_i (void)
-    : subscription_matched_received_ (false),
-      publication_matched_received_ (false),
-      liveliness_changed_received_ (false),
-      thread_id_listener_subscription_matched_ (0),
-      thread_id_listener_publication_matched_ (0),
-      thread_id_listener_liveliness_changed_ (0),
+    : unexpected_matched_ (false),
+      unexpected_liveliness_ (false),
       received_(0)
   {
-    this->lc_ = ::CCM_DDS::DataListenerControl::_nil ();
-    this->pulser_= new Pulser (*this);
   }
 
   Receiver_exec_i::~Receiver_exec_i (void)
   {
   }
 
+  // Supported operations and attributes.
   // Port operations.
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_read_status (void)
+  ::CCM_DDS::TestTopic::CCM_Listener_ptr
+  Receiver_exec_i::get_info_out_data_listener (void)
   {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
+    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new TestTopic RAW listener\n")));
+    return new TestTopic_RawListener_exec_i (this->received_);
   }
 
   ::CCM_DDS::CCM_PortStatusListener_ptr
   Receiver_exec_i::get_info_out_status (void)
   {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  ::CSL_USTest::TestTopicConn::CCM_Listener_ptr
-  Receiver_exec_i::get_info_out_data_listener (void)
-  {
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new TestTopic RAW listener\n")));
-    return new TestTopic_RawListener_exec_i (this->received_,
-                                             *this);
+    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new PortStatuslistener\n")));
+    return new PortStatusListener_exec_i ();
   }
 
   ::CCM_DDS::CCM_ConnectorStatusListener_ptr
   Receiver_exec_i::get_info_out_connector_status (void)
   {
-    return new ConnectorStatusListener_exec_i (this->subscription_matched_received_,
-                                               this->publication_matched_received_,
-                                               this->liveliness_changed_received_,
-                                               this->thread_id_listener_subscription_matched_,
-                                               this->thread_id_listener_publication_matched_,
-                                               this->thread_id_listener_liveliness_changed_);
+    return new ConnectorStatusListener_exec_i (this->unexpected_matched_,this->unexpected_liveliness_);
   }
 
   // Operations from Components::SessionComponent.
@@ -209,90 +174,27 @@ namespace CIAO_CSL_USTest_Receiver_Impl
   }
 
   void
-  Receiver_exec_i::stop (void)
-  {
-    if (CORBA::is_nil (this->lc_.in ()))
-      {
-        ACE_ERROR ((LM_INFO, ACE_TEXT ("Error:  Listener control receptacle is null!\n")));
-      }
-    this->lc_->mode (::CCM_DDS::NOT_ENABLED);
-  }
-
-  void
-  Receiver_exec_i::start (void)
-  {
-    this->lc_ = this->context_->get_connection_info_out_data_control ();
-    if (CORBA::is_nil (this->lc_.in ()))
-      {
-        ACE_ERROR ((LM_INFO, ACE_TEXT ("Error:  Listener control receptacle is null!\n")));
-      }
-    this->lc_->mode (::CCM_DDS::NOT_ENABLED);
-  }
-
-  void
   Receiver_exec_i::configuration_complete (void)
   {
-    this->reader_ = this->context_->get_connection_info_read_data ();
-  }
-
-  void
-  Receiver_exec_i::read_all ()
-  {
-    try
-      {
-        TestTopic_Seq           *readertest_info_seq;
-        ::CCM_DDS::ReadInfoSeq  *readinfo_seq;
-        if (this->received_ < 30)
-          {
-            this->reader_->read_all (
-                    readertest_info_seq,
-                    readinfo_seq);
-            ACE_DEBUG ((LM_DEBUG, "Read %u samples\n",
-                                  readinfo_seq->length ()));
-            this->received_ += readinfo_seq->length ();
-          }
-        else
-          {
-            this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->cancel_timer (this->pulser_);
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::start :Stop reading.\n")));
-            delete this->pulser_;
-          }
-      }
-    catch (const CCM_DDS::NonExistent& ex)
-      {
-        for (CORBA::ULong i = 0; i < ex.indexes.length (); ++i)
-          {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ ALL: ")
-                  ACE_TEXT ("caught expected exception: index <%u>\n"),
-                  ex.indexes[i]));
-          }
-      }
-    catch (const CCM_DDS::InternalError& ex)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: READ ALL: ")
-              ACE_TEXT ("caught InternalError exception: retval <%u>\n"),
-              ex.error_code));
-      }
-    catch (const CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR: READ ALL: ");
-        ACE_ERROR ((LM_ERROR,
-          ACE_TEXT ("ERROR: Receiver_exec_i::read_all : Exception caught\n")));
-      }
-  }
+       this->reader_ = this->context_->get_connection_info_out_data ();
+       if (CORBA::is_nil (this->reader_))
+       {
+         ACE_ERROR ((LM_INFO, ACE_TEXT ("Error:  Reader is null!\n")));
+         throw CORBA::INTERNAL ();
+       }
+   }
 
   void
   Receiver_exec_i::ccm_activate (void)
   {
-    if (this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->schedule_timer (
-                this->pulser_,
-                0,
-                ACE_Time_Value (6, 0),
-                ACE_Time_Value (3, 0)) == -1)
+    ::CCM_DDS::DataListenerControl_var lc =
+    this->context_->get_connection_info_out_data_control ();
+    if (CORBA::is_nil (lc.in ()))
       {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                              ACE_TEXT ("Error scheduling timer\n")));
+        ACE_ERROR ((LM_INFO, ACE_TEXT ("Error:  Listener control receptacle is null!\n")));
+        throw CORBA::INTERNAL ();
       }
+    lc->mode (::CCM_DDS::NOT_ENABLED);
   }
 
   void
@@ -303,180 +205,18 @@ namespace CIAO_CSL_USTest_Receiver_Impl
   void
   Receiver_exec_i::ccm_remove (void)
   {
-     if (!this->subscription_matched_received_.value ())
+     if(!this->unexpected_matched_.value () || !this->unexpected_liveliness_.value ())
       {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("RECEIVER ERROR: Didn't receive the expected ")
-                              ACE_TEXT ("'SUBSCRIPTION_MATCHED_STATUS'\n")
+        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: did not receive the expected ")
+                               ACE_TEXT ("states 'PUBLICATION_MATCHED_STATUS and/or LIVELINESS_CHANGED_STATUS' in Receiver\n")
                     ));
       }
     else
       {
-         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("RECEIVER OK: Received the expected ")
-                               ACE_TEXT ("'SUBSCRIPTION_MATCHED_STATUS'\n")
-                    ));
-      }
-    if (!this->publication_matched_received_.value ())
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("RECEIVER ERROR: Didn't receive the expected ")
-                              ACE_TEXT ("'PUBLICATION_MATCHED_STATUS'\n")
+         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Received the expected ")
+                               ACE_TEXT ("'PUBLICATION_MATCHED_STATUS and LIVELINESS_CHANGED_STATUS' in Receiver\n")
                     ));
       }
-    else
-      {
-         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("RECEIVER OK: Received the expected ")
-                               ACE_TEXT ("'PUBLICATION_MATCHED_STATUS' \n")
-                    ));
-      }
-    if (!this->liveliness_changed_received_.value ())
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("RECEIVER ERROR: Didn't receive the expected ")
-                              ACE_TEXT ("'LIVELINESS_CHANGED_STATUS'\n")
-                    ));
-      }
-    else
-      {
-         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("RECEIVER OK: Received the expected ")
-                               ACE_TEXT ("'LIVELINESS_CHANGED_STATUS' \n")
-                    ));
-      }
-
-    //test thread switch for SUBSCRIPTION_MATCHED_STATUS
-    if (this->thread_id_listener_subscription_matched_.value () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: "
-                              "Thread ID for 'SUBSCRIPTION_MATCHED_STATUS' not set!\n"));
-      }
-    #if defined (CIAO_DDS4CCM_CONTEXT_SWITCH) && (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (ACE_OS::thr_equal (this->thread_id_listener_subscription_matched_.value (),
-                                ACE_Thread::self ()))
-      {
-        ACE_DEBUG ((LM_DEBUG, "RECEIVER OK: "
-                              "Thread switch for 'SUBSCRIPTION_MATCHED_STATUS' seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_subscription_matched_.value (),
-                              ACE_Thread::self ()));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: "
-                              "Thread switch for 'SUBSCRIPTION_MATCHED_STATUS' "
-                              "doesn't seem to work! "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_subscription_matched_.value (),
-                              ACE_Thread::self ()));
-      }
-    #else
-    else if (ACE_OS::thr_equal (this->thread_id_listener_subscription_matched_.value (),
-                                ACE_Thread::self ()))
-      {
-        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: 'SUBSCRIPTION_MATCHED_STATUS': "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_subscription_matched_.value (),
-                              ACE_Thread::self ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "RECEIVER OK: 'SUBSCRIPTION_MATCHED_STATUS': "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_subscription_matched_.value (),
-                              ACE_Thread::self ()));
-      }
-    #endif
-
-    //test thread switch for PUBLICATION_MATCHED_STATUS
-    if (this->thread_id_listener_publication_matched_.value () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: "
-                              "Thread ID for 'PUBLICATION_MATCHED_STATUS' not set!\n"));
-      }
-    #if defined (CIAO_DDS4CCM_CONTEXT_SWITCH) && (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (ACE_OS::thr_equal (this->thread_id_listener_publication_matched_.value (),
-                                ACE_Thread::self ()))
-      {
-        ACE_DEBUG ((LM_DEBUG, "RECEIVER OK: "
-                              "Thread switch for 'PUBLICATION_MATCHED_STATUS' seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_publication_matched_.value (),
-                              ACE_Thread::self ()));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: "
-                              "Thread switch for 'PUBLICATION_MATCHED_STATUS' "
-                              "doesn't seem to work! "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_publication_matched_.value (),
-                              ACE_Thread::self ()));
-      }
-    #else
-    else if (ACE_OS::thr_equal (this->thread_id_listener_publication_matched_.value (),
-                                ACE_Thread::self ()))
-      {
-        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: 'PUBLICATION_MATCHED_STATUS': "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_publication_matched_.value (),
-                              ACE_Thread::self ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "RECEIVER OK: 'PUBLICATION_MATCHED_STATUS': "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_publication_matched_.value (),
-                              ACE_Thread::self ()));
-      }
-    #endif
-
-    //test thread switch for LIVELINESS_CHANGED_STATUS
-    if (this->thread_id_listener_liveliness_changed_.value () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: "
-                              "Thread ID for 'LIVELINESS_CHANGED_STATUS' not set!\n"));
-      }
-    #if defined (CIAO_DDS4CCM_CONTEXT_SWITCH) && (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (ACE_OS::thr_equal (this->thread_id_listener_liveliness_changed_.value (),
-                                ACE_Thread::self ()))
-      {
-        ACE_DEBUG ((LM_DEBUG, "RECEIVER OK: "
-                              "Thread switch for 'LIVELINESS_CHANGED_STATUS' seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_liveliness_changed_.value (),
-                              ACE_Thread::self ()));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: "
-                              "Thread switch for 'LIVELINESS_CHANGED_STATUS' "
-                              "doesn't seem to work! "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_liveliness_changed_.value (),
-                              ACE_Thread::self ()));
-      }
-    #else
-    else if (ACE_OS::thr_equal (this->thread_id_listener_liveliness_changed_.value (),
-                                ACE_Thread::self ()))
-      {
-        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: 'LIVELINESS_CHANGED_STATUS': "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_liveliness_changed_.value (),
-                              ACE_Thread::self ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "RECEIVER OK: 'LIVELINESS_CHANGED_STATUS': "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_liveliness_changed_.value (),
-                              ACE_Thread::self ()));
-      }
-    #endif
   }
 
   extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h
index e351f24a8b3..34f2f251151 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Receiver/CSL_USTest_Receiver_exec.h
@@ -20,37 +20,16 @@ namespace CIAO_CSL_USTest_Receiver_Impl
 {
   typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::ULong > Atomic_ULong;
   typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, ACE_thread_t> Atomic_ThreadId;
-
   class Receiver_exec_i;
 
-  //============================================================
-  // Pulser
-  //============================================================
-  class Pulser :
-    public ACE_Event_Handler
-  {
-  public:
-    Pulser (Receiver_exec_i &callback);
-
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    Receiver_exec_i &callback_;
-  };
-
-  //============================================================
-  // TestTopic_RawListener_exec_i
-  //============================================================
   class RECEIVER_EXEC_Export TestTopic_RawListener_exec_i
-    : public virtual ::CSL_USTest::TestTopicConn::CCM_Listener,
+    : public virtual ::CCM_DDS::TestTopic::CCM_Listener,
       public virtual ::CORBA::LocalObject
   {
   public:
-    TestTopic_RawListener_exec_i (Atomic_ULong &,
-                                  Receiver_exec_i &callback);
+    TestTopic_RawListener_exec_i (Atomic_ULong &);
     virtual ~TestTopic_RawListener_exec_i (void);
-
+   
     virtual void
     on_one_data (
       const TestTopic & an_instance,
@@ -59,41 +38,31 @@ namespace CIAO_CSL_USTest_Receiver_Impl
     virtual void
     on_many_data (
       const ::TestTopic_Seq & data,
-      const ::CCM_DDS::ReadInfoSeq & info);
+      const ::CCM_DDS::ReadInfoSeq & info );
 
   private:
     Atomic_ULong &received_;
-    Receiver_exec_i &callback_;
   };
-
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  class RECEIVER_EXEC_Export ConnectorStatusListener_exec_i
+  
+class RECEIVER_EXEC_Export ConnectorStatusListener_exec_i
     : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
       public virtual ::CORBA::LocalObject
   {
   public:
-    ConnectorStatusListener_exec_i (Atomic_Boolean &,
-                                    Atomic_Boolean &,
-                                    Atomic_Boolean &,
-                                    Atomic_ThreadId &,
-                                    Atomic_ThreadId &,
-                                    Atomic_ThreadId &);
-
+    ConnectorStatusListener_exec_i (Atomic_Boolean &,Atomic_Boolean &);
     virtual ~ConnectorStatusListener_exec_i (void);
-
+    
     virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
+    void on_inconsistent_topic( ::DDS::Topic_ptr the_topic, 
                                 const DDS::InconsistentTopicStatus & status);
     virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
+    void on_requested_incompatible_qos( ::DDS::DataReader_ptr the_reader,
                                         const DDS::RequestedIncompatibleQosStatus & status);
     virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
+    void on_sample_rejected( ::DDS::DataReader_ptr the_reader, 
                              const DDS::SampleRejectedStatus & status);
     virtual
-    void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
+    void on_offered_deadline_missed( ::DDS::DataWriter_ptr the_writer,
                                      const DDS::OfferedDeadlineMissedStatus & status);
     virtual
     void on_offered_incompatible_qos( ::DDS::DataWriter_ptr the_writer, 
@@ -103,17 +72,30 @@ namespace CIAO_CSL_USTest_Receiver_Impl
                                ::DDS::StatusKind  status_kind);
 
   private:
-    Atomic_Boolean &subscription_matched_received_;
-    Atomic_Boolean &publication_matched_received_;
-    Atomic_Boolean &liveliness_changed_received_;
-    Atomic_ThreadId &thread_id_subcription_matched_;
-    Atomic_ThreadId &thread_id_publication_matched_;
-    Atomic_ThreadId &thread_id_liveliness_changed_;
+    Atomic_Boolean &unexpected_matched_;
+    Atomic_Boolean &unexpected_liveliness_;
+  
+  };
+  
+class RECEIVER_EXEC_Export PortStatusListener_exec_i
+    : public virtual ::CCM_DDS::CCM_PortStatusListener,
+      public virtual ::CORBA::LocalObject
+  {
+  public:
+    PortStatusListener_exec_i (void);
+    virtual ~PortStatusListener_exec_i (void);
+
+    virtual void
+    on_requested_deadline_missed (
+      ::DDS::DataReader_ptr the_reader,
+      const ::DDS::RequestedDeadlineMissedStatus & status);
+
+    virtual void
+    on_sample_lost (
+      ::DDS::DataReader_ptr the_reader,
+      const ::DDS::SampleLostStatus & status);
   };
 
-  //============================================================
-  // Receiver_exec_i
-  //============================================================
   class RECEIVER_EXEC_Export Receiver_exec_i
     : public virtual Receiver_Exec,
       public virtual ::CORBA::LocalObject
@@ -122,24 +104,18 @@ namespace CIAO_CSL_USTest_Receiver_Impl
     Receiver_exec_i (void);
     virtual ~Receiver_exec_i (void);
 
-    // Supported operations and attributes.
-    void stop (void);
-    void start (void);
-    void read_all (void);
-
+   // Supported operations and attributes.
+  
     // Port operations.
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_out_status (void);
-
-    virtual ::CSL_USTest::TestTopicConn::CCM_Listener_ptr
+    virtual ::CCM_DDS::TestTopic::CCM_Listener_ptr
     get_info_out_data_listener (void);
 
+    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
+    get_info_out_status (void);
+   
     virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
     get_info_out_connector_status (void);
-
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_read_status (void);
-
+  
     // Operations from Components::SessionComponent.
     virtual void
     set_session_context (
@@ -152,18 +128,10 @@ namespace CIAO_CSL_USTest_Receiver_Impl
 
   private:
     ::CSL_USTest::CCM_Receiver_Context_var context_;
-    ::CCM_DDS::DataListenerControl_var lc_;
-    ::CSL_USTest::TestTopicConn::Reader_var reader_;
-
-    Pulser *pulser_;
-
-    Atomic_Boolean subscription_matched_received_;
-    Atomic_Boolean publication_matched_received_;
-    Atomic_Boolean liveliness_changed_received_;
-    Atomic_ThreadId thread_id_listener_subscription_matched_;
-    Atomic_ThreadId thread_id_listener_publication_matched_;
-    Atomic_ThreadId thread_id_listener_liveliness_changed_;
+    Atomic_Boolean unexpected_matched_;
+    Atomic_Boolean unexpected_liveliness_;
     Atomic_ULong received_;
+    ::CCM_DDS::TestTopic::Reader_var reader_;
   };
 
   extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.idl b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.idl
index 9b12ba19106..a0701193457 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.idl
@@ -16,7 +16,7 @@ module CSL_USTest
 {
   component Sender
   {
-    port TestTopicConn::DDS_Write test_topic_write;
+    port CCM_DDS::TestTopic::DDS_Write test_topic_write;
     provides CCM_DDS::ConnectorStatusListener test_topic_connector_status;
   };
 };
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc
index 676ed1d6a48..20144c4e0ab 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_CSL_USTest_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(DDS_CSL_USTest_Sender_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_CSL_USTest_Sender_idl_gen) : componentidldefaults {
   after += DDS_CSL_USTest_Connector_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_CSL_USTest_Sender_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_CSL_USTest_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_CSL_USTest_Sender_lem_gen) : ciaoidldefaults {
   after += DDS_CSL_USTest_Sender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
@@ -109,7 +109,7 @@ project(DDS_CSL_USTest_Sender_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_CSL_USTest_Sender_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_CSL_USTest_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      += DDS_CSL_USTest_Base_stub  DDS_CSL_USTest_Sender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_CSL_USTest_Connector_stub DDS_CSL_USTest_Connector_svnt DDS_CSL_USTest_Connector_lem_stub
   sharedname  = Sender_svnt
   libs       += Sender_stub Sender_lem_stub  \
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp
index d16f7c1e436..88c136904ed 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.cpp
@@ -13,44 +13,11 @@
 namespace CIAO_CSL_USTest_Sender_Impl
 {
   //============================================================
-  // pulse_Generator
+  // Facet Executor Implementation Class: ConnectorStatusListener_exec_i
   //============================================================
-  pulse_Generator::pulse_Generator (Sender_exec_i &callback)
-    : pulse_callback_ (callback)
-  {
-  }
-
-  int
-  pulse_Generator::handle_timeout (const ACE_Time_Value &, const void *)
-  {
-    // Notify the subscribers
-    this->pulse_callback_.tick ();
-    return 0;
-  }
-
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (Atomic_Boolean &subscription_matched_received,
-                                                                  Atomic_Boolean &publication_matched_received,
-                                                                  Atomic_Boolean &liveliness_changed_received,
-                                                                  Atomic_Boolean &liveliness_lost_received,
-                                                                  Atomic_Boolean &reliable_dr_activity_changed_received,
-                                                                  Atomic_ThreadId &thread_id_subcription_matched,
-                                                                  Atomic_ThreadId &thread_id_publication_matched,
-                                                                  Atomic_ThreadId &thread_id_liveliness_changed,
-                                                                  Atomic_ThreadId &thread_id_liveliness_lost,
-                                                                  Atomic_ThreadId &thread_id_reliable_dr_activity_changed)
-   : subscription_matched_received_ (subscription_matched_received),
-     publication_matched_received_ (publication_matched_received),
-     liveliness_changed_received_ (liveliness_changed_received),
-     liveliness_lost_received_ (liveliness_lost_received),
-     reliable_dr_activity_changed_received_ (reliable_dr_activity_changed_received),
-     thread_id_subcription_matched_ (thread_id_subcription_matched),
-     thread_id_publication_matched_ (thread_id_publication_matched),
-     thread_id_liveliness_changed_ (thread_id_liveliness_changed),
-     thread_id_liveliness_lost_ (thread_id_liveliness_lost),
-     thread_id_reliable_dr_activity_changed_ (thread_id_reliable_dr_activity_changed)
+  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (Atomic_Boolean &unexpected_matched, Atomic_Boolean &unexpected_liveliness)
+   : unexpected_matched_ (unexpected_matched),
+     unexpected_liveliness_ (unexpected_liveliness)
   {
   }
 
@@ -59,84 +26,53 @@ namespace CIAO_CSL_USTest_Sender_Impl
   }
 
   // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic (
+  void ConnectorStatusListener_exec_i::on_inconsistent_topic(
      ::DDS::Topic_ptr /*the_topic*/,
      const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
+    {
+    }
 
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
+  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos(
     ::DDS::DataReader_ptr /*the_reader*/,
-     const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
+     const DDS::RequestedIncompatibleQosStatus & /*status*/)  {
+    }
 
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
+  void ConnectorStatusListener_exec_i::on_sample_rejected(
      ::DDS::DataReader_ptr /*the_reader*/,
-     const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
+     const DDS::SampleRejectedStatus & /*status*/)  {
+    }
 
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed (
+  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
      ::DDS::DataWriter_ptr /*the_writer*/,
-     const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
+     const DDS::OfferedDeadlineMissedStatus & /*status*/)  {
+    }
 
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos (
+  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
      ::DDS::DataWriter_ptr /*the_writer*/,
-     const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
+     const DDS::OfferedIncompatibleQosStatus & /*status*/)  {
+    }
 
-  void ConnectorStatusListener_exec_i::on_unexpected_status (
+  void ConnectorStatusListener_exec_i::on_unexpected_status(
     ::DDS::Entity_ptr the_entity,
-    ::DDS::StatusKind status_kind)
-  {
-    ACE_DEBUG ((LM_DEBUG, "SENDER\t\tConnectorStatusListener_exec_i::on_unexpected_status: "
-                          "received <%C>\n",
-                          CIAO::DDS4CCM::translate_statuskind (status_kind)));
-
-    if (!CORBA::is_nil (the_entity) && status_kind == DDS::SUBSCRIPTION_MATCHED_STATUS)
-      {
-        this->subscription_matched_received_ = true;
-        this->thread_id_subcription_matched_ = ACE_Thread::self ();
-      }
-    else if (!CORBA::is_nil(the_entity) && status_kind == DDS::LIVELINESS_CHANGED_STATUS)
-      {
-        this->liveliness_changed_received_ = true;
-        this->thread_id_liveliness_changed_ = ACE_Thread::self ();
-      }
-    else if (!CORBA::is_nil(the_entity) && status_kind == DDS::LIVELINESS_LOST_STATUS)
+    ::DDS::StatusKind  status_kind)  {
+      CORBA::ULong kind = status_kind;
+      if((!CORBA::is_nil(the_entity)) && (kind==DDS::PUBLICATION_MATCHED_STATUS))
       {
-        this->liveliness_lost_received_ = true;
-        this->thread_id_liveliness_lost_ = ACE_Thread::self ();
+        this->unexpected_matched_ = true;
       }
-    else if (!CORBA::is_nil(the_entity) && status_kind == DDS::PUBLICATION_MATCHED_STATUS)
+      if((!CORBA::is_nil(the_entity)) && (kind==DDS::LIVELINESS_CHANGED_STATUS))
       {
-        this->publication_matched_received_ = true;
-        this->thread_id_publication_matched_ = ACE_Thread::self ();
+        this->unexpected_liveliness_ = true;
       }
-    else if (!CORBA::is_nil(the_entity) && status_kind == DDS::RELIABLE_READER_ACTIVITY_CHANGED_STATUS)
-      {
-        this->reliable_dr_activity_changed_received_ = true;
-        this->thread_id_reliable_dr_activity_changed_ = ACE_Thread::self ();
-      }
-  }
-
+    }
   //============================================================
-  // Sender_exec_i
+  // Component Executor Implementation Class: Sender_exec_i
   //============================================================
+
   Sender_exec_i::Sender_exec_i (void)
-    : subscription_matched_received_ (false),
-      publication_matched_received_ (false),
-      liveliness_changed_received_ (false),
-      liveliness_lost_received_ (false),
-      thread_id_listener_subscription_matched_ (0),
-      thread_id_listener_publication_matched_ (0),
-      thread_id_listener_liveliness_lost_ (0)
+    : unexpected_matched_ (false),
+      unexpected_liveliness_ (false)
   {
-    this->ticker_ = new pulse_Generator (*this);
   }
 
   Sender_exec_i::~Sender_exec_i (void)
@@ -146,55 +82,7 @@ namespace CIAO_CSL_USTest_Sender_Impl
   ::CCM_DDS::CCM_ConnectorStatusListener_ptr
   Sender_exec_i::get_test_topic_connector_status (void)
   {
-    return new ConnectorStatusListener_exec_i (this->subscription_matched_received_,
-                                               this->publication_matched_received_,
-                                               this->liveliness_changed_received_,
-                                               this->liveliness_lost_received_,
-                                               this->reliable_dr_activity_changed_received_,
-                                               this->thread_id_listener_subscription_matched_,
-                                               this->thread_id_listener_publication_matched_,
-                                               this->thread_id_listener_liveliness_changed_,
-                                               this->thread_id_listener_liveliness_lost_,
-                                               this->thread_id_reliable_dr_activity_changed_);
-  }
-
-  // Supported operations and attributes.
-  void
-  Sender_exec_i::tick ()
-  {
-    for (CSL_SRTest_Table::iterator i = this->_ktests_.begin ();
-         i != this->_ktests_.end ();
-         ++i)
-      {
-        try
-          {
-            if (!CORBA::is_nil (this->writer_))
-              {
-                this->writer_->write_one(i->second,::DDS::HANDLE_NIL);
-                ACE_DEBUG ((LM_DEBUG, "Written sample: <%C> - <%d>\n",
-                  i->first.c_str (),
-                  i->second->x));
-                i->second->x++;
-              }
-            else ACE_ERROR ((LM_ERROR, "Unable to write sample: <%C> - <%d>\n",
-                                        i->first.c_str (),
-                                        i->second->x));
-          }
-        catch (const CCM_DDS::InternalError& )
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while creating topic for <%C>.\n"),
-                    i->first.c_str ()));
-          }
-     }
-  }
-
-  void
-  Sender_exec_i::add_instance_of_topic (const char * key, int x)
-  {
-    TestTopic *new_key = new TestTopic;
-    new_key->key = CORBA::string_dup(key);
-    new_key->x = x;
-    this->_ktests_[key] = new_key;
+    return new ConnectorStatusListener_exec_i (this->unexpected_matched_,this->unexpected_liveliness_);
   }
 
   // Supported operations and attributes.
@@ -203,7 +91,7 @@ namespace CIAO_CSL_USTest_Sender_Impl
   {
     this->context_ = ::CSL_USTest::CCM_Sender_Context::_narrow (ctx);
 
-    if (::CORBA::is_nil (this->context_.in ()))
+    if ( ::CORBA::is_nil (this->context_.in ()))
       {
         throw ::CORBA::INTERNAL ();
       }
@@ -216,326 +104,41 @@ namespace CIAO_CSL_USTest_Sender_Impl
   }
 
   void
+  Sender_exec_i::add_instance_of_topic (const char * key, int x)
+  {
+    TestTopic *new_key = new TestTopic;
+    new_key->key = CORBA::string_dup(key);
+    new_key->x = x;
+    this->_ktests_[key] = new_key;
+  }
+  void
   Sender_exec_i::ccm_activate (void)
   {
     //add 2 different instances of topic
-    this->add_instance_of_topic ("ONE", 1);
-    this->add_instance_of_topic ("TWO", 2);
-    // calculate the interval time
-    if (this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->schedule_timer (
-                this->ticker_,
-                0,
-                ACE_Time_Value (3, 0),
-                ACE_Time_Value (1, 0)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
-                              ACE_TEXT ("Error scheduling timer\n")));
-      }
-  }
+    this->add_instance_of_topic ("ONE",1);
+    this->add_instance_of_topic ("TWO",2);
+ }
 
   void
   Sender_exec_i::ccm_passivate (void)
   {
-    this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->cancel_timer (this->ticker_);
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n")));
-    delete this->ticker_;
   }
 
   void
   Sender_exec_i::ccm_remove (void)
   {
-    if (!this->subscription_matched_received_.value ())
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("SENDER ERROR: Didn't receive the expected ")
-                              ACE_TEXT ("'SUBSCRIPTION_MATCHED_STATUS'\n")
-                    ));
-      }
-    else
-      {
-         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("SENDER OK: Received the expected ")
-                               ACE_TEXT ("'SUBSCRIPTION_MATCHED_STATUS'\n")
-                    ));
-      }
-    if (!this->publication_matched_received_.value ())
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("SENDER ERROR: Didn't receive the expected ")
-                              ACE_TEXT ("'PUBLICATION_MATCHED_STATUS'\n")
-                    ));
-      }
-    else
-      {
-         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("SENDER OK: Received the expected ")
-                               ACE_TEXT ("'PUBLICATION_MATCHED_STATUS'\n")
-                    ));
-      }
-    if (!this->liveliness_changed_received_.value ())
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("SENDER ERROR: Didn't receive the expected ")
-                              ACE_TEXT ("'LIVELINESS_CHANGED_STATUS'\n")
-                    ));
-      }
-    else
-      {
-         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("SENDER OK: Received the expected ")
-                               ACE_TEXT ("'LIVELINESS_CHANGED_STATUS'\n")
-                    ));
-      }
-    if (!this->liveliness_lost_received_.value ())
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("SENDER ERROR: Didn't receive the expected ")
-                              ACE_TEXT ("'LIVELINESS_LOST_STATUS'\n")
-                    ));
-      }
-    else
+    if(!this->unexpected_matched_.value () || !this->unexpected_liveliness_.value ())
       {
-         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("SENDER OK: Received the expected ")
-                               ACE_TEXT ("'LIVELINESS_LOST_STATUS'\n")
-                    ));
-      }
-    if (!this->reliable_dr_activity_changed_received_.value ())
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("SENDER ERROR: Didn't receive the expected ")
-                              ACE_TEXT ("'RELIABLE_READER_ACTIVITY_CHANGED_STATUS'\n")
+        ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: did not receive the expected ")
+                               ACE_TEXT ("states 'PUBLICATION_MATCHED_STATUS and/or LIVELINESS_CHANGED_STATUS' in Sender\n")
                     ));
       }
     else
       {
-         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("SENDER OK: Received the expected ")
-                               ACE_TEXT ("'RELIABLE_READER_ACTIVITY_CHANGED_STATUS'\n")
+        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Received the expected ")
+                               ACE_TEXT ("'LIVELINESS_CHANGED_STATUS' and 'PUBLICATION_MATCHED_STATUS' in Sender\n")
                     ));
       }
-
-    //test thread switch for SUBSCRIPTION_MATCHED_STATUS
-    if (this->thread_id_listener_subscription_matched_.value () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: "
-                              "Thread ID for 'SUBSCRIPTION_MATCHED_STATUS' not set!\n"));
-      }
-    #if defined (CIAO_DDS4CCM_CONTEXT_SWITCH) && (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (ACE_OS::thr_equal (this->thread_id_listener_subscription_matched_.value (),
-                                ACE_Thread::self ()))
-      {
-        ACE_DEBUG ((LM_DEBUG, "SENDER OK: "
-                              "Thread switch for 'SUBSCRIPTION_MATCHED_STATUS' seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_subscription_matched_.value (),
-                              ACE_Thread::self ()));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: "
-                              "Thread switch for 'SUBSCRIPTION_MATCHED_STATUS' "
-                              "doesn't seem to work! "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_subscription_matched_.value (),
-                              ACE_Thread::self ()));
-      }
-    #else
-    else if (ACE_OS::thr_equal (this->thread_id_listener_subscription_matched_.value (),
-                                ACE_Thread::self ()))
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: 'SUBSCRIPTION_MATCHED_STATUS': "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_subscription_matched_.value (),
-                              ACE_Thread::self ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "SENDER OK: 'SUBSCRIPTION_MATCHED_STATUS': "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_subscription_matched_.value (),
-                              ACE_Thread::self ()));
-      }
-    #endif
-
-    //test thread switch for PUBLICATION_MATCHED_STATUS
-    if (this->thread_id_listener_publication_matched_.value () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: "
-                              "Thread ID for 'PUBLICATION_MATCHED_STATUS' not set!\n"));
-      }
-    #if defined (CIAO_DDS4CCM_CONTEXT_SWITCH) && (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (ACE_OS::thr_equal (this->thread_id_listener_publication_matched_.value (),
-                                ACE_Thread::self ()))
-      {
-        ACE_DEBUG ((LM_DEBUG, "SENDER OK: "
-                              "Thread switch for 'PUBLICATION_MATCHED_STATUS' seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_publication_matched_.value (),
-                              ACE_Thread::self ()));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: "
-                              "Thread switch for 'PUBLICATION_MATCHED_STATUS' "
-                              "doesn't seem to work! "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_publication_matched_.value (),
-                              ACE_Thread::self ()));
-      }
-    #else
-    else if (ACE_OS::thr_equal (this->thread_id_listener_publication_matched_.value (),
-                                ACE_Thread::self ()))
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: 'PUBLICATION_MATCHED_STATUS': "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_publication_matched_.value (),
-                              ACE_Thread::self ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "SENDER OK: 'PUBLICATION_MATCHED_STATUS': "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_publication_matched_.value (),
-                              ACE_Thread::self ()));
-      }
-    #endif
-
-    //test thread switch for LIVELINESS_CHANGED_STATUS
-    if (this->thread_id_listener_liveliness_changed_.value () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: "
-                              "Thread ID for 'LIVELINESS_CHANGED_STATUS' not set!\n"));
-      }
-    #if defined (CIAO_DDS4CCM_CONTEXT_SWITCH) && (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (ACE_OS::thr_equal (this->thread_id_listener_liveliness_changed_.value (),
-                                ACE_Thread::self ()))
-      {
-        ACE_DEBUG ((LM_DEBUG, "SENDER OK: "
-                              "Thread switch for 'LIVELINESS_CHANGED_STATUS' seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_liveliness_changed_.value (),
-                              ACE_Thread::self ()));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: "
-                              "Thread switch for 'LIVELINESS_CHANGED_STATUS' "
-                              "doesn't seem to work! "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_liveliness_changed_.value (),
-                              ACE_Thread::self ()));
-      }
-    #else
-    else if (ACE_OS::thr_equal (this->thread_id_listener_liveliness_changed_.value (),
-                                ACE_Thread::self ()))
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: 'LIVELINESS_CHANGED_STATUS': "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_liveliness_changed_.value (),
-                              ACE_Thread::self ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "SENDER OK: 'LIVELINESS_CHANGED_STATUS': "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_liveliness_changed_.value (),
-                              ACE_Thread::self ()));
-      }
-    #endif
-
-    //test thread switch for LIVELINESS_LOST_STATUS
-    if (this->thread_id_listener_liveliness_lost_.value () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: "
-                              "Thread ID for 'LIVELINESS_LOST_STATUS' not set!\n"));
-      }
-    #if defined (CIAO_DDS4CCM_CONTEXT_SWITCH) && (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (ACE_OS::thr_equal (this->thread_id_listener_liveliness_lost_.value (),
-                                ACE_Thread::self ()))
-      {
-        ACE_DEBUG ((LM_DEBUG, "SENDER OK: "
-                              "Thread switch for 'LIVELINESS_LOST_STATUS' seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_liveliness_lost_.value (),
-                              ACE_Thread::self ()));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: "
-                              "Thread switch for 'LIVELINESS_LOST_STATUS' "
-                              "doesn't seem to work! "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_liveliness_lost_.value (),
-                              ACE_Thread::self ()));
-      }
-    #else
-    else if (ACE_OS::thr_equal (this->thread_id_listener_liveliness_lost_.value (),
-                                ACE_Thread::self ()))
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: 'LIVELINESS_LOST_STATUS': "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_liveliness_lost_.value (),
-                              ACE_Thread::self ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "SENDER OK: 'LIVELINESS_LOST_STATUS': "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_liveliness_lost_.value (),
-                              ACE_Thread::self ()));
-      }
-    #endif
-
-/*
-    //test thread switch for RELIABLE_READER_ACTIVITY_CHANGED_STATUS
-    if (this->thread_id_reliable_dr_activity_changed_.value () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: "
-                              "Thread ID for 'RELIABLE_READER_ACTIVITY_CHANGED_STATUS' not set!\n"));
-      }
-    #if defined (CIAO_DDS4CCM_CONTEXT_SWITCH) && (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (ACE_OS::thr_equal (this->thread_id_reliable_dr_activity_changed_.value (),
-                                ACE_Thread::self ()))
-      {
-        ACE_DEBUG ((LM_DEBUG, "SENDER OK: "
-                              "Thread switch for 'RELIABLE_READER_ACTIVITY_CHANGED_STATUS' seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_reliable_dr_activity_changed_.value (),
-                              ACE_Thread::self ()));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: "
-                              "Thread switch for 'RELIABLE_READER_ACTIVITY_CHANGED_STATUS' "
-                              "doesn't seem to work! "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_reliable_dr_activity_changed_.value (),
-                              ACE_Thread::self ()));
-      }
-    #else
-    else if (ACE_OS::thr_equal (this->thread_id_listener_liveliness_lost_.value (),
-                                ACE_Thread::self ()))
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: 'RELIABLE_READER_ACTIVITY_CHANGED_STATUS': "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_reliable_dr_activity_changed_.value (),
-                              ACE_Thread::self ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "SENDER OK: 'RELIABLE_READER_ACTIVITY_CHANGED_STATUS': "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_reliable_dr_activity_changed_.value (),
-                              ACE_Thread::self ()));
-      }
-    #endif
-*/
   }
 
   extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h
index 0ad029002ee..7f239db4006 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/Sender/CSL_USTest_Sender_exec.h
@@ -20,76 +20,40 @@
 namespace CIAO_CSL_USTest_Sender_Impl
 {
   typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, ACE_thread_t> Atomic_ThreadId;
 
   class Sender_exec_i;
 
-  //============================================================
-  // pulse_Generator
-  //============================================================
-  class pulse_Generator :
-    public ACE_Event_Handler
-  {
-  public:
-    pulse_Generator (Sender_exec_i &callback);
-
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
-  private:
-    Sender_exec_i &pulse_callback_;
-  };
 
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  class SENDER_EXEC_Export ConnectorStatusListener_exec_i
+class SENDER_EXEC_Export ConnectorStatusListener_exec_i
     : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
       public virtual ::CORBA::LocalObject
   {
   public:
-    ConnectorStatusListener_exec_i (Atomic_Boolean &,
-                                    Atomic_Boolean &,
-                                    Atomic_Boolean &,
-                                    Atomic_Boolean &,
-                                    Atomic_Boolean &,
-                                    Atomic_ThreadId &,
-                                    Atomic_ThreadId &,
-                                    Atomic_ThreadId &,
-                                    Atomic_ThreadId &,
-                                    Atomic_ThreadId &);
-
-    virtual ~ConnectorStatusListener_exec_i (void);
-
+    ConnectorStatusListener_exec_i (Atomic_Boolean &,Atomic_Boolean &);
+   virtual ~ConnectorStatusListener_exec_i (void);
+    
     virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
+    void on_inconsistent_topic( ::DDS::Topic_ptr the_topic, 
                                 const DDS::InconsistentTopicStatus & status);
     virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
+    void on_requested_incompatible_qos( ::DDS::DataReader_ptr the_reader,
                                         const DDS::RequestedIncompatibleQosStatus & status);
     virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
+    void on_sample_rejected( ::DDS::DataReader_ptr the_reader, 
                              const DDS::SampleRejectedStatus & status);
     virtual
-    void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
+    void on_offered_deadline_missed( ::DDS::DataWriter_ptr the_writer,
                                      const DDS::OfferedDeadlineMissedStatus & status);
     virtual
     void on_offered_incompatible_qos( ::DDS::DataWriter_ptr the_writer, 
                                       const DDS::OfferedIncompatibleQosStatus & status);
     virtual
     void on_unexpected_status( ::DDS::Entity_ptr the_entity,
-                               ::DDS::StatusKind  status_kind);
-
-  private:
-    Atomic_Boolean &subscription_matched_received_;
-    Atomic_Boolean &publication_matched_received_;
-    Atomic_Boolean &liveliness_changed_received_;
-    Atomic_Boolean &liveliness_lost_received_;
-    Atomic_Boolean &reliable_dr_activity_changed_received_;
-    Atomic_ThreadId &thread_id_subcription_matched_;
-    Atomic_ThreadId &thread_id_publication_matched_;
-    Atomic_ThreadId &thread_id_liveliness_changed_;
-    Atomic_ThreadId &thread_id_liveliness_lost_;
-    Atomic_ThreadId &thread_id_reliable_dr_activity_changed_;
+       ::DDS::StatusKind  status_kind);
+     private:
+    Atomic_Boolean &unexpected_matched_;
+    Atomic_Boolean &unexpected_liveliness_;
+  
   };
 
   class Sender_exec_i
@@ -99,6 +63,8 @@ namespace CIAO_CSL_USTest_Sender_Impl
   public:
     Sender_exec_i (void);
     virtual ~Sender_exec_i (void);
+    virtual void add_instance_of_topic (const char *, int x );
+    void tick (void);
 
     virtual void set_session_context (::Components::SessionContext_ptr ctx);
     virtual void configuration_complete (void);
@@ -106,34 +72,21 @@ namespace CIAO_CSL_USTest_Sender_Impl
     virtual void ccm_passivate (void);
     virtual void ccm_remove (void);
 
-    void tick (void);
-
     // Port operations.
     virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_test_topic_connector_status (void);
+      get_test_topic_connector_status(void);
 
   private:
-    ::CSL_USTest::CCM_Sender_Context_var context_;
-    ::CSL_USTest::TestTopicConn::Writer_var writer_;
-
-    Atomic_Boolean subscription_matched_received_;
-    Atomic_Boolean publication_matched_received_;
-    Atomic_Boolean liveliness_changed_received_;
-    Atomic_Boolean liveliness_lost_received_;
-    Atomic_Boolean reliable_dr_activity_changed_received_;
-    Atomic_ThreadId thread_id_listener_subscription_matched_;
-    Atomic_ThreadId thread_id_listener_publication_matched_;
-    Atomic_ThreadId thread_id_listener_liveliness_changed_;
-    Atomic_ThreadId thread_id_listener_liveliness_lost_;
-    Atomic_ThreadId thread_id_reliable_dr_activity_changed_;
-
-    pulse_Generator * ticker_;
+    CCM_DDS::TestTopic::Writer_var writer_;
 
+    ::CSL_USTest::CCM_Sender_Context_var context_;
+ 
+    Atomic_Boolean unexpected_matched_;
+    Atomic_Boolean unexpected_liveliness_;
+    
     TAO_SYNCH_MUTEX mutex_;
-    typedef std::map<ACE_CString, TestTopic_var> CSL_SRTest_Table;
-    CSL_SRTest_Table _ktests_;
-
-    void add_instance_of_topic (const char *, int x);
+    typedef std::map<ACE_CString, TestTopic_var> CSL_USTest_Table;
+    CSL_USTest_Table _ktests_;
  };
 
   extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/Plan.cdp
index 83306d7eb0c..48b2aa22d5e 100644
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/Plan.cdp
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/Plan.cdp
@@ -177,17 +177,6 @@
     <source/>
     <implementation xmi:idref="CSL_USTest_ConnectorComponentImplementation" />
     <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CSL_Library#CSL_Profile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
       <name>topic_name</name>
       <value>
         <type>
@@ -206,17 +195,6 @@
     <source/>
     <implementation xmi:idref="CSL_USTest_ConnectorComponentImplementation" />
     <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>CSL_Library#CSL_Profile</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
       <name>topic_name</name>
       <value>
         <type>
@@ -275,6 +253,25 @@
     </internalEndpoint>
   </connection>
   <connection>
+    <name>_portstatuslistener</name>
+    <deployRequirement>
+      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
+      <resourceType>Local_Interface</resourceType>
+    </deployRequirement>
+    <internalEndpoint>
+      <portName>info_out_status</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="ReceiverComponentInstance" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>push_consumer_status</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="CSL_USTest_ConnectorComponentInstance2" />
+    </internalEndpoint>
+  </connection>
+  <connection>
     <name>_listener</name>
     <deployRequirement>
       <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
@@ -351,26 +348,6 @@
     </internalEndpoint>
   </connection>
 
-  <connection>
-    <name>info_read_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_read_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_consumer_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="CSL_USTest_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
 
   <artifact xmi:id="Sender_ExecArtifact">
     <name>Sender_exec</name>
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/USER_QOS_PROFILES.xml b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/USER_QOS_PROFILES.xml
deleted file mode 100644
index 72769833b96..00000000000
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/USER_QOS_PROFILES.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-
-Description
-XML QoS Profile 
-
-The QoS configuration of the DDS entities in the generated example is 
-loaded from this file.
-
-This file is used only when it is in the current working directory
-or when the enviroment variable
-NDDS_QOS_PROFILES is defined and points to this file.
-
-For more information about XML QoS Profiles see Chapter 15 in the 
-RTI Data Distribution Service user manual.
--->
-<dds xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="c:/ndds/ndds.4.4d/scripts/../resource/rtiddsgen/../qos_profiles_4.4d/schema/rti_dds_qos_profiles.xsd" version="4.4d">
-  <!-- QoS Library containing the QoS profile used in the generated example.
-
-        A QoS library is a named set of QoS profiles.
-    -->
-  <qos_library name="CSL_Library">
-    <!-- QoS profile used to configure reliable communication between the DataWriter 
-             and DataReader created in the example code.
-
-             A QoS profile groups a set of related QoS.
-        -->
-    <qos_profile name="CSL_Profile" is_default_qos="true">
-      <!-- QoS used to configure the data writer created in the example code -->
-      <datawriter_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <durability>
-          <kind>TRANSIENT_DURABILITY_QOS</kind>
-        </durability>
-        <history>
-          <kind>KEEP_LAST_HISTORY_QOS</kind>
-          <depth>200</depth>
-        </history>
-        <protocol>
-          <rtps_reliable_writer>
-            <max_heartbeat_retries>1</max_heartbeat_retries>
-          </rtps_reliable_writer>
-        </protocol>
-        <liveliness>
-          <kind>DDS_MANUAL_BY_TOPIC_LIVELINESS_QOS</kind>
-          <lease_duration>
-            <sec>1</sec>
-            <nanosec>0</nanosec>
-          </lease_duration>
-        </liveliness>
-      </datawriter_qos>
-      <!-- QoS used to configure the data reader created in the example code -->
-      <datareader_qos>
-        <reliability>
-          <kind>RELIABLE_RELIABILITY_QOS</kind>
-        </reliability>
-        <history>
-          <kind>KEEP_LAST_HISTORY_QOS</kind>
-          <depth>20</depth>
-        </history>
-        <durability>
-          <kind>TRANSIENT_LOCAL_DURABILITY_QOS</kind>
-        </durability>
-      </datareader_qos>
-    </qos_profile>
-  </qos_library>
-</dds>
\ No newline at end of file
diff --git a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl
index edfa27e2a1f..dc0c34941c6 100755
--- a/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/CSLUnexpStat/descriptors/run_test.pl
@@ -100,8 +100,6 @@ sub kill_open_processes {
     if ($ns_running == 1) {
         $NS->Kill (); $NS->TimedWait (1);
     }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
 }
 
 sub run_node_daemons {
@@ -218,8 +216,8 @@ for ($i = 0; $i < $nr_daemon; ++$i) {
     }
 }
 
-print "Sleeping 20 seconds to allow task to complete\n";
-sleep (20);
+print "Sleeping 10 seconds to allow task to complete\n";
+sleep (10);
 
 # Invoke executor - stop the application -.
 print "Invoking executor - stop the application -\n";
diff --git a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.idl b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.idl
index db4905ab610..a824bb09c00 100644
--- a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.idl
@@ -8,8 +8,6 @@
 #ifndef WRITER_BASE_IDL
 #define WRITER_BASE_IDL
 
-#pragma ndds typesupport "Base/Writer_BaseSupport.h"
-
 struct WriterTest {
   string key; //@key
   long iteration;
diff --git a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.mpc b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.mpc
index 7c554de57f6..bcc6d0008c1 100644
--- a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Base/Writer_Base.mpc
@@ -1,25 +1,76 @@
 // $Id$
+// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n Writer_Base"
 
-project (DDS_DDSWriterEntityBase_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
-  sharedname = DDS_DDSWriterEntityBase_stub
-  dynamicflags += WRITER_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Gxhst -Sci \
+project(DDS_DDSWriterEntityBase_idl_gen) : taoidldefaults, anytypecode {
+  custom_only = 1
+  idlflags -= -St -Sa
+  idlflags += -SS -Gxhst \
               -Wb,stub_export_macro=WRITER_BASE_STUB_Export \
               -Wb,stub_export_include=Writer_Base_stub_export.h
 
   IDL_Files {
     Writer_Base.idl
   }
+}
 
-  opendds_ts_flags += --export=WRITER_BASE_STUB_Export
+project(DDS_DDSWriterEntityBase_ndds_ts_gen) : ndds_ts_defaults {
+  custom_only = 1
+  after += DDS_DDSWriterEntityBase_idl_gen
 
-  DDSGenerator_Files {
+  NDDSTypeSupport_Files {
     Writer_Base.idl
   }
+}
+
+project(DDS_DDSWriterEntityBase_NDDS_TS) : nddslib, taolib {
+  after += DDS_DDSWriterEntityBase_ndds_ts_gen DDS_DDSWriterEntityBase_stub
+  libs += DDS_DDSWriterEntityBase_stub
+  libout = ../lib
+  libpaths    += ../lib
+  sharedname = DDS_DDSWriterEntityBase_NDDS_TS
+  dynamicflags = NDDS_USER_DLL_EXPORT
+
+  verbatim(gnuace, macros) {
+    override no_hidden_visibility = 1
+  }
 
   Source_Files {
+    Writer_Base.cxx
+    Writer_BasePlugin.cxx
+    Writer_BaseSupport.cxx
+  }
+
+  Header_Files {
+    Writer_Base.h
+    Writer_BasePlugin.h
+    Writer_BaseSupport.h
+  }
+
+  Inline_Files {
+  }
+}
+
+project(DDS_DDSWriterEntityBase_stub) : ccm_stub {
+  after += DDS_DDSWriterEntityBase_idl_gen
+  libout = ../lib
+  libpaths += ../lib
+  sharedname = DDS_DDSWriterEntityBase_stub
+  dynamicflags = WRITER_BASE_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    Writer_BaseC.cpp
+  }
+
+  Header_Files {
+    Writer_BaseC.h
+    Writer_Base_stub_export.h
+  }
+
+  Inline_Files {
+    Writer_BaseC.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.mpc b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.mpc
index 36d588708cb..c8fed4a0dc9 100644
--- a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_DDSWriterEntityBase -l .. -o ../lib -u DDS Writer_Connector"
 
-project(DDS_DDSWriterEntityConnector_idl_gen) : connectoridldefaults, dds4ccm {
+project(DDS_DDSWriterEntityConnector_idl_gen) : connectoridldefaults {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=WRITER_CONNECTOR_STUB_Export \
@@ -10,8 +10,8 @@ project(DDS_DDSWriterEntityConnector_idl_gen) : connectoridldefaults, dds4ccm {
               -Wb,skel_export_include=Writer_Connector_svnt_export.h \
               -Wb,svnt_export_macro=WRITER_CONNECTOR_SVNT_Export \
               -Wb,svnt_export_include=Writer_Connector_svnt_export.h \
-              -Wb,conn_export_macro=WRITER_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Writer_Connector_conn_export.h \
+              -Wb,exec_export_macro=WRITER_CONNECTOR_EXEC_Export \
+              -Wb,exec_export_include=Writer_Connector_exec_export.h \
               -I ..
 
   IDL_Files {
@@ -19,7 +19,7 @@ project(DDS_DDSWriterEntityConnector_idl_gen) : connectoridldefaults, dds4ccm {
   }
 }
 
-project(DDS_DDSWriterEntityConnector_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_DDSWriterEntityConnector_lem_gen) : ciaoidldefaults {
   custom_only = 1
   after += DDS_DDSWriterEntityConnector_idl_gen
   idlflags += -Wb,stub_export_macro=WRITER_CONNECTOR_LEM_STUB_Export \
@@ -85,24 +85,24 @@ project(DDS_DDSWriterEntityConnector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_DDSWriterEntityConnector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_DDSWriterEntityConnector_lem_stub DDS_DDSWriterEntityConnector_stub DDS4CCM_lem_stub
+  after   += DDS_DDSWriterEntityConnector_lem_stub DDS_DDSWriterEntityConnector_stub DDS4CCM_lem_stub DDS_DDSWriterEntityBase_NDDS_TS
   sharedname = DDS_DDSWriterEntityConnector_exec
-  libs += DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityConnector_lem_stub DDS_DDSWriterEntityBase_stub DDS4CCM_lem_stub
+  libs += DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityConnector_lem_stub DDS_DDSWriterEntityBase_stub DDS4CCM_lem_stub DDS_DDSWriterEntityBase_NDDS_TS
   libpaths += ../lib
   libout = ../lib
   includes += ..
-  dynamicflags   = WRITER_CONNECTOR_CONN_BUILD_DLL
+  dynamicflags   = WRITER_CONNECTOR_EXEC_BUILD_DLL
 
   IDL_Files {
   }
 
   Source_Files {
-    Writer_Connector_conn.cpp
+    Writer_Connector_exec.cpp
   }
 
   Header_Files {
-    Writer_Connector_conn.h
-    Writer_Connector_conn_export.h
+    Writer_Connector_exec.h
+    Writer_Connector_exec_export.h
   }
 
   Inline_Files {
diff --git a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector_exec.cpp b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector_exec.cpp
new file mode 100644
index 00000000000..81585b43a78
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector_exec.cpp
@@ -0,0 +1,30 @@
+// -*- C++ -*-
+// $Id$
+
+#include "Writer_Connector_exec.h"
+
+namespace CIAO_Writer_Writer_Connector_Impl
+{
+  Writer_Connector_exec_i::Writer_Connector_exec_i (void)
+    : DDS_Event_Connector_T<WriterTest_DDS_Traits, WriterTest_Connector_Traits> ()
+  {
+  }
+
+  Writer_Connector_exec_i::~Writer_Connector_exec_i (void)
+  {
+  }
+
+  extern "C" WRITER_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_Writer_Writer_Connector_Impl (void)
+  {
+    ::Components::EnterpriseComponent_ptr retval =
+      ::Components::EnterpriseComponent::_nil ();
+
+    ACE_NEW_NORETURN (
+      retval,
+      Writer_Connector_exec_i ());
+
+    return retval;
+  }
+}
+
diff --git a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector_exec.h
new file mode 100644
index 00000000000..05f2d6bee47
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Connector/Writer_Connector_exec.h
@@ -0,0 +1,60 @@
+// -*- C++ -*-
+// $Id$
+
+#ifndef WRITER_CONNECTOR_EXEC_H_
+#define WRITER_CONNECTOR_EXEC_H_
+
+#include /**/ "ace/pre.h"
+
+#include "Writer_ConnectorEC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "Writer_Connector_exec_export.h"
+#include "tao/LocalObject.h"
+
+#include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
+#include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
+
+#include "Base/Writer_BaseSupport.h"
+
+namespace CIAO_Writer_Writer_Connector_Impl
+{
+  // @from use of WriterTest as a parameter
+  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+    WriterTest,
+    WriterTestSeq,
+    WriterTestTypeSupport,
+    WriterTestDataWriter,
+    WriterTestDataReader > WriterTest_DDS_Traits;
+
+  typedef CIAO::DDS4CCM::Connector_Traits <
+    ::CIAO_Writer_Writer_Connector_Impl::Writer_Connector_Exec,
+    WriterTest_Seq,
+    ::CCM_DDS::WriterTest::CCM_Writer,
+    ::CCM_DDS::WriterTest::CCM_Updater,
+    ::CCM_DDS::WriterTest::CCM_Getter,
+    ::CCM_DDS::WriterTest::CCM_Reader,
+    ::Writer::CCM_Writer_Connector_Context,
+    ::CCM_DDS::WriterTest::Listener,
+    ::CCM_DDS::WriterTest::StateListener,
+    ::CCM_DDS::ConnectorStatusListener> WriterTest_Connector_Traits;
+
+  class WRITER_CONNECTOR_EXEC_Export Writer_Connector_exec_i :
+    public DDS_Event_Connector_T <WriterTest_DDS_Traits, WriterTest_Connector_Traits>
+  {
+  public:
+    Writer_Connector_exec_i (void);
+    virtual ~Writer_Connector_exec_i (void);
+  };
+
+  extern "C" WRITER_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_Writer_Writer_Connector_Impl (void);
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
diff --git a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver.mpc
index 3645300c105..dc31dc8ca8e 100644
--- a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Receiver/Writer_Receiver.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_DDSWriterEntityReceiver_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_DDSWriterEntityReceiver_idl_gen) : componentidldefaults {
   custom_only = 1
   after += DDS_DDSWriterEntityConnector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
@@ -17,7 +17,7 @@ project(DDS_DDSWriterEntityReceiver_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_DDSWriterEntityReceiver_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_DDSWriterEntityReceiver_lem_gen) : ciaoidldefaults {
   after += DDS_DDSWriterEntityReceiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
@@ -107,7 +107,7 @@ project(DDS_DDSWriterEntityReceiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_DDSWriterEntityReceiver_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_DDSWriterEntityReceiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      +=   DDS_DDSWriterEntityReceiver_lem_stub DDS_DDSWriterEntityBase_stub DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityConnector_svnt DDS_DDSWriterEntityReceiver_exec DDS_DDSWriterEntityConnector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
   sharedname  = Receiver_svnt
   libs       += Receiver_stub Receiver_lem_stub DDS_DDSWriterEntityBase_stub DDS_DDSWriterEntityConnector_stub DDS_DDSWriterEntityConnector_svnt Receiver_exec DDS_DDSWriterEntityConnector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
diff --git a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender.mpc b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender.mpc
index 87658cd8967..b9cae6a9735 100644
--- a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_DDSWriterEntityBase -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(DDS_DDSWriterEntitySender_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_DDSWriterEntitySender_idl_gen) : componentidldefaults   {
   after += DDS_DDSWriterEntityConnector_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_DDSWriterEntitySender_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_DDSWriterEntitySender_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_DDSWriterEntitySender_lem_gen) : ciaoidldefaults {
   after += DDS_DDSWriterEntitySender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
@@ -85,14 +85,14 @@ project(DDS_DDSWriterEntitySender_stub) : ccm_stub, dds4ccm_base {
   }
 }
 
-project(DDS_DDSWriterEntitySender_exec) : ciao_executor, dds4ccm_base, dds4ccm_impl {
+project(DDS_DDSWriterEntitySender_exec) : ciao_executor, nddslib, dds4ccm_base {
   after += DDS_DDSWriterEntitySender_lem_stub DDS_DDSWriterEntitySender_stub \
            DDS_DDSWriterEntityConnector_lem_stub DDS_DDSWriterEntityConnector_stub \
-           DDS4CCM_lem_stub
+           DDS4CCM_lem_stub CIAO_DDS4CCM_NDDS_Impl
   sharedname = Sender_exec
   libs += Sender_stub Sender_lem_stub DDS_DDSWriterEntityBase_stub \
           DDS_DDSWriterEntityConnector_lem_stub DDS_DDSWriterEntityConnector_stub \
-          DDS4CCM_lem_stub
+          DDS4CCM_lem_stub CIAO_DDS4CCM_NDDS_Impl
   libpaths += ../lib
   includes += ..
   libout = ../lib
@@ -115,7 +115,7 @@ project(DDS_DDSWriterEntitySender_exec) : ciao_executor, dds4ccm_base, dds4ccm_i
 }
 
 
-project(DDS_DDSWriterEntitySender_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_DDSWriterEntitySender_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after += DDS_DDSWriterEntityBase_stub DDS_DDSWriterEntitySender_lem_stub \
            DDS4CCM_lem_stub DDS4CCM_skel DDS_DDSWriterEntityConnector_stub \
            DDS_DDSWriterEntityConnector_svnt DDS_DDSWriterEntityConnector_lem_stub
diff --git a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.cpp
index 91cee664d62..0030f85372a 100644
--- a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/Sender/Writer_Sender_exec.cpp
@@ -123,7 +123,7 @@ namespace CIAO_Writer_Sender_Impl
         if (this->last_key == this->ktests_.end ())
           {
             unregister_handles ();
-            this->stop ();
+            stop ();
           }
       }
   }
@@ -152,13 +152,9 @@ namespace CIAO_Writer_Sender_Impl
   void
   Sender_exec_i::stop (void)
   {
-    if (this->ticker_)
-      {
-        this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->cancel_timer (this->ticker_);
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n")));
-        delete this->ticker_;
-        this->ticker_ = 0;
-      }
+    this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->cancel_timer (this->ticker_);
+    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n")));
+    delete this->ticker_;
   }
 
   ::CORBA::UShort
@@ -214,8 +210,8 @@ namespace CIAO_Writer_Sender_Impl
   {
     DDS::DataWriter_var dds_dw =
       this->context_->get_connection_info_write_dds_entity ();
-    CIAO::DDS4CCM::CCM_DDS_DataWriter_i *rti_rd =
-      dynamic_cast <CIAO::DDS4CCM::CCM_DDS_DataWriter_i *> (dds_dw.in ());
+    CIAO::DDS4CCM::RTI::RTI_DataWriter_i *rti_rd =
+      dynamic_cast <CIAO::DDS4CCM::RTI::RTI_DataWriter_i *> (dds_dw.in ());
     DDSDataWriter * p = rti_rd->get_impl ();
     this->writer_ = dynamic_cast <WriterTestDataWriter *> (p);
   }
diff --git a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/descriptors/run_test.pl
index bbe2080c3ad..27ebb78087b 100755
--- a/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/DDSWriterEntity/descriptors/run_test.pl
@@ -105,8 +105,6 @@ sub kill_open_processes {
     if ($ns_running == 1) {
         $NS->Kill (); $NS->TimedWait (1);
     }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
 }
 
 sub run_node_daemons {
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.idl
index bbddf1366ce..93f149290e6 100644
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.idl
@@ -8,8 +8,6 @@
 #ifndef EVENT_CONNECTION_TEST_BASE_IDL
 #define EVENT_CONNECTION_TEST_BASE_IDL
 
-#pragma ndds typesupport "Base/Event_Connection_Test_BaseSupport.h"
-
 struct Event_ConnectionTest {
   string key; //@key
   long iteration;
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc
index b13ec18ef4a..1f7085ef55e 100644
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Base/Event_Connection_Test_Base.mpc
@@ -1,25 +1,75 @@
 // $Id$
 
-project (DDS_ECT_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
-  sharedname = DDS_ECT_Base_stub
-  dynamicflags += EVENT_CONNECTION_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Gxhst -Sci \
+project(DDS_ECT_Base_idl_gen) : taoidldefaults, anytypecode {
+  custom_only = 1
+  idlflags -= -St -Sa
+  idlflags += -SS -Gxhst \
               -Wb,stub_export_macro=EVENT_CONNECTION_TEST_BASE_STUB_Export \
               -Wb,stub_export_include=Event_Connection_Test_Base_stub_export.h
 
   IDL_Files {
     Event_Connection_Test_Base.idl
   }
+}
 
-  opendds_ts_flags += --export=EVENT_CONNECTION_TEST_BASE_STUB_Export
+project(DDS_ECT_Base_ndds_ts_gen) : ndds_ts_defaults {
+  custom_only = 1
+  after += DDS_ECT_Base_idl_gen
 
-  DDSGenerator_Files {
+  NDDSTypeSupport_Files {
     Event_Connection_Test_Base.idl
   }
+}
+
+project(DDS_ECT_Base_NDDS_TS) : nddslib, taolib {
+  after += DDS_ECT_Base_ndds_ts_gen DDS_ECT_Base_stub
+  libs += DDS_ECT_Base_stub
+  libout = ../lib
+  libpaths    += ../lib
+  sharedname = DDS_ECT_Base_NDDS_TS
+  dynamicflags = NDDS_USER_DLL_EXPORT
+
+  verbatim(gnuace, macros) {
+    override no_hidden_visibility = 1
+  }
 
   Source_Files {
+    Event_Connection_Test_Base.cxx
+    Event_Connection_Test_BasePlugin.cxx
+    Event_Connection_Test_BaseSupport.cxx
+  }
+
+  Header_Files {
+    Event_Connection_Test_Base.h
+    Event_Connection_Test_BasePlugin.h
+    Event_Connection_Test_BaseSupport.h
+  }
+
+  Inline_Files {
+  }
+}
+
+project(DDS_ECT_Base_stub) : ccm_stub {
+  after += DDS_ECT_Base_idl_gen
+  libout = ../lib
+  libpaths += ../lib
+  sharedname = DDS_ECT_Base_stub
+  dynamicflags = EVENT_CONNECTION_TEST_BASE_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    Event_Connection_Test_BaseC.cpp
+  }
+
+  Header_Files {
+    Event_Connection_Test_BaseC.h
+    Event_Connection_Test_Base_stub_export.h
+  }
+
+  Inline_Files {
+    Event_Connection_Test_BaseC.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc
index 3db8009e6ef..0b50d50242d 100644
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_ECT_Base -l .. -o ../lib -u DDS Event_Connection_Test_Connector"
 
-project(DDS_ECT_Connector_idl_gen) : connectoridldefaults, dds4ccm {
+project(DDS_ECT_Connector_idl_gen) : connectoridldefaults {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=EVENT_CONNECTION_CONNECTOR_STUB_Export \
@@ -10,8 +10,8 @@ project(DDS_ECT_Connector_idl_gen) : connectoridldefaults, dds4ccm {
               -Wb,skel_export_include=Event_Connection_Test_Connector_svnt_export.h \
               -Wb,svnt_export_macro=EVENT_CONNECTION_CONNECTOR_SVNT_Export \
               -Wb,svnt_export_include=Event_Connection_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=EVENT_CONNECTION_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Event_Connection_Test_Connector_conn_export.h \
+              -Wb,exec_export_macro=EVENT_CONNECTION_CONNECTOR_EXEC_Export \
+              -Wb,exec_export_include=Event_Connection_Test_Connector_exec_export.h \
               -I ..
 
   IDL_Files {
@@ -19,7 +19,7 @@ project(DDS_ECT_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   }
 }
 
-project(DDS_ECT_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_ECT_Connector_lem_gen) : ciaoidldefaults {
   custom_only = 1
   after += DDS_ECT_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=EVENT_CONNECTION_CONNECTOR_LEM_STUB_Export \
@@ -85,24 +85,24 @@ project(DDS_ECT_Connector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_ECT_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_ECT_Connector_lem_stub DDS_ECT_Connector_stub DDS4CCM_lem_stub
+  after   += DDS_ECT_Connector_lem_stub DDS_ECT_Connector_stub DDS4CCM_lem_stub DDS_ECT_Base_NDDS_TS
   sharedname = DDS_ECT_Connector_exec
-  libs += DDS_ECT_Connector_stub DDS_ECT_Connector_lem_stub DDS_ECT_Base_stub DDS4CCM_lem_stub
+  libs += DDS_ECT_Connector_stub DDS_ECT_Connector_lem_stub DDS_ECT_Base_stub DDS4CCM_lem_stub DDS_ECT_Base_NDDS_TS
   libpaths += ../lib
   libout = ../lib
   includes += ..
-  dynamicflags   = EVENT_CONNECTION_CONNECTOR_CONN_BUILD_DLL
+  dynamicflags   = EVENT_CONNECTION_CONNECTOR_EXEC_BUILD_DLL
 
   IDL_Files {
   }
 
   Source_Files {
-    Event_Connection_Test_Connector_conn.cpp
+    Event_Connection_Test_Connector_exec.cpp
   }
 
   Header_Files {
-    Event_Connection_Test_Connector_conn.h
-    Event_Connection_Test_Connector_conn_export.h
+    Event_Connection_Test_Connector_exec.h
+    Event_Connection_Test_Connector_exec_export.h
   }
 
   Inline_Files {
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector_exec.cpp b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector_exec.cpp
new file mode 100644
index 00000000000..0e17da08cd4
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector_exec.cpp
@@ -0,0 +1,30 @@
+// -*- C++ -*-
+// $Id$
+
+#include "Event_Connection_Test_Connector_exec.h"
+
+namespace CIAO_Event_Connection_Test_Event_Connection_Test_Connector_Impl
+{
+  Event_Connection_Test_Connector_exec_i::Event_Connection_Test_Connector_exec_i ()
+    : DDS_Event_Connector_T<Event_ConnectionTest_DDS_Traits, Event_ConnectionTest_Connector_Traits> ()
+  {
+  }
+
+  Event_Connection_Test_Connector_exec_i::~Event_Connection_Test_Connector_exec_i (void)
+  {
+  }
+
+  extern "C" EVENT_CONNECTION_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_Event_Connection_Test_Event_Connection_Test_Connector_Impl (void)
+  {
+    ::Components::EnterpriseComponent_ptr retval =
+      ::Components::EnterpriseComponent::_nil ();
+
+    ACE_NEW_NORETURN (
+      retval,
+      Event_Connection_Test_Connector_exec_i ());
+
+    return retval;
+  }
+}
+
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector_exec.h
new file mode 100644
index 00000000000..8a5081c039a
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Connector/Event_Connection_Test_Connector_exec.h
@@ -0,0 +1,61 @@
+// -*- C++ -*-
+// $Id$
+
+#ifndef EVENT_CONNECTION_TEST_CONNECTOR_EXEC_H_
+#define EVENT_CONNECTION_TEST_CONNECTOR_EXEC_H_
+
+#include /**/ "ace/pre.h"
+
+#include "Event_Connection_Test_ConnectorEC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "Event_Connection_Test_Connector_exec_export.h"
+#include "tao/LocalObject.h"
+
+#include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
+#include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
+
+#include "Base/Event_Connection_Test_BaseSupport.h"
+
+namespace CIAO_Event_Connection_Test_Event_Connection_Test_Connector_Impl
+{
+
+  // @from use of Event_ConnectionTest as a parameter
+  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+    Event_ConnectionTest,
+    Event_ConnectionTestSeq,
+    Event_ConnectionTestTypeSupport,
+    Event_ConnectionTestDataWriter,
+    Event_ConnectionTestDataReader > Event_ConnectionTest_DDS_Traits;
+
+  typedef CIAO::DDS4CCM::Connector_Traits <
+    ::CIAO_Event_Connection_Test_Event_Connection_Test_Connector_Impl::Event_Connection_Test_Connector_Exec,
+    Event_ConnectionTest_Seq,
+    ::CCM_DDS::Event_ConnectionTest::CCM_Writer,
+    ::CCM_DDS::Event_ConnectionTest::CCM_Updater,
+    ::CCM_DDS::Event_ConnectionTest::CCM_Getter,
+    ::CCM_DDS::Event_ConnectionTest::CCM_Reader,
+    ::Event_Connection_Test::CCM_Event_Connection_Test_Connector_Context,
+    ::CCM_DDS::Event_ConnectionTest::Listener,
+    ::CCM_DDS::Event_ConnectionTest::StateListener,
+    ::CCM_DDS::ConnectorStatusListener> Event_ConnectionTest_Connector_Traits;
+
+  class EVENT_CONNECTION_CONNECTOR_EXEC_Export Event_Connection_Test_Connector_exec_i :
+    public DDS_Event_Connector_T <Event_ConnectionTest_DDS_Traits, Event_ConnectionTest_Connector_Traits>
+  {
+  public:
+    Event_Connection_Test_Connector_exec_i ();
+    virtual ~Event_Connection_Test_Connector_exec_i (void);
+  };
+
+  extern "C" EVENT_CONNECTION_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_Event_Connection_Test_Event_Connection_Test_Connector_Impl (void);
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.mpc
index 977e32bfc7c..9c3d59f3b04 100644
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Receiver/Event_Connection_Test_Receiver.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_ECT_Receiver_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_ECT_Receiver_idl_gen) : componentidldefaults {
   custom_only = 1
   after += DDS_ECT_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
@@ -17,7 +17,7 @@ project(DDS_ECT_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_ECT_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_ECT_Receiver_lem_gen) : ciaoidldefaults {
   after += DDS_ECT_Receiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
@@ -107,7 +107,7 @@ project(DDS_ECT_Receiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_ECT_Receiver_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_ECT_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      +=   DDS_ECT_Receiver_lem_stub DDS_ECT_Base_stub DDS_ECT_Connector_stub DDS_ECT_Connector_svnt DDS_ECT_Receiver_exec DDS_ECT_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
   sharedname  = Receiver_svnt
   libs       += Receiver_stub Receiver_lem_stub DDS_ECT_Base_stub DDS_ECT_Connector_stub DDS_ECT_Connector_svnt Receiver_exec DDS_ECT_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.mpc
index 8258674efe6..f989d33ef69 100644
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/Sender/Event_Connection_Test_Sender.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_ECT_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(DDS_ECT_Sender_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_ECT_Sender_idl_gen) : componentidldefaults {
   after += DDS_ECT_Connector_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_ECT_Sender_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_ECT_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_ECT_Sender_lem_gen) : ciaoidldefaults {
   after += DDS_ECT_Sender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
@@ -109,7 +109,7 @@ project(DDS_ECT_Sender_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_ECT_Sender_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_ECT_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      += DDS_ECT_Base_stub  DDS_ECT_Sender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_ECT_Connector_stub DDS_ECT_Connector_svnt  DDS_ECT_Connector_lem_stub
   sharedname  = Sender_svnt
   libs       += Sender_stub Sender_lem_stub  \
diff --git a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl
index a625ecd9216..dc0c34941c6 100755
--- a/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/Event_Connection_Test/descriptors/run_test.pl
@@ -100,8 +100,6 @@ sub kill_open_processes {
     if ($ns_running == 1) {
         $NS->Kill (); $NS->TimedWait (1);
     }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
 }
 
 sub run_node_daemons {
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.idl b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.idl
deleted file mode 100644
index 3606e7a2a3b..00000000000
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.idl
+++ /dev/null
@@ -1,20 +0,0 @@
-// $Id$
-
-/**
- * @file FSS_Event_Base.idl
- * @author Marcel Smit <msmit@remedy.nl>
- */
-
-#ifndef FIXED_SIZE_STRUCT_EVENT_BASE_IDL
-#define FIXED_SIZE_STRUCT_EVENT_BASE_IDL
-
-#pragma ndds typesupport "Base/FSS_Event_BaseSupport.h"
-
-struct FixedStructSizeTest {
-  long one;
-  long two;
-};
-
-typedef sequence<FixedStructSizeTest> FixedStructSizeTest_Seq;
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.mpc b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.mpc
deleted file mode 100755
index 504f7e0d832..00000000000
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Base/FSS_Event_Base.mpc
+++ /dev/null
@@ -1,25 +0,0 @@
-// $Id$
-
-project (DDS_FSS_Event_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
-  sharedname = DDS_FSS_Event_Base_stub
-  dynamicflags += FIXED_SIZE_STRUCT_EVENT_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Gxhst -Sci \
-              -Wb,stub_export_macro=FIXED_SIZE_STRUCT_EVENT_BASE_STUB_Export \
-              -Wb,stub_export_include=FSS_Event_Base_stub_export.h
-
-  IDL_Files {
-    FSS_Event_Base.idl
-  }
-
-  opendds_ts_flags += --export=FIXED_SIZE_STRUCT_EVENT_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    FSS_Event_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.idl b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.idl
deleted file mode 100644
index 8f9420c456a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.idl
+++ /dev/null
@@ -1,26 +0,0 @@
-// $Id$
-
-/**
- * @file FSS_Event_Connector.idl
- * @author Marcel Smit <msmit@remedy.nl>
- */
-
-#ifndef FIXED_SIZE_STRUCT_EVENT_CONNECTOR_IDL_
-#define FIXED_SIZE_STRUCT_EVENT_CONNECTOR_IDL_
-
-#include  <Components.idl>
-#include "Base/FSS_Event_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
-
-#pragma ciao lem "Connector/FSS_Event_ConnectorE.idl"
-#pragma ndds typesupport "Base/FSS_Event_BaseSupport.h"
-
-module FSS_Event
-{
-  module ::CCM_DDS::Typed < ::FixedStructSizeTest, ::FixedStructSizeTest_Seq> FixedStructSizeTestConn;
-  connector FSS_Event_Connector : FixedStructSizeTestConn::DDS_Event
-  {
-  };
-};
-
-#endif /* FSS_Event_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc
deleted file mode 100755
index 0da1b2b71b0..00000000000
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/EventConnector/Connector/FSS_Event_Connector.mpc
+++ /dev/null
@@ -1,144 +0,0 @@
-// $Id$
-
-project(DDS_FSS_Event_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=FIXED_SIZE_STRUCT_EVENT_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=FSS_Event_Connector_stub_export.h \
-              -Wb,skel_export_macro=FIXED_SIZE_STRUCT_EVENT_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=FSS_Event_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=FIXED_SIZE_STRUCT_EVENT_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=FSS_Event_Connector_svnt_export.h \
-              -Wb,conn_export_macro=FIXED_SIZE_STRUCT_EVENT_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=FSS_Event_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    FSS_Event_Connector.idl
-  }
-}
-
-project(DDS_FSS_Event_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_FSS_Event_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=FIXED_SIZE_STRUCT_EVENT_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=FSS_Event_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
-
-  IDL_Files {
-    FSS_Event_ConnectorE.idl
-  }
-}
-
-project(DDS_FSS_Event_Connector_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_FSS_Event_Connector_lem_gen DDS_FSS_Event_Connector_stub DDS_FSS_Event_Base_stub DDS4CCM_lem_stub
-  libs  += DDS_FSS_Event_Base_stub DDS_FSS_Event_Connector_stub DDS4CCM_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_FSS_Event_Connector_lem_stub
-  dynamicflags   = FIXED_SIZE_STRUCT_EVENT_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    FSS_Event_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    FSS_Event_ConnectorEC.h
-    FSS_Event_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    FSS_Event_ConnectorEC.inl
-  }
-}
-
-project(DDS_FSS_Event_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_FSS_Event_Connector_idl_gen DDS_FSS_Event_Base_stub
-  libs  += DDS_FSS_Event_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_FSS_Event_Connector_stub
-  dynamicflags   = FIXED_SIZE_STRUCT_EVENT_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    FSS_Event_ConnectorC.cpp
-  }
-
-  Header_Files {
-    FSS_Event_ConnectorC.h
-    FSS_Event_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    FSS_Event_ConnectorC.inl
-  }
-}
-
-project(DDS_FSS_Event_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_FSS_Event_Connector_lem_stub DDS_FSS_Event_Connector_stub DDS4CCM_lem_stub
-  sharedname = DDS_FSS_Event_Connector_exec
-  libs += DDS_FSS_Event_Connector_stub DDS_FSS_Event_Connector_lem_stub DDS_FSS_Event_Base_stub DDS4CCM_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags   = FIXED_SIZE_STRUCT_EVENT_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    FSS_Event_Connector_conn.cpp
-  }
-
-  Header_Files {
-    FSS_Event_Connector_conn.h
-    FSS_Event_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_FSS_Event_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_FSS_Event_Connector_lem_stub DDS_FSS_Event_Connector_exec DDS_FSS_Event_Connector_stub DDS4CCM_lem_stub
-  sharedname  = DDS_FSS_Event_Connector_svnt
-  libs       += DDS_FSS_Event_Connector_stub \
-                DDS_FSS_Event_Connector_lem_stub  \
-                DDS_FSS_Event_Base_stub \
-                DDS_FSS_Event_Connector_exec \
-                DDS4CCM_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags = FIXED_SIZE_STRUCT_EVENT_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    FSS_Event_ConnectorS.cpp
-    FSS_Event_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    FSS_Event_ConnectorS.h
-    FSS_Event_Connector_svnt.h
-    FSS_Event_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-    FSS_Event_ConnectorS.inl
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.idl b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.idl
deleted file mode 100644
index b178ad0fad3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.idl
+++ /dev/null
@@ -1,20 +0,0 @@
-// $Id$
-
-/**
- * @file FSS_State_Base.idl
- * @author Marcel Smit <msmit@remedy.nl>
- */
-
-#ifndef FIXED_SIZE_STRUCT_STATE_BASE_IDL
-#define FIXED_SIZE_STRUCT_STATE_BASE_IDL
-
-#pragma ndds typesupport "Base/FSS_State_BaseSupport.h"
-
-struct FixedStructSizeTest {
-  long one;
-  long two;
-};
-
-typedef sequence<FixedStructSizeTest> FixedStructSizeTest_Seq;
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.mpc b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.mpc
deleted file mode 100755
index e37f63b3b2f..00000000000
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Base/FSS_State_Base.mpc
+++ /dev/null
@@ -1,25 +0,0 @@
-// $Id$
-
-project (DDS_FSS_State_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
-  sharedname = DDS_FSS_State_Base_stub
-  dynamicflags += FIXED_SIZE_STRUCT_STATE_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Gxhst -Sci \
-              -Wb,stub_export_macro=FIXED_SIZE_STRUCT_STATE_BASE_STUB_Export \
-              -Wb,stub_export_include=FSS_State_Base_stub_export.h
-
-  IDL_Files {
-    FSS_State_Base.idl
-  }
-
-  opendds_ts_flags += --export=FIXED_SIZE_STRUCT_STATE_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    FSS_State_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.idl b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.idl
deleted file mode 100644
index 3d10bf9cceb..00000000000
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.idl
+++ /dev/null
@@ -1,26 +0,0 @@
-// $Id$
-
-/**
- * @file FSS_State_Connector.idl
- * @author Marcel Smit <msmit@remedy.nl>
- */
-
-#ifndef FIXED_SIZE_STRUCT_STATE_CONNECTOR_IDL_
-#define FIXED_SIZE_STRUCT_STATE_CONNECTOR_IDL_
-
-#include  <Components.idl>
-#include "Base/FSS_State_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
-
-#pragma ciao lem "Connector/FSS_State_ConnectorE.idl"
-#pragma ndds typesupport "Base/FSS_State_BaseSupport.h"
-
-module FSS_State
-{
-  module ::CCM_DDS::Typed < ::FixedStructSizeTest, ::FixedStructSizeTest_Seq> FixedStructSizeTestConn;
-  connector FSS_State_Connector : FixedStructSizeTestConn::DDS_Event
-  {
-  };
-};
-
-#endif /* FSS_State_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc b/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc
deleted file mode 100755
index 6852ed65347..00000000000
--- a/CIAO/connectors/dds4ccm/tests/FixedSizeStruct/StateConnector/Connector/FSS_State_Connector.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-// $Id$
-// This file is generated with "generate_component_mpc.pl -p DDS_FSS_State_Base -l .. -o ../lib -u DDS FSS_State_Connector"
-
-project(DDS_FSS_State_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=FIXED_SIZE_STRUCT_STATE_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=FSS_State_Connector_stub_export.h \
-              -Wb,skel_export_macro=FIXED_SIZE_STRUCT_STATE_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=FSS_State_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=FIXED_SIZE_STRUCT_STATE_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=FSS_State_Connector_svnt_export.h \
-              -Wb,conn_export_macro=FIXED_SIZE_STRUCT_STATE_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=FSS_State_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    FSS_State_Connector.idl
-  }
-}
-
-project(DDS_FSS_State_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_FSS_State_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=FIXED_SIZE_STRUCT_STATE_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=FSS_State_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
-
-  IDL_Files {
-    FSS_State_ConnectorE.idl
-  }
-}
-
-project(DDS_FSS_State_Connector_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_FSS_State_Connector_lem_gen DDS_FSS_State_Connector_stub DDS_FSS_State_Base_stub DDS4CCM_lem_stub
-  libs  += DDS_FSS_State_Base_stub DDS_FSS_State_Connector_stub DDS4CCM_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_FSS_State_Connector_lem_stub
-  dynamicflags   = FIXED_SIZE_STRUCT_STATE_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    FSS_State_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    FSS_State_ConnectorEC.h
-    FSS_State_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    FSS_State_ConnectorEC.inl
-  }
-}
-
-project(DDS_FSS_State_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_FSS_State_Connector_idl_gen DDS_FSS_State_Base_stub
-  libs  += DDS_FSS_State_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_FSS_State_Connector_stub
-  dynamicflags   = FIXED_SIZE_STRUCT_STATE_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    FSS_State_ConnectorC.cpp
-  }
-
-  Header_Files {
-    FSS_State_ConnectorC.h
-    FSS_State_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    FSS_State_ConnectorC.inl
-  }
-}
-
-project(DDS_FSS_State_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_FSS_State_Connector_lem_stub DDS_FSS_State_Connector_stub DDS4CCM_lem_stub DDS_FSS_State_Base_stub
-  sharedname = DDS_FSS_State_Connector_exec
-  libs += DDS_FSS_State_Connector_stub DDS_FSS_State_Connector_lem_stub DDS_FSS_State_Base_stub DDS4CCM_lem_stub DDS_FSS_State_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags   = FIXED_SIZE_STRUCT_STATE_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    FSS_State_Connector_conn.cpp
-  }
-
-  Header_Files {
-    FSS_State_Connector_conn.h
-    FSS_State_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_FSS_State_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_FSS_State_Connector_lem_stub DDS_FSS_State_Connector_exec DDS_FSS_State_Connector_stub DDS4CCM_lem_stub
-  sharedname  = DDS_FSS_State_Connector_svnt
-  libs       += DDS_FSS_State_Connector_stub \
-                DDS_FSS_State_Connector_lem_stub  \
-                DDS_FSS_State_Base_stub \
-                DDS_FSS_State_Connector_exec \
-                DDS4CCM_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags = FIXED_SIZE_STRUCT_STATE_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    FSS_State_ConnectorS.cpp
-    FSS_State_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    FSS_State_ConnectorS.h
-    FSS_State_Connector_svnt.h
-    FSS_State_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-    FSS_State_ConnectorS.inl
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.idl b/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.idl
index 5709fe39c20..1ae28f92876 100644
--- a/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.idl
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.idl
@@ -14,7 +14,7 @@ interface GetInvoker
 {
   void start_timeout_get_one ();
   void start_timeout_get_many ();
-  void start_get_one (in string key, in long fixed_key, in long iteration);
+  void start_get_one (in string key, in long iteration);
   void start_get_many (in short keys, in long iterations);
 };
 
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc b/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc
index cc14ce7be8f..04eafadc615 100755
--- a/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Base/Get_Invoker.mpc
@@ -1,8 +1,8 @@
 // $Id$
 
-project(DDS_Get_Invoker_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_Get_Invoker_idl_gen) : componentidldefaults {
   custom_only = 1
-  after +=
+  after += 
   idlflags += -Wb,stub_export_macro=GET_INVOKER_STUB_Export \
               -Wb,stub_export_include=Get_Invoker_stub_export.h \
               -Wb,skel_export_macro=GET_INVOKER_SVNT_Export \
@@ -17,7 +17,7 @@ project(DDS_Get_Invoker_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_Get_Invoker_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_Get_Invoker_lem_gen) : ciaoidldefaults {
   after += DDS_Get_Invoker_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=GET_INVOKER_LEM_STUB_Export \
@@ -57,7 +57,7 @@ project(DDS_Get_Invoker_lem_stub) : ccm_svnt, dds4ccm_base  {
 
 project(DDS_Get_Invoker_stub) : ccm_stub, dds4ccm_base {
   after += DDS_Get_Invoker_idl_gen
-  libs  +=
+  libs  += 
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -82,9 +82,9 @@ project(DDS_Get_Invoker_stub) : ccm_stub, dds4ccm_base {
 }
 
 
-project(DDS_Get_Invoker_svnt) : ciao_servant, dds4ccm_base {
-  after      +=   DDS_Get_Invoker_lem_stub DDS_Get_Invoker_stub \
-                  DDS4CCM_lem_stub DDS4CCM_skel DDS_Get_Invoker_idl_gen
+project(DDS_Get_Invoker_svnt) : ciao_servant, dds4ccm_base, nddslib {
+  after      +=   DDS_Get_Invoker_lem_stub DDS_Get_Invoker_stub\
+                  DDS4CCM_lem_stub DDS4CCM_skel
   sharedname  = Get_Invoker_svnt
   libs       += Get_Invoker_stub Get_Invoker_lem_stub \
                 DDS4CCM_lem_stub DDS4CCM_skel
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl
index bf36400955d..e1401e9fc0f 100644
--- a/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.idl
@@ -8,23 +8,11 @@
 #ifndef GETTER_TEST_BASE_IDL
 #define GETTER_TEST_BASE_IDL
 
-#pragma ndds typesupport "Base/Getter_Test_BaseSupport.h"
-#pragma opendds typesupport "Base/Getter_Test_BaseTypeSupportC.h"
-
-#pragma DCPS_DATA_TYPE "GetterTest"
-
 struct GetterTest {
   string key;
   long iteration;
 };
-typedef sequence<GetterTest> GetterTest_Seq;
-
-#pragma DCPS_DATA_TYPE "GetterFixed"
 
-struct GetterFixed {
-  long key;
-  long iteration;
-};
-typedef sequence<GetterFixed> GetterFixed_Seq;
+typedef sequence<GetterTest> GetterTest_Seq;
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc
index 10ba8dbca86..2d1a03c53ed 100755
--- a/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Base/Getter_Test_Base.mpc
@@ -1,28 +1,75 @@
 // $Id$
+// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n Getter_Test_Base"
 
-project (DDS_Getter_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
-  sharedname = DDS_Getter_Test_Base_stub
-  dynamicflags += GETTER_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Gxhst -Sci \
+project(DDS_Getter_Test_Base_idl_gen) : taoidldefaults, anytypecode {
+  custom_only = 1
+  idlflags -= -St -Sa
+  idlflags += -SS -Gxhst \
               -Wb,stub_export_macro=GETTER_TEST_BASE_STUB_Export \
               -Wb,stub_export_include=Getter_Test_Base_stub_export.h
 
   IDL_Files {
     Getter_Test_Base.idl
   }
+}
 
-  opendds_ts_flags += --export=GETTER_TEST_BASE_STUB_Export
+project(DDS_Getter_Test_Base_ndds_ts_gen) : ndds_ts_defaults {
+  custom_only = 1
+  after += DDS_Getter_Test_Base_idl_gen
 
-  DDSGenerator_Files {
+  NDDSTypeSupport_Files {
     Getter_Test_Base.idl
   }
+}
 
-  Source_Files {
+project(DDS_Getter_Test_Base_NDDS_TS) : nddslib, taolib {
+  after += DDS_Getter_Test_Base_ndds_ts_gen DDS_Getter_Test_Base_stub
+  libs += DDS_Getter_Test_Base_stub
+  libout = ../lib
+  libpaths    += ../lib
+  sharedname = DDS_Getter_Test_Base_NDDS_TS
+  dynamicflags = NDDS_USER_DLL_EXPORT
+
+  verbatim(gnuace, macros) {
+    override no_hidden_visibility = 1
   }
 
   Source_Files {
+    Getter_Test_Base.cxx
+    Getter_Test_BasePlugin.cxx
+    Getter_Test_BaseSupport.cxx
+  }
+
+  Header_Files {
+    Getter_Test_Base.h
+    Getter_Test_BasePlugin.h
+    Getter_Test_BaseSupport.h
+  }
+
+  Inline_Files {
   }
 }
 
+project(DDS_Getter_Test_Base_stub) : ccm_stub {
+  after += DDS_Getter_Test_Base_idl_gen
+  libout = ../lib
+  libpaths += ../lib
+  sharedname = DDS_Getter_Test_Base_stub
+  dynamicflags = GETTER_TEST_BASE_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    Getter_Test_BaseC.cpp
+  }
+
+  Header_Files {
+    Getter_Test_BaseC.h
+    Getter_Test_Base_stub_export.h
+  }
+
+  Inline_Files {
+    Getter_Test_BaseC.inl
+  }
+}
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.idl b/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.idl
index dbf1699555b..937fc22bba9 100644
--- a/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.idl
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.idl
@@ -14,17 +14,16 @@
 
 #pragma ciao lem "Connector/Getter_Test_ConnectorE.idl"
 
-module Getter_Test
+module CCM_DDS
 {
-  module ::CCM_DDS::Typed < ::GetterTest, ::GetterTest_Seq> GetterTestConn;
-  connector Getter_Test_Connector : GetterTestConn::DDS_Event
-  {
-  };
+  module ::CCM_DDS::Typed < ::GetterTest, ::GetterTest_Seq> GetterTest;
+};
 
-  module ::CCM_DDS::Typed < ::GetterFixed, ::GetterFixed_Seq> GetterFixedConn;
-  connector Getter_Fixed_Connector : GetterFixedConn::DDS_Event
+module Getter_Test
+{
+  connector Getter_Test_Connector : ::CCM_DDS::GetterTest::DDS_Event
   {
   };
 };
 
-#endif /* GETTER_TEST_CONNECTOR_IDL_ */
+#endif /* Getter_Test_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc
index 66398ad591f..b1516c45eda 100755
--- a/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_Getter_Test_Base -l .. -o ../lib -u DDS Getter_Test_Connector"
 
-project(DDS_Getter_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
+project(DDS_Getter_Test_Connector_idl_gen) : connectoridldefaults {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=GETTER_TEST_CONNECTOR_STUB_Export \
@@ -10,8 +10,8 @@ project(DDS_Getter_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
               -Wb,skel_export_include=Getter_Test_Connector_svnt_export.h \
               -Wb,svnt_export_macro=GETTER_TEST_CONNECTOR_SVNT_Export \
               -Wb,svnt_export_include=Getter_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=GETTER_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Getter_Test_Connector_conn_export.h \
+              -Wb,exec_export_macro=GETTER_TEST_CONNECTOR_EXEC_Export \
+              -Wb,exec_export_include=Getter_Test_Connector_exec_export.h \
               -I ..
 
   IDL_Files {
@@ -19,7 +19,7 @@ project(DDS_Getter_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   }
 }
 
-project(DDS_Getter_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_Getter_Test_Connector_lem_gen) : ciaoidldefaults {
   custom_only = 1
   after += DDS_Getter_Test_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=GETTER_TEST_CONNECTOR_LEM_STUB_Export \
@@ -85,24 +85,24 @@ project(DDS_Getter_Test_Connector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_Getter_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_Getter_Test_Connector_lem_stub DDS_Getter_Test_Connector_stub DDS4CCM_lem_stub DDS_Getter_Test_Base_stub
+  after   += DDS_Getter_Test_Connector_lem_stub DDS_Getter_Test_Connector_stub DDS4CCM_lem_stub DDS_Getter_Test_Base_NDDS_TS
   sharedname = DDS_Getter_Test_Connector_exec
-  libs += DDS_Getter_Test_Connector_stub DDS_Getter_Test_Connector_lem_stub DDS_Getter_Test_Base_stub DDS4CCM_lem_stub DDS_Getter_Test_Base_stub
+  libs += DDS_Getter_Test_Connector_stub DDS_Getter_Test_Connector_lem_stub DDS_Getter_Test_Base_stub DDS4CCM_lem_stub DDS_Getter_Test_Base_NDDS_TS
   libpaths += ../lib
   libout = ../lib
   includes += ..
-  dynamicflags   = GETTER_TEST_CONNECTOR_CONN_BUILD_DLL
+  dynamicflags   = GETTER_TEST_CONNECTOR_EXEC_BUILD_DLL
 
   IDL_Files {
   }
 
   Source_Files {
-    Getter_Test_Connector_conn.cpp
+    Getter_Test_Connector_exec.cpp
   }
 
   Header_Files {
-    Getter_Test_Connector_conn.h
-    Getter_Test_Connector_conn_export.h
+    Getter_Test_Connector_exec.h
+    Getter_Test_Connector_exec_export.h
   }
 
   Inline_Files {
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector_exec.cpp b/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector_exec.cpp
new file mode 100644
index 00000000000..acd0ff1313c
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector_exec.cpp
@@ -0,0 +1,30 @@
+// -*- C++ -*-
+// $Id$
+
+#include "Getter_Test_Connector_exec.h"
+
+namespace CIAO_Getter_Test_Getter_Test_Connector_Impl
+{
+  Getter_Test_Connector_exec_i::Getter_Test_Connector_exec_i (void)
+    : DDS_Event_Connector_T<GetterTest_DDS_Traits, GetterTest_Connector_Traits> ()
+  {
+  }
+
+  Getter_Test_Connector_exec_i::~Getter_Test_Connector_exec_i (void)
+  {
+  }
+
+  extern "C" GETTER_TEST_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_Getter_Test_Getter_Test_Connector_Impl (void)
+  {
+    ::Components::EnterpriseComponent_ptr retval =
+      ::Components::EnterpriseComponent::_nil ();
+
+    ACE_NEW_NORETURN (
+      retval,
+      Getter_Test_Connector_exec_i ());
+
+    return retval;
+  }
+}
+
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector_exec.h
new file mode 100644
index 00000000000..5cecdc7aa5a
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Connector/Getter_Test_Connector_exec.h
@@ -0,0 +1,61 @@
+// -*- C++ -*-
+// $Id$
+
+#ifndef GETTER_TEST_CONNECTOR_EXEC_H_
+#define GETTER_TEST_CONNECTOR_EXEC_H_
+
+#include /**/ "ace/pre.h"
+
+#include "Getter_Test_ConnectorEC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "Getter_Test_Connector_exec_export.h"
+#include "tao/LocalObject.h"
+
+#include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
+#include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
+
+#include "Base/Getter_Test_BaseSupport.h"
+
+namespace CIAO_Getter_Test_Getter_Test_Connector_Impl
+{
+
+  // @from use of GetterTest as a parameter
+  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+    GetterTest,
+    GetterTestSeq,
+    GetterTestTypeSupport,
+    GetterTestDataWriter,
+    GetterTestDataReader > GetterTest_DDS_Traits;
+
+  typedef CIAO::DDS4CCM::Connector_Traits <
+    ::CIAO_Getter_Test_Getter_Test_Connector_Impl::Getter_Test_Connector_Exec,
+    GetterTest_Seq,
+    ::CCM_DDS::GetterTest::CCM_Writer,
+    ::CCM_DDS::GetterTest::CCM_Updater,
+    ::CCM_DDS::GetterTest::CCM_Getter,
+    ::CCM_DDS::GetterTest::CCM_Reader,
+    ::Getter_Test::CCM_Getter_Test_Connector_Context,
+    ::CCM_DDS::GetterTest::Listener,
+    ::CCM_DDS::GetterTest::StateListener,
+    ::CCM_DDS::ConnectorStatusListener> GetterTest_Connector_Traits;
+
+  class GETTER_TEST_CONNECTOR_EXEC_Export Getter_Test_Connector_exec_i :
+    public DDS_Event_Connector_T <GetterTest_DDS_Traits, GetterTest_Connector_Traits>
+  {
+  public:
+    Getter_Test_Connector_exec_i (void);
+    virtual ~Getter_Test_Connector_exec_i (void);
+  };
+
+  extern "C" GETTER_TEST_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_Getter_Test_Getter_Test_Connector_Impl (void);
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.idl
index a034cfa12cf..dffe9828ae7 100644
--- a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.idl
@@ -15,8 +15,7 @@ module Getter_Test
 {
   component Receiver
   {
-    port GetterTestConn::DDS_Get info_get;
-    port GetterFixedConn::DDS_Get info_fixed;
+    port CCM_DDS::GetterTest::DDS_Get info_get;
 
     provides GetInvoker getter_invoke;
   };
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc
index 3bc6e99c9eb..204d58414f6 100755
--- a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_Getter_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_Getter_Test_Receiver_idl_gen) : componentidldefaults {
   custom_only = 1
   after += DDS_Getter_Test_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
@@ -17,7 +17,7 @@ project(DDS_Getter_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_Getter_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_Getter_Test_Receiver_lem_gen) : ciaoidldefaults {
   after += DDS_Getter_Test_Receiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
@@ -118,7 +118,7 @@ project(DDS_Getter_Test_Receiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_Getter_Test_Receiver_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_Getter_Test_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      +=   DDS_Getter_Test_Receiver_lem_stub DDS_Getter_Test_Base_stub \
                   DDS_Getter_Test_Connector_stub DDS_Getter_Test_Connector_svnt \
                   DDS_Getter_Test_Receiver_exec DDS_Getter_Test_Connector_lem_stub \
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp
index 0bc81c1f2d1..55d851da9c5 100644
--- a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.cpp
@@ -1,4 +1,4 @@
-// // -*- C++ -*-
+// -*- C++ -*-
 //
 // $Id$
 
@@ -36,10 +36,9 @@ namespace CIAO_Getter_Test_Receiver_Impl
 
   void
   Invoker_exec_i::start_get_one (const char * key,
-                                 ::CORBA::Long fixed_key,
-                                 ::CORBA::Long iteration)
+                                     CORBA::Long iteration)
   {
-    this->callback_.start_get_one (key, fixed_key, iteration);
+    this->callback_.start_get_one (key, iteration);
   }
 
   void
@@ -53,11 +52,9 @@ namespace CIAO_Getter_Test_Receiver_Impl
   //============================================================
   GetOneHandler::GetOneHandler (Receiver_exec_i &callback,
                                 const char * key,
-                                CORBA::Long fixed_key,
                                 CORBA::Long iteration)
     : callback_ (callback),
       key_ (key),
-      fixed_key_ (fixed_key),
       iteration_ (iteration)
   {
   }
@@ -69,7 +66,7 @@ namespace CIAO_Getter_Test_Receiver_Impl
   int
   GetOneHandler::handle_exception (ACE_HANDLE)
   {
-    this->callback_.get_one (this->key_, this->fixed_key_, this->iteration_);
+    this->callback_.get_one (this->key_, this->iteration_);
     return 0;
   }
 
@@ -109,13 +106,9 @@ namespace CIAO_Getter_Test_Receiver_Impl
 
   void
   Receiver_exec_i::start_get_one (const char * key,
-                                  CORBA::Long fixed_key,
-                                  CORBA::Long iteration)
+                                          CORBA::Long iteration)
   {
-    GetOneHandler* rh = new  GetOneHandler (*this,
-                                            CORBA::string_dup (key),
-                                            fixed_key,
-                                            iteration);
+    GetOneHandler* rh = new  GetOneHandler (*this, CORBA::string_dup (key), iteration);
     this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->notify (rh);
   }
 
@@ -181,90 +174,13 @@ namespace CIAO_Getter_Test_Receiver_Impl
   }
 
   void
-  Receiver_exec_i::get_one_fixed (CORBA::Long fixed_key, CORBA::Long iteration)
-  {
-    DDS::Duration_t to;
-    to.sec = 5;
-    to.nanosec = 0;
-    this->fixed_->time_out (to);
-    ACE_DEBUG ((LM_DEBUG, CLINFO "Receiver_exec_i::get_one_fixed: "
-                                  "Start getting data from DDS: "
-                                  "key <%u> - iteration <%d> "
-                                  " with timeout: "
-                                  "sec <%u> - nanosec <%u>\n",
-                                  fixed_key, iteration,
-                                  this->getter_->time_out ().sec,
-                                  this->getter_->time_out ().nanosec));
-    GetterFixed gettertest_info;
-    ::CCM_DDS::ReadInfo readinfo;
-    ACE_Time_Value tv = ACE_OS::gettimeofday ();
-    bool result = this->fixed_->get_one (gettertest_info, readinfo);
-    if (result)
-      {
-        ACE_Time_Value dur = ACE_OS::gettimeofday () - tv;
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::get_one_fixed: "
-                               "get_one took <%#T>\n",
-                               &dur));
-        if (gettertest_info.key != fixed_key)
-          {
-            ACE_ERROR ((LM_ERROR, CLINFO "ERROR FIXED: GET ONE: "
-                                          "Expected key does "
-                                          "not match received key: "
-                                          "expected <%u> - received <%C>\n",
-                                          fixed_key,
-                                          gettertest_info.key));
-          }
-        if (gettertest_info.iteration != iteration)
-          {
-            ACE_ERROR ((LM_ERROR, CLINFO "ERROR FIXED: GET ONE: "
-                                          "Expected iteration does "
-                                          "not match received iteration: "
-                                          "expected <%d> - received <%d>\n",
-                                          iteration,
-                                          gettertest_info.iteration));
-          }
-        // check readinfo struct.
-        if (readinfo.instance_handle.isValid)
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR FIXED: GET MANY: ")
-                    ACE_TEXT ("received instance handle should be invalid ")
-                    ACE_TEXT ("for unkeyed data: ")
-                    ACE_TEXT ("key <%u> - iteration <%u>\n"),
-                    gettertest_info.key,
-                    gettertest_info.iteration));
-          }
-        if (readinfo.source_timestamp.sec == 0 &&
-            readinfo.source_timestamp.nanosec == 0)
-          {
-            ACE_ERROR ((LM_ERROR, "ERROR FIXED: READ ONE LAST: "
-                                "source timestamp seems to be invalid (nil) "
-                                "key <%u> - iteration <%d>\n",
-                                gettertest_info.key,
-                                gettertest_info.iteration));
-          }
-        ACE_DEBUG ((LM_DEBUG, CLINFO "Receiver_exec_i::get_one_fixed: "
-                                      "Returned data : key <%u> - iteration <%d>\n",
-                                      gettertest_info.key,
-                                      gettertest_info.iteration));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, CLINFO "ERROR FIXED: GET ONE: "
-                                      "Time out while waiting for "
-                                      "key <%u> - iteration <%d>\n",
-                                      fixed_key,
-                                      iteration));
-      }
-  }
-
-  void
-  Receiver_exec_i::get_one_variable (const char * key, CORBA::Long iteration)
+  Receiver_exec_i::get_one (const char * key, CORBA::Long iteration)
   {
     DDS::Duration_t to;
     to.sec = 5;
     to.nanosec = 0;
     this->getter_->time_out (to);
-    ACE_DEBUG ((LM_DEBUG, CLINFO "Receiver_exec_i::get_one_variable: "
+    ACE_DEBUG ((LM_DEBUG, CLINFO "Receiver_exec_i::get_one: "
                                   "Start getting data from DDS: "
                                   "key <%C> - iteration <%d> "
                                   " with timeout: "
@@ -279,12 +195,12 @@ namespace CIAO_Getter_Test_Receiver_Impl
     if (result)
       {
         ACE_Time_Value dur = ACE_OS::gettimeofday () - tv;
-        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::get_one_variable: "
+        ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::get_one: "
                                "get_one took <%#T>\n",
                                &dur));
         if (ACE_OS::strcmp (gettertest_info->key, key) != 0)
           {
-            ACE_ERROR ((LM_ERROR, CLINFO "ERROR VARIABLE: GET ONE: "
+            ACE_ERROR ((LM_ERROR, CLINFO "ERROR: GET ONE: "
                                           "Expected key does "
                                           "not match received key: "
                                           "expected <%C> - received <%C>\n",
@@ -293,7 +209,7 @@ namespace CIAO_Getter_Test_Receiver_Impl
           }
         if (gettertest_info->iteration != iteration)
           {
-            ACE_ERROR ((LM_ERROR, CLINFO "ERROR VARIABLE: GET ONE: "
+            ACE_ERROR ((LM_ERROR, CLINFO "ERROR: GET ONE: "
                                           "Expected iteration does "
                                           "not match received iteration: "
                                           "expected <%d> - received <%d>\n",
@@ -303,7 +219,7 @@ namespace CIAO_Getter_Test_Receiver_Impl
         // check readinfo struct.
         if (readinfo.instance_handle.isValid)
           {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR VARIABLE: GET MANY: ")
+            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: GET MANY: ")
                     ACE_TEXT ("received instance handle should be invalid ")
                     ACE_TEXT ("for unkeyed data: ")
                     ACE_TEXT ("key <%C> - iteration <%u>\n"),
@@ -313,20 +229,20 @@ namespace CIAO_Getter_Test_Receiver_Impl
         if (readinfo.source_timestamp.sec == 0 &&
             readinfo.source_timestamp.nanosec == 0)
           {
-            ACE_ERROR ((LM_ERROR, "ERROR VARIABLE: READ ONE LAST: "
+            ACE_ERROR ((LM_ERROR, "ERROR: READ ONE LAST: "
                                 "source timestamp seems to be invalid (nil) "
                                 "key <%C> - iteration <%d>\n",
                                 gettertest_info->key.in (),
                                 gettertest_info->iteration));
           }
-        ACE_DEBUG ((LM_DEBUG, CLINFO "Receiver_exec_i::get_one_variable: "
+        ACE_DEBUG ((LM_DEBUG, CLINFO "Receiver_exec_i::get_one: "
                                       "Returned data : key <%C> - iteration <%d>\n",
                                       gettertest_info->key.in (),
                                       gettertest_info->iteration));
       }
     else
       {
-        ACE_ERROR ((LM_ERROR, CLINFO "ERROR VARIABLE: GET ONE: "
+        ACE_ERROR ((LM_ERROR, CLINFO "ERROR: GET ONE: "
                                       "Time out while waiting for "
                                       "key <%C> - iteration <%d>\n",
                                       key,
@@ -335,58 +251,7 @@ namespace CIAO_Getter_Test_Receiver_Impl
   }
 
   void
-  Receiver_exec_i::get_one (const char * key,
-                            CORBA::Long fixed_key,
-                            CORBA::Long iteration)
-  {
-    this->get_one_variable (key, iteration);
-    this->get_one_fixed (fixed_key, iteration);
-  }
-
-  void
-  Receiver_exec_i::timeout_get_one_fixed ()
-  {
-    try
-      {
-        DDS::Duration_t to;
-        to.sec = 1;
-        to.nanosec = 0;
-        this->fixed_->time_out (to);
-        ACE_DEBUG ((LM_DEBUG, CLINFO "Receiver_exec_i::timeout_get_one_fixed: "
-                                      "Start getting data from DDS: timeout: "
-                                      "sec <%d> - nanosec <%u>\n",
-                                      this->fixed_->time_out ().sec,
-                                      this->fixed_->time_out ().nanosec));
-        GetterFixed gettertest_info;
-        ::CCM_DDS::ReadInfo readinfo;
-        bool result = this->fixed_->get_one (gettertest_info, readinfo);
-        if (result)
-          {
-            ACE_ERROR ((LM_ERROR, CLINFO "ERROR FIXED: TIMEOUT GET ONE: "
-                                          "Returning true when get no data.\n"));
-          }
-        else
-          {
-            ACE_DEBUG ((LM_DEBUG, CLINFO "Receiver_exec_i::timeout_get_one_fixed: "
-                                          "Expected to return no data.\n"));
-          }
-      }
-    catch (const CCM_DDS::InternalError& )
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR FIXED: TIMEOUT GET ONE: "
-                               "Caught unexcepted InternalError "
-                               "exception\n"));
-      }
-    catch (const CORBA::Exception& ex)
-      {
-        ex._tao_print_exception ("ERROR FIXED: TIMEOUT GET ONE:");
-        ACE_ERROR ((LM_ERROR,
-                "ERROR: Receiver_exec_i::timeout_get_one_fixed : Exception caught\n"));
-      }
-  }
-
-  void
-  Receiver_exec_i::timeout_get_one_variable ()
+  Receiver_exec_i::timeout_get_one ()
   {
     try
       {
@@ -394,7 +259,7 @@ namespace CIAO_Getter_Test_Receiver_Impl
         to.sec = 1;
         to.nanosec = 0;
         this->getter_->time_out (to);
-        ACE_DEBUG ((LM_DEBUG, CLINFO "Receiver_exec_i::timeout_get_one_variable: "
+        ACE_DEBUG ((LM_DEBUG, CLINFO "Receiver_exec_i::timeout_get_one: "
                                       "Start getting data from DDS: timeout: "
                                       "sec <%d> - nanosec <%u>\n",
                                       this->getter_->time_out ().sec,
@@ -404,37 +269,30 @@ namespace CIAO_Getter_Test_Receiver_Impl
         bool result = this->getter_->get_one (gettertest_info, readinfo);
         if (result)
           {
-            ACE_ERROR ((LM_ERROR, CLINFO "ERROR VARIABLE: TIMEOUT GET ONE: "
+            ACE_ERROR ((LM_ERROR, CLINFO "ERROR: TIMEOUT GET ONE: "
                                           "Returning true when get no data.\n"));
           }
         else
           {
-            ACE_DEBUG ((LM_DEBUG, CLINFO "Receiver_exec_i::timeout_get_one_variable: "
+            ACE_DEBUG ((LM_DEBUG, CLINFO "Receiver_exec_i::timeout_get_one: "
                                           "Expected to return no data.\n"));
           }
       }
     catch (const CCM_DDS::InternalError& )
       {
-        ACE_ERROR ((LM_ERROR, "ERROR VARIABLE: TIMEOUT GET ONE: "
+        ACE_ERROR ((LM_ERROR, "ERROR: TIMEOUT GET ONE: "
                                "Caught unexcepted InternalError "
                                "exception\n"));
       }
     catch (const CORBA::Exception& ex)
       {
-        ex._tao_print_exception ("ERROR VARIABLE: TIMEOUT GET ONE:");
+        ex._tao_print_exception ("ERROR: TIMEOUT GET ONE:");
         ACE_ERROR ((LM_ERROR,
-                "ERROR: Receiver_exec_i::timeout_get_one_variable : Exception caught\n"));
+                "ERROR: Receiver_exec_i::timeout_get_one : Exception caught\n"));
       }
   }
 
   void
-  Receiver_exec_i::timeout_get_one ()
-  {
-    this->timeout_get_one_variable ();
-    this->timeout_get_one_fixed ();
-  }
-
-  void
   Receiver_exec_i::timeout_get_many ()
   {
     try
@@ -476,22 +334,16 @@ namespace CIAO_Getter_Test_Receiver_Impl
       }
   }
 
-  ::Getter_Test::GetterTestConn::CCM_Listener_ptr
+  ::CCM_DDS::GetterTest::CCM_Listener_ptr
   Receiver_exec_i::get_info_out_data_listener (void)
   {
-    return ::Getter_Test::GetterTestConn::CCM_Listener::_nil ();
+    return 0;
   }
 
   ::CCM_DDS::CCM_PortStatusListener_ptr
   Receiver_exec_i::get_info_get_status (void)
   {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
-  }
-
-  ::CCM_DDS::CCM_PortStatusListener_ptr
-  Receiver_exec_i::get_info_fixed_status (void)
-  {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
+    return 0;
   }
 
   ::CCM_GetInvoker_ptr
@@ -516,7 +368,6 @@ namespace CIAO_Getter_Test_Receiver_Impl
   Receiver_exec_i::configuration_complete (void)
   {
     this->getter_ = this->context_->get_connection_info_get_fresh_data ();
-    this->fixed_ = this->context_->get_connection_info_fixed_fresh_data ();
   }
 
   void
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h
index f23118c7b86..abb08d9db15 100644
--- a/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Receiver/Getter_Test_Receiver_exec.h
@@ -27,7 +27,6 @@ namespace CIAO_Getter_Test_Receiver_Impl
   public:
     GetOneHandler (Receiver_exec_i &,
                    const char * key,
-                   CORBA::Long fixed_key,
                    CORBA::Long iteration);
     virtual ~GetOneHandler ();
 
@@ -36,7 +35,6 @@ namespace CIAO_Getter_Test_Receiver_Impl
   private:
     Receiver_exec_i &callback_;
     const char * key_;
-    CORBA::Long fixed_key_;
     CORBA::Long iteration_;
   };
 
@@ -75,8 +73,7 @@ namespace CIAO_Getter_Test_Receiver_Impl
     virtual void start_timeout_get_many ();
 
     virtual void start_get_one (const char * key,
-                                ::CORBA::Long fixed_key,
-                                ::CORBA::Long iteration);
+                                     ::CORBA::Long iteration);
     virtual void start_get_many (::CORBA::Short keys , ::CORBA::Long iterations);
 
   private:
@@ -94,31 +91,25 @@ namespace CIAO_Getter_Test_Receiver_Impl
     Receiver_exec_i (void);
     virtual ~Receiver_exec_i (void);
 
-    virtual ::Getter_Test::GetterTestConn::CCM_Listener_ptr
+    virtual ::CCM_DDS::GetterTest::CCM_Listener_ptr
     get_info_out_data_listener (void);
 
     virtual ::CCM_DDS::CCM_PortStatusListener_ptr
     get_info_get_status (void);
 
-    virtual ::CCM_DDS::CCM_PortStatusListener_ptr
-    get_info_fixed_status (void);
-
     virtual ::CCM_GetInvoker_ptr
     get_getter_invoke ();
 
+    void timeout_get_one ();
+    void timeout_get_many ();
 
     void start_get_one (const char * key,
-                        CORBA::Long fixed_key,
                         CORBA::Long iteration);
-    void timeout_get_one ();
-    void timeout_get_many ();
     void get_one (const char * key,
-                  CORBA::Long fixed_key,
                   CORBA::Long iteration);
 
     void start_get_many (CORBA::Short keys,
                          CORBA::Long iterations);
-
     void get_many (CORBA::Short keys,
                          CORBA::Long iterations);
 
@@ -134,16 +125,7 @@ namespace CIAO_Getter_Test_Receiver_Impl
 
   private:
     ::Getter_Test::CCM_Receiver_Context_var context_;
-    ::Getter_Test::GetterTestConn::Getter_var getter_;
-    ::Getter_Test::GetterFixedConn::Getter_var fixed_;
-
-    void timeout_get_one_fixed ();
-    void timeout_get_one_variable ();
-
-    void get_one_fixed (CORBA::Long fixed_key,
-                        CORBA::Long iteration);
-    void get_one_variable (const char * key,
-                           CORBA::Long iteration);
+    ::CCM_DDS::GetterTest::Getter_var       getter_;
   };
 
   extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.idl b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.idl
index fa49687b75c..d7903029ee5 100644
--- a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.idl
@@ -17,9 +17,7 @@ module Getter_Test
 {
   component Sender
   {
-    port GetterTestConn::DDS_Write info_write;
-    port GetterFixedConn::DDS_Write info_fixed;
-
+    port CCM_DDS::GetterTest::DDS_Write info_write;
     provides CCM_DDS::ConnectorStatusListener info_out_connector_status;
 
     uses GetInvoker invoke_getter;
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.mpc
index 821ecd7deb8..0fb49fb5349 100755
--- a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_Getter_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(DDS_Getter_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_Getter_Test_Sender_idl_gen) : componentidldefaults {
   after += DDS_Getter_Test_Connector_idl_gen DDS_Starter_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_Getter_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_Getter_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_Getter_Test_Sender_lem_gen) : ciaoidldefaults {
   after += DDS_Getter_Test_Sender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
@@ -117,7 +117,7 @@ project(DDS_Getter_Test_Sender_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_Getter_Test_Sender_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_Getter_Test_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      += DDS_Getter_Test_Base_stub  DDS_Getter_Test_Sender_lem_stub \
                 DDS4CCM_lem_stub DDS4CCM_skel DDS_Getter_Test_Connector_stub \
                 DDS_Getter_Test_Connector_svnt DDS_Getter_Test_Connector_lem_stub \
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp
index d4f9f8dda1f..a12801101d7 100644
--- a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.cpp
@@ -161,25 +161,17 @@ namespace CIAO_Getter_Test_Sender_Impl
   {
     if (this->last_iter_ <= this->iterations_)
       {
-        GetterFixed  fixed_key;
         GetterTest *new_key = new GetterTest;
         new_key->key = CORBA::string_dup("KEY_1");
-        fixed_key.key = 1;
         this->invoker_->start_get_one (
                         CORBA::string_dup("KEY_1"),
-                        1,
                         last_iter_);
         new_key->iteration = last_iter_;
-        fixed_key.iteration = last_iter_;
-
         ACE_Time_Value tv (0, 50000);
         ACE_OS::sleep (tv);
-
         this->writer_->write_one (*new_key, ::DDS::HANDLE_NIL);
-        this->fixed_->write_one (fixed_key, ::DDS::HANDLE_NIL);
-        ACE_DEBUG ((LM_DEBUG, CLINFO "Written keys <%C> and <%u> with <%d>\n",
-                    new_key->key.in (), fixed_key.key, last_iter_));
-
+        ACE_DEBUG ((LM_DEBUG, CLINFO "Written key <%C> with <%d>\n",
+                    new_key->key.in (), last_iter_));
         ++last_iter_;
      }
    else
@@ -242,7 +234,6 @@ namespace CIAO_Getter_Test_Sender_Impl
     try
       {
         this->writer_ = this->context_->get_connection_info_write_data ();
-        this->fixed_ = this->context_->get_connection_info_fixed_data ();
         this->invoker_ = this->context_->get_connection_invoke_getter ();
         this->ccm_activated_ = true;
       }
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h
index 8d7cde811e6..834f61bd720 100644
--- a/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/Getter/Sender/Getter_Test_Sender_exec.h
@@ -102,8 +102,7 @@ namespace CIAO_Getter_Test_Sender_Impl
 
   private:
     ::Getter_Test::CCM_Sender_Context_var context_;
-    ::Getter_Test::GetterTestConn::Writer_var writer_;
-    ::Getter_Test::GetterFixedConn::Writer_var fixed_;
+    CCM_DDS::GetterTest::Writer_var writer_;
     GetInvoker_var invoker_;
 
     CORBA::UShort iterations_;
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/Getter/descriptors/Plan.cdp
index 53497bcb9f5..f097c53dae7 100644
--- a/CIAO/connectors/dds4ccm/tests/Getter/descriptors/Plan.cdp
+++ b/CIAO/connectors/dds4ccm/tests/Getter/descriptors/Plan.cdp
@@ -58,58 +58,6 @@
     </execParameter>
   </implementation>
 
-  <implementation xmi:id="Getter_Fixed_ConnectorComponentImplementation">
-    <name>Getter_Fixed_ConnectorComponentImplementation</name>
-    <source/>
-    <artifact xmi:idref="Getter_Test_Connector_ExecArtifact" />
-    <artifact xmi:idref="Getter_Test_Connector_SvntArtifact" />
-    <execParameter>
-      <!-- entrypoint as exec parameter (see 10.6.1) -->
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Getter_Test_Getter_Fixed_Connector_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Getter_Test_Getter_Fixed_Connector_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Getter_Test_Connector_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Getter_Test_Connector_exec</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
   <implementation xmi:id="Getter_Test_ConnectorComponentImplementation">
     <name>Getter_Test_ConnectorComponentImplementation</name>
     <source/>
@@ -212,7 +160,6 @@
       </value>
     </execParameter>
   </implementation>
-
   <instance xmi:id="ReceiverComponentInstance">
     <name>ReceiverComponent</name>
     <node>ReceiverNode</node>
@@ -220,7 +167,6 @@
     <source/>
     <implementation xmi:idref="ReceiverComponentImplementation" />
   </instance>
-
   <instance xmi:id="Getter_Test_ConnectorComponentInstance">
     <name>Getter_Test_ConnectorComponent</name>
     <node>SenderNode</node>
@@ -257,45 +203,6 @@
       </value>
     </configProperty>
   </instance>
-
-  <!-- FIXED -->
-  <instance xmi:id="Getter_Fixed_ConnectorComponentInstance">
-    <name>Getter_Fixed_ConnectorComponent</name>
-    <node>SenderNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Getter_Fixed_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Getter_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-  <instance xmi:id="Getter_Fixed_ConnectorComponentInstance2">
-    <name>Getter_Fixed_ConnectorComponent2</name>
-    <node>ReceiverNode</node>
-    <!-- hostname -->
-    <source/>
-    <implementation xmi:idref="Getter_Fixed_ConnectorComponentImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Getter_Test</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
   <instance xmi:id="SenderComponentInstance">
     <name>SenderComponent</name>
     <node>SenderNode</node>
@@ -347,26 +254,6 @@
   </connection>
 
   <connection>
-    <name>info_fixed_data</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_fixed_fresh_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ReceiverComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>pull_consumer_fresh_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Getter_Fixed_ConnectorComponentInstance2" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
     <name>info_out_connector_status_sender</name>
     <deployRequirement>
       <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
@@ -407,26 +294,6 @@
   </connection>
 
   <connection>
-    <name>fixed_writer_connection</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>info_fixed_data</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="SenderComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_data</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Getter_Fixed_ConnectorComponentInstance" />
-    </internalEndpoint>
-  </connection>
-
-  <connection>
     <name>reader_starter</name>
     <internalEndpoint>
       <portName>invoke_getter</portName>
diff --git a/CIAO/connectors/dds4ccm/tests/Getter/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/Getter/descriptors/run_test.pl
index 3b13df93b5d..eb1326705fc 100755
--- a/CIAO/connectors/dds4ccm/tests/Getter/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/Getter/descriptors/run_test.pl
@@ -100,8 +100,6 @@ sub kill_open_processes {
     if ($ns_running == 1) {
         $NS->Kill (); $NS->TimedWait (1);
     }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
 }
 
 sub run_node_daemons {
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl
index 82801a020ae..81572ff2d95 100644
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.idl
@@ -8,8 +8,6 @@
 #ifndef WRITER_BASE_IDL
 #define WRITER_BASE_IDL
 
-#pragma ndds typesupport "Base/Writer_BaseSupport.h"
-
 struct WriterTest {
   string key; //@key
 };
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.mpc b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.mpc
index b0e2a2692b8..2b9bb339fe5 100644
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Base/Writer_Base.mpc
@@ -1,25 +1,76 @@
 // $Id$
+// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n Writer_Base"
 
-project (DDS_DDSInstanceHandleBase_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
-  sharedname = DDS_DDSInstanceHandleBase_stub
-  dynamicflags += WRITER_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Gxhst -Sci \
+project(DDS_DDSInstanceHandleBase_idl_gen) : taoidldefaults, anytypecode {
+  custom_only = 1
+  idlflags -= -St -Sa
+  idlflags += -SS -Gxhst \
               -Wb,stub_export_macro=WRITER_BASE_STUB_Export \
               -Wb,stub_export_include=Writer_Base_stub_export.h
 
   IDL_Files {
     Writer_Base.idl
   }
+}
 
-  opendds_ts_flags += --export=WRITER_BASE_STUB_Export
+project(DDS_DDSInstanceHandleBase_ndds_ts_gen) : ndds_ts_defaults {
+  custom_only = 1
+  after += DDS_DDSInstanceHandleBase_idl_gen
 
-  DDSGenerator_Files {
+  NDDSTypeSupport_Files {
     Writer_Base.idl
   }
+}
+
+project(DDS_DDSInstanceHandleBase_NDDS_TS) : nddslib, taolib {
+  after += DDS_DDSInstanceHandleBase_ndds_ts_gen DDS_DDSInstanceHandleBase_stub
+  libs += DDS_DDSInstanceHandleBase_stub
+  libout = ../lib
+  libpaths    += ../lib
+  sharedname = DDS_DDSInstanceHandleBase_NDDS_TS
+  dynamicflags = NDDS_USER_DLL_EXPORT
+
+  verbatim(gnuace, macros) {
+    override no_hidden_visibility = 1
+  }
 
   Source_Files {
+    Writer_Base.cxx
+    Writer_BasePlugin.cxx
+    Writer_BaseSupport.cxx
+  }
+
+  Header_Files {
+    Writer_Base.h
+    Writer_BasePlugin.h
+    Writer_BaseSupport.h
+  }
+
+  Inline_Files {
+  }
+}
+
+project(DDS_DDSInstanceHandleBase_stub) : ccm_stub {
+  after += DDS_DDSInstanceHandleBase_idl_gen
+  libout = ../lib
+  libpaths += ../lib
+  sharedname = DDS_DDSInstanceHandleBase_stub
+  dynamicflags = WRITER_BASE_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    Writer_BaseC.cpp
+  }
+
+  Header_Files {
+    Writer_BaseC.h
+    Writer_Base_stub_export.h
+  }
+
+  Inline_Files {
+    Writer_BaseC.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc
index eaf896a44af..9b9e471c9a1 100644
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_DDSInstanceHandleBase -l .. -o ../lib -u DDS Writer_Connector"
 
-project(DDS_InstanceHandleConnector_idl_gen) : connectoridldefaults, dds4ccm {
+project(DDS_InstanceHandleConnector_idl_gen) : connectoridldefaults {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=WRITER_CONNECTOR_STUB_Export \
@@ -10,8 +10,8 @@ project(DDS_InstanceHandleConnector_idl_gen) : connectoridldefaults, dds4ccm {
               -Wb,skel_export_include=Writer_Connector_svnt_export.h \
               -Wb,svnt_export_macro=WRITER_CONNECTOR_SVNT_Export \
               -Wb,svnt_export_include=Writer_Connector_svnt_export.h \
-              -Wb,conn_export_macro=WRITER_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Writer_Connector_conn_export.h \
+              -Wb,exec_export_macro=WRITER_CONNECTOR_EXEC_Export \
+              -Wb,exec_export_include=Writer_Connector_exec_export.h \
               -I ..
 
   IDL_Files {
@@ -19,7 +19,7 @@ project(DDS_InstanceHandleConnector_idl_gen) : connectoridldefaults, dds4ccm {
   }
 }
 
-project(DDS_InstanceHandleConnector_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_InstanceHandleConnector_lem_gen) : ciaoidldefaults {
   custom_only = 1
   after += DDS_InstanceHandleConnector_idl_gen
   idlflags += -Wb,stub_export_macro=WRITER_CONNECTOR_LEM_STUB_Export \
@@ -85,24 +85,24 @@ project(DDS_InstanceHandleConnector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_InstanceHandleConnector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_InstanceHandleConnector_lem_stub DDS_InstanceHandleConnector_stub DDS4CCM_lem_stub DDS_DDSInstanceHandleBase_stub
+  after   += DDS_InstanceHandleConnector_lem_stub DDS_InstanceHandleConnector_stub DDS4CCM_lem_stub DDS_DDSInstanceHandleBase_NDDS_TS
   sharedname = DDS_InstanceHandleConnector_exec
-  libs += DDS_InstanceHandleConnector_stub DDS_InstanceHandleConnector_lem_stub DDS_DDSInstanceHandleBase_stub DDS4CCM_lem_stub DDS_DDSInstanceHandleBase_stub
+  libs += DDS_InstanceHandleConnector_stub DDS_InstanceHandleConnector_lem_stub DDS_DDSInstanceHandleBase_stub DDS4CCM_lem_stub DDS_DDSInstanceHandleBase_NDDS_TS
   libpaths += ../lib
   libout = ../lib
   includes += ..
-  dynamicflags   = WRITER_CONNECTOR_CONN_BUILD_DLL
+  dynamicflags   = WRITER_CONNECTOR_EXEC_BUILD_DLL
 
   IDL_Files {
   }
 
   Source_Files {
-    Writer_Connector_conn.cpp
+    Writer_Connector_exec.cpp
   }
 
   Header_Files {
-    Writer_Connector_conn.h
-    Writer_Connector_conn_export.h
+    Writer_Connector_exec.h
+    Writer_Connector_exec_export.h
   }
 
   Inline_Files {
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector_exec.cpp b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector_exec.cpp
new file mode 100644
index 00000000000..81585b43a78
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector_exec.cpp
@@ -0,0 +1,30 @@
+// -*- C++ -*-
+// $Id$
+
+#include "Writer_Connector_exec.h"
+
+namespace CIAO_Writer_Writer_Connector_Impl
+{
+  Writer_Connector_exec_i::Writer_Connector_exec_i (void)
+    : DDS_Event_Connector_T<WriterTest_DDS_Traits, WriterTest_Connector_Traits> ()
+  {
+  }
+
+  Writer_Connector_exec_i::~Writer_Connector_exec_i (void)
+  {
+  }
+
+  extern "C" WRITER_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_Writer_Writer_Connector_Impl (void)
+  {
+    ::Components::EnterpriseComponent_ptr retval =
+      ::Components::EnterpriseComponent::_nil ();
+
+    ACE_NEW_NORETURN (
+      retval,
+      Writer_Connector_exec_i ());
+
+    return retval;
+  }
+}
+
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector_exec.h
new file mode 100644
index 00000000000..05f2d6bee47
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Connector/Writer_Connector_exec.h
@@ -0,0 +1,60 @@
+// -*- C++ -*-
+// $Id$
+
+#ifndef WRITER_CONNECTOR_EXEC_H_
+#define WRITER_CONNECTOR_EXEC_H_
+
+#include /**/ "ace/pre.h"
+
+#include "Writer_ConnectorEC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "Writer_Connector_exec_export.h"
+#include "tao/LocalObject.h"
+
+#include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
+#include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
+
+#include "Base/Writer_BaseSupport.h"
+
+namespace CIAO_Writer_Writer_Connector_Impl
+{
+  // @from use of WriterTest as a parameter
+  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+    WriterTest,
+    WriterTestSeq,
+    WriterTestTypeSupport,
+    WriterTestDataWriter,
+    WriterTestDataReader > WriterTest_DDS_Traits;
+
+  typedef CIAO::DDS4CCM::Connector_Traits <
+    ::CIAO_Writer_Writer_Connector_Impl::Writer_Connector_Exec,
+    WriterTest_Seq,
+    ::CCM_DDS::WriterTest::CCM_Writer,
+    ::CCM_DDS::WriterTest::CCM_Updater,
+    ::CCM_DDS::WriterTest::CCM_Getter,
+    ::CCM_DDS::WriterTest::CCM_Reader,
+    ::Writer::CCM_Writer_Connector_Context,
+    ::CCM_DDS::WriterTest::Listener,
+    ::CCM_DDS::WriterTest::StateListener,
+    ::CCM_DDS::ConnectorStatusListener> WriterTest_Connector_Traits;
+
+  class WRITER_CONNECTOR_EXEC_Export Writer_Connector_exec_i :
+    public DDS_Event_Connector_T <WriterTest_DDS_Traits, WriterTest_Connector_Traits>
+  {
+  public:
+    Writer_Connector_exec_i (void);
+    virtual ~Writer_Connector_exec_i (void);
+  };
+
+  extern "C" WRITER_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_Writer_Writer_Connector_Impl (void);
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.idl b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.idl
index c39a2e21252..ec54cdf3774 100644
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.idl
+++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.idl
@@ -17,6 +17,7 @@ module Writer
   component Sender
   {
     port CCM_DDS::WriterTest::DDS_Write info_write;
+    attribute unsigned short rate;
     attribute unsigned short keys;
   };
 };
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc
index df9ba2d3f54..8be968cee0f 100644
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_DDSInstanceHandleBase -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(DDS_DDSInstanceHandleSender_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_DDSInstanceHandleSender_idl_gen) : componentidldefaults   {
   after += DDS_InstanceHandleConnector_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_DDSInstanceHandleSender_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_DDSInstanceHandleSender_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_DDSInstanceHandleSender_lem_gen) : ciaoidldefaults {
   after += DDS_DDSInstanceHandleSender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
@@ -85,14 +85,14 @@ project(DDS_DDSInstanceHandleSender_stub) : ccm_stub, dds4ccm_base {
   }
 }
 
-project(DDS_DDSInstanceHandleSender_exec) : ciao_executor, dds4ccm_base, dds4ccm_impl {
+project(DDS_DDSInstanceHandleSender_exec) : ciao_executor, nddslib, dds4ccm_base {
   after += DDS_DDSInstanceHandleSender_lem_stub DDS_DDSInstanceHandleSender_stub \
            DDS_InstanceHandleConnector_lem_stub DDS_InstanceHandleConnector_stub \
-           DDS4CCM_lem_stub
+           DDS4CCM_lem_stub CIAO_DDS4CCM_NDDS_Impl
   sharedname = Sender_exec
   libs += Sender_stub Sender_lem_stub DDS_DDSInstanceHandleBase_stub \
           DDS_InstanceHandleConnector_lem_stub DDS_InstanceHandleConnector_stub \
-          DDS4CCM_lem_stub
+          DDS4CCM_lem_stub CIAO_DDS4CCM_NDDS_Impl
   libpaths += ../lib
   includes += ..
   libout = ../lib
@@ -115,7 +115,7 @@ project(DDS_DDSInstanceHandleSender_exec) : ciao_executor, dds4ccm_base, dds4ccm
 }
 
 
-project(DDS_DDSInstanceHandleSender_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_DDSInstanceHandleSender_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after += DDS_DDSInstanceHandleBase_stub DDS_DDSInstanceHandleSender_lem_stub \
            DDS4CCM_lem_stub DDS4CCM_skel DDS_InstanceHandleConnector_stub \
            DDS_InstanceHandleConnector_svnt DDS_InstanceHandleConnector_lem_stub
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp
index 13e89da3498..dfdf186a249 100644
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.cpp
@@ -13,17 +13,18 @@
 namespace CIAO_Writer_Sender_Impl
 {
   //============================================================
-  // ReadHandler
+  // pulse_Generator
   //============================================================
-  StartHandler::StartHandler(Sender_exec_i &callback)
-    : callback_ (callback)
+  pulse_Generator::pulse_Generator (Sender_exec_i &callback)
+    : pulse_callback_ (callback)
   {
   }
 
   int
-  StartHandler::handle_exception (ACE_HANDLE)
+  pulse_Generator::handle_timeout (const ACE_Time_Value &, const void *)
   {
-    this->callback_.run ();
+    // Notify the subscribers
+    this->pulse_callback_.tick ();
     return 0;
   }
 
@@ -31,8 +32,10 @@ namespace CIAO_Writer_Sender_Impl
   // Sender_exec_i
   //============================================================
   Sender_exec_i::Sender_exec_i (void)
-    : keys_ (5)
+    : rate_ (1),
+      keys_ (5)
   {
+    this->ticker_ = new pulse_Generator (*this);
   }
 
   Sender_exec_i::~Sender_exec_i (void)
@@ -63,7 +66,7 @@ namespace CIAO_Writer_Sender_Impl
   }
 
   void
-  Sender_exec_i::register_handles ()
+  Sender_exec_i::register_handles()
   {
     Writer_Table::iterator i = this->ktests_.begin ();
     for (i = this->ktests_.begin(); i != this->ktests_.end(); ++i)
@@ -83,27 +86,26 @@ namespace CIAO_Writer_Sender_Impl
   void
   Sender_exec_i::test_equality ()
   {
-    Writer_Table::iterator i = this->ktests_.begin ();
-    for (i = this->ktests_.begin(); i != this->ktests_.end(); ++i)
+    if (this->last_key_ != this->ktests_.end ())
       {
         ::DDS::InstanceHandle_t ccm_hnd =
-          this->handles_[i->first.c_str ()];
+          this->handles_[this->last_key_->first.c_str ()];
 
         DDS_InstanceHandle_t dds_hnd =
-          this->dds_writer_->lookup_instance (i->second);
+          this->dds_writer_->lookup_instance (this->last_key_->second);
         if (dds_hnd == ccm_hnd)
           {
             ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::test_equality - "
                           "== operator seems to work for DDS and "
                           "CCM handles for key <%C>\n",
-                          i->first.c_str ()));
+                          this->last_key_->first.c_str ()));
           }
         else
           {
             ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::test_equality - "
                           "== operator doesn't seem to work for DDS and "
                           "CCM handles for key <%C>\n",
-                          i->first.c_str ()));
+                          this->last_key_->first.c_str ()));
           }
         DDS::InstanceHandle_t ccm_dds_hnd;
         ccm_dds_hnd <<= dds_hnd;
@@ -112,14 +114,14 @@ namespace CIAO_Writer_Sender_Impl
             ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::test_equality - "
                           "== operator seems to work for CCM handles "
                           "for key <%C>\n",
-                          i->first.c_str ()));
+                          this->last_key_->first.c_str ()));
           }
         else
           {
             ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::test_equality - "
                           "== operator doesn't seem to work for CCM "
                           "handles for key <%C>\n",
-                          i->first.c_str ()));
+                          this->last_key_->first.c_str ()));
           }
       }
   }
@@ -127,13 +129,12 @@ namespace CIAO_Writer_Sender_Impl
   void
   Sender_exec_i::test_non_equality ()
   {
-    Writer_Table::iterator i = this->ktests_.begin ();
-    for (i = this->ktests_.begin(); i != this->ktests_.end(); ++i)
+    if (this->last_key_ != this->ktests_.end ())
       {
         ::DDS::InstanceHandle_t ccm_hnd =
-          this->handles_[i->first.c_str ()];
+          this->handles_[this->last_key_->first.c_str ()];
 
-        Writer_Table::iterator unequal = i;
+        Writer_Table::iterator unequal = this->last_key_;
         ++unequal;
         if (unequal == this->ktests_.end ())
           unequal = this->ktests_.begin ();
@@ -146,14 +147,14 @@ namespace CIAO_Writer_Sender_Impl
             ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::test_equality - "
                           "!= operator seems to work for DDS and "
                           "CCM handles for key <%C>\n",
-                          i->first.c_str ()));
+                          this->last_key_->first.c_str ()));
           }
         else
           {
             ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::test_equality - "
                           "!= operator doesn't seem to work for DDS and "
                           "CCM handles for key <%C>\n",
-                          i->first.c_str ()));
+                          this->last_key_->first.c_str ()));
           }
         DDS::InstanceHandle_t ccm_dds_hnd;
         ccm_dds_hnd <<= dds_hnd;
@@ -162,21 +163,26 @@ namespace CIAO_Writer_Sender_Impl
             ACE_DEBUG ((LM_DEBUG, "Sender_exec_i::test_equality - "
                           "!= operator seems to work for CCM "
                           "handles for key <%C>\n",
-                          i->first.c_str ()));
+                          this->last_key_->first.c_str ()));
           }
         else
           {
             ACE_ERROR ((LM_ERROR, "ERROR: Sender_exec_i::test_equality - "
                           "!= operator doesn't seem to work for CCM "
                           "handles for key <%C>\n",
-                          i->first.c_str ()));
+                          this->last_key_->first.c_str ()));
           }
+        ++this->last_key_;
+      }
+    else
+      {
+        unregister_handles ();
+        this->stop ();
       }
-    unregister_handles ();
   }
 
   void
-  Sender_exec_i::run ()
+  Sender_exec_i::tick ()
   {
     test_equality ();
     test_non_equality ();
@@ -185,8 +191,36 @@ namespace CIAO_Writer_Sender_Impl
   void
   Sender_exec_i::start (void)
   {
-    StartHandler *rh = new StartHandler (*this);
-    this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->notify (rh);
+    long usec = 1000000 / this->rate_;
+    if (this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->schedule_timer (
+                this->ticker_,
+                0,
+                ACE_Time_Value (0, usec),
+                ACE_Time_Value (0, usec)) == -1)
+      {
+        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
+                              ACE_TEXT ("Error scheduling timer")));
+      }
+  }
+
+  void
+  Sender_exec_i::stop (void)
+  {
+    this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->cancel_timer (this->ticker_);
+    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::stop : Timer canceled.\n")));
+    delete this->ticker_;
+  }
+
+  ::CORBA::UShort
+  Sender_exec_i::rate (void)
+  {
+    return this->rate_;
+  }
+
+  void
+  Sender_exec_i::rate (::CORBA::UShort rate)
+  {
+    this->rate_ = rate;
   }
 
   ::CORBA::UShort
@@ -218,8 +252,8 @@ namespace CIAO_Writer_Sender_Impl
   {
     DDS::DataWriter_var dds_dw =
       this->context_->get_connection_info_write_dds_entity ();
-    CIAO::DDS4CCM::CCM_DDS_DataWriter_i *rti_rd =
-      dynamic_cast <CIAO::DDS4CCM::CCM_DDS_DataWriter_i *> (dds_dw.in ());
+    CIAO::DDS4CCM::RTI::RTI_DataWriter_i *rti_rd =
+      dynamic_cast <CIAO::DDS4CCM::RTI::RTI_DataWriter_i *> (dds_dw.in ());
     DDSDataWriter * p = rti_rd->get_impl ();
     this->dds_writer_ = dynamic_cast <WriterTestDataWriter *> (p);
     this->ccm_writer_ = this->context_->get_connection_info_write_data ();
@@ -242,12 +276,14 @@ namespace CIAO_Writer_Sender_Impl
 
         this->ktests_[key] = new_key;
       }
+    this->last_key_ = this->ktests_.begin ();
     register_handles ();
   }
 
   void
   Sender_exec_i::ccm_passivate (void)
   {
+    this->stop ();
   }
 
   void
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.h
index ffb84827501..19d8b9b072e 100644
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/Sender/Writer_Sender_exec.h
@@ -26,16 +26,19 @@ namespace CIAO_Writer_Sender_Impl
   class Sender_exec_i;
 
   //============================================================
-  // ReadHandler
+  // pulse_Generator
   //============================================================
-  class StartHandler :
+  class pulse_Generator :
     public ACE_Event_Handler
   {
   public:
-    StartHandler (Sender_exec_i &callback);
-    virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
+    pulse_Generator (Sender_exec_i &callback);
+    /// Handle the timeout.
+    virtual int handle_timeout (const ACE_Time_Value &tv,
+                                const void *arg);
   private:
-    Sender_exec_i &callback_;
+    /// Maintains a handle that actually process the event
+    Sender_exec_i &pulse_callback_;
   };
 
   //============================================================
@@ -49,6 +52,10 @@ namespace CIAO_Writer_Sender_Impl
     Sender_exec_i (void);
     virtual ~Sender_exec_i (void);
 
+    virtual ::CORBA::UShort rate (void);
+
+    virtual void rate (::CORBA::UShort rate);
+
     virtual ::CORBA::UShort keys (void);
 
     virtual void keys (::CORBA::UShort keys);
@@ -61,15 +68,18 @@ namespace CIAO_Writer_Sender_Impl
     virtual void ccm_passivate (void);
     virtual void ccm_remove (void);
 
-    void run ();
+    void tick ();
 
   private:
     void start (void);
+    void stop (void);
 
     WriterTestDataWriter * dds_writer_;
     CCM_DDS::WriterTest::Writer_var ccm_writer_;
 
+    pulse_Generator * ticker_;
     ::Writer::CCM_Sender_Context_var context_;
+    CORBA::UShort rate_;
     CORBA::UShort keys_;
 
     void register_handles ();
@@ -83,6 +93,8 @@ namespace CIAO_Writer_Sender_Impl
 
     typedef std::map<ACE_CString, ::DDS::InstanceHandle_t> CCM_Handles;
     CCM_Handles handles_;
+
+    Writer_Table::iterator last_key_;
   };
 
   extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/InstanceHandle/descriptors/Plan.cdp
index 10ad51c564a..30757f60de8 100644
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/descriptors/Plan.cdp
+++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/descriptors/Plan.cdp
@@ -133,6 +133,17 @@
     <source/>
     <implementation xmi:idref="SenderComponentImplementation" />
     <configProperty>
+      <name>rate</name>
+      <value>
+        <type>
+          <kind>tk_ushort</kind>
+        </type>
+        <value>
+          <ushort>10</ushort>
+        </value>
+      </value>
+    </configProperty>
+    <configProperty>
       <name>keys</name>
       <value>
         <type>
diff --git a/CIAO/connectors/dds4ccm/tests/InstanceHandle/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/InstanceHandle/descriptors/run_test.pl
index fdbccf937c8..fb9e19cc0ce 100755
--- a/CIAO/connectors/dds4ccm/tests/InstanceHandle/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/InstanceHandle/descriptors/run_test.pl
@@ -44,6 +44,11 @@ $tg_executor = 0;
 $status = 0;
 $cdp_file = "Plan.cdp";
 
+# $ENV {'CIAO_TRACE_ENABLE'} = 1;
+# $ENV {'DANCE_TRACE_ENABLE'} = 1;
+# $ENV {'CIAO_LOG_LEVEL'} = 3;
+# $ENV {'DANCE_LOG_LEVEL'} = 3;
+
 sub create_targets {
     #   naming service
     $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
@@ -100,8 +105,6 @@ sub kill_open_processes {
     if ($ns_running == 1) {
         $NS->Kill (); $NS->TimedWait (1);
     }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
 }
 
 sub run_node_daemons {
@@ -218,8 +221,8 @@ for ($i = 0; $i < $nr_daemon; ++$i) {
     }
 }
 
-print "Sleeping 5 seconds to allow task to complete\n";
-sleep (5);
+print "Sleeping 20 seconds to allow task to complete\n";
+sleep (20);
 
 # Invoke executor - stop the application -.
 print "Invoking executor - stop the application -\n";
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl
index ef05630a31e..2c9c7a55b43 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.idl
@@ -8,8 +8,6 @@
 #ifndef KEYED_TEST_BASE_IDL
 #define KEYED_TEST_BASE_IDL
 
-#pragma ndds typesupport "Base/Keyed_Test_BaseSupport.h"
-
 struct KeyedTest {
   string key; //@key
   long iteration;
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc
index 236a8129759..3814ea67918 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Base/Keyed_Test_Base.mpc
@@ -1,25 +1,76 @@
 // $Id$
+// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n Keyed_Test_Base"
 
-project (DDS_Keyed_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
-  sharedname = DDS_Keyed_Test_Base_stub
-  dynamicflags += KEYED_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Gxhst -Sci \
+project(DDS_Keyed_Test_Base_idl_gen) : taoidldefaults, anytypecode {
+  custom_only = 1
+  idlflags -= -St -Sa
+  idlflags += -SS -Gxhst \
               -Wb,stub_export_macro=KEYED_TEST_BASE_STUB_Export \
               -Wb,stub_export_include=Keyed_Test_Base_stub_export.h
 
   IDL_Files {
     Keyed_Test_Base.idl
   }
+}
 
-  opendds_ts_flags += --export=KEYED_TEST_BASE_STUB_Export
+project(DDS_Keyed_Test_Base_ndds_ts_gen) : ndds_ts_defaults {
+  custom_only = 1
+  after += DDS_Keyed_Test_Base_idl_gen
 
-  DDSGenerator_Files {
+  NDDSTypeSupport_Files {
     Keyed_Test_Base.idl
   }
+}
+
+project(DDS_Keyed_Test_Base_NDDS_TS) : nddslib, taolib {
+  after += DDS_Keyed_Test_Base_ndds_ts_gen DDS_Keyed_Test_Base_stub
+  libs += DDS_Keyed_Test_Base_stub
+  libout = ../lib
+  libpaths    += ../lib
+  sharedname = DDS_Keyed_Test_Base_NDDS_TS
+  dynamicflags = NDDS_USER_DLL_EXPORT
+
+  verbatim(gnuace, macros) {
+    override no_hidden_visibility = 1
+  }
 
   Source_Files {
+    Keyed_Test_Base.cxx
+    Keyed_Test_BasePlugin.cxx
+    Keyed_Test_BaseSupport.cxx
+  }
+
+  Header_Files {
+    Keyed_Test_Base.h
+    Keyed_Test_BasePlugin.h
+    Keyed_Test_BaseSupport.h
+  }
+
+  Inline_Files {
+  }
+}
+
+project(DDS_Keyed_Test_Base_stub) : ccm_stub {
+  after += DDS_Keyed_Test_Base_idl_gen
+  libout = ../lib
+  libpaths += ../lib
+  sharedname = DDS_Keyed_Test_Base_stub
+  dynamicflags = KEYED_TEST_BASE_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    Keyed_Test_BaseC.cpp
+  }
+
+  Header_Files {
+    Keyed_Test_BaseC.h
+    Keyed_Test_Base_stub_export.h
+  }
+
+  Inline_Files {
+    Keyed_Test_BaseC.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc
index 600419c57dc..bdcda9f692d 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_Keyed_Test_Base -l .. -o ../lib -u DDS Keyed_Test_Connector"
 
-project(DDS_Keyed_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
+project(DDS_Keyed_Test_Connector_idl_gen) : connectoridldefaults {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=KEYED_TEST_CONNECTOR_STUB_Export \
@@ -10,8 +10,8 @@ project(DDS_Keyed_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
               -Wb,skel_export_include=Keyed_Test_Connector_svnt_export.h \
               -Wb,svnt_export_macro=KEYED_TEST_CONNECTOR_SVNT_Export \
               -Wb,svnt_export_include=Keyed_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=KEYED_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Keyed_Test_Connector_conn_export.h \
+              -Wb,exec_export_macro=KEYED_TEST_CONNECTOR_EXEC_Export \
+              -Wb,exec_export_include=Keyed_Test_Connector_exec_export.h \
               -I ..
 
   IDL_Files {
@@ -19,7 +19,7 @@ project(DDS_Keyed_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   }
 }
 
-project(DDS_Keyed_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_Keyed_Test_Connector_lem_gen) : ciaoidldefaults {
   custom_only = 1
   after += DDS_Keyed_Test_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=KEYED_TEST_CONNECTOR_LEM_STUB_Export \
@@ -85,24 +85,24 @@ project(DDS_Keyed_Test_Connector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_Keyed_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_Keyed_Test_Connector_lem_stub DDS_Keyed_Test_Connector_stub DDS4CCM_lem_stub DDS_Keyed_Test_Base_stub
+  after   += DDS_Keyed_Test_Connector_lem_stub DDS_Keyed_Test_Connector_stub DDS4CCM_lem_stub DDS_Keyed_Test_Base_NDDS_TS
   sharedname = DDS_Keyed_Test_Connector_exec
-  libs += DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Connector_lem_stub DDS_Keyed_Test_Base_stub DDS4CCM_lem_stub DDS_Keyed_Test_Base_stub
+  libs += DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Connector_lem_stub DDS_Keyed_Test_Base_stub DDS4CCM_lem_stub DDS_Keyed_Test_Base_NDDS_TS
   libpaths += ../lib
   libout = ../lib
   includes += ..
-  dynamicflags   = KEYED_TEST_CONNECTOR_CONN_BUILD_DLL
+  dynamicflags   = KEYED_TEST_CONNECTOR_EXEC_BUILD_DLL
 
   IDL_Files {
   }
 
   Source_Files {
-    Keyed_Test_Connector_conn.cpp
+    Keyed_Test_Connector_exec.cpp
   }
 
   Header_Files {
-    Keyed_Test_Connector_conn.h
-    Keyed_Test_Connector_conn_export.h
+    Keyed_Test_Connector_exec.h
+    Keyed_Test_Connector_exec_export.h
   }
 
   Inline_Files {
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector_exec.cpp b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector_exec.cpp
new file mode 100644
index 00000000000..052eacaeced
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector_exec.cpp
@@ -0,0 +1,30 @@
+// -*- C++ -*-
+// $Id$
+
+#include "Keyed_Test_Connector_exec.h"
+
+namespace CIAO_Keyed_Test_Keyed_Test_Connector_Impl
+{
+  Keyed_Test_Connector_exec_i::Keyed_Test_Connector_exec_i (void)
+    : DDS_Event_Connector_T<KeyedTest_DDS_Traits, KeyedTest_Connector_Traits> ()
+  {
+  }
+
+  Keyed_Test_Connector_exec_i::~Keyed_Test_Connector_exec_i (void)
+  {
+  }
+
+  extern "C" KEYED_TEST_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_Keyed_Test_Keyed_Test_Connector_Impl (void)
+  {
+    ::Components::EnterpriseComponent_ptr retval =
+      ::Components::EnterpriseComponent::_nil ();
+
+    ACE_NEW_NORETURN (
+      retval,
+      Keyed_Test_Connector_exec_i ());
+
+    return retval;
+  }
+}
+
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector_exec.h
new file mode 100644
index 00000000000..0c9fcc66731
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Connector/Keyed_Test_Connector_exec.h
@@ -0,0 +1,61 @@
+// -*- C++ -*-
+// $Id$
+
+#ifndef KEYED_TEST_CONNECTOR_EXEC_H_
+#define KEYED_TEST_CONNECTOR_EXEC_H_
+
+#include /**/ "ace/pre.h"
+
+#include "Keyed_Test_ConnectorEC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "Keyed_Test_Connector_exec_export.h"
+#include "tao/LocalObject.h"
+
+#include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
+#include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
+
+#include "Base/Keyed_Test_BaseSupport.h"
+
+namespace CIAO_Keyed_Test_Keyed_Test_Connector_Impl
+{
+
+  // @from use of KeyedTest as a parameter
+  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+    KeyedTest,
+    KeyedTestSeq,
+    KeyedTestTypeSupport,
+    KeyedTestDataWriter,
+    KeyedTestDataReader > KeyedTest_DDS_Traits;
+
+  typedef CIAO::DDS4CCM::Connector_Traits <
+    ::CIAO_Keyed_Test_Keyed_Test_Connector_Impl::Keyed_Test_Connector_Exec,
+    KeyedTest_Seq,
+    ::CCM_DDS::KeyedTest::CCM_Writer,
+    ::CCM_DDS::KeyedTest::CCM_Updater,
+    ::CCM_DDS::KeyedTest::CCM_Getter,
+    ::CCM_DDS::KeyedTest::CCM_Reader,
+    ::Keyed_Test::CCM_Keyed_Test_Connector_Context,
+    ::CCM_DDS::KeyedTest::Listener,
+    ::CCM_DDS::KeyedTest::StateListener,
+    ::CCM_DDS::ConnectorStatusListener> KeyedTest_Connector_Traits;
+
+  class KEYED_TEST_CONNECTOR_EXEC_Export Keyed_Test_Connector_exec_i :
+    public DDS_Event_Connector_T <KeyedTest_DDS_Traits, KeyedTest_Connector_Traits>
+  {
+  public:
+    Keyed_Test_Connector_exec_i (void);
+    virtual ~Keyed_Test_Connector_exec_i (void);
+  };
+
+  extern "C" KEYED_TEST_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_Keyed_Test_Keyed_Test_Connector_Impl (void);
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.mpc
index 1784d080aa7..f3ee28f4b96 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Receiver/Keyed_Test_Receiver.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_Keyed_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_Keyed_Test_Receiver_idl_gen) : componentidldefaults {
   custom_only = 1
   after += DDS_Keyed_Test_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
@@ -17,7 +17,7 @@ project(DDS_Keyed_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_Keyed_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_Keyed_Test_Receiver_lem_gen) : ciaoidldefaults {
   after += DDS_Keyed_Test_Receiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
@@ -107,7 +107,7 @@ project(DDS_Keyed_Test_Receiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_Keyed_Test_Receiver_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_Keyed_Test_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      +=   DDS_Keyed_Test_Receiver_lem_stub DDS_Keyed_Test_Base_stub DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Connector_svnt DDS_Keyed_Test_Receiver_exec DDS_Keyed_Test_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
   sharedname  = Receiver_svnt
   libs       += Receiver_stub Receiver_lem_stub DDS_Keyed_Test_Base_stub DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Connector_svnt Receiver_exec DDS_Keyed_Test_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc
index ba7ec3f4b2a..e40e0dca99a 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/Sender/Keyed_Test_Sender.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_Keyed_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(DDS_Keyed_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_Keyed_Test_Sender_idl_gen) : componentidldefaults {
   after += DDS_Keyed_Test_Connector_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_Keyed_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_Keyed_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_Keyed_Test_Sender_lem_gen) : ciaoidldefaults {
   after += DDS_Keyed_Test_Sender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
@@ -109,7 +109,7 @@ project(DDS_Keyed_Test_Sender_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_Keyed_Test_Sender_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_Keyed_Test_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      += DDS_Keyed_Test_Base_stub  DDS_Keyed_Test_Sender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_Keyed_Test_Connector_stub DDS_Keyed_Test_Connector_svnt  DDS_Keyed_Test_Connector_lem_stub
   sharedname  = Sender_svnt
   libs       += Sender_stub Sender_lem_stub  \
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl
index 4c584d6e11a..6f82b757a0a 100755
--- a/CIAO/connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/KeyedSamples/descriptors/run_test.pl
@@ -100,8 +100,6 @@ sub kill_open_processes {
     if ($ns_running == 1) {
         $NS->Kill (); $NS->TimedWait (1);
     }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
 }
 
 sub run_node_daemons {
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.idl b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.idl
index db4905ab610..a824bb09c00 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.idl
@@ -8,8 +8,6 @@
 #ifndef WRITER_BASE_IDL
 #define WRITER_BASE_IDL
 
-#pragma ndds typesupport "Base/Writer_BaseSupport.h"
-
 struct WriterTest {
   string key; //@key
   long iteration;
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc
index e0af46d8e73..e8dd47efc0f 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Base/Writer_Base.mpc
@@ -1,25 +1,76 @@
 // $Id$
+// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n Writer_Base"
 
-project (DDS_KeyedWriterBase_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
-  sharedname = DDS_KeyedWriterBase_stub
-  dynamicflags += WRITER_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Gxhst -Sci \
+project(DDS_KeyedWriterBase_idl_gen) : taoidldefaults, anytypecode {
+  custom_only = 1
+  idlflags -= -St -Sa
+  idlflags += -SS -Gxhst \
               -Wb,stub_export_macro=WRITER_BASE_STUB_Export \
               -Wb,stub_export_include=Writer_Base_stub_export.h
 
   IDL_Files {
     Writer_Base.idl
   }
+}
 
-  opendds_ts_flags += --export=WRITER_BASE_STUB_Export
+project(DDS_KeyedWriterBase_ndds_ts_gen) : ndds_ts_defaults {
+  custom_only = 1
+  after += DDS_KeyedWriterBase_idl_gen
 
-  DDSGenerator_Files {
+  NDDSTypeSupport_Files {
     Writer_Base.idl
   }
+}
+
+project(DDS_KeyedWriterBase_NDDS_TS) : nddslib, taolib {
+  after += DDS_KeyedWriterBase_ndds_ts_gen DDS_KeyedWriterBase_stub
+  libs += DDS_KeyedWriterBase_stub
+  libout = ../lib
+  libpaths    += ../lib
+  sharedname = DDS_KeyedWriterBase_NDDS_TS
+  dynamicflags = NDDS_USER_DLL_EXPORT
+
+  verbatim(gnuace, macros) {
+    override no_hidden_visibility = 1
+  }
 
   Source_Files {
+    Writer_Base.cxx
+    Writer_BasePlugin.cxx
+    Writer_BaseSupport.cxx
+  }
+
+  Header_Files {
+    Writer_Base.h
+    Writer_BasePlugin.h
+    Writer_BaseSupport.h
+  }
+
+  Inline_Files {
+  }
+}
+
+project(DDS_KeyedWriterBase_stub) : ccm_stub {
+  after += DDS_KeyedWriterBase_idl_gen
+  libout = ../lib
+  libpaths += ../lib
+  sharedname = DDS_KeyedWriterBase_stub
+  dynamicflags = WRITER_BASE_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    Writer_BaseC.cpp
+  }
+
+  Header_Files {
+    Writer_BaseC.h
+    Writer_Base_stub_export.h
+  }
+
+  Inline_Files {
+    Writer_BaseC.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc
index 3da46b66869..e568d289da1 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_KeyedWriterBase -l .. -o ../lib -u DDS Writer_Connector"
 
-project(DDS_KeyedWriterConnector_idl_gen) : connectoridldefaults, dds4ccm {
+project(DDS_KeyedWriterConnector_idl_gen) : connectoridldefaults {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=WRITER_CONNECTOR_STUB_Export \
@@ -10,8 +10,8 @@ project(DDS_KeyedWriterConnector_idl_gen) : connectoridldefaults, dds4ccm {
               -Wb,skel_export_include=Writer_Connector_svnt_export.h \
               -Wb,svnt_export_macro=WRITER_CONNECTOR_SVNT_Export \
               -Wb,svnt_export_include=Writer_Connector_svnt_export.h \
-              -Wb,conn_export_macro=WRITER_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Writer_Connector_conn_export.h \
+              -Wb,exec_export_macro=WRITER_CONNECTOR_EXEC_Export \
+              -Wb,exec_export_include=Writer_Connector_exec_export.h \
               -I ..
 
   IDL_Files {
@@ -19,7 +19,7 @@ project(DDS_KeyedWriterConnector_idl_gen) : connectoridldefaults, dds4ccm {
   }
 }
 
-project(DDS_KeyedWriterConnector_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_KeyedWriterConnector_lem_gen) : ciaoidldefaults {
   custom_only = 1
   after += DDS_KeyedWriterConnector_idl_gen
   idlflags += -Wb,stub_export_macro=WRITER_CONNECTOR_LEM_STUB_Export \
@@ -85,24 +85,24 @@ project(DDS_KeyedWriterConnector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_KeyedWriterConnector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_KeyedWriterConnector_lem_stub DDS_KeyedWriterConnector_stub DDS4CCM_lem_stub DDS_KeyedWriterBase_stub
+  after   += DDS_KeyedWriterConnector_lem_stub DDS_KeyedWriterConnector_stub DDS4CCM_lem_stub DDS_KeyedWriterBase_NDDS_TS
   sharedname = DDS_KeyedWriterConnector_exec
-  libs += DDS_KeyedWriterConnector_stub DDS_KeyedWriterConnector_lem_stub DDS_KeyedWriterBase_stub DDS4CCM_lem_stub DDS_KeyedWriterBase_stub
+  libs += DDS_KeyedWriterConnector_stub DDS_KeyedWriterConnector_lem_stub DDS_KeyedWriterBase_stub DDS4CCM_lem_stub DDS_KeyedWriterBase_NDDS_TS
   libpaths += ../lib
   libout = ../lib
   includes += ..
-  dynamicflags   = WRITER_CONNECTOR_CONN_BUILD_DLL
+  dynamicflags   = WRITER_CONNECTOR_EXEC_BUILD_DLL
 
   IDL_Files {
   }
 
   Source_Files {
-    Writer_Connector_conn.cpp
+    Writer_Connector_exec.cpp
   }
 
   Header_Files {
-    Writer_Connector_conn.h
-    Writer_Connector_conn_export.h
+    Writer_Connector_exec.h
+    Writer_Connector_exec_export.h
   }
 
   Inline_Files {
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector_exec.cpp b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector_exec.cpp
new file mode 100644
index 00000000000..81585b43a78
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector_exec.cpp
@@ -0,0 +1,30 @@
+// -*- C++ -*-
+// $Id$
+
+#include "Writer_Connector_exec.h"
+
+namespace CIAO_Writer_Writer_Connector_Impl
+{
+  Writer_Connector_exec_i::Writer_Connector_exec_i (void)
+    : DDS_Event_Connector_T<WriterTest_DDS_Traits, WriterTest_Connector_Traits> ()
+  {
+  }
+
+  Writer_Connector_exec_i::~Writer_Connector_exec_i (void)
+  {
+  }
+
+  extern "C" WRITER_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_Writer_Writer_Connector_Impl (void)
+  {
+    ::Components::EnterpriseComponent_ptr retval =
+      ::Components::EnterpriseComponent::_nil ();
+
+    ACE_NEW_NORETURN (
+      retval,
+      Writer_Connector_exec_i ());
+
+    return retval;
+  }
+}
+
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector_exec.h
new file mode 100644
index 00000000000..05f2d6bee47
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Connector/Writer_Connector_exec.h
@@ -0,0 +1,60 @@
+// -*- C++ -*-
+// $Id$
+
+#ifndef WRITER_CONNECTOR_EXEC_H_
+#define WRITER_CONNECTOR_EXEC_H_
+
+#include /**/ "ace/pre.h"
+
+#include "Writer_ConnectorEC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "Writer_Connector_exec_export.h"
+#include "tao/LocalObject.h"
+
+#include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
+#include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
+
+#include "Base/Writer_BaseSupport.h"
+
+namespace CIAO_Writer_Writer_Connector_Impl
+{
+  // @from use of WriterTest as a parameter
+  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+    WriterTest,
+    WriterTestSeq,
+    WriterTestTypeSupport,
+    WriterTestDataWriter,
+    WriterTestDataReader > WriterTest_DDS_Traits;
+
+  typedef CIAO::DDS4CCM::Connector_Traits <
+    ::CIAO_Writer_Writer_Connector_Impl::Writer_Connector_Exec,
+    WriterTest_Seq,
+    ::CCM_DDS::WriterTest::CCM_Writer,
+    ::CCM_DDS::WriterTest::CCM_Updater,
+    ::CCM_DDS::WriterTest::CCM_Getter,
+    ::CCM_DDS::WriterTest::CCM_Reader,
+    ::Writer::CCM_Writer_Connector_Context,
+    ::CCM_DDS::WriterTest::Listener,
+    ::CCM_DDS::WriterTest::StateListener,
+    ::CCM_DDS::ConnectorStatusListener> WriterTest_Connector_Traits;
+
+  class WRITER_CONNECTOR_EXEC_Export Writer_Connector_exec_i :
+    public DDS_Event_Connector_T <WriterTest_DDS_Traits, WriterTest_Connector_Traits>
+  {
+  public:
+    Writer_Connector_exec_i (void);
+    virtual ~Writer_Connector_exec_i (void);
+  };
+
+  extern "C" WRITER_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_Writer_Writer_Connector_Impl (void);
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc
index 4c41207a86c..0ab377d825c 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Receiver/Writer_Receiver.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_KeyedWriterReceiver_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_KeyedWriterReceiver_idl_gen) : componentidldefaults {
   custom_only = 1
   after += DDS_KeyedWriterConnector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
@@ -17,7 +17,7 @@ project(DDS_KeyedWriterReceiver_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_KeyedWriterReceiver_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_KeyedWriterReceiver_lem_gen) : ciaoidldefaults {
   after += DDS_KeyedWriterReceiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
@@ -107,7 +107,7 @@ project(DDS_KeyedWriterReceiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_KeyedWriterReceiver_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_KeyedWriterReceiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      +=   DDS_KeyedWriterReceiver_lem_stub DDS_KeyedWriterBase_stub DDS_KeyedWriterConnector_stub DDS_KeyedWriterConnector_svnt DDS_KeyedWriterReceiver_exec DDS_KeyedWriterConnector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
   sharedname  = Receiver_svnt
   libs       += Receiver_stub Receiver_lem_stub DDS_KeyedWriterBase_stub DDS_KeyedWriterConnector_stub DDS_KeyedWriterConnector_svnt Receiver_exec DDS_KeyedWriterConnector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc
index 66be0dfb9a9..407519e7c41 100644
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/Sender/Writer_Sender.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_KeyedWriterBase -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(DDS_KeyedWriterSender_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_KeyedWriterSender_idl_gen) : componentidldefaults {
   after += DDS_KeyedWriterConnector_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_KeyedWriterSender_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_KeyedWriterSender_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_KeyedWriterSender_lem_gen) : ciaoidldefaults {
   after += DDS_KeyedWriterSender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
@@ -109,7 +109,7 @@ project(DDS_KeyedWriterSender_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_KeyedWriterSender_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_KeyedWriterSender_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      += DDS_KeyedWriterBase_stub  DDS_KeyedWriterSender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_KeyedWriterConnector_stub DDS_KeyedWriterConnector_svnt  DDS_KeyedWriterConnector_lem_stub
   sharedname  = Sender_svnt
   libs       += Sender_stub Sender_lem_stub  \
diff --git a/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl
index 4c584d6e11a..6f82b757a0a 100755
--- a/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/KeyedWriter/descriptors/run_test.pl
@@ -100,8 +100,6 @@ sub kill_open_processes {
     if ($ns_running == 1) {
         $NS->Kill (); $NS->TimedWait (1);
     }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
 }
 
 sub run_node_daemons {
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl
index dfa83eb4c61..1c5c8b21163 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.idl
@@ -8,8 +8,6 @@
 #ifndef LISTEN_MANY_BY_MANY_TEST_BASE_IDL
 #define LISTEN_MANY_BY_MANY_TEST_BASE_IDL
 
-#pragma ndds typesupport "Base/LMBM_Test_BaseSupport.h"
-
 struct ListenManyByManyTest {
   string key; //@key
   long iteration;
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc
index 6936e2d5fb7..f521e910d58 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Base/LMBM_Test_Base.mpc
@@ -1,25 +1,75 @@
 // $Id$
+// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n LMBM_Test_Base"
 
-project (DDS_LMBM_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
-  sharedname = DDS_LMBM_Test_Base_stub
-  dynamicflags += LISTEN_MANY_BY_MANY_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Gxhst -Sci \
+project(DDS_LMBM_Test_Base_idl_gen) : taoidldefaults, anytypecode {
+  custom_only = 1
+  idlflags -= -St -Sa
+  idlflags += -SS -Gxhst \
               -Wb,stub_export_macro=LISTEN_MANY_BY_MANY_TEST_BASE_STUB_Export \
               -Wb,stub_export_include=LMBM_Test_Base_stub_export.h
 
   IDL_Files {
     LMBM_Test_Base.idl
   }
+}
 
-  opendds_ts_flags += --export=LISTEN_MANY_BY_MANY_TEST_BASE_STUB_Export
+project(DDS_LMBM_Test_Base_ndds_ts_gen) : ndds_ts_defaults {
+  custom_only = 1
+  after += DDS_LMBM_Test_Base_idl_gen
 
-  DDSGenerator_Files {
+  NDDSTypeSupport_Files {
     LMBM_Test_Base.idl
   }
+}
+
+project(DDS_LMBM_Test_Base_NDDS_TS) : nddslib, taolib {
+  after += DDS_LMBM_Test_Base_ndds_ts_gen DDS_LMBM_Test_Base_stub
+  libs += DDS_LMBM_Test_Base_stub
+  libout = ../lib
+  libpaths    += ../lib
+  sharedname = DDS_LMBM_Test_Base_NDDS_TS
+  dynamicflags = NDDS_USER_DLL_EXPORT
+
+  verbatim(gnuace, macros) {
+    override no_hidden_visibility = 1
+  }
 
   Source_Files {
+    LMBM_Test_Base.cxx
+    LMBM_Test_BasePlugin.cxx
+    LMBM_Test_BaseSupport.cxx
+  }
+
+  Header_Files {
+    LMBM_Test_Base.h
+    LMBM_Test_BasePlugin.h
+    LMBM_Test_BaseSupport.h
+  }
+
+  Inline_Files {
   }
 }
 
+project(DDS_LMBM_Test_Base_stub) : ccm_stub {
+  after += DDS_LMBM_Test_Base_idl_gen
+  libout = ../lib
+  libpaths += ../lib
+  sharedname = DDS_LMBM_Test_Base_stub
+  dynamicflags = LISTEN_MANY_BY_MANY_TEST_BASE_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    LMBM_Test_BaseC.cpp
+  }
+
+  Header_Files {
+    LMBM_Test_BaseC.h
+    LMBM_Test_Base_stub_export.h
+  }
+
+  Inline_Files {
+    LMBM_Test_BaseC.inl
+  }
+}
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc
index 909ce5b59b6..9da600a743b 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_LMBM_Test_Base -l .. -o ../lib -u DDS LMBM_Test_Connector"
 
-project(DDS_LMBM_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
+project(DDS_LMBM_Test_Connector_idl_gen) : connectoridldefaults {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=LISTEN_MANY_BY_MANY_TEST_CONNECTOR_STUB_Export \
@@ -10,8 +10,8 @@ project(DDS_LMBM_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
               -Wb,skel_export_include=LMBM_Test_Connector_svnt_export.h \
               -Wb,svnt_export_macro=LISTEN_MANY_BY_MANY_TEST_CONNECTOR_SVNT_Export \
               -Wb,svnt_export_include=LMBM_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=LISTEN_MANY_BY_MANY_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=LMBM_Test_Connector_conn_export.h \
+              -Wb,exec_export_macro=LISTEN_MANY_BY_MANY_TEST_CONNECTOR_EXEC_Export \
+              -Wb,exec_export_include=LMBM_Test_Connector_exec_export.h \
               -I ..
 
   IDL_Files {
@@ -19,7 +19,7 @@ project(DDS_LMBM_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   }
 }
 
-project(DDS_LMBM_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_LMBM_Test_Connector_lem_gen) : ciaoidldefaults {
   custom_only = 1
   after += DDS_LMBM_Test_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=LISTEN_MANY_BY_MANY_TEST_CONNECTOR_LEM_STUB_Export \
@@ -85,24 +85,24 @@ project(DDS_LMBM_Test_Connector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_LMBM_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_LMBM_Test_Connector_lem_stub DDS_LMBM_Test_Connector_stub DDS4CCM_lem_stub DDS_LMBM_Test_Base_stub
+  after   += DDS_LMBM_Test_Connector_lem_stub DDS_LMBM_Test_Connector_stub DDS4CCM_lem_stub DDS_LMBM_Test_Base_NDDS_TS
   sharedname = DDS_LMBM_Test_Connector_exec
-  libs += DDS_LMBM_Test_Connector_stub DDS_LMBM_Test_Connector_lem_stub DDS_LMBM_Test_Base_stub DDS4CCM_lem_stub DDS_LMBM_Test_Base_stub
+  libs += DDS_LMBM_Test_Connector_stub DDS_LMBM_Test_Connector_lem_stub DDS_LMBM_Test_Base_stub DDS4CCM_lem_stub DDS_LMBM_Test_Base_NDDS_TS
   libpaths += ../lib
   libout = ../lib
   includes += ..
-  dynamicflags   = LISTEN_MANY_BY_MANY_TEST_CONNECTOR_CONN_BUILD_DLL
+  dynamicflags   = LISTEN_MANY_BY_MANY_TEST_CONNECTOR_EXEC_BUILD_DLL
 
   IDL_Files {
   }
 
   Source_Files {
-    LMBM_Test_Connector_conn.cpp
+    LMBM_Test_Connector_exec.cpp
   }
 
   Header_Files {
-    LMBM_Test_Connector_conn.h
-    LMBM_Test_Connector_conn_export.h
+    LMBM_Test_Connector_exec.h
+    LMBM_Test_Connector_exec_export.h
   }
 
   Inline_Files {
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector_exec.cpp b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector_exec.cpp
new file mode 100644
index 00000000000..4c20f9e9239
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector_exec.cpp
@@ -0,0 +1,30 @@
+// -*- C++ -*-
+// $Id$
+
+#include "LMBM_Test_Connector_exec.h"
+
+namespace CIAO_LMBM_Test_LMBM_Test_Connector_Impl
+{
+  LMBM_Test_Connector_exec_i::LMBM_Test_Connector_exec_i (void)
+    : DDS_Event_Connector_T<ListenManyByManyTest_DDS_Traits, ListenManyByManyTest_Connector_Traits> ()
+  {
+  }
+
+  LMBM_Test_Connector_exec_i::~LMBM_Test_Connector_exec_i (void)
+  {
+  }
+
+  extern "C" LISTEN_MANY_BY_MANY_TEST_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_LMBM_Test_LMBM_Test_Connector_Impl (void)
+  {
+    ::Components::EnterpriseComponent_ptr retval =
+      ::Components::EnterpriseComponent::_nil ();
+
+    ACE_NEW_NORETURN (
+      retval,
+      LMBM_Test_Connector_exec_i ());
+
+    return retval;
+  }
+}
+
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector_exec.h
new file mode 100644
index 00000000000..25e0b3e4351
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Connector/LMBM_Test_Connector_exec.h
@@ -0,0 +1,61 @@
+// -*- C++ -*-
+// $Id$
+
+#ifndef LISTEN_MANY_BY_MANY_TEST_CONNECTOR_EXEC_H_
+#define LISTEN_MANY_BY_MANY_TEST_CONNECTOR_EXEC_H_
+
+#include /**/ "ace/pre.h"
+
+#include "LMBM_Test_ConnectorEC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "LMBM_Test_Connector_exec_export.h"
+#include "tao/LocalObject.h"
+
+#include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
+#include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
+
+#include "Base/LMBM_Test_BaseSupport.h"
+
+namespace CIAO_LMBM_Test_LMBM_Test_Connector_Impl
+{
+
+  // @from use of ListenManyByManyTest as a parameter
+  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+    ListenManyByManyTest,
+    ListenManyByManyTestSeq,
+    ListenManyByManyTestTypeSupport,
+    ListenManyByManyTestDataWriter,
+    ListenManyByManyTestDataReader > ListenManyByManyTest_DDS_Traits;
+
+  typedef CIAO::DDS4CCM::Connector_Traits <
+    ::CIAO_LMBM_Test_LMBM_Test_Connector_Impl::LMBM_Test_Connector_Exec,
+    ListenManyByManyTest_Seq,
+    ::CCM_DDS::ListenManyByManyTest::CCM_Writer,
+    ::CCM_DDS::ListenManyByManyTest::CCM_Updater,
+    ::CCM_DDS::ListenManyByManyTest::CCM_Getter,
+    ::CCM_DDS::ListenManyByManyTest::CCM_Reader,
+    ::LMBM_Test::CCM_LMBM_Test_Connector_Context,
+    ::CCM_DDS::ListenManyByManyTest::Listener,
+    ::CCM_DDS::ListenManyByManyTest::StateListener,
+    ::CCM_DDS::ConnectorStatusListener> ListenManyByManyTest_Connector_Traits;
+
+  class LISTEN_MANY_BY_MANY_TEST_CONNECTOR_EXEC_Export LMBM_Test_Connector_exec_i :
+    public DDS_Event_Connector_T <ListenManyByManyTest_DDS_Traits, ListenManyByManyTest_Connector_Traits>
+  {
+  public:
+    LMBM_Test_Connector_exec_i (void);
+    virtual ~LMBM_Test_Connector_exec_i (void);
+  };
+
+  extern "C" LISTEN_MANY_BY_MANY_TEST_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_LMBM_Test_LMBM_Test_Connector_Impl (void);
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.idl
index 1361b12bcb0..238db27557f 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.idl
@@ -15,6 +15,7 @@ module LMBM_Test
   component Receiver
   {
     port CCM_DDS::ListenManyByManyTest::DDS_Listen info_listen;
+    provides CCM_DDS::ConnectorStatusListener info_listen_connector_status;
 
     attribute unsigned short keys;
     attribute unsigned short iterations;
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.mpc
index 3cf42501a32..74f1dbaf92a 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_LMBM_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_LMBM_Test_Receiver_idl_gen) : componentidldefaults {
   custom_only = 1
   after += DDS_LMBM_Test_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
@@ -17,7 +17,7 @@ project(DDS_LMBM_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_LMBM_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_LMBM_Test_Receiver_lem_gen) : ciaoidldefaults {
   after += DDS_LMBM_Test_Receiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
@@ -114,7 +114,7 @@ project(DDS_LMBM_Test_Receiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_LMBM_Test_Receiver_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_LMBM_Test_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      +=   DDS_LMBM_Test_Receiver_lem_stub DDS_LMBM_Test_Base_stub \
                   DDS_LMBM_Test_Connector_stub DDS_LMBM_Test_Connector_svnt \
                   DDS_LMBM_Test_Receiver_exec DDS_LMBM_Test_Connector_lem_stub \
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp
index 9574e68b179..ba9544b75be 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.cpp
@@ -12,9 +12,12 @@ namespace CIAO_LMBM_Test_Receiver_Impl
   //============================================================
   ListenManyByManyTest_Listener_exec_i::ListenManyByManyTest_Listener_exec_i (
                                               Atomic_ULong &received_one_by_one,
-                                              Atomic_ULong &received_many_by_many)
+                                              Atomic_ULong &received_many_by_many,
+                                              Atomic_Bool &many_received)
     : received_one_by_one_ (received_one_by_one),
-      received_many_by_many_ (received_many_by_many)
+      received_many_by_many_ (received_many_by_many),
+      many_received_ (many_received)
+
   {
   }
 
@@ -68,6 +71,68 @@ namespace CIAO_LMBM_Test_Receiver_Impl
           }
       }
     this->received_many_by_many_ += an_instance.length ();
+    if (!this->many_received_.value () && an_instance.length () > 1)
+      {
+        this->many_received_ = true;
+      }
+  }
+
+  //============================================================
+  // ConnectorStatusListener_exec_i
+  //============================================================
+  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (
+            Receiver_exec_i &callback,
+            const CORBA::ULong &expected)
+    : callback_ (callback),
+      expected_ (expected),
+      received_ (0)
+  {
+  }
+
+  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
+  {
+  }
+
+  void ConnectorStatusListener_exec_i::on_inconsistent_topic(
+     ::DDS::Topic_ptr ,
+     const DDS::InconsistentTopicStatus & )
+  {
+  }
+
+  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos(
+    ::DDS::DataReader_ptr ,
+     const DDS::RequestedIncompatibleQosStatus & )
+  {
+  }
+
+  void ConnectorStatusListener_exec_i::on_sample_rejected(
+     ::DDS::DataReader_ptr ,
+     const DDS::SampleRejectedStatus & )
+  {
+  }
+
+  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
+     ::DDS::DataWriter_ptr ,
+     const DDS::OfferedDeadlineMissedStatus & )
+  {
+  }
+
+  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
+     ::DDS::DataWriter_ptr ,
+     const DDS::OfferedIncompatibleQosStatus & )
+  {
+  }
+
+  void ConnectorStatusListener_exec_i::on_unexpected_status(
+    ::DDS::Entity_ptr ,
+    ::DDS::StatusKind  status_kind)
+  {
+    if (status_kind == ::DDS::DATA_ON_READERS_STATUS)
+      ++this->received_;
+      if (this->received_ >= this->expected_)
+      {
+        this->callback_.start ();
+      }
   }
 
   //============================================================
@@ -76,6 +141,9 @@ namespace CIAO_LMBM_Test_Receiver_Impl
   Receiver_exec_i::Receiver_exec_i (void)
     : received_one_by_one_ (0),
       received_many_by_many_ (0),
+      started_ (false),
+      many_received_ (false),
+      expected_ (50),
       iterations_ (10),
       keys_ (5)
   {
@@ -88,9 +156,13 @@ namespace CIAO_LMBM_Test_Receiver_Impl
   void
   Receiver_exec_i::start ()
   {
-    ::CCM_DDS::DataListenerControl_var dlc =
-        this->context_->get_connection_info_listen_data_control ();
-    dlc->mode (::CCM_DDS::MANY_BY_MANY);
+    if (!this->started_.value ())
+      {
+        this->started_ = true;
+        ::CCM_DDS::DataListenerControl_var dlc =
+            this->context_->get_connection_info_listen_data_control ();
+        dlc->mode (::CCM_DDS::MANY_BY_MANY);
+      }
   }
 
   ::CCM_DDS::ListenManyByManyTest::CCM_Listener_ptr
@@ -98,7 +170,8 @@ namespace CIAO_LMBM_Test_Receiver_Impl
   {
     return new ListenManyByManyTest_Listener_exec_i (
                 this->received_one_by_one_,
-                this->received_many_by_many_);
+                this->received_many_by_many_,
+                this->many_received_);
   }
 
   ::CCM_DDS::CCM_PortStatusListener_ptr
@@ -110,7 +183,9 @@ namespace CIAO_LMBM_Test_Receiver_Impl
   ::CCM_DDS::CCM_ConnectorStatusListener_ptr
   Receiver_exec_i::get_info_listen_connector_status (void)
   {
-    return::CCM_DDS::CCM_ConnectorStatusListener::_nil ();
+    return new ConnectorStatusListener_exec_i (
+                    *this,
+                    this->expected_);
   }
 
   ::CORBA::UShort
@@ -123,6 +198,7 @@ namespace CIAO_LMBM_Test_Receiver_Impl
   Receiver_exec_i::iterations (::CORBA::UShort iterations)
   {
     this->iterations_ = iterations;
+    this->expected_ = this->keys_ * this->iterations_;
   }
 
   ::CORBA::UShort
@@ -135,6 +211,7 @@ namespace CIAO_LMBM_Test_Receiver_Impl
   Receiver_exec_i::keys (::CORBA::UShort keys)
   {
     this->keys_ = keys;
+    this->expected_ = this->keys_ * this->iterations_;
   }
 
   void
@@ -157,7 +234,6 @@ namespace CIAO_LMBM_Test_Receiver_Impl
   void
   Receiver_exec_i::ccm_activate (void)
   {
-    start ();
   }
 
   void
@@ -168,24 +244,24 @@ namespace CIAO_LMBM_Test_Receiver_Impl
   void
   Receiver_exec_i::ccm_remove (void)
   {
-    CORBA::ULong expected = this->keys_ * this->iterations_;
+    this->expected_ = this->keys_ * this->iterations_;
     if (this->received_many_by_many_.value () == 0)
       {
         ACE_ERROR ((LM_ERROR, "ERROR: MANY_BY_MANY: "
                                "Didn't receive samples on many_by_many "
                                "callback while mode is MANY_BY_MANY "
                                "expected <%u> - received <%u>\n",
-                               expected,
+                               this->expected_,
                                this->received_many_by_many_.value ()));
       }
-    else if (expected != this->received_many_by_many_.value ())
+    else if (this->expected_ != this->received_many_by_many_.value ())
       {
         ACE_ERROR ((LM_ERROR, "ERROR: MANY_BY_MANY: "
                                "Didn't receive the expected "
                                "number of samples on many_by_many "
                                "callback while mode is MANY_BY_MANY "
                                "expected <%u> - received <%u>\n",
-                               expected,
+                               this->expected_,
                                this->received_many_by_many_.value ()));
       }
     if (this->received_one_by_one_.value () > 0)
@@ -196,13 +272,31 @@ namespace CIAO_LMBM_Test_Receiver_Impl
                                "expected <0> - received <%u>\n",
                                this->received_one_by_one_.value ()));
       }
+    if (!this->started_.value ())
+      {
+        ACE_ERROR ((LM_ERROR, "ERROR: MANY_BY_MANY: "
+                               "Didn't received DATA_ON_READERS_STATUS on "
+                               "ConnectorStatusListener\n"));
+      }
     if (this->received_one_by_one_.value () == 0   &&
-        this->received_many_by_many_.value () > 0)
+        this->received_many_by_many_.value () > 0 &&
+        this->started_.value ())
       {
-        ACE_DEBUG ((LM_DEBUG, "MANY_BY_MANY: "
-                                "Received only data on "
-                                "many_by_many callback. "
-                                "Test passed!\n"));
+        if (this->many_received_.value ())
+          {
+            ACE_DEBUG ((LM_DEBUG, "MANY_BY_MANY: "
+                                   "Received only data on "
+                                   "many_by_many callback. "
+                                   "Test passed!\n"));
+          }
+        else
+          {
+            ACE_DEBUG ((LM_ERROR, "ERROR: MANY_BY_MANY: "
+                                   "Received only data on "
+                                   "many_by_many callback but "
+                                   "all samples were received "
+                                   "one by one.\n"));
+          }
       }
   }
 
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.h
index 1f1318e02d5..d61d5c5823a 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Receiver/LMBM_Test_Receiver_exec.h
@@ -31,7 +31,8 @@ namespace CIAO_LMBM_Test_Receiver_Impl
   public:
     ListenManyByManyTest_Listener_exec_i (
                             Atomic_ULong &received_one_by_one,
-                            Atomic_ULong &received_many_by_many);
+                            Atomic_ULong &received_many_by_many,
+                            Atomic_Bool &many_received);
     virtual ~ListenManyByManyTest_Listener_exec_i (void);
 
     virtual void
@@ -45,6 +46,44 @@ namespace CIAO_LMBM_Test_Receiver_Impl
   private:
     Atomic_ULong &received_one_by_one_;
     Atomic_ULong &received_many_by_many_;
+    Atomic_Bool  &many_received_;
+  };
+
+  //============================================================
+  // ConnectorStatusListener_exec_i
+  //============================================================
+  class RECEIVER_EXEC_Export ConnectorStatusListener_exec_i
+    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
+      public virtual ::CORBA::LocalObject
+  {
+  public:
+    ConnectorStatusListener_exec_i (
+                Receiver_exec_i &callback,
+                const CORBA::ULong &expected);
+    virtual ~ConnectorStatusListener_exec_i (void);
+
+    virtual
+    void on_inconsistent_topic( ::DDS::Topic_ptr ,
+                              const DDS::InconsistentTopicStatus & );
+    virtual
+    void on_requested_incompatible_qos( ::DDS::DataReader_ptr ,
+                              const DDS::RequestedIncompatibleQosStatus & );
+    virtual
+    void on_sample_rejected( ::DDS::DataReader_ptr ,
+                              const DDS::SampleRejectedStatus & );
+    virtual
+    void on_offered_deadline_missed( ::DDS::DataWriter_ptr ,
+                              const DDS::OfferedDeadlineMissedStatus & );
+    virtual
+    void on_offered_incompatible_qos( ::DDS::DataWriter_ptr ,
+                              const DDS::OfferedIncompatibleQosStatus & );
+    virtual
+    void on_unexpected_status( ::DDS::Entity_ptr ,
+                              ::DDS::StatusKind );
+  private:
+    Receiver_exec_i &callback_;
+    CORBA::ULong expected_;
+    CORBA::ULong received_;
   };
 
   //============================================================
@@ -92,6 +131,9 @@ namespace CIAO_LMBM_Test_Receiver_Impl
 
     Atomic_ULong received_one_by_one_;
     Atomic_ULong received_many_by_many_;
+    Atomic_Bool  started_;
+    Atomic_Bool  many_received_;
+    CORBA::ULong expected_;
 
     CORBA::UShort iterations_;
     CORBA::UShort keys_;
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.mpc
index a83b428a029..9837f3dd1fa 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/Sender/LMBM_Test_Sender.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_LMBM_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(DDS_LMBM_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_LMBM_Test_Sender_idl_gen) : componentidldefaults {
   after += DDS_LMBM_Test_Connector_idl_gen DDS_Starter_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_LMBM_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_LMBM_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_LMBM_Test_Sender_lem_gen) : ciaoidldefaults {
   after += DDS_LMBM_Test_Sender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
@@ -115,7 +115,7 @@ project(DDS_LMBM_Test_Sender_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_LMBM_Test_Sender_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_LMBM_Test_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      += DDS_LMBM_Test_Base_stub  DDS_LMBM_Test_Sender_lem_stub \
                 DDS4CCM_lem_stub DDS4CCM_skel DDS_LMBM_Test_Connector_stub \
                 DDS_LMBM_Test_Connector_svnt DDS_LMBM_Test_Connector_lem_stub
diff --git a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl
index 017ddc50ed1..a6cac2e165a 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/ListenManyByMany/descriptors/run_test.pl
@@ -100,8 +100,6 @@ sub kill_open_processes {
     if ($ns_running == 1) {
         $NS->Kill (); $NS->TimedWait (1);
     }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
 }
 
 sub run_node_daemons {
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl
index 6fb7559eb8f..114ce51f4f2 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.idl
@@ -8,8 +8,6 @@
 #ifndef LISTEN_NOT_ENABLED_TEST_BASE_IDL
 #define LISTEN_NOT_ENABLED_TEST_BASE_IDL
 
-#pragma ndds typesupport "Base/LNE_Test_BaseSupport.h"
-
 struct ListenNotEnabledTest {
   string key; //@key
   long iteration;
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc
index 56630da7f98..a39cb37b0b6 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Base/LNE_Test_Base.mpc
@@ -1,25 +1,75 @@
 // $Id$
+// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n LNE_Test_Base"
 
-project (DDS_LNE_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
-  sharedname = DDS_LNE_Test_Base_stub
-  dynamicflags += LISTEN_NOT_ENABLED_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Gxhst -Sci \
+project(DDS_LNE_Test_Base_idl_gen) : taoidldefaults, anytypecode {
+  custom_only = 1
+  idlflags -= -St -Sa
+  idlflags += -SS -Gxhst \
               -Wb,stub_export_macro=LISTEN_NOT_ENABLED_TEST_BASE_STUB_Export \
               -Wb,stub_export_include=LNE_Test_Base_stub_export.h
 
   IDL_Files {
     LNE_Test_Base.idl
   }
+}
 
-  opendds_ts_flags += --export=LISTEN_NOT_ENABLED_TEST_BASE_STUB_Export
+project(DDS_LNE_Test_Base_ndds_ts_gen) : ndds_ts_defaults {
+  custom_only = 1
+  after += DDS_LNE_Test_Base_idl_gen
 
-  DDSGenerator_Files {
+  NDDSTypeSupport_Files {
     LNE_Test_Base.idl
   }
+}
+
+project(DDS_LNE_Test_Base_NDDS_TS) : nddslib, taolib {
+  after += DDS_LNE_Test_Base_ndds_ts_gen DDS_LNE_Test_Base_stub
+  libs += DDS_LNE_Test_Base_stub
+  libout = ../lib
+  libpaths    += ../lib
+  sharedname = DDS_LNE_Test_Base_NDDS_TS
+  dynamicflags = NDDS_USER_DLL_EXPORT
+
+  verbatim(gnuace, macros) {
+    override no_hidden_visibility = 1
+  }
 
   Source_Files {
+    LNE_Test_Base.cxx
+    LNE_Test_BasePlugin.cxx
+    LNE_Test_BaseSupport.cxx
+  }
+
+  Header_Files {
+    LNE_Test_Base.h
+    LNE_Test_BasePlugin.h
+    LNE_Test_BaseSupport.h
+  }
+
+  Inline_Files {
   }
 }
 
+project(DDS_LNE_Test_Base_stub) : ccm_stub {
+  after += DDS_LNE_Test_Base_idl_gen
+  libout = ../lib
+  libpaths += ../lib
+  sharedname = DDS_LNE_Test_Base_stub
+  dynamicflags = LISTEN_NOT_ENABLED_TEST_BASE_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    LNE_Test_BaseC.cpp
+  }
+
+  Header_Files {
+    LNE_Test_BaseC.h
+    LNE_Test_Base_stub_export.h
+  }
+
+  Inline_Files {
+    LNE_Test_BaseC.inl
+  }
+}
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc
index da90e01ab6f..f422a852dc0 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_LNE_Test_Base -l .. -o ../lib -u DDS LNE_Test_Connector"
 
-project(DDS_LNE_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
+project(DDS_LNE_Test_Connector_idl_gen) : connectoridldefaults {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=LISTEN_NOT_ENABLED_TEST_CONNECTOR_STUB_Export \
@@ -10,8 +10,8 @@ project(DDS_LNE_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
               -Wb,skel_export_include=LNE_Test_Connector_svnt_export.h \
               -Wb,svnt_export_macro=LISTEN_NOT_ENABLED_TEST_CONNECTOR_SVNT_Export \
               -Wb,svnt_export_include=LNE_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=LISTEN_NOT_ENABLED_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=LNE_Test_Connector_conn_export.h \
+              -Wb,exec_export_macro=LISTEN_NOT_ENABLED_TEST_CONNECTOR_EXEC_Export \
+              -Wb,exec_export_include=LNE_Test_Connector_exec_export.h \
               -I ..
 
   IDL_Files {
@@ -19,7 +19,7 @@ project(DDS_LNE_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   }
 }
 
-project(DDS_LNE_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_LNE_Test_Connector_lem_gen) : ciaoidldefaults {
   custom_only = 1
   after += DDS_LNE_Test_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=LISTEN_NOT_ENABLED_TEST_CONNECTOR_LEM_STUB_Export \
@@ -85,24 +85,24 @@ project(DDS_LNE_Test_Connector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_LNE_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_LNE_Test_Connector_lem_stub DDS_LNE_Test_Connector_stub DDS4CCM_lem_stub DDS_LNE_Test_Base_stub
+  after   += DDS_LNE_Test_Connector_lem_stub DDS_LNE_Test_Connector_stub DDS4CCM_lem_stub DDS_LNE_Test_Base_NDDS_TS
   sharedname = DDS_LNE_Test_Connector_exec
-  libs += DDS_LNE_Test_Connector_stub DDS_LNE_Test_Connector_lem_stub DDS_LNE_Test_Base_stub DDS4CCM_lem_stub DDS_LNE_Test_Base_stub
+  libs += DDS_LNE_Test_Connector_stub DDS_LNE_Test_Connector_lem_stub DDS_LNE_Test_Base_stub DDS4CCM_lem_stub DDS_LNE_Test_Base_NDDS_TS
   libpaths += ../lib
   libout = ../lib
   includes += ..
-  dynamicflags   = LISTEN_NOT_ENABLED_TEST_CONNECTOR_CONN_BUILD_DLL
+  dynamicflags   = LISTEN_NOT_ENABLED_TEST_CONNECTOR_EXEC_BUILD_DLL
 
   IDL_Files {
   }
 
   Source_Files {
-    LNE_Test_Connector_conn.cpp
+    LNE_Test_Connector_exec.cpp
   }
 
   Header_Files {
-    LNE_Test_Connector_conn.h
-    LNE_Test_Connector_conn_export.h
+    LNE_Test_Connector_exec.h
+    LNE_Test_Connector_exec_export.h
   }
 
   Inline_Files {
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector_exec.cpp b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector_exec.cpp
new file mode 100644
index 00000000000..49ca01d82a5
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector_exec.cpp
@@ -0,0 +1,30 @@
+// -*- C++ -*-
+// $Id$
+
+#include "LNE_Test_Connector_exec.h"
+
+namespace CIAO_LNE_Test_LNE_Test_Connector_Impl
+{
+  LNE_Test_Connector_exec_i::LNE_Test_Connector_exec_i (void)
+    : DDS_Event_Connector_T<ListenNotEnabledTest_DDS_Traits, ListenNotEnabledTest_Connector_Traits> ()
+  {
+  }
+
+  LNE_Test_Connector_exec_i::~LNE_Test_Connector_exec_i (void)
+  {
+  }
+
+  extern "C" LISTEN_NOT_ENABLED_TEST_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_LNE_Test_LNE_Test_Connector_Impl (void)
+  {
+    ::Components::EnterpriseComponent_ptr retval =
+      ::Components::EnterpriseComponent::_nil ();
+
+    ACE_NEW_NORETURN (
+      retval,
+      LNE_Test_Connector_exec_i ());
+
+    return retval;
+  }
+}
+
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector_exec.h
new file mode 100644
index 00000000000..8a9edb7b207
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Connector/LNE_Test_Connector_exec.h
@@ -0,0 +1,61 @@
+// -*- C++ -*-
+// $Id$
+
+#ifndef LISTEN_NOT_ENABLED_TEST_CONNECTOR_EXEC_H_
+#define LISTEN_NOT_ENABLED_TEST_CONNECTOR_EXEC_H_
+
+#include /**/ "ace/pre.h"
+
+#include "LNE_Test_ConnectorEC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "LNE_Test_Connector_exec_export.h"
+#include "tao/LocalObject.h"
+
+#include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
+#include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
+
+#include "Base/LNE_Test_BaseSupport.h"
+
+namespace CIAO_LNE_Test_LNE_Test_Connector_Impl
+{
+
+  // @from use of ListenNotEnabledTest as a parameter
+  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+    ListenNotEnabledTest,
+    ListenNotEnabledTestSeq,
+    ListenNotEnabledTestTypeSupport,
+    ListenNotEnabledTestDataWriter,
+    ListenNotEnabledTestDataReader > ListenNotEnabledTest_DDS_Traits;
+
+  typedef CIAO::DDS4CCM::Connector_Traits <
+    ::CIAO_LNE_Test_LNE_Test_Connector_Impl::LNE_Test_Connector_Exec,
+    ListenNotEnabledTest_Seq,
+    ::CCM_DDS::ListenNotEnabledTest::CCM_Writer,
+    ::CCM_DDS::ListenNotEnabledTest::CCM_Updater,
+    ::CCM_DDS::ListenNotEnabledTest::CCM_Getter,
+    ::CCM_DDS::ListenNotEnabledTest::CCM_Reader,
+    ::LNE_Test::CCM_LNE_Test_Connector_Context,
+    ::CCM_DDS::ListenNotEnabledTest::Listener,
+    ::CCM_DDS::ListenNotEnabledTest::StateListener,
+    ::CCM_DDS::ConnectorStatusListener> ListenNotEnabledTest_Connector_Traits;
+
+  class LISTEN_NOT_ENABLED_TEST_CONNECTOR_EXEC_Export LNE_Test_Connector_exec_i :
+    public DDS_Event_Connector_T <ListenNotEnabledTest_DDS_Traits, ListenNotEnabledTest_Connector_Traits>
+  {
+  public:
+    LNE_Test_Connector_exec_i (void);
+    virtual ~LNE_Test_Connector_exec_i (void);
+  };
+
+  extern "C" LISTEN_NOT_ENABLED_TEST_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_LNE_Test_LNE_Test_Connector_Impl (void);
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.idl
index dcc35279c4b..77e3c1737a7 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.idl
@@ -15,6 +15,7 @@ module LNE_Test
   component Receiver
   {
     port CCM_DDS::ListenNotEnabledTest::DDS_Listen info_listen;
+    provides CCM_DDS::ConnectorStatusListener info_listen_connector_status;
   };
 };
 
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.mpc
index 470e858a7d9..cc0ad916dca 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_LNE_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_LNE_Test_Receiver_idl_gen) : componentidldefaults {
   custom_only = 1
   after += DDS_LNE_Test_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
@@ -17,7 +17,7 @@ project(DDS_LNE_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_LNE_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_LNE_Test_Receiver_lem_gen) : ciaoidldefaults {
   after += DDS_LNE_Test_Receiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
@@ -114,7 +114,7 @@ project(DDS_LNE_Test_Receiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_LNE_Test_Receiver_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_LNE_Test_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      +=   DDS_LNE_Test_Receiver_lem_stub DDS_LNE_Test_Base_stub \
                   DDS_LNE_Test_Connector_stub DDS_LNE_Test_Connector_svnt \
                   DDS_LNE_Test_Receiver_exec DDS_LNE_Test_Connector_lem_stub \
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.cpp
index 4b7694f375a..bd3ac4c5a15 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.cpp
@@ -41,11 +41,65 @@ namespace CIAO_LNE_Test_Receiver_Impl
   }
 
   //============================================================
+  // ConnectorStatusListener_exec_i
+  //============================================================
+  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (
+            Atomic_Bool &data_received)
+    : data_received_ (data_received)
+  {
+  }
+
+  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
+  {
+  }
+
+  void ConnectorStatusListener_exec_i::on_inconsistent_topic(
+     ::DDS::Topic_ptr ,
+     const DDS::InconsistentTopicStatus & )
+  {
+  }
+
+  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos(
+    ::DDS::DataReader_ptr ,
+     const DDS::RequestedIncompatibleQosStatus & )
+  {
+  }
+
+  void ConnectorStatusListener_exec_i::on_sample_rejected(
+     ::DDS::DataReader_ptr ,
+     const DDS::SampleRejectedStatus & )
+  {
+  }
+
+  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
+     ::DDS::DataWriter_ptr ,
+     const DDS::OfferedDeadlineMissedStatus & )
+  {
+  }
+
+  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
+     ::DDS::DataWriter_ptr ,
+     const DDS::OfferedIncompatibleQosStatus & )
+  {
+  }
+
+  void ConnectorStatusListener_exec_i::on_unexpected_status(
+    ::DDS::Entity_ptr ,
+    ::DDS::StatusKind  status_kind)
+  {
+    if (status_kind == ::DDS::DATA_ON_READERS_STATUS)
+      {
+        this->data_received_ = true;
+      }
+  }
+
+  //============================================================
   // Receiver_exec_i
   //============================================================
   Receiver_exec_i::Receiver_exec_i (void)
     : received_one_by_one_ (0),
-      received_many_by_many_ (0)
+      received_many_by_many_ (0),
+      data_received_ (false)
   {
   }
 
@@ -70,7 +124,7 @@ namespace CIAO_LNE_Test_Receiver_Impl
   ::CCM_DDS::CCM_ConnectorStatusListener_ptr
   Receiver_exec_i::get_info_listen_connector_status (void)
   {
-    return ::CCM_DDS::CCM_ConnectorStatusListener::_nil ();
+    return new ConnectorStatusListener_exec_i (this->data_received_);
   }
 
   void
@@ -122,8 +176,15 @@ namespace CIAO_LNE_Test_Receiver_Impl
                                "expected <0> - received <%u>\n",
                                this->received_many_by_many_.value ()));
       }
+    if (this->data_received_.value ())
+      {
+        ACE_ERROR ((LM_ERROR, "ERROR: NOT ENABLED: "
+                               "Received DATA_ON_READERS_STATUS on "
+                               "ConnectorStatusListener\n"));
+      }
     if (this->received_one_by_one_.value () == 0   &&
-        this->received_many_by_many_.value () == 0)
+        this->received_many_by_many_.value () == 0 &&
+        !this->data_received_.value ())
       {
         ACE_DEBUG ((LM_DEBUG, "NOT ENABLED: "
                                "Received no data at all."
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.h
index 71b4b85630f..e932dcb9955 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Receiver/LNE_Test_Receiver_exec.h
@@ -19,6 +19,7 @@ namespace CIAO_LNE_Test_Receiver_Impl
   class Receiver_exec_i;
 
   typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::ULong> Atomic_ULong;
+  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, bool> Atomic_Bool;
 
   //============================================================
   // ListenNotEnabledTest_Listener_exec_i
@@ -47,6 +48,39 @@ namespace CIAO_LNE_Test_Receiver_Impl
   };
 
   //============================================================
+  // ConnectorStatusListener_exec_i
+  //============================================================
+  class RECEIVER_EXEC_Export ConnectorStatusListener_exec_i
+    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
+      public virtual ::CORBA::LocalObject
+  {
+  public:
+    ConnectorStatusListener_exec_i (Atomic_Bool &data_received);
+    virtual ~ConnectorStatusListener_exec_i (void);
+
+    virtual
+    void on_inconsistent_topic( ::DDS::Topic_ptr ,
+                              const DDS::InconsistentTopicStatus & );
+    virtual
+    void on_requested_incompatible_qos( ::DDS::DataReader_ptr ,
+                              const DDS::RequestedIncompatibleQosStatus & );
+    virtual
+    void on_sample_rejected( ::DDS::DataReader_ptr ,
+                              const DDS::SampleRejectedStatus & );
+    virtual
+    void on_offered_deadline_missed( ::DDS::DataWriter_ptr ,
+                              const DDS::OfferedDeadlineMissedStatus & );
+    virtual
+    void on_offered_incompatible_qos( ::DDS::DataWriter_ptr ,
+                              const DDS::OfferedIncompatibleQosStatus & );
+    virtual
+    void on_unexpected_status( ::DDS::Entity_ptr ,
+                              ::DDS::StatusKind );
+  private:
+    Atomic_Bool &data_received_;
+  };
+
+  //============================================================
   // Receiver_exec_i
   //============================================================
   class RECEIVER_EXEC_Export Receiver_exec_i
@@ -81,6 +115,7 @@ namespace CIAO_LNE_Test_Receiver_Impl
 
     Atomic_ULong received_one_by_one_;
     Atomic_ULong received_many_by_many_;
+    Atomic_Bool  data_received_;
   };
 
   extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc
index bc9340eac60..27b38ae0fab 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/Sender/LNE_Test_Sender.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_LNE_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(DDS_LNE_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_LNE_Test_Sender_idl_gen) : componentidldefaults {
   after += DDS_LNE_Test_Connector_idl_gen DDS_Starter_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_LNE_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_LNE_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_LNE_Test_Sender_lem_gen) : ciaoidldefaults {
   after += DDS_LNE_Test_Sender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
@@ -115,7 +115,7 @@ project(DDS_LNE_Test_Sender_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_LNE_Test_Sender_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_LNE_Test_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      += DDS_LNE_Test_Base_stub  DDS_LNE_Test_Sender_lem_stub \
                 DDS4CCM_lem_stub DDS4CCM_skel DDS_LNE_Test_Connector_stub \
                 DDS_LNE_Test_Connector_svnt DDS_LNE_Test_Connector_lem_stub
diff --git a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl
index a625ecd9216..dc0c34941c6 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/ListenNotEnabled/descriptors/run_test.pl
@@ -100,8 +100,6 @@ sub kill_open_processes {
     if ($ns_running == 1) {
         $NS->Kill (); $NS->TimedWait (1);
     }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
 }
 
 sub run_node_daemons {
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl
index 5260399276e..3e01accec65 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.idl
@@ -8,8 +8,6 @@
 #ifndef LISTEN_ONE_BY_ONE_TEST_BASE_IDL
 #define LISTEN_ONE_BY_ONE_TEST_BASE_IDL
 
-#pragma ndds typesupport "Base/LOBO_Test_BaseSupport.h"
-
 struct ListenOneByOneTest {
   string key; //@key
   long iteration;
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc
index 2308b46eef0..89f1db4f525 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Base/LOBO_Test_Base.mpc
@@ -1,25 +1,75 @@
 // $Id$
+// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n LOBO_Test_Base"
 
-project (DDS_LOBO_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
-  sharedname = DDS_LOBO_Test_Base_stub
-  dynamicflags += LISTEN_ONE_BY_ONE_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Gxhst -Sci \
+project(DDS_LOBO_Test_Base_idl_gen) : taoidldefaults, anytypecode {
+  custom_only = 1
+  idlflags -= -St -Sa
+  idlflags += -SS -Gxhst \
               -Wb,stub_export_macro=LISTEN_ONE_BY_ONE_TEST_BASE_STUB_Export \
               -Wb,stub_export_include=LOBO_Test_Base_stub_export.h
 
   IDL_Files {
     LOBO_Test_Base.idl
   }
+}
 
-  opendds_ts_flags += --export=LISTEN_ONE_BY_ONE_TEST_BASE_STUB_Export
+project(DDS_LOBO_Test_Base_ndds_ts_gen) : ndds_ts_defaults {
+  custom_only = 1
+  after += DDS_LOBO_Test_Base_idl_gen
 
-  DDSGenerator_Files {
+  NDDSTypeSupport_Files {
     LOBO_Test_Base.idl
   }
+}
+
+project(DDS_LOBO_Test_Base_NDDS_TS) : nddslib, taolib {
+  after += DDS_LOBO_Test_Base_ndds_ts_gen DDS_LOBO_Test_Base_stub
+  libs += DDS_LOBO_Test_Base_stub
+  libout = ../lib
+  libpaths    += ../lib
+  sharedname = DDS_LOBO_Test_Base_NDDS_TS
+  dynamicflags = NDDS_USER_DLL_EXPORT
+
+  verbatim(gnuace, macros) {
+    override no_hidden_visibility = 1
+  }
 
   Source_Files {
+    LOBO_Test_Base.cxx
+    LOBO_Test_BasePlugin.cxx
+    LOBO_Test_BaseSupport.cxx
+  }
+
+  Header_Files {
+    LOBO_Test_Base.h
+    LOBO_Test_BasePlugin.h
+    LOBO_Test_BaseSupport.h
+  }
+
+  Inline_Files {
   }
 }
 
+project(DDS_LOBO_Test_Base_stub) : ccm_stub {
+  after += DDS_LOBO_Test_Base_idl_gen
+  libout = ../lib
+  libpaths += ../lib
+  sharedname = DDS_LOBO_Test_Base_stub
+  dynamicflags = LISTEN_ONE_BY_ONE_TEST_BASE_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    LOBO_Test_BaseC.cpp
+  }
+
+  Header_Files {
+    LOBO_Test_BaseC.h
+    LOBO_Test_Base_stub_export.h
+  }
+
+  Inline_Files {
+    LOBO_Test_BaseC.inl
+  }
+}
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc
index d428cb604f8..5cc617d4eb6 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_LOBO_Test_Base -l .. -o ../lib -u DDS LOBO_Test_Connector"
 
-project(DDS_LOBO_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
+project(DDS_LOBO_Test_Connector_idl_gen) : connectoridldefaults {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=LISTEN_ONE_BY_ONE_TEST_CONNECTOR_STUB_Export \
@@ -10,8 +10,8 @@ project(DDS_LOBO_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
               -Wb,skel_export_include=LOBO_Test_Connector_svnt_export.h \
               -Wb,svnt_export_macro=LISTEN_ONE_BY_ONE_TEST_CONNECTOR_SVNT_Export \
               -Wb,svnt_export_include=LOBO_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=LISTEN_ONE_BY_ONE_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=LOBO_Test_Connector_conn_export.h \
+              -Wb,exec_export_macro=LISTEN_ONE_BY_ONE_TEST_CONNECTOR_EXEC_Export \
+              -Wb,exec_export_include=LOBO_Test_Connector_exec_export.h \
               -I ..
 
   IDL_Files {
@@ -19,7 +19,7 @@ project(DDS_LOBO_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   }
 }
 
-project(DDS_LOBO_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_LOBO_Test_Connector_lem_gen) : ciaoidldefaults {
   custom_only = 1
   after += DDS_LOBO_Test_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=LISTEN_ONE_BY_ONE_TEST_CONNECTOR_LEM_STUB_Export \
@@ -85,24 +85,24 @@ project(DDS_LOBO_Test_Connector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_LOBO_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_LOBO_Test_Connector_lem_stub DDS_LOBO_Test_Connector_stub DDS4CCM_lem_stub DDS_LOBO_Test_Base_stub
+  after   += DDS_LOBO_Test_Connector_lem_stub DDS_LOBO_Test_Connector_stub DDS4CCM_lem_stub DDS_LOBO_Test_Base_NDDS_TS
   sharedname = DDS_LOBO_Test_Connector_exec
-  libs += DDS_LOBO_Test_Connector_stub DDS_LOBO_Test_Connector_lem_stub DDS_LOBO_Test_Base_stub DDS4CCM_lem_stub DDS_LOBO_Test_Base_stub
+  libs += DDS_LOBO_Test_Connector_stub DDS_LOBO_Test_Connector_lem_stub DDS_LOBO_Test_Base_stub DDS4CCM_lem_stub DDS_LOBO_Test_Base_NDDS_TS
   libpaths += ../lib
   libout = ../lib
   includes += ..
-  dynamicflags   = LISTEN_ONE_BY_ONE_TEST_CONNECTOR_CONN_BUILD_DLL
+  dynamicflags   = LISTEN_ONE_BY_ONE_TEST_CONNECTOR_EXEC_BUILD_DLL
 
   IDL_Files {
   }
 
   Source_Files {
-    LOBO_Test_Connector_conn.cpp
+    LOBO_Test_Connector_exec.cpp
   }
 
   Header_Files {
-    LOBO_Test_Connector_conn.h
-    LOBO_Test_Connector_conn_export.h
+    LOBO_Test_Connector_exec.h
+    LOBO_Test_Connector_exec_export.h
   }
 
   Inline_Files {
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector_exec.cpp b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector_exec.cpp
new file mode 100644
index 00000000000..91f0a878c83
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector_exec.cpp
@@ -0,0 +1,30 @@
+// -*- C++ -*-
+// $Id$
+
+#include "LOBO_Test_Connector_exec.h"
+
+namespace CIAO_LOBO_Test_LOBO_Test_Connector_Impl
+{
+  LOBO_Test_Connector_exec_i::LOBO_Test_Connector_exec_i (void)
+    : DDS_Event_Connector_T<ListenOneByOneTest_DDS_Traits, ListenOneByOneTest_Connector_Traits> ()
+  {
+  }
+
+  LOBO_Test_Connector_exec_i::~LOBO_Test_Connector_exec_i (void)
+  {
+  }
+
+  extern "C" LISTEN_ONE_BY_ONE_TEST_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_LOBO_Test_LOBO_Test_Connector_Impl (void)
+  {
+    ::Components::EnterpriseComponent_ptr retval =
+      ::Components::EnterpriseComponent::_nil ();
+
+    ACE_NEW_NORETURN (
+      retval,
+      LOBO_Test_Connector_exec_i ());
+
+    return retval;
+  }
+}
+
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector_exec.h
new file mode 100644
index 00000000000..0400ea51e97
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Connector/LOBO_Test_Connector_exec.h
@@ -0,0 +1,61 @@
+// -*- C++ -*-
+// $Id$
+
+#ifndef LISTEN_ONE_BY_ONE_TEST_CONNECTOR_EXEC_H_
+#define LISTEN_ONE_BY_ONE_TEST_CONNECTOR_EXEC_H_
+
+#include /**/ "ace/pre.h"
+
+#include "LOBO_Test_ConnectorEC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "LOBO_Test_Connector_exec_export.h"
+#include "tao/LocalObject.h"
+
+#include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
+#include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
+
+#include "Base/LOBO_Test_BaseSupport.h"
+
+namespace CIAO_LOBO_Test_LOBO_Test_Connector_Impl
+{
+
+  // @from use of ListenOneByOneTest as a parameter
+  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+    ListenOneByOneTest,
+    ListenOneByOneTestSeq,
+    ListenOneByOneTestTypeSupport,
+    ListenOneByOneTestDataWriter,
+    ListenOneByOneTestDataReader > ListenOneByOneTest_DDS_Traits;
+
+  typedef CIAO::DDS4CCM::Connector_Traits <
+    ::CIAO_LOBO_Test_LOBO_Test_Connector_Impl::LOBO_Test_Connector_Exec,
+    ListenOneByOneTest_Seq,
+    ::CCM_DDS::ListenOneByOneTest::CCM_Writer,
+    ::CCM_DDS::ListenOneByOneTest::CCM_Updater,
+    ::CCM_DDS::ListenOneByOneTest::CCM_Getter,
+    ::CCM_DDS::ListenOneByOneTest::CCM_Reader,
+    ::LOBO_Test::CCM_LOBO_Test_Connector_Context,
+    ::CCM_DDS::ListenOneByOneTest::Listener,
+    ::CCM_DDS::ListenOneByOneTest::StateListener,
+    ::CCM_DDS::ConnectorStatusListener> ListenOneByOneTest_Connector_Traits;
+
+  class LISTEN_ONE_BY_ONE_TEST_CONNECTOR_EXEC_Export LOBO_Test_Connector_exec_i :
+    public DDS_Event_Connector_T <ListenOneByOneTest_DDS_Traits, ListenOneByOneTest_Connector_Traits>
+  {
+  public:
+    LOBO_Test_Connector_exec_i (void);
+    virtual ~LOBO_Test_Connector_exec_i (void);
+  };
+
+  extern "C" LISTEN_ONE_BY_ONE_TEST_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_LOBO_Test_LOBO_Test_Connector_Impl (void);
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.idl
index a959a830358..5440820adf6 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.idl
@@ -15,6 +15,7 @@ module LOBO_Test
   component Receiver
   {
     port CCM_DDS::ListenOneByOneTest::DDS_Listen info_listen;
+    provides CCM_DDS::ConnectorStatusListener info_listen_connector_status;
 
     attribute unsigned short keys;
     attribute unsigned short iterations;
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.mpc
index 3fd08622f06..6a4264165ae 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_LOBO_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_LOBO_Test_Receiver_idl_gen) : componentidldefaults {
   custom_only = 1
   after += DDS_LOBO_Test_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
@@ -17,7 +17,7 @@ project(DDS_LOBO_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_LOBO_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_LOBO_Test_Receiver_lem_gen) : ciaoidldefaults {
   after += DDS_LOBO_Test_Receiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
@@ -114,7 +114,7 @@ project(DDS_LOBO_Test_Receiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_LOBO_Test_Receiver_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_LOBO_Test_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      +=   DDS_LOBO_Test_Receiver_lem_stub DDS_LOBO_Test_Base_stub \
                   DDS_LOBO_Test_Connector_stub DDS_LOBO_Test_Connector_svnt \
                   DDS_LOBO_Test_Receiver_exec DDS_LOBO_Test_Connector_lem_stub \
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp
index 774117e3f2b..01e2e86b00d 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.cpp
@@ -12,11 +12,9 @@ namespace CIAO_LOBO_Test_Receiver_Impl
   //============================================================
   ListenOneByOneTest_Listener_exec_i::ListenOneByOneTest_Listener_exec_i (
                                               Atomic_ULong &received_one_by_one,
-                                              Atomic_ULong &received_many_by_many,
-                                              Atomic_ThreadId &thread_id)
+                                              Atomic_ULong &received_many_by_many)
     : received_one_by_one_ (received_one_by_one),
-      received_many_by_many_ (received_many_by_many),
-      thread_id_ (thread_id)
+      received_many_by_many_ (received_many_by_many)
   {
   }
 
@@ -29,7 +27,6 @@ namespace CIAO_LOBO_Test_Receiver_Impl
                                   const ListenOneByOneTest & an_instance,
                                   const ::CCM_DDS::ReadInfo & info)
   {
-    this->thread_id_ = ACE_Thread::self ();
     ACE_DEBUG ((LM_DEBUG, "ListenOneByOneTest_Listener_exec_i::on_one_data: "
                             "key <%C> - iteration <%d>\n",
                             an_instance.key.in (),
@@ -64,12 +61,65 @@ namespace CIAO_LOBO_Test_Receiver_Impl
   }
 
   //============================================================
+  // ConnectorStatusListener_exec_i
+  //============================================================
+  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (
+            Receiver_exec_i &callback)
+    : callback_ (callback)
+  {
+  }
+
+  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
+  {
+  }
+
+  void ConnectorStatusListener_exec_i::on_inconsistent_topic(
+     ::DDS::Topic_ptr ,
+     const DDS::InconsistentTopicStatus & )
+  {
+  }
+
+  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos(
+    ::DDS::DataReader_ptr ,
+     const DDS::RequestedIncompatibleQosStatus & )
+  {
+  }
+
+  void ConnectorStatusListener_exec_i::on_sample_rejected(
+     ::DDS::DataReader_ptr ,
+     const DDS::SampleRejectedStatus & )
+  {
+  }
+
+  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
+     ::DDS::DataWriter_ptr ,
+     const DDS::OfferedDeadlineMissedStatus & )
+  {
+  }
+
+  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
+     ::DDS::DataWriter_ptr ,
+     const DDS::OfferedIncompatibleQosStatus & )
+  {
+  }
+
+  void ConnectorStatusListener_exec_i::on_unexpected_status(
+    ::DDS::Entity_ptr ,
+    ::DDS::StatusKind  status_kind)
+  {
+    if (status_kind == ::DDS::DATA_ON_READERS_STATUS)
+      {
+        this->callback_.start ();
+      }
+  }
+
+  //============================================================
   // Receiver_exec_i
   //============================================================
   Receiver_exec_i::Receiver_exec_i (void)
     : received_one_by_one_ (0),
       received_many_by_many_ (0),
-      thread_id_listener_ (0),
+      started_ (false),
       iterations_ (10),
       keys_ (5)
   {
@@ -82,9 +132,13 @@ namespace CIAO_LOBO_Test_Receiver_Impl
   void
   Receiver_exec_i::start ()
   {
-    ::CCM_DDS::DataListenerControl_var dlc =
-        this->context_->get_connection_info_listen_data_control ();
-    dlc->mode (::CCM_DDS::ONE_BY_ONE);
+    if (!this->started_.value ())
+      {
+        this->started_ = true;
+        ::CCM_DDS::DataListenerControl_var dlc =
+            this->context_->get_connection_info_listen_data_control ();
+        dlc->mode (::CCM_DDS::ONE_BY_ONE);
+      }
   }
 
   ::CCM_DDS::ListenOneByOneTest::CCM_Listener_ptr
@@ -92,8 +146,7 @@ namespace CIAO_LOBO_Test_Receiver_Impl
   {
     return new ListenOneByOneTest_Listener_exec_i (
                 this->received_one_by_one_,
-                this->received_many_by_many_,
-                this->thread_id_listener_);
+                this->received_many_by_many_);
   }
 
   ::CCM_DDS::CCM_PortStatusListener_ptr
@@ -105,7 +158,7 @@ namespace CIAO_LOBO_Test_Receiver_Impl
   ::CCM_DDS::CCM_ConnectorStatusListener_ptr
   Receiver_exec_i::get_info_listen_connector_status (void)
   {
-    return ::CCM_DDS::CCM_ConnectorStatusListener::_nil ();
+    return new ConnectorStatusListener_exec_i (*this);
   }
 
   ::CORBA::UShort
@@ -152,7 +205,6 @@ namespace CIAO_LOBO_Test_Receiver_Impl
   void
   Receiver_exec_i::ccm_activate (void)
   {
-    start ();
   }
 
   void
@@ -191,58 +243,21 @@ namespace CIAO_LOBO_Test_Receiver_Impl
                                "expected <0> - received <%u>\n",
                                this->received_many_by_many_.value ()));
       }
+    if (!this->started_.value ())
+      {
+        ACE_ERROR ((LM_ERROR, "ERROR: ONE_BY_ONE: "
+                               "Didn't received DATA_ON_READERS_STATUS on "
+                               "ConnectorStatusListener\n"));
+      }
     if (this->received_one_by_one_.value () > 0   &&
-        this->received_many_by_many_.value () == 0)
+        this->received_many_by_many_.value () == 0 &&
+        this->started_.value ())
       {
         ACE_DEBUG ((LM_DEBUG, "ONE_BY_ONE: "
                                "Received only data on "
                                "one_by_one callback. "
                                "Test passed!\n"));
       }
-    if (this->thread_id_listener_.value () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
-                              "Thread ID for ReaderListener not set!\n"));
-      }
-    #if defined (CIAO_DDS4CCM_CONTEXT_SWITCH) && (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (ACE_OS::thr_equal (this->thread_id_listener_.value (),
-                                ACE_Thread::self ()))
-      {
-        ACE_DEBUG ((LM_DEBUG, "ONE_BY_ONE: "
-                              "Thread switch for ReaderListener seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_.value (),
-                              ACE_Thread::self ()));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: ONE_BY_ONE: "
-                              "Thread switch for ReaderListener "
-                              "doesn't seem to work! "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_.value (),
-                              ACE_Thread::self ()));
-      }
-    #else
-    else if (ACE_OS::thr_equal (this->thread_id_listener_.value (),
-                                ACE_Thread::self ()))
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: ONE_BY_ONE: ReaderListener: "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_.value (),
-                              ACE_Thread::self ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "ONE_BY_ONE: ReaderListener: "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_.value (),
-                              ACE_Thread::self ()));
-      }
-    #endif
   }
 
   extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.h
index 2a27dff5876..6a64f454548 100644
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Receiver/LOBO_Test_Receiver_exec.h
@@ -13,7 +13,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/LocalObject.h"
-#include "ace/OS_NS_Thread.h"
 #include "ace/Reactor.h"
 #include "ace/Task.h"
 
@@ -25,7 +24,6 @@ namespace CIAO_LOBO_Test_Receiver_Impl
 
   typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::ULong> Atomic_ULong;
   typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, bool> Atomic_Bool;
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, ACE_thread_t> Atomic_ThreadId;
 
   //============================================================
   // ListenOneByOneTest_Listener_exec_i
@@ -37,8 +35,7 @@ namespace CIAO_LOBO_Test_Receiver_Impl
   public:
     ListenOneByOneTest_Listener_exec_i (
                             Atomic_ULong &received_one_by_one,
-                            Atomic_ULong &received_many_by_many,
-                            Atomic_ThreadId &thread_id);
+                            Atomic_ULong &received_many_by_many);
     virtual ~ListenOneByOneTest_Listener_exec_i (void);
 
     virtual void
@@ -52,7 +49,39 @@ namespace CIAO_LOBO_Test_Receiver_Impl
   private:
     Atomic_ULong &received_one_by_one_;
     Atomic_ULong &received_many_by_many_;
-    Atomic_ThreadId &thread_id_;
+  };
+
+  //============================================================
+  // ConnectorStatusListener_exec_i
+  //============================================================
+  class RECEIVER_EXEC_Export ConnectorStatusListener_exec_i
+    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
+      public virtual ::CORBA::LocalObject
+  {
+  public:
+    ConnectorStatusListener_exec_i (Receiver_exec_i &callback);
+    virtual ~ConnectorStatusListener_exec_i (void);
+
+    virtual
+    void on_inconsistent_topic( ::DDS::Topic_ptr ,
+                              const DDS::InconsistentTopicStatus & );
+    virtual
+    void on_requested_incompatible_qos( ::DDS::DataReader_ptr ,
+                              const DDS::RequestedIncompatibleQosStatus & );
+    virtual
+    void on_sample_rejected( ::DDS::DataReader_ptr ,
+                              const DDS::SampleRejectedStatus & );
+    virtual
+    void on_offered_deadline_missed( ::DDS::DataWriter_ptr ,
+                              const DDS::OfferedDeadlineMissedStatus & );
+    virtual
+    void on_offered_incompatible_qos( ::DDS::DataWriter_ptr ,
+                              const DDS::OfferedIncompatibleQosStatus & );
+    virtual
+    void on_unexpected_status( ::DDS::Entity_ptr ,
+                              ::DDS::StatusKind );
+  private:
+    Receiver_exec_i &callback_;
   };
 
   //============================================================
@@ -98,9 +127,9 @@ namespace CIAO_LOBO_Test_Receiver_Impl
   private:
     ::LOBO_Test::CCM_Receiver_Context_var context_;
 
-    Atomic_ULong    received_one_by_one_;
-    Atomic_ULong    received_many_by_many_;
-    Atomic_ThreadId thread_id_listener_;
+    Atomic_ULong received_one_by_one_;
+    Atomic_ULong received_many_by_many_;
+    Atomic_Bool  started_;
 
     CORBA::UShort iterations_;
     CORBA::UShort keys_;
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.mpc
index 65f91ced2eb..173dce00442 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/Sender/LOBO_Test_Sender.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_LOBO_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(DDS_LOBO_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_LOBO_Test_Sender_idl_gen) : componentidldefaults {
   after += DDS_LOBO_Test_Connector_idl_gen DDS_Starter_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_LOBO_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_LOBO_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_LOBO_Test_Sender_lem_gen) : ciaoidldefaults {
   after += DDS_LOBO_Test_Sender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
@@ -115,7 +115,7 @@ project(DDS_LOBO_Test_Sender_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_LOBO_Test_Sender_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_LOBO_Test_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      += DDS_LOBO_Test_Base_stub  DDS_LOBO_Test_Sender_lem_stub \
                 DDS4CCM_lem_stub DDS4CCM_skel DDS_LOBO_Test_Connector_stub \
                 DDS_LOBO_Test_Connector_svnt DDS_LOBO_Test_Connector_lem_stub
diff --git a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl
index 017ddc50ed1..a6cac2e165a 100755
--- a/CIAO/connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/ListenOneByOne/descriptors/run_test.pl
@@ -100,8 +100,6 @@ sub kill_open_processes {
     if ($ns_running == 1) {
         $NS->Kill (); $NS->TimedWait (1);
     }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
 }
 
 sub run_node_daemons {
diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl
index 1508ad78921..1bedfe06c99 100644
--- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.idl
@@ -8,8 +8,6 @@
 #ifndef NONCHANGEABLE_BASE_IDL
 #define NONCHANGEABLE_BASE_IDL
 
-#pragma ndds typesupport "Base/NonChangeable_BaseSupport.h"
-
 struct NonChangeableTest {
   string key;
   long iteration;
diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc
index 4258f9133d0..396c11037e5 100644
--- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Base/NonChangeable_Base.mpc
@@ -1,25 +1,76 @@
 // $Id$
+// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n NonChangeable_Base"
 
-project (DDS_NonChangeableBase_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
-  sharedname = DDS_NonChangeableBase_stub
-  dynamicflags += NONCHANGEABLE_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Gxhst -Sci \
+project(DDS_NonChangeableBase_idl_gen) : taoidldefaults, anytypecode {
+  custom_only = 1
+  idlflags -= -St -Sa
+  idlflags += -SS -Gxhst \
               -Wb,stub_export_macro=NONCHANGEABLE_BASE_STUB_Export \
               -Wb,stub_export_include=NonChangeable_Base_stub_export.h
 
   IDL_Files {
     NonChangeable_Base.idl
   }
+}
 
-  opendds_ts_flags += --export=NONCHANGEABLE_BASE_STUB_Export
+project(DDS_NonChangeableBase_ndds_ts_gen) : ndds_ts_defaults {
+  custom_only = 1
+  after += DDS_NonChangeableBase_idl_gen
 
-  DDSGenerator_Files {
+  NDDSTypeSupport_Files {
     NonChangeable_Base.idl
   }
+}
+
+project(DDS_NonChangeableBase_NDDS_TS) : nddslib, taolib {
+  after += DDS_NonChangeableBase_ndds_ts_gen DDS_NonChangeableBase_stub
+  libs += DDS_NonChangeableBase_stub
+  libout = ../lib
+  libpaths    += ../lib
+  sharedname = DDS_NonChangeableBase_NDDS_TS
+  dynamicflags = NDDS_USER_DLL_EXPORT
+
+  verbatim(gnuace, macros) {
+    override no_hidden_visibility = 1
+  }
 
   Source_Files {
+    NonChangeable_Base.cxx
+    NonChangeable_BasePlugin.cxx
+    NonChangeable_BaseSupport.cxx
+  }
+
+  Header_Files {
+    NonChangeable_Base.h
+    NonChangeable_BasePlugin.h
+    NonChangeable_BaseSupport.h
+  }
+
+  Inline_Files {
+  }
+}
+
+project(DDS_NonChangeableBase_stub) : ccm_stub {
+  after += DDS_NonChangeableBase_idl_gen
+  libout = ../lib
+  libpaths += ../lib
+  sharedname = DDS_NonChangeableBase_stub
+  dynamicflags = NONCHANGEABLE_BASE_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    NonChangeable_BaseC.cpp
+  }
+
+  Header_Files {
+    NonChangeable_BaseC.h
+    NonChangeable_Base_stub_export.h
+  }
+
+  Inline_Files {
+    NonChangeable_BaseC.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc
index 43fce05d8bf..d5a5d367cf4 100644
--- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_NonChangeableBase -l .. -o ../lib -u DDS NonChangeable_Connector"
 
-project(DDS_NonChangeableConnector_idl_gen) : connectoridldefaults, dds4ccm {
+project(DDS_NonChangeableConnector_idl_gen) : connectoridldefaults {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=NONCHANGEABLE_CONNECTOR_STUB_Export \
@@ -10,8 +10,8 @@ project(DDS_NonChangeableConnector_idl_gen) : connectoridldefaults, dds4ccm {
               -Wb,skel_export_include=NonChangeable_Connector_svnt_export.h \
               -Wb,svnt_export_macro=NONCHANGEABLE_CONNECTOR_SVNT_Export \
               -Wb,svnt_export_include=NonChangeable_Connector_svnt_export.h \
-              -Wb,conn_export_macro=NONCHANGEABLE_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=NonChangeable_Connector_conn_export.h \
+              -Wb,exec_export_macro=NONCHANGEABLE_CONNECTOR_EXEC_Export \
+              -Wb,exec_export_include=NonChangeable_Connector_exec_export.h \
               -I ..
 
   IDL_Files {
@@ -19,7 +19,7 @@ project(DDS_NonChangeableConnector_idl_gen) : connectoridldefaults, dds4ccm {
   }
 }
 
-project(DDS_NonChangeableConnector_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_NonChangeableConnector_lem_gen) : ciaoidldefaults {
   custom_only = 1
   after += DDS_NonChangeableConnector_idl_gen
   idlflags += -Wb,stub_export_macro=NONCHANGEABLE_CONNECTOR_LEM_STUB_Export \
@@ -85,24 +85,24 @@ project(DDS_NonChangeableConnector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_NonChangeableConnector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_NonChangeableConnector_lem_stub DDS_NonChangeableConnector_stub DDS4CCM_lem_stub DDS_NonChangeableBase_stub
+  after   += DDS_NonChangeableConnector_lem_stub DDS_NonChangeableConnector_stub DDS4CCM_lem_stub DDS_NonChangeableBase_NDDS_TS
   sharedname = DDS_NonChangeableConnector_exec
-  libs += DDS_NonChangeableConnector_stub DDS_NonChangeableConnector_lem_stub DDS_NonChangeableBase_stub DDS4CCM_lem_stub DDS_NonChangeableBase_stub
+  libs += DDS_NonChangeableConnector_stub DDS_NonChangeableConnector_lem_stub DDS_NonChangeableBase_stub DDS4CCM_lem_stub DDS_NonChangeableBase_NDDS_TS
   libpaths += ../lib
   libout = ../lib
   includes += ..
-  dynamicflags   = NONCHANGEABLE_CONNECTOR_CONN_BUILD_DLL
+  dynamicflags   = NONCHANGEABLE_CONNECTOR_EXEC_BUILD_DLL
 
   IDL_Files {
   }
 
   Source_Files {
-    NonChangeable_Connector_conn.cpp
+    NonChangeable_Connector_exec.cpp
   }
 
   Header_Files {
-    NonChangeable_Connector_conn.h
-    NonChangeable_Connector_conn_export.h
+    NonChangeable_Connector_exec.h
+    NonChangeable_Connector_exec_export.h
   }
 
   Inline_Files {
diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.cpp b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.cpp
new file mode 100644
index 00000000000..67dd26afc95
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.cpp
@@ -0,0 +1,170 @@
+// -*- C++ -*-
+// $Id$
+
+#include "NonChangeable_Connector_exec.h"
+
+namespace CIAO_NonChangeable_NonChangeable_Connector_Impl
+{
+  NonChangeable_Connector_exec_i::NonChangeable_Connector_exec_i (void)
+    : DDS_Event_Connector_T<NonChangeableTest_DDS_Traits, NonChangeableTest_Connector_Traits> ()
+  {
+  }
+
+  NonChangeable_Connector_exec_i::~NonChangeable_Connector_exec_i (void)
+  {
+  }
+
+  void
+  NonChangeable_Connector_exec_i::test_domain_id ()
+  {
+    bool nonchangeable_caught = false;
+    try
+      {
+        DDS::DomainId_t id = 0;
+        this->domain_id (id);
+      }
+    catch (const CCM_DDS::NonChangeable)
+      {
+        ACE_DEBUG ((LM_DEBUG,
+          ACE_TEXT ("test_domain_id : Expected exception caught\n")));
+        nonchangeable_caught = true;
+      }
+    catch (const CORBA::Exception& ex)
+      {
+        ex._tao_print_exception ("Exception caught:");
+        ACE_ERROR ((LM_ERROR,
+          ACE_TEXT ("ERROR: test_domain_id : Exception caught\n")));
+      }
+    catch (...)
+      {
+        ACE_ERROR ((LM_ERROR,
+          ACE_TEXT ("ERROR: test_domain_id : Unknown exception caught\n")));
+      }
+    if (!nonchangeable_caught)
+      {
+        ACE_ERROR ((LM_ERROR,
+          ACE_TEXT ("ERROR: test_domain_id : No NonChangeable exception caught\n")));
+      }
+  }
+
+  void
+  NonChangeable_Connector_exec_i::test_qos_profile ()
+  {
+    bool nonchangeable_caught = false;
+    try
+      {
+        this->qos_profile ("test");
+      }
+    catch (const CCM_DDS::NonChangeable)
+      {
+        ACE_DEBUG ((LM_DEBUG,
+          ACE_TEXT ("test_qos_profile : Expected exception caught\n")));
+        nonchangeable_caught = true;
+      }
+    catch (const CORBA::Exception& ex)
+      {
+        ex._tao_print_exception ("Exception caught:");
+        ACE_ERROR ((LM_ERROR,
+          ACE_TEXT ("ERROR: test_qos_profile : Exception caught\n")));
+      }
+    catch (...)
+      {
+        ACE_ERROR ((LM_ERROR,
+          ACE_TEXT ("ERROR: test_qos_profile : Unknown exception caught\n")));
+      }
+    if (!nonchangeable_caught)
+      {
+        ACE_ERROR ((LM_ERROR,
+          ACE_TEXT ("ERROR: test_qos_profile : No NonChangeable exception caught\n")));
+      }
+  }
+
+  void
+  NonChangeable_Connector_exec_i::test_topic_name ()
+  {
+    bool nonchangeable_caught = false;
+    try
+      {
+        this->topic_name ("test");
+      }
+    catch (const CCM_DDS::NonChangeable)
+      {
+        ACE_DEBUG ((LM_DEBUG,
+          ACE_TEXT ("test_topic_name : Expected exception caught\n")));
+        nonchangeable_caught = true;
+      }
+    catch (const CORBA::Exception& ex)
+      {
+        ex._tao_print_exception ("Exception caught:");
+        ACE_ERROR ((LM_ERROR,
+          ACE_TEXT ("ERROR: test_topic_name : Exception caught\n")));
+      }
+    catch (...)
+      {
+        ACE_ERROR ((LM_ERROR,
+          ACE_TEXT ("ERROR: test_topic_name : Unknown exception caught\n")));
+      }
+    if (!nonchangeable_caught)
+      {
+        ACE_ERROR ((LM_ERROR,
+          ACE_TEXT ("ERROR: test_topic_name : No NonChangeable exception caught\n")));
+      }
+  }
+
+  void
+  NonChangeable_Connector_exec_i::test_key_fields ()
+  {
+    bool nonchangeable_caught = false;
+    try
+      {
+        DDS::StringSeq key_fields;
+        this->key_fields (key_fields);
+      }
+    catch (const CCM_DDS::NonChangeable)
+      {
+        ACE_DEBUG ((LM_DEBUG,
+          ACE_TEXT ("test_key_fields : Expected exception caught\n")));
+        nonchangeable_caught = true;
+      }
+    catch (const CORBA::Exception& ex)
+      {
+        ex._tao_print_exception ("Exception caught:");
+        ACE_ERROR ((LM_ERROR,
+          ACE_TEXT ("ERROR: test_key_fields : Exception caught\n")));
+      }
+    catch (...)
+      {
+        ACE_ERROR ((LM_ERROR,
+          ACE_TEXT ("ERROR: test_key_fields : Unknown exception caught\n")));
+      }
+    if (!nonchangeable_caught)
+      {
+        ACE_ERROR ((LM_ERROR,
+          ACE_TEXT ("ERROR: test_key_fields : No NonChangeable exception caught\n")));
+      }
+  }
+
+
+  void
+  NonChangeable_Connector_exec_i::ccm_activate ()
+  {
+    test_domain_id ();
+    test_qos_profile ();
+    test_topic_name ();
+    test_key_fields ();
+  }
+
+  extern "C" NONCHANGEABLE_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_NonChangeable_NonChangeable_Connector_Impl (void)
+  {
+    ::Components::EnterpriseComponent_ptr retval =
+      ::Components::EnterpriseComponent::_nil ();
+
+    ACE_NEW_NORETURN (
+      retval,
+      NonChangeable_Connector_exec_i ());
+
+    return retval;
+  }
+}
+
diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.h
new file mode 100644
index 00000000000..436fb018deb
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/Connector/NonChangeable_Connector_exec.h
@@ -0,0 +1,67 @@
+// -*- C++ -*-
+// $Id$
+
+#ifndef NONCHANGEABLE_CONNECTOR_EXEC_H_
+#define NONCHANGEABLE_CONNECTOR_EXEC_H_
+
+#include /**/ "ace/pre.h"
+
+#include "NonChangeable_ConnectorEC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "NonChangeable_Connector_exec_export.h"
+#include "tao/LocalObject.h"
+
+#include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
+#include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
+
+#include "Base/NonChangeable_BaseSupport.h"
+
+namespace CIAO_NonChangeable_NonChangeable_Connector_Impl
+{
+  // @from use of NonChangeableTest as a parameter
+  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+    NonChangeableTest,
+    NonChangeableTestSeq,
+    NonChangeableTestTypeSupport,
+    NonChangeableTestDataWriter,
+    NonChangeableTestDataReader > NonChangeableTest_DDS_Traits;
+
+  typedef CIAO::DDS4CCM::Connector_Traits <
+    ::CIAO_NonChangeable_NonChangeable_Connector_Impl::NonChangeable_Connector_Exec,
+    NonChangeableTest_Seq,
+    ::CCM_DDS::NonChangeableTest::CCM_Writer,
+    ::CCM_DDS::NonChangeableTest::CCM_Updater,
+    ::CCM_DDS::NonChangeableTest::CCM_Getter,
+    ::CCM_DDS::NonChangeableTest::CCM_Reader,
+    ::NonChangeable::CCM_NonChangeable_Connector_Context,
+    ::CCM_DDS::NonChangeableTest::Listener,
+    ::CCM_DDS::NonChangeableTest::StateListener,
+    ::CCM_DDS::ConnectorStatusListener> NonChangeableTest_Connector_Traits;
+
+  class NONCHANGEABLE_CONNECTOR_EXEC_Export NonChangeable_Connector_exec_i :
+    public DDS_Event_Connector_T <NonChangeableTest_DDS_Traits, NonChangeableTest_Connector_Traits>
+  {
+  public:
+    NonChangeable_Connector_exec_i (void);
+    virtual ~NonChangeable_Connector_exec_i (void);
+
+    void ccm_activate (void);
+  private:
+    void test_domain_id ();
+    void test_qos_profile ();
+    void test_topic_name ();
+    void test_key_fields ();
+  };
+
+  extern "C" NONCHANGEABLE_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_NonChangeable_NonChangeable_Connector_Impl (void);
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
diff --git a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl
index e91dc5b9c10..bbb29e79d89 100755
--- a/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/NonChangeableAttribute/descriptors/run_test.pl
@@ -100,8 +100,6 @@ sub kill_open_processes {
     if ($ns_running == 1) {
         $NS->Kill (); $NS->TimedWait (1);
     }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
 }
 
 sub run_node_daemons {
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/ConnectorStatusListener_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/ConnectorStatusListener_Test_Base.idl
index 148b50ead6b..0d56350babc 100644
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/ConnectorStatusListener_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/ConnectorStatusListener_Test_Base.idl
@@ -1,23 +1,28 @@
 // $Id$
 
+/**
+ * @file 
+ * @author 
+ */
+
 #ifndef CONNECTORSTATUSLISTENER_TEST_BASE_IDL
 #define CONNECTORSTATUSLISTENER_TEST_BASE_IDL
 
-#pragma ndds typesupport "Base/ConnectorStatusListener_Test_BaseSupport.h"
 
-struct TestTopic {
-  string key; //@key
-  long x;
-};
+  struct TestTopic {
+    string key; //@key
+    long x;
+   };
+
 
 typedef sequence<TestTopic> TestTopic_Seq;
 
 struct TestSecondTopic {
-  string key; //@key
-  long x;
-  long y;
-};
+    string key; //@key
+    long x;
+    long y;
+   };
 
-typedef sequence<TestSecondTopic> TestSecondTopic_Seq;
 
+typedef sequence<TestSecondTopic> TestSecondTopic_Seq;
 #endif
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/ConnectorStatusListener_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/ConnectorStatusListener_Test_Base.mpc
index 5435326d875..0ef849ed087 100644
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/ConnectorStatusListener_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Base/ConnectorStatusListener_Test_Base.mpc
@@ -1,25 +1,76 @@
 // $Id$
+// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n ConnectorStatusListener_Test_Base"
 
-project (DDS_OIT_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
-  sharedname = DDS_ConnectorStatusListener_Test_Base_stub
-  dynamicflags += CONNECTORSTATUSLISTENER_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Gxhst -Sci \
+project(DDS_OIT_Test_Base_idl_gen) : taoidldefaults, anytypecode {
+  custom_only = 1
+  idlflags -= -St -Sa
+  idlflags += -SS -Gxhst \
               -Wb,stub_export_macro=CONNECTORSTATUSLISTENER_TEST_BASE_STUB_Export \
               -Wb,stub_export_include=ConnectorStatusListener_Test_Base_stub_export.h
 
   IDL_Files {
     ConnectorStatusListener_Test_Base.idl
   }
+}
 
-  opendds_ts_flags += --export=CONNECTORSTATUSLISTENER_TEST_BASE_STUB_Export
+project(DDS_OIT_Test_Base_ndds_ts_gen) : ndds_ts_defaults {
+  custom_only = 1
+  after += DDS_OIT_Test_Base_idl_gen
 
-  DDSGenerator_Files {
+  NDDSTypeSupport_Files {
     ConnectorStatusListener_Test_Base.idl
   }
+}
+
+project(DDS_OIT_Test_Base_NDDS_TS) : nddslib, taolib {
+  after += DDS_OIT_Test_Base_ndds_ts_gen DDS_OIT_Test_Base_stub
+  libs += DDS_ConnectorStatusListener_Test_Base_stub
+  libout = ../lib
+  libpaths    += ../lib
+  sharedname = DDS_ConnectorStatusListener_Test_Base_NDDS_TS
+  dynamicflags = NDDS_USER_DLL_EXPORT
+
+  verbatim(gnuace, macros) {
+    override no_hidden_visibility = 1
+  }
 
   Source_Files {
+    ConnectorStatusListener_Test_Base.cxx
+    ConnectorStatusListener_Test_BasePlugin.cxx
+    ConnectorStatusListener_Test_BaseSupport.cxx
+  }
+
+  Header_Files {
+    ConnectorStatusListener_Test_Base.h
+    ConnectorStatusListener_Test_BasePlugin.h
+    ConnectorStatusListener_Test_BaseSupport.h
+  }
+
+  Inline_Files {
+  }
+}
+
+project(DDS_OIT_Test_Base_stub) : ccm_stub {
+  after += DDS_OIT_Test_Base_idl_gen
+  libout = ../lib
+  libpaths += ../lib
+  sharedname = DDS_ConnectorStatusListener_Test_Base_stub
+  dynamicflags = CONNECTORSTATUSLISTENER_TEST_BASE_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    ConnectorStatusListener_Test_BaseC.cpp
+  }
+
+  Header_Files {
+    ConnectorStatusListener_Test_BaseC.h
+    ConnectorStatusListener_Test_Base_stub_export.h
+  }
+
+  Inline_Files {
+    ConnectorStatusListener_Test_BaseC.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector.mpc
index e25544272bf..56b493a9cb2 100644
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_OIT_Test_Base -l .. -o ../lib -u DDS ConnectorStatusListener_Test_Connector"
 
-project(DDS_OIT_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
+project(DDS_OIT_Test_Connector_idl_gen) : connectoridldefaults {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=CONNECTORSTATUSLISTENER_TEST_CONNECTOR_STUB_Export \
@@ -10,8 +10,8 @@ project(DDS_OIT_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
               -Wb,skel_export_include=ConnectorStatusListener_Test_Connector_svnt_export.h \
               -Wb,svnt_export_macro=CONNECTORSTATUSLISTENER_TEST_CONNECTOR_SVNT_Export \
               -Wb,svnt_export_include=ConnectorStatusListener_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=CONNECTORSTATUSLISTENER_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=ConnectorStatusListener_Test_Connector_conn_export.h \
+              -Wb,exec_export_macro=CONNECTORSTATUSLISTENER_TEST_CONNECTOR_EXEC_Export \
+              -Wb,exec_export_include=ConnectorStatusListener_Test_Connector_exec_export.h \
               -I ..
 
   IDL_Files {
@@ -19,7 +19,7 @@ project(DDS_OIT_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   }
 }
 
-project(DDS_OIT_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_OIT_Test_Connector_lem_gen) : ciaoidldefaults {
   custom_only = 1
   after += DDS_OIT_Test_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=CONNECTORSTATUSLISTENER_TEST_CONNECTOR_LEM_STUB_Export \
@@ -85,24 +85,24 @@ project(DDS_OIT_Test_Connector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_OIT_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_OIT_Test_Connector_lem_stub DDS_OIT_Test_Connector_stub DDS4CCM_lem_stub DDS_OIT_Test_Base_stub
+  after   += DDS_OIT_Test_Connector_lem_stub DDS_OIT_Test_Connector_stub DDS4CCM_lem_stub DDS_OIT_Test_Base_NDDS_TS
   sharedname = DDS_ConnectorStatusListener_Test_Connector_exec
-  libs += DDS_ConnectorStatusListener_Test_Connector_stub DDS_ConnectorStatusListener_Test_Connector_lem_stub DDS_ConnectorStatusListener_Test_Base_stub DDS4CCM_lem_stub DDS_ConnectorStatusListener_Test_Base_stub
+  libs += DDS_ConnectorStatusListener_Test_Connector_stub DDS_ConnectorStatusListener_Test_Connector_lem_stub DDS_ConnectorStatusListener_Test_Base_stub DDS4CCM_lem_stub DDS_ConnectorStatusListener_Test_Base_NDDS_TS
   libpaths += ../lib
   libout = ../lib
   includes += ..
-  dynamicflags   = CONNECTORSTATUSLISTENER_TEST_CONNECTOR_CONN_BUILD_DLL
+  dynamicflags   = CONNECTORSTATUSLISTENER_TEST_CONNECTOR_EXEC_BUILD_DLL
 
   IDL_Files {
   }
 
   Source_Files {
-    ConnectorStatusListener_Test_Connector_conn.cpp
+    ConnectorStatusListener_Test_Connector_exec.cpp
   }
 
   Header_Files {
-    ConnectorStatusListener_Test_Connector_conn.h
-    ConnectorStatusListener_Test_Connector_conn_export.h
+    ConnectorStatusListener_Test_Connector_exec.h
+    ConnectorStatusListener_Test_Connector_exec_export.h
   }
 
   Inline_Files {
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector_exec.cpp b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector_exec.cpp
new file mode 100644
index 00000000000..48290925cd1
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector_exec.cpp
@@ -0,0 +1,30 @@
+// -*- C++ -*-
+// $Id$
+
+#include "ConnectorStatusListener_Test_Connector_exec.h"
+
+namespace CIAO_ConnectorStatusListener_Test_ConnectorStatusListener_Test_Connector_Impl
+{
+  ConnectorStatusListener_Test_Connector_exec_i::ConnectorStatusListener_Test_Connector_exec_i (void)
+    : DDS_Event_Connector_T<TestTopic_DDS_Traits, TestTopic_Connector_Traits> ()
+  {
+  }
+
+  ConnectorStatusListener_Test_Connector_exec_i::~ConnectorStatusListener_Test_Connector_exec_i (void)
+  {
+  }
+
+  extern "C" CONNECTORSTATUSLISTENER_TEST_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_ConnectorStatusListener_Test_ConnectorStatusListener_Test_Connector_Impl (void)
+  {
+    ::Components::EnterpriseComponent_ptr retval =
+      ::Components::EnterpriseComponent::_nil ();
+
+    ACE_NEW_NORETURN (
+      retval,
+      ConnectorStatusListener_Test_Connector_exec_i ()); //should be set by dep. plan.
+
+    return retval;
+  }
+}
+
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector_exec.h
new file mode 100644
index 00000000000..739257a7345
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Connector/ConnectorStatusListener_Test_Connector_exec.h
@@ -0,0 +1,61 @@
+// -*- C++ -*-
+// $Id$
+
+#ifndef CONNECTORSTATUSLISTENER_TEST_CONNECTOR_EXEC_H_
+#define CONNECTORSTATUSLISTENER_TEST_CONNECTOR_EXEC_H_
+
+#include /**/ "ace/pre.h"
+
+#include "ConnectorStatusListener_Test_ConnectorEC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "ConnectorStatusListener_Test_Connector_exec_export.h"
+#include "tao/LocalObject.h"
+
+#include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
+#include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
+
+#include "Base/ConnectorStatusListener_Test_BaseSupport.h"
+
+namespace CIAO_ConnectorStatusListener_Test_ConnectorStatusListener_Test_Connector_Impl
+{
+
+  // @from use of ConnectorStatusListener_Test as a parameter
+  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+    TestTopic,
+    TestTopicSeq,
+    TestTopicTypeSupport,
+    TestTopicDataWriter,
+    TestTopicDataReader > TestTopic_DDS_Traits;
+
+  typedef CIAO::DDS4CCM::Connector_Traits <
+    ::CIAO_ConnectorStatusListener_Test_ConnectorStatusListener_Test_Connector_Impl::ConnectorStatusListener_Test_Connector_Exec,
+    TestTopic_Seq,
+    ::CCM_DDS::TestTopic::CCM_Writer,
+    ::CCM_DDS::TestTopic::CCM_Updater,
+    ::CCM_DDS::TestTopic::CCM_Getter,
+    ::CCM_DDS::TestTopic::CCM_Reader,
+    ::ConnectorStatusListener_Test::CCM_ConnectorStatusListener_Test_Connector_Context,
+    ::CCM_DDS::TestTopic::Listener,
+    ::CCM_DDS::TestTopic::StateListener,
+    ::CCM_DDS::ConnectorStatusListener> TestTopic_Connector_Traits;
+
+  class CONNECTORSTATUSLISTENER_TEST_CONNECTOR_EXEC_Export ConnectorStatusListener_Test_Connector_exec_i :
+    public DDS_Event_Connector_T <TestTopic_DDS_Traits, TestTopic_Connector_Traits>
+  {
+  public:
+    ConnectorStatusListener_Test_Connector_exec_i (void);
+    virtual ~ConnectorStatusListener_Test_Connector_exec_i (void);
+  };
+
+  extern "C" CONNECTORSTATUSLISTENER_TEST_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_ConnectorStatusListener_Test_ConnectorStatusListener_Test_Connector_Impl (void);
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver.mpc
index aa1d2e46dac..0b5d77ebebb 100644
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_OIT_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_OIT_Test_Receiver_idl_gen) : componentidldefaults {
   custom_only = 1
   after += DDS_OIT_Test_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
@@ -17,7 +17,7 @@ project(DDS_OIT_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_OIT_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_OIT_Test_Receiver_lem_gen) : ciaoidldefaults {
   after += DDS_OIT_Test_Receiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
@@ -107,7 +107,7 @@ project(DDS_OIT_Test_Receiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_OIT_Test_Receiver_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_OIT_Test_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      +=   DDS_OIT_Test_Receiver_lem_stub DDS_OIT_Test_Base_stub DDS_OIT_Test_Connector_stub DDS_OIT_Test_Connector_svnt DDS_OIT_Test_Receiver_exec DDS_OIT_Test_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
   sharedname  = Receiver_svnt
   libs       += Receiver_stub Receiver_lem_stub DDS_ConnectorStatusListener_Test_Base_stub DDS_ConnectorStatusListener_Test_Connector_stub DDS_ConnectorStatusListener_Test_Connector_svnt Receiver_exec DDS_ConnectorStatusListener_Test_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver_exec.cpp
index ef01ce3c309..13e5cb9fcc5 100644
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver_exec.cpp
@@ -7,10 +7,8 @@
 
 namespace CIAO_ConnectorStatusListener_Test_Receiver_Impl
 {
-  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (Atomic_Boolean &inconsistent,
-                                                                  Atomic_ThreadId &thread_id)
-    : inconsistent_ (inconsistent),
-      thread_id_ (thread_id)
+  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (Atomic_Boolean &inconsistent)
+   : inconsistent_ (inconsistent)
   {
   }
 
@@ -20,49 +18,108 @@ namespace CIAO_ConnectorStatusListener_Test_Receiver_Impl
 
   // Operations from ::CCM_DDS::ConnectorStatusListener
   void ConnectorStatusListener_exec_i::on_inconsistent_topic(
-    ::DDS::Topic_ptr /* the_topic */,
-    const DDS::InconsistentTopicStatus & /* status */)
+     ::DDS::Topic_ptr /* the_topic */,
+     const DDS::InconsistentTopicStatus & /* status */)
   {
-    this->thread_id_ = ACE_Thread::self ();
     this->inconsistent_ = true;
+    //ACE_DEBUG ((LM_DEBUG, "Receiver: ConnectorStatusListener_exec_i::on_inconsistent_topic\n"));
   }
 
   void ConnectorStatusListener_exec_i::on_requested_incompatible_qos(
     ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
+     const DDS::RequestedIncompatibleQosStatus & /*status*/)
   {
+    //ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_requested_incompatible_qos\n"));
   }
 
   void ConnectorStatusListener_exec_i::on_sample_rejected(
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
+     ::DDS::DataReader_ptr /*the_reader*/,
+     const DDS::SampleRejectedStatus & /*status*/)
   {
+    //ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_sample_rejected\n"));
   }
 
   void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
+     ::DDS::DataWriter_ptr /*the_writer*/,
+     const DDS::OfferedDeadlineMissedStatus & /*status*/)
   {
+    //ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_offered_deadline_missed\n"));
   }
 
   void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
+     ::DDS::DataWriter_ptr /*the_writer*/,
+     const DDS::OfferedIncompatibleQosStatus & /*status*/)
   {
+    //ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_offered_incompatible_qos\n"));
   }
 
   void ConnectorStatusListener_exec_i::on_unexpected_status(
     ::DDS::Entity_ptr /*the_entity*/,
     ::DDS::StatusKind  /*status_kind*/)
   {
+    //ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_unexpected_status\n"));
+  }
+
+  TestTopic_RawListener_exec_i::TestTopic_RawListener_exec_i (void)
+  {
+  }
+
+  TestTopic_RawListener_exec_i::~TestTopic_RawListener_exec_i (void)
+  {
+  }
+
+  // Operations from ::CCM_DDS::TestTopic_RawListener
+
+  void
+  TestTopic_RawListener_exec_i::on_one_data (
+    const TestTopic & /*an_instance*/ ,
+    const ::CCM_DDS::ReadInfo & /* info */)
+  {
+    //ACE_DEBUG ((LM_DEBUG, " receive data ============= %d\n", this->received_));
+  }
+
+  void
+  TestTopic_RawListener_exec_i::on_many_data (
+    const TestTopic_Seq & /*an_instance */,
+    const ::CCM_DDS::ReadInfoSeq & /* info */)
+  {
+    //ACE_DEBUG ((LM_DEBUG, " receive data ============= %d\n", this->received_));
+  }
+
+  //============================================================
+  // Facet Executor Implementation Class: PortStatusListener_exec_i
+  //============================================================
+
+  PortStatusListener_exec_i::PortStatusListener_exec_i (void)
+  {
+  }
+
+  PortStatusListener_exec_i::~PortStatusListener_exec_i (void)
+  {
+  }
+
+  // Operations from ::CCM_DDS::PortStatusListener
+
+  void
+    PortStatusListener_exec_i::on_requested_deadline_missed (
+    ::DDS::DataReader_ptr /* the_reader */,
+    const ::DDS::RequestedDeadlineMissedStatus & /* status */)
+  {
+  }
+
+  void
+  PortStatusListener_exec_i::on_sample_lost (
+    ::DDS::DataReader_ptr /* the_reader */,
+    const ::DDS::SampleLostStatus & /* status */)
+  {
   }
 
   //============================================================
   // Component Executor Implementation Class: Receiver_exec_iTestTopic_RawListener_exec_i ();
   //============================================================
+
   Receiver_exec_i::Receiver_exec_i (void)
-    : inconsistent_ (false) ,
-      thread_id_listener_ (0)
+    : inconsistent_ (false)
   {
   }
 
@@ -75,7 +132,7 @@ namespace CIAO_ConnectorStatusListener_Test_Receiver_Impl
   Receiver_exec_i::get_info_out_data_listener (void)
   {
     ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new TestTopic RAW listener\n")));
-    return ::CCM_DDS::TestTopic::CCM_Listener::_nil ();
+    return new TestTopic_RawListener_exec_i ();
   }
 
 
@@ -83,14 +140,13 @@ namespace CIAO_ConnectorStatusListener_Test_Receiver_Impl
   Receiver_exec_i::get_info_out_status (void)
   {
     ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new PortStatuslistener\n")));
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
+    return new PortStatusListener_exec_i ();
   }
 
   ::CCM_DDS::CCM_ConnectorStatusListener_ptr
   Receiver_exec_i::get_info_out_connector_status (void)
   {
-    return new ConnectorStatusListener_exec_i (this->inconsistent_,
-                                               this->thread_id_listener_);
+    return new ConnectorStatusListener_exec_i (this->inconsistent_);
   }
 
   // Operations from Components::SessionComponent.
@@ -133,62 +189,19 @@ namespace CIAO_ConnectorStatusListener_Test_Receiver_Impl
   void
   Receiver_exec_i::ccm_remove (void)
   {
-    if (!this->inconsistent_.value ())
+    ACE_DEBUG ((LM_DEBUG, "*************in remove Receiver********** \n"));
+    if(!this->inconsistent_.value ())
       {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("RECEIVER ERROR: did not receive the expected ")
-                              ACE_TEXT ("error 'on_inconsistent_topic'\n")
+         ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: did not receive the expected ")
+                               ACE_TEXT ("error 'on_inconsistent_topic' in Receiver\n")
                     ));
       }
     else
       {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("RECEIVER OK: Received the expected ")
-                              ACE_TEXT ("'on_inconsistent_topic'\n")
+         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Received the expected ")
+                               ACE_TEXT ("'on_inconsistent_topic' in Receiver\n")
                     ));
       }
-    if (this->thread_id_listener_.value () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: "
-                              "Thread ID for ConnectorStatusListener not set!\n"));
-      }
-    #if defined (CIAO_DDS4CCM_CONTEXT_SWITCH) && (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (ACE_OS::thr_equal (this->thread_id_listener_.value (),
-                                ACE_Thread::self ()))
-      {
-        ACE_DEBUG ((LM_DEBUG, "RECEIVER OK: "
-                              "Thread switch for ConnectorStatusListener seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_.value (),
-                              ACE_Thread::self ()));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: "
-                              "Thread switch for ConnectorStatusListener "
-                              "doesn't seem to work! "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_.value (),
-                              ACE_Thread::self ()));
-      }
-    #else
-    else if (ACE_OS::thr_equal (this->thread_id_listener_.value (),
-                                ACE_Thread::self ()))
-      {
-        ACE_ERROR ((LM_ERROR, "RECEIVER ERROR: ConnectorStatusListener: "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_.value (),
-                              ACE_Thread::self ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "RECEIVER OK: ConnectorStatusListener: "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_.value (),
-                              ACE_Thread::self ()));
-      }
-    #endif
   }
 
   extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver_exec.h
index df98570f112..dd5417f4c6e 100644
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Receiver/ConnectorStatusListener_Test_Receiver_exec.h
@@ -13,57 +13,83 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/LocalObject.h"
-#include "ace/OS_NS_Thread.h"
-#include "ace/Reactor.h"
 #include "ace/Task.h"
+#include "ace/Reactor.h"
 
 namespace CIAO_ConnectorStatusListener_Test_Receiver_Impl
 {
   typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, ACE_thread_t> Atomic_ThreadId;
 
   class Receiver_exec_i;
 
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
+  class RECEIVER_EXEC_Export TestTopic_RawListener_exec_i
+    : public virtual ::CCM_DDS::TestTopic::CCM_Listener,
+      public virtual ::CORBA::LocalObject
+  {
+  public:
+    TestTopic_RawListener_exec_i (void);
+    virtual ~TestTopic_RawListener_exec_i (void);
+
+    virtual void
+    on_one_data (
+      const TestTopic & an_instance,
+      const ::CCM_DDS::ReadInfo & info);
+
+    virtual void
+      on_many_data (
+        const ::TestTopic_Seq & data,
+        const ::CCM_DDS::ReadInfoSeq & infos);
+  };
+
   class RECEIVER_EXEC_Export ConnectorStatusListener_exec_i
     : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
       public virtual ::CORBA::LocalObject
   {
   public:
-    ConnectorStatusListener_exec_i (Atomic_Boolean &,
-                                    Atomic_ThreadId &);
+    ConnectorStatusListener_exec_i (Atomic_Boolean &);
     virtual ~ConnectorStatusListener_exec_i (void);
 
     virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
+    void on_inconsistent_topic( ::DDS::Topic_ptr the_topic,
                                 const DDS::InconsistentTopicStatus & status);
     virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
+    void on_requested_incompatible_qos( ::DDS::DataReader_ptr the_reader,
                                         const DDS::RequestedIncompatibleQosStatus & status);
     virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
+    void on_sample_rejected( ::DDS::DataReader_ptr the_reader,
                              const DDS::SampleRejectedStatus & status);
     virtual
-      void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                       const DDS::OfferedDeadlineMissedStatus & status);
+      void on_offered_deadline_missed( ::DDS::DataWriter_ptr the_writer,
+                                     const DDS::OfferedDeadlineMissedStatus & status);
     virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
+    void on_offered_incompatible_qos( ::DDS::DataWriter_ptr the_writer,
                                       const DDS::OfferedIncompatibleQosStatus & status);
     virtual
-      void on_unexpected_status (
-        ::DDS::Entity_ptr the_entity,
-        ::DDS::StatusKind  status_kind);
+      void on_unexpected_status( ::DDS::Entity_ptr the_entity,
+       ::DDS::StatusKind  status_kind);
     private:
     Atomic_Boolean &inconsistent_;
-    Atomic_ThreadId &thread_id_;
 
   };
+  class RECEIVER_EXEC_Export PortStatusListener_exec_i
+    : public virtual ::CCM_DDS::CCM_PortStatusListener,
+      public virtual ::CORBA::LocalObject
+  {
+  public:
+    PortStatusListener_exec_i (void);
+    virtual ~PortStatusListener_exec_i (void);
+
+    virtual void
+    on_requested_deadline_missed (
+      ::DDS::DataReader_ptr the_reader,
+      const ::DDS::RequestedDeadlineMissedStatus & status);
+
+    virtual void
+    on_sample_lost (
+      ::DDS::DataReader_ptr the_reader,
+      const ::DDS::SampleLostStatus & status);
+  };
 
-  //============================================================
-  // Receiver_exec_i
-  //============================================================
   class RECEIVER_EXEC_Export Receiver_exec_i
     : public virtual Receiver_Exec,
       public virtual ::CORBA::LocalObject
@@ -95,9 +121,7 @@ namespace CIAO_ConnectorStatusListener_Test_Receiver_Impl
 
   private:
     ::ConnectorStatusListener_Test::CCM_Receiver_Context_var context_;
-
     Atomic_Boolean inconsistent_;
-    Atomic_ThreadId thread_id_listener_;
   };
 
   extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/CSL_TestSec_Connector_exec.cpp b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/CSL_TestSec_Connector_exec.cpp
new file mode 100644
index 00000000000..399f716c2a4
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/CSL_TestSec_Connector_exec.cpp
@@ -0,0 +1,30 @@
+// -*- C++ -*-
+// $Id$
+
+#include "CSL_TestSec_Connector_exec.h"
+
+namespace CIAO_ConnectorStatusListener_TestSec_ConnectorStatusListener_TestSec_Connector_Impl
+{
+  ConnectorStatusListener_TestSec_Connector_exec_i::ConnectorStatusListener_TestSec_Connector_exec_i (void)
+    : DDS_Event_Connector_T<TestSecondTopic_DDS_Traits, TestSecondTopic_Connector_Traits> ()
+  {
+  }
+
+  ConnectorStatusListener_TestSec_Connector_exec_i::~ConnectorStatusListener_TestSec_Connector_exec_i (void)
+  {
+  }
+
+  extern "C" CONNECTORSTATUSLISTENER_TESTSEC_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_ConnectorStatusListener_TestSec_ConnectorStatusListener_TestSec_Connector_Impl (void)
+  {
+    ::Components::EnterpriseComponent_ptr retval =
+      ::Components::EnterpriseComponent::_nil ();
+
+    ACE_NEW_NORETURN (
+      retval,
+      ConnectorStatusListener_TestSec_Connector_exec_i ()); //should be set by dep. plan.
+
+    return retval;
+  }
+}
+
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/CSL_TestSec_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/CSL_TestSec_Connector_exec.h
new file mode 100644
index 00000000000..f50cea99cfe
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/CSL_TestSec_Connector_exec.h
@@ -0,0 +1,61 @@
+// -*- C++ -*-
+// $Id$
+
+#ifndef CONNECTORSTATUSLISTENER_TESTSEC_CONNECTOR_EXEC_H_
+#define CONNECTORSTATUSLISTENER_TESTSEC_CONNECTOR_EXEC_H_
+
+#include /**/ "ace/pre.h"
+
+#include "ConnectorStatusListener_TestSec_ConnectorEC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "ConnectorStatusListener_TestSec_Connector_exec_export.h"
+#include "tao/LocalObject.h"
+
+#include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
+#include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
+
+#include "Base/ConnectorStatusListener_Test_BaseSupport.h"
+
+namespace CIAO_ConnectorStatusListener_TestSec_ConnectorStatusListener_TestSec_Connector_Impl
+{
+
+  // @from use of ConnectorStatusListener_Test as a parameter
+  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+    TestSecondTopic,
+    TestSecondTopicSeq,
+    TestSecondTopicTypeSupport,
+    TestSecondTopicDataWriter,
+    TestSecondTopicDataReader > TestSecondTopic_DDS_Traits;
+
+  typedef CIAO::DDS4CCM::Connector_Traits <
+    ::CIAO_ConnectorStatusListener_Test_ConnectorStatusListener_TestSec_Connector_Impl::ConnectorStatusListener_TestSec_Connector_Exec,
+    TestSecondTopic_Seq,
+    ::CCM_DDS::TestSecondTopic::CCM_Writer,
+    ::CCM_DDS::TestSecondTopic::CCM_Updater,
+    ::CCM_DDS::TestSecondTopic::CCM_Getter,
+    ::CCM_DDS::TestSecondTopic::CCM_Reader,
+    ::ConnectorStatusListener_Test::CCM_ConnectorStatusListener_TestSec_Connector_Context,
+    ::CCM_DDS::TestSecondTopic::Listener,
+    ::CCM_DDS::TestSecondTopic::StateListener,
+    ::CCM_DDS::ConnectorStatusListener> TestSecondTopic_Connector_Traits;
+
+  class CONNECTORSTATUSLISTENER_TESTSEC_CONNECTOR_EXEC_Export ConnectorStatusListener_TestSec_Connector_exec_i :
+    public DDS_Event_Connector_T <TestSecondTopic_DDS_Traits, TestSecondTopic_Connector_Traits>
+  {
+  public:
+    ConnectorStatusListener_TestSec_Connector_exec_i (void);
+    virtual ~ConnectorStatusListener_TestSec_Connector_exec_i (void);
+  };
+
+  extern "C" CONNECTORSTATUSLISTENER_TESTSEC_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_ConnectorStatusListener_TestSec_ConnectorStatusListener_TestSec_Connector_Impl (void);
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.mpc b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.mpc
index 2babbd644f8..3596be88f93 100644
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/SecConnector/ConnectorStatusListener_TestSec_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_OIT_Test_Base -l .. -o ../lib -u DDS ConnectorStatusListener_TestSec_Connector"
 
-project(DDS_OIT_TestSec_Connector_idl_gen) : connectoridldefaults, dds4ccm {
+project(DDS_OIT_TestSec_Connector_idl_gen) : connectoridldefaults {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=CONNECTORSTATUSLISTENER_TESTSEC_CONNECTOR_STUB_Export \
@@ -10,8 +10,8 @@ project(DDS_OIT_TestSec_Connector_idl_gen) : connectoridldefaults, dds4ccm {
               -Wb,skel_export_include=ConnectorStatusListener_TestSec_Connector_svnt_export.h \
               -Wb,svnt_export_macro=CONNECTORSTATUSLISTENER_TESTSEC_CONNECTOR_SVNT_Export \
               -Wb,svnt_export_include=ConnectorStatusListener_TestSec_Connector_svnt_export.h \
-              -Wb,conn_export_macro=CONNECTORSTATUSLISTENER_TESTSEC_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=ConnectorStatusListener_TestSec_Connector_conn_export.h \
+              -Wb,exec_export_macro=CONNECTORSTATUSLISTENER_TESTSEC_CONNECTOR_EXEC_Export \
+              -Wb,exec_export_include=ConnectorStatusListener_TestSec_Connector_exec_export.h \
               -I ..
 
   IDL_Files {
@@ -19,7 +19,7 @@ project(DDS_OIT_TestSec_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   }
 }
 
-project(DDS_OIT_TestSec_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_OIT_TestSec_Connector_lem_gen) : ciaoidldefaults {
   custom_only = 1
   after += DDS_OIT_TestSec_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=CONNECTORSTATUSLISTENER_TESTSEC_CONNECTOR_LEM_STUB_Export \
@@ -85,24 +85,24 @@ project(DDS_OIT_TestSec_Connector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_OIT_TestSec_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_OIT_TestSec_Connector_lem_stub DDS_OIT_TestSec_Connector_stub DDS4CCM_lem_stub DDS_OIT_Test_Base_stub
+  after   += DDS_OIT_TestSec_Connector_lem_stub DDS_OIT_TestSec_Connector_stub DDS4CCM_lem_stub DDS_OIT_Test_Base_NDDS_TS
   sharedname = DDS_ConnectorStatusListener_TestSec_Connector_exec
-  libs += DDS_ConnectorStatusListener_TestSec_Connector_stub DDS_CSL_TestSec_Connector_lem_stub DDS_ConnectorStatusListener_Test_Base_stub DDS4CCM_lem_stub DDS_ConnectorStatusListener_Test_Base_stub
+  libs += DDS_ConnectorStatusListener_TestSec_Connector_stub DDS_CSL_TestSec_Connector_lem_stub DDS_ConnectorStatusListener_Test_Base_stub DDS4CCM_lem_stub DDS_ConnectorStatusListener_Test_Base_NDDS_TS
   libpaths += ../lib
   libout = ../lib
   includes += ..
-  dynamicflags   = CONNECTORSTATUSLISTENER_TESTSEC_CONNECTOR_CONN_BUILD_DLL
+  dynamicflags   = CONNECTORSTATUSLISTENER_TESTSEC_CONNECTOR_EXEC_BUILD_DLL
 
   IDL_Files {
   }
 
   Source_Files {
-    ConnectorStatusListener_TestSec_Connector_conn.cpp
+    CSL_TestSec_Connector_exec.cpp
   }
 
   Header_Files {
-    ConnectorStatusListener_TestSec_Connector_conn.h
-    ConnectorStatusListener_TestSec_Connector_conn_export.h
+    CSL_TestSec_Connector_exec.h
+    ConnectorStatusListener_TestSec_Connector_exec_export.h
   }
 
   Inline_Files {
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender.mpc
index 100fc162b89..38faf4c8e3e 100644
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_OIT_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(DDS_OIT_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_OIT_Test_Sender_idl_gen) : componentidldefaults {
   after += DDS_OIT_Test_Connector_idl_gen DDS_OIT_TestSec_Connector_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_OIT_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_OIT_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_OIT_Test_Sender_lem_gen) : ciaoidldefaults {
   after += DDS_OIT_Test_Sender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
@@ -109,7 +109,7 @@ project(DDS_OIT_Test_Sender_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_OIT_Test_Sender_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_OIT_Test_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      += DDS_OIT_Test_Base_stub  DDS_OIT_Test_Sender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_OIT_Test_Connector_stub DDS_OIT_TestSec_Connector_stub DDS_OIT_Test_Connector_svnt  DDS_OIT_TestSec_Connector_svnt DDS_OIT_Test_Connector_lem_stub DDS_OIT_TestSec_Connector_lem_stub
   sharedname  = Sender_svnt
   libs       += Sender_stub Sender_lem_stub  \
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender_exec.cpp
index 2d5f072e180..5a2613c5fb0 100644
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender_exec.cpp
@@ -11,12 +11,11 @@ namespace CIAO_ConnectorStatusListener_Test_Sender_Impl
 {
 
   //============================================================
-  // ConnectorStatusListener_sec_exec_i
+  // Facet Executor Implementation Class: ConnectorStatusListener_sec_exec_i
   //============================================================
-  ConnectorStatusListener_sec_exec_i::ConnectorStatusListener_sec_exec_i (Atomic_Boolean &inconsistent,
-                                                                          Atomic_ThreadId &thread_id)
-    : inconsistent_ (inconsistent),
-      thread_id_ (thread_id)
+
+  ConnectorStatusListener_sec_exec_i::ConnectorStatusListener_sec_exec_i (Atomic_Boolean &inconsistent)
+   : inconsistent_ (inconsistent)
   {
   }
 
@@ -25,50 +24,45 @@ namespace CIAO_ConnectorStatusListener_Test_Sender_Impl
   }
 
   // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_sec_exec_i::on_inconsistent_topic (
+  void ConnectorStatusListener_sec_exec_i::on_inconsistent_topic(
      ::DDS::Topic_ptr /*the_topic*/,
      const DDS::InconsistentTopicStatus & /*status*/)
-  {
-    this->thread_id_ = ACE_Thread::self ();
-    this->inconsistent_ = true;
-  }
-
-  void ConnectorStatusListener_sec_exec_i::on_requested_incompatible_qos (
+    {
+//    ACE_DEBUG ((LM_DEBUG, "Sender : ConnectorStatusListener_sec_exec_i::on_inconsistent_topic\n"));
+      this->inconsistent_ = true;
+    }
+  void ConnectorStatusListener_sec_exec_i::on_requested_incompatible_qos(
     ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_sec_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_sec_exec_i::on_offered_deadline_missed (
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_sec_exec_i::on_offered_incompatible_qos (
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
-
-  void ConnectorStatusListener_sec_exec_i::on_unexpected_status (
+     const DDS::RequestedIncompatibleQosStatus & /*status*/)  {
+//    ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_requested_incompatible_qos\n"));
+    }
+  void ConnectorStatusListener_sec_exec_i::on_sample_rejected(
+     ::DDS::DataReader_ptr /*the_reader*/,
+     const DDS::SampleRejectedStatus & /*status*/)  {
+//    ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_sample_rejected\n"));
+    }
+  void ConnectorStatusListener_sec_exec_i::on_offered_deadline_missed(
+     ::DDS::DataWriter_ptr /*the_writer*/,
+     const DDS::OfferedDeadlineMissedStatus & /*status*/)  {
+//    ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_offered_deadline_missed\n"));
+    }
+  void ConnectorStatusListener_sec_exec_i::on_offered_incompatible_qos(
+     ::DDS::DataWriter_ptr /*the_writer*/,
+     const DDS::OfferedIncompatibleQosStatus & /*status*/)  {
+//    ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_offered_incompatible_qos\n"));
+    }
+  void ConnectorStatusListener_sec_exec_i::on_unexpected_status(
     ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind  /*status_kind*/)
-  {
-  }
+    ::DDS::StatusKind  /*status_kind*/)  {
+//    ACE_DEBUG ((LM_DEBUG, "ConnectorStatusListener_exec_i::on_unexpected_status\n"));
+    }
 
   //============================================================
-  // Sender_exec_i
+  // Component Executor Implementation Class: Sender_exec_i
   //============================================================
+
   Sender_exec_i::Sender_exec_i (void)
-    : inconsistent_ (false),
-      thread_id_listener_ (0)
+    : inconsistent_ (false)
   {
   }
 
@@ -79,8 +73,7 @@ namespace CIAO_ConnectorStatusListener_Test_Sender_Impl
   ::CCM_DDS::CCM_ConnectorStatusListener_ptr
   Sender_exec_i::get_test_sec_topic_connector_status (void)
   {
-    return new ConnectorStatusListener_sec_exec_i (this->inconsistent_,
-                                                   this->thread_id_listener_);
+    return new ConnectorStatusListener_sec_exec_i (this->inconsistent_);
   }
 
   void
@@ -100,7 +93,8 @@ namespace CIAO_ConnectorStatusListener_Test_Sender_Impl
   {
   }
 
-  void
+
+void
   Sender_exec_i::add_instance_of_sec_topic (const char * key, int x)
   {
     TestSecondTopic *new_key = new TestSecondTopic;
@@ -126,62 +120,17 @@ namespace CIAO_ConnectorStatusListener_Test_Sender_Impl
   void
   Sender_exec_i::ccm_remove (void)
   {
-    if (this->inconsistent_.value ())
+    if(!this->inconsistent_.value ())
       {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("SENDER OK: Received the expected ")
-                              ACE_TEXT ("'on_inconsistent_topic'\n")
+         ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: did not receive the expected ")
+                               ACE_TEXT ("error 'on_inconsistent_topic' in Sender\n")
                     ));
       }
     else
       {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("SENDER ERROR: did not receive the expected ")
-                              ACE_TEXT ("error 'on_inconsistent_topic'\n")
-                    ));
-      }
-    if (this->thread_id_listener_.value () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: "
-                              "Thread ID for ConnectorStatusListener not set!\n"));
-      }
-    #if defined (CIAO_DDS4CCM_CONTEXT_SWITCH) && (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (ACE_OS::thr_equal (this->thread_id_listener_.value (),
-                                ACE_Thread::self ()))
-      {
-        ACE_DEBUG ((LM_DEBUG, "SENDER OK: "
-                              "Thread switch for ConnectorStatusListener seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_.value (),
-                              ACE_Thread::self ()));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: "
-                              "Thread switch for ConnectorStatusListener "
-                              "doesn't seem to work! "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_.value (),
-                              ACE_Thread::self ()));
-      }
-    #else
-    else if (ACE_OS::thr_equal (this->thread_id_listener_.value (),
-                                ACE_Thread::self ()))
-      {
-        ACE_ERROR ((LM_ERROR, "SENDER ERROR: ConnectorStatusListener: "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_.value (),
-                              ACE_Thread::self ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "SENDER OK: ConnectorStatusListener: "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_.value (),
-                              ACE_Thread::self ()));
+         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Received the expected ")
+                               ACE_TEXT (" 'on_inconsistent_topic' in Sender\n")));
       }
-    #endif
   }
 
   extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender_exec.h
index 0740c92a9ff..aeb634f6f79 100644
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/Sender/ConnectorStatusListener_Test_Sender_exec.h
@@ -20,48 +20,40 @@
 namespace CIAO_ConnectorStatusListener_Test_Sender_Impl
 {
   typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, ACE_thread_t> Atomic_ThreadId;
 
   class Sender_exec_i;
 
-  //============================================================
-  // ConnectorStatusListener_sec_exec_i
-  //============================================================
-  class SENDER_EXEC_Export ConnectorStatusListener_sec_exec_i
+class SENDER_EXEC_Export ConnectorStatusListener_sec_exec_i
     : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
       public virtual ::CORBA::LocalObject
   {
   public:
-    ConnectorStatusListener_sec_exec_i (Atomic_Boolean &,
-                                        Atomic_ThreadId &);
-    virtual ~ConnectorStatusListener_sec_exec_i (void);
+    ConnectorStatusListener_sec_exec_i (Atomic_Boolean &);
+   virtual ~ConnectorStatusListener_sec_exec_i (void);
 
     virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
+    void on_inconsistent_topic( ::DDS::Topic_ptr the_topic,
                                 const DDS::InconsistentTopicStatus & status);
     virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
+    void on_requested_incompatible_qos( ::DDS::DataReader_ptr the_reader,
                                         const DDS::RequestedIncompatibleQosStatus & status);
     virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
+    void on_sample_rejected( ::DDS::DataReader_ptr the_reader,
                              const DDS::SampleRejectedStatus & status);
     virtual
-      void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
-                                       const DDS::OfferedDeadlineMissedStatus & status);
+      void on_offered_deadline_missed( ::DDS::DataWriter_ptr the_writer,
+                                     const DDS::OfferedDeadlineMissedStatus & status);
     virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
+    void on_offered_incompatible_qos( ::DDS::DataWriter_ptr the_writer,
                                       const DDS::OfferedIncompatibleQosStatus & status);
     virtual
-      void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                                 ::DDS::StatusKind  status_kind);
-  private:
+      void on_unexpected_status( ::DDS::Entity_ptr the_entity,
+       ::DDS::StatusKind  status_kind);
+     private:
     Atomic_Boolean &inconsistent_;
-    Atomic_ThreadId &thread_id_;
+
   };
 
-  //============================================================
-  // Sender_exec_i
-  //============================================================
   class Sender_exec_i
     : public virtual Sender_Exec,
       public virtual ::CORBA::LocalObject
@@ -72,27 +64,28 @@ namespace CIAO_ConnectorStatusListener_Test_Sender_Impl
 
     virtual void set_session_context (::Components::SessionContext_ptr ctx);
 
+    virtual void add_instance_of_sec_topic (const char *, int x );
+
+
     virtual void configuration_complete (void);
+
     virtual void ccm_activate (void);
     virtual void ccm_passivate (void);
     virtual void ccm_remove (void);
 
      // Port operations.
     virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_test_sec_topic_connector_status(void);
+      get_test_sec_topic_connector_status(void);
 
   private:
     ::ConnectorStatusListener_Test::CCM_Sender_Context_var context_;
 
     Atomic_Boolean inconsistent_;
-    Atomic_ThreadId thread_id_listener_;
 
     TAO_SYNCH_MUTEX mutex_;
     typedef std::map<ACE_CString, TestSecondTopic_var> ConnectorStatusListener_TestSec_Table;
     ConnectorStatusListener_TestSec_Table sec_ktests_;
-
-    void add_instance_of_sec_topic (const char *, int x );
-  };
+ };
 
   extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
   create_ConnectorStatusListener_Test_Sender_Impl (void);
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/Plan.cdp
index 4d1f382e3e2..1c52fdc2dbb 100644
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/Plan.cdp
+++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/Plan.cdp
@@ -123,7 +123,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_ConnectorStatusListener_Test_ConnectorStatusListener_TestSec_Connector_Impl</string>
+          <string>create_ConnectorStatusListener_TestSec_ConnectorStatusListener_TestSec_Connector_Impl</string>
         </value>
       </value>
     </execParameter>
diff --git a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl
index 39300e01ff2..844ab83201f 100644
--- a/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/On_Inconsistent_Topic/descriptors/run_test.pl
@@ -100,8 +100,6 @@ sub kill_open_processes {
     if ($ns_running == 1) {
         $NS->Kill (); $NS->TimedWait (1);
     }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
 }
 
 sub run_node_daemons {
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl
index 0442b012395..a68da731f57 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.idl
@@ -1,20 +1,18 @@
 // $Id$
 
 /**
- * @file   PSL_DeadlineTest_Base.idl
+ * @file   PSL_DeadlineTest_Base.idl 
  * @author Marijke Hengstmengel <mhengstmengel@remedy.nl>
  */
 
 #ifndef PSL_DEADLINETEST_BASE_IDL
 #define PSL_DEADLINETEST_BASE_IDL
 
-#pragma ndds typesupport "Base/PSL_DeadlineTest_BaseSupport.h"
-
-struct TestTopic {
-  string key; //@key
-  long x;
-};
 
+  struct TestTopic {
+    string key; //@key
+    long x;
+   };
 typedef sequence<TestTopic> TestTopic_Seq;
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc
index 99ffa6c0cd4..c6a7c9ba18c 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Base/PSL_DeadlineTest_Base.mpc
@@ -1,25 +1,76 @@
 // $Id$
+// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n PSL_DeadlineTest_Base"
 
-project (DDS_PSL_DeadlineTest_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
-  sharedname = DDS_PSL_DeadlineTest_Base_stub
-  dynamicflags += PSL_DEADLINETEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Gxhst -Sci \
+project(DDS_PSL_DeadlineTest_Base_idl_gen) : taoidldefaults, anytypecode {
+  custom_only = 1
+  idlflags -= -St -Sa
+  idlflags += -SS -Gxhst \
               -Wb,stub_export_macro=PSL_DEADLINETEST_BASE_STUB_Export \
               -Wb,stub_export_include=PSL_DeadlineTest_Base_stub_export.h
 
   IDL_Files {
     PSL_DeadlineTest_Base.idl
   }
+}
 
-  opendds_ts_flags += --export=PSL_DEADLINETEST_BASE_STUB_Export
+project(DDS_PSL_DeadlineTest_Base_ndds_ts_gen) : ndds_ts_defaults {
+  custom_only = 1
+  after += DDS_PSL_DeadlineTest_Base_idl_gen
 
-  DDSGenerator_Files {
+  NDDSTypeSupport_Files {
     PSL_DeadlineTest_Base.idl
   }
+}
+
+project(DDS_PSL_DeadlineTest_Base_NDDS_TS) : nddslib, taolib {
+  after += DDS_PSL_DeadlineTest_Base_ndds_ts_gen DDS_PSL_DeadlineTest_Base_stub
+  libs += DDS_PSL_DeadlineTest_Base_stub
+  libout = ../lib
+  libpaths    += ../lib
+  sharedname = DDS_PSL_DeadlineTest_Base_NDDS_TS
+  dynamicflags = NDDS_USER_DLL_EXPORT
+
+  verbatim(gnuace, macros) {
+    override no_hidden_visibility = 1
+  }
 
   Source_Files {
+    PSL_DeadlineTest_Base.cxx
+    PSL_DeadlineTest_BasePlugin.cxx
+    PSL_DeadlineTest_BaseSupport.cxx
+  }
+
+  Header_Files {
+    PSL_DeadlineTest_Base.h
+    PSL_DeadlineTest_BasePlugin.h
+    PSL_DeadlineTest_BaseSupport.h
+  }
+
+  Inline_Files {
+  }
+}
+
+project(DDS_PSL_DeadlineTest_Base_stub) : ccm_stub {
+  after += DDS_PSL_DeadlineTest_Base_idl_gen
+  libout = ../lib
+  libpaths += ../lib
+  sharedname = DDS_PSL_DeadlineTest_Base_stub
+  dynamicflags = PSL_DEADLINETEST_BASE_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    PSL_DeadlineTest_BaseC.cpp
+  }
+
+  Header_Files {
+    PSL_DeadlineTest_BaseC.h
+    PSL_DeadlineTest_Base_stub_export.h
+  }
+
+  Inline_Files {
+    PSL_DeadlineTest_BaseC.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc
index 036a1c19cbb..4311096d671 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_PSL_DeadlineTest_Base -l .. -o ../lib -u DDS PSL_DeadlineTest_Connector"
 
-project(DDS_PSL_DT_Connector_idl_gen) : connectoridldefaults, dds4ccm {
+project(DDS_PSL_DT_Connector_idl_gen) : connectoridldefaults {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=PSL_DEADLINETEST_CONNECTOR_STUB_Export \
@@ -10,8 +10,8 @@ project(DDS_PSL_DT_Connector_idl_gen) : connectoridldefaults, dds4ccm {
               -Wb,skel_export_include=PSL_DeadlineTest_Connector_svnt_export.h \
               -Wb,svnt_export_macro=PSL_DEADLINETEST_CONNECTOR_SVNT_Export \
               -Wb,svnt_export_include=PSL_DeadlineTest_Connector_svnt_export.h \
-              -Wb,conn_export_macro=PSL_DEADLINETEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=PSL_DeadlineTest_Connector_conn_export.h \
+              -Wb,exec_export_macro=PSL_DEADLINETEST_CONNECTOR_EXEC_Export \
+              -Wb,exec_export_include=PSL_DeadlineTest_Connector_exec_export.h \
               -I ..
 
   IDL_Files {
@@ -19,7 +19,7 @@ project(DDS_PSL_DT_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   }
 }
 
-project(DDS_PSL_DT_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_PSL_DT_Connector_lem_gen) : ciaoidldefaults {
   custom_only = 1
   after += DDS_PSL_DT_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=PSL_DEADLINETEST_CONNECTOR_LEM_STUB_Export \
@@ -85,24 +85,24 @@ project(DDS_PSL_DeadlineTest_Connector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_PSL_DeadlineTest_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_PSL_DT_Connector_lem_stub DDS_PSL_DeadlineTest_Connector_stub DDS4CCM_lem_stub DDS_PSL_DeadlineTest_Base_stub
+  after   += DDS_PSL_DT_Connector_lem_stub DDS_PSL_DeadlineTest_Connector_stub DDS4CCM_lem_stub DDS_PSL_DeadlineTest_Base_NDDS_TS
   sharedname = DDS_PSL_DeadlineTest_Connector_exec
-  libs += DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DT_Connector_lem_stub DDS_PSL_DeadlineTest_Base_stub DDS4CCM_lem_stub DDS_PSL_DeadlineTest_Base_stub
+  libs += DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DT_Connector_lem_stub DDS_PSL_DeadlineTest_Base_stub DDS4CCM_lem_stub DDS_PSL_DeadlineTest_Base_NDDS_TS
   libpaths += ../lib
   libout = ../lib
   includes += ..
-  dynamicflags   = PSL_DEADLINETEST_CONNECTOR_CONN_BUILD_DLL
+  dynamicflags   = PSL_DEADLINETEST_CONNECTOR_EXEC_BUILD_DLL
 
   IDL_Files {
   }
 
   Source_Files {
-    PSL_DeadlineTest_Connector_conn.cpp
+    PSL_DeadlineTest_Connector_exec.cpp
   }
 
   Header_Files {
-    PSL_DeadlineTest_Connector_conn.h
-    PSL_DeadlineTest_Connector_conn_export.h
+    PSL_DeadlineTest_Connector_exec.h
+    PSL_DeadlineTest_Connector_exec_export.h
   }
 
   Inline_Files {
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector_exec.cpp b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector_exec.cpp
new file mode 100644
index 00000000000..43215b9bb82
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector_exec.cpp
@@ -0,0 +1,30 @@
+// -*- C++ -*-
+// $Id$
+
+#include "PSL_DeadlineTest_Connector_exec.h"
+
+namespace CIAO_PSL_DeadlineTest_PSL_DeadlineTest_Connector_Impl
+{
+  PSL_DeadlineTest_Connector_exec_i::PSL_DeadlineTest_Connector_exec_i (void)
+    : DDS_Event_Connector_T<TestTopic_DDS_Traits, TestTopic_Connector_Traits> ()
+  {
+  }
+
+  PSL_DeadlineTest_Connector_exec_i::~PSL_DeadlineTest_Connector_exec_i (void)
+  {
+  }
+
+  extern "C" PSL_DEADLINETEST_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_PSL_DeadlineTest_PSL_DeadlineTest_Connector_Impl (void)
+  {
+    ::Components::EnterpriseComponent_ptr retval =
+      ::Components::EnterpriseComponent::_nil ();
+
+    ACE_NEW_NORETURN (
+      retval,
+      PSL_DeadlineTest_Connector_exec_i ());
+
+    return retval;
+  }
+}
+
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector_exec.h
new file mode 100644
index 00000000000..e72f0e6ec48
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Connector/PSL_DeadlineTest_Connector_exec.h
@@ -0,0 +1,62 @@
+// -*- C++ -*-
+// $Id$
+
+#ifndef PSL_DEADLINETEST_CONNECTOR_EXEC_H_
+#define PSL_DEADLINETEST_CONNECTOR_EXEC_H_
+
+#include /**/ "ace/pre.h"
+
+#include "PSL_DeadlineTest_ConnectorEC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "PSL_DeadlineTest_Connector_exec_export.h"
+#include "tao/LocalObject.h"
+
+#include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
+#include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
+
+
+#include "Base/PSL_DeadlineTest_BaseSupport.h"
+
+namespace CIAO_PSL_DeadlineTest_PSL_DeadlineTest_Connector_Impl
+{
+
+  // @from use of PSL_DeadlineTest as a parameter
+  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+    TestTopic,
+    TestTopicSeq,
+    TestTopicTypeSupport,
+    TestTopicDataWriter,
+    TestTopicDataReader > TestTopic_DDS_Traits;
+
+  typedef CIAO::DDS4CCM::Connector_Traits <
+    ::CIAO_PSL_DeadlineTest_PSL_DeadlineTest_Connector_Impl::PSL_DeadlineTest_Connector_Exec,
+    TestTopic_Seq,
+    ::CCM_DDS::TestTopic::CCM_Writer,
+    ::CCM_DDS::TestTopic::CCM_Updater,
+    ::CCM_DDS::TestTopic::CCM_Getter,
+    ::CCM_DDS::TestTopic::CCM_Reader,
+    ::PSL_DeadlineTest::CCM_PSL_DeadlineTest_Connector_Context,
+    ::CCM_DDS::TestTopic::Listener,
+    ::CCM_DDS::TestTopic::StateListener,
+    ::CCM_DDS::ConnectorStatusListener> TestTopic_Connector_Traits;
+
+  class PSL_DEADLINETEST_CONNECTOR_EXEC_Export PSL_DeadlineTest_Connector_exec_i :
+    public DDS_Event_Connector_T <TestTopic_DDS_Traits, TestTopic_Connector_Traits>
+  {
+  public:
+    PSL_DeadlineTest_Connector_exec_i (void);
+    virtual ~PSL_DeadlineTest_Connector_exec_i (void);
+  };
+
+  extern "C" PSL_DEADLINETEST_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_PSL_DeadlineTest_PSL_DeadlineTest_Connector_Impl (void);
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.idl b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.idl
index c849128c8e5..0e95cfa753a 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.idl
@@ -16,7 +16,8 @@ module PSL_DeadlineTest
   {
     port CCM_DDS::TestTopic::DDS_Get info_get;
     port CCM_DDS::TestTopic::DDS_Listen info_out;
-  };
+    provides CCM_DDS::ConnectorStatusListener info_out_connector_status;
+   };
 };
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc
index a0555d8bef9..99438c8e4ce 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_PSL_DeadlineTest_Receiver_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_PSL_DeadlineTest_Receiver_idl_gen) : componentidldefaults {
   custom_only = 1
   after += DDS_PSL_DT_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
@@ -17,7 +17,7 @@ project(DDS_PSL_DeadlineTest_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_PSL_DeadlineTest_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_PSL_DeadlineTest_Receiver_lem_gen) : ciaoidldefaults {
   after += DDS_PSL_DeadlineTest_Receiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
@@ -107,7 +107,7 @@ project(DDS_PSL_DeadlineTest_Receiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_PSL_DeadlineTest_Receiver_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_PSL_DeadlineTest_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      +=   DDS_PSL_DT_Receiver_lem_stub DDS_PSL_DeadlineTest_Base_stub DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DeadlineTest_Connector_svnt DDS_PSL_DeadlineTest_Receiver_exec DDS_PSL_DT_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
   sharedname  = Receiver_svnt
   libs       += Receiver_stub Receiver_lem_stub DDS_PSL_DeadlineTest_Base_stub DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DeadlineTest_Connector_svnt Receiver_exec DDS_PSL_DT_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp
index b3c1c12b13e..4895eaca806 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.cpp
@@ -15,9 +15,48 @@
 
 namespace CIAO_PSL_DeadlineTest_Receiver_Impl
 {
+//============================================================
+  // Facet Executor Implementation Class: ConnectorStatusListener_exec_i
   //============================================================
-  // read_action_Generator
-  //============================================================
+  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (void)
+  {
+  }
+
+  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
+  {
+  }
+
+  // Operations from ::CCM_DDS::ConnectorStatusListener
+  void ConnectorStatusListener_exec_i::on_inconsistent_topic(
+     ::DDS::Topic_ptr /*the_topic*/, 
+     const DDS::InconsistentTopicStatus & /*status*/){
+    }
+
+  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos(
+    ::DDS::DataReader_ptr /*the_reader*/,
+     const DDS::RequestedIncompatibleQosStatus & /*status*/)  {
+    }
+
+  void ConnectorStatusListener_exec_i::on_sample_rejected(
+     ::DDS::DataReader_ptr /*the_reader*/, 
+     const DDS::SampleRejectedStatus & /*status*/)  {
+    }
+
+  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
+     ::DDS::DataWriter_ptr /*the_writer*/,
+     const DDS::OfferedDeadlineMissedStatus & /*status*/)  {
+    }
+
+  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
+     ::DDS::DataWriter_ptr /*the_writer*/, 
+     const DDS::OfferedIncompatibleQosStatus & /*status*/)  {
+    }
+
+  void ConnectorStatusListener_exec_i::on_unexpected_status(
+    ::DDS::Entity_ptr /*the_entity*/,
+    ::DDS::StatusKind /*status_kind*/)  {
+   }
+
   read_action_Generator::read_action_Generator (Receiver_exec_i &callback)
     : pulse_callback_ (callback)
   {
@@ -40,10 +79,10 @@ namespace CIAO_PSL_DeadlineTest_Receiver_Impl
       }
     return 0;
   }
-
   //============================================================
-  // TestTopic_RawListener_exec_i
+  // Facet Executor Implementation Class: TestTopic_RawListener_exec_i
   //============================================================
+
   TestTopic_RawListener_exec_i::TestTopic_RawListener_exec_i (void)
   {
   }
@@ -52,6 +91,8 @@ namespace CIAO_PSL_DeadlineTest_Receiver_Impl
   {
   }
 
+  // Operations from ::CCM_DDS::TestTopic_RawListener
+
   void
   TestTopic_RawListener_exec_i::on_one_data (
     const TestTopic & an_instance ,
@@ -69,20 +110,13 @@ namespace CIAO_PSL_DeadlineTest_Receiver_Impl
     const ::CCM_DDS::ReadInfoSeq & /* info */)
   {
   }
-
   //============================================================
-  // PortStatusListener_exec_i
+  // Facet Executor Implementation Class: PortStatusListener_exec_i
   //============================================================
-  PortStatusListener_exec_i::PortStatusListener_exec_i (Atomic_Boolean &deadline_port_1,
-                                                        Atomic_Boolean &deadline_port_2,
-                                                        Atomic_ThreadId &thread_id_1,
-                                                        Atomic_ThreadId &thread_id_2,
-                                                        int port_nr)
-    : deadline_port_1_ (deadline_port_1),
-      deadline_port_2_ (deadline_port_2),
-      thread_id_1_ (thread_id_1),
-      thread_id_2_ (thread_id_2),
-      port_nr_ (port_nr)
+  PortStatusListener_exec_i::PortStatusListener_exec_i (Atomic_Boolean &deadline_port_1, Atomic_Boolean &deadline_port_2,int port_nr)
+    : deadline_port_1_(deadline_port_1),
+      deadline_port_2_(deadline_port_2),
+      port_nr_(port_nr)
   {
   }
 
@@ -92,19 +126,17 @@ namespace CIAO_PSL_DeadlineTest_Receiver_Impl
 
   // Operations from ::CCM_DDS::PortStatusListener
   void
-  PortStatusListener_exec_i::on_requested_deadline_missed (
+    PortStatusListener_exec_i::on_requested_deadline_missed (
     ::DDS::DataReader_ptr the_reader,
-    const ::DDS::RequestedDeadlineMissedStatus & status)
+    const ::DDS::RequestedDeadlineMissedStatus &  status)
   {
-    if (this->port_nr_ == 1 && !CORBA::is_nil( the_reader) && status.total_count!= 0)
+    if((this->port_nr_ == 1) && (!CORBA::is_nil( the_reader)) && (status.total_count!= 0))       
       {
         this->deadline_port_1_ = true;
-        this->thread_id_1_ = ACE_Thread::self ();
       }
-    if (this->port_nr_ == 2 && !CORBA::is_nil (the_reader) && status.total_count!= 0)
+    if((this->port_nr_ == 2)&& (!CORBA::is_nil( the_reader)) && (status.total_count!= 0)) 
       {
         this->deadline_port_2_ = true;
-        this->thread_id_2_ = ACE_Thread::self ();
       }
   }
 
@@ -116,14 +148,12 @@ namespace CIAO_PSL_DeadlineTest_Receiver_Impl
   }
 
   //============================================================
-  // Receiver_exec_i
+  // Component Executor Implementation Class: Receiver_exec_iTestTopic_RawListener_exec_i ();
   //============================================================
   Receiver_exec_i::Receiver_exec_i (void)
   : rate_ (10),
     deadline_port_1_ (false),
-    deadline_port_2_ (false),
-    thread_id_listener_1_ (0),
-    thread_id_listener_2_ (0)
+    deadline_port_2_ (false)
   {
     this->ticker_ = new read_action_Generator (*this); 
   }
@@ -142,60 +172,57 @@ namespace CIAO_PSL_DeadlineTest_Receiver_Impl
       }
     TestTopic_Seq_var TestTopic_infos;
     ::CCM_DDS::ReadInfoSeq_var readinfoseq;
-    try
-      {
-        this->reader_->read_all(TestTopic_infos.out(), readinfoseq.out());
-        for(CORBA::ULong i = 0; i < readinfoseq->length(); ++i)
-          {
-            ACE_Time_Value tv;
-            tv <<= readinfoseq[i].source_timestamp;
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL ReadInfo ")
-                                  ACE_TEXT ("-> UTC date =%#T\n"),
-                                  &tv));
-          }
-        for(CORBA::ULong i = 0; i < TestTopic_infos->length(); ++i)
-          {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL keyed test info : ")
-                  ACE_TEXT ("Number <%d> : received TestTopic_info for <%C> at %u\n"),
-                i,
-                TestTopic_infos[i].key.in (),
-                TestTopic_infos[i].x));
-          }
-      }
+    try{
+      this->reader_->read_all(TestTopic_infos.out(), readinfoseq.out());
+      for(CORBA::ULong i = 0; i < readinfoseq->length(); ++i)
+        {
+          ACE_Time_Value tv;
+          tv <<= readinfoseq[i].source_timestamp;
+          ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL ReadInfo ")
+                                ACE_TEXT ("-> UTC date =%#T\n"),
+                                &tv));
+        }
+      for(CORBA::ULong i = 0; i < TestTopic_infos->length(); ++i)
+        {
+           ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL keyed test info : ")
+                ACE_TEXT ("Number <%d> : received TestTopic_info for <%C> at %u\n"),
+              i,
+              TestTopic_infos[i].key.in (),
+              TestTopic_infos[i].x));
+        }
+    }
     catch( const CCM_DDS::InternalError& )
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("internal error or no data\n")));
-      }
+    {
+      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("internal error or no data\n")));
+    }
   }
-
+  // Component attributes.
   // Port operations.
   ::CCM_DDS::TestTopic::CCM_Listener_ptr
   Receiver_exec_i::get_info_out_data_listener (void)
   {
     ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new TestTopic RAW listener\n")));
-    return new TestTopic_RawListener_exec_i ();
+    return new TestTopic_RawListener_exec_i (/*this->received_*/);
   }
 
   ::CCM_DDS::CCM_PortStatusListener_ptr
   Receiver_exec_i::get_info_out_status (void)
   {
     ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new PortStatuslistener\n")));
-    return new PortStatusListener_exec_i (this->deadline_port_1_,
-                                          this->deadline_port_2_,
-                                          this->thread_id_listener_1_,
-                                          this->thread_id_listener_2_,
-                                          1);
+    return new PortStatusListener_exec_i ( this->deadline_port_1_,this->deadline_port_2_, 1);
   }
 
   ::CCM_DDS::CCM_PortStatusListener_ptr
   Receiver_exec_i::get_info_get_status (void)
   {
     ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new PortStatuslistener\n")));
-    return new PortStatusListener_exec_i (this->deadline_port_1_,
-                                          this->deadline_port_2_,
-                                          this->thread_id_listener_1_,
-                                          this->thread_id_listener_2_,
-                                          2);
+    return new PortStatusListener_exec_i (this->deadline_port_1_,this->deadline_port_2_,2);
+  }
+
+  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
+  Receiver_exec_i::get_info_out_connector_status (void)
+  {
+    return new ConnectorStatusListener_exec_i ();
   }
 
   // Operations from Components::SessionComponent.
@@ -205,7 +232,7 @@ namespace CIAO_PSL_DeadlineTest_Receiver_Impl
   {
     this->context_ =
       ::PSL_DeadlineTest::CCM_Receiver_Context::_narrow (ctx);
-    if (::CORBA::is_nil (this->context_.in ()))
+    if ( ::CORBA::is_nil (this->context_.in ()))
       {
         throw ::CORBA::INTERNAL ();
       }
@@ -228,7 +255,7 @@ namespace CIAO_PSL_DeadlineTest_Receiver_Impl
         ACE_ERROR ((LM_INFO, ACE_TEXT ("Error:  Listener control receptacle is null!\n")));
         throw CORBA::INTERNAL ();
       }
-    lc->mode (::CCM_DDS::NOT_ENABLED);
+       lc->mode (::CCM_DDS::NOT_ENABLED);
 
     // calculate the interval time
     long usec = 1000000 / this->rate_;
@@ -252,123 +279,19 @@ namespace CIAO_PSL_DeadlineTest_Receiver_Impl
   void
   Receiver_exec_i::ccm_remove (void)
   {
-     if (!this->deadline_port_1_.value ())
-      {
-
-         ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: did not receive the expected ")
-                               ACE_TEXT (" error 'on_requested_deadline_missed' on PortStatusListener I in Receiver")
-                    ));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK : Have received the expected ")
-                               ACE_TEXT ("'on_requested_deadline_missed' in PortStatusListener I in Receiver\n")
-                    ));
-      }
-     if (!this->deadline_port_2_.value ())
+     if(!this->deadline_port_1_.value () || !this->deadline_port_2_.value ())
       {
 
          ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: did not receive the expected ")
-                               ACE_TEXT (" error 'on_requested_deadline_missed' on PortStatusListener II in Receiver")
+                               ACE_TEXT (" error 'on_requested_deadline_missed' on DDS_Listen and/or DDS_GET port in Receiver")
                     ));
       }
     else
       {
         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK : Have received the expected ")
-                               ACE_TEXT ("'on_requested_deadline_missed' in PortStatusListener II in Receiver\n")
+                               ACE_TEXT ("'on_requested_deadline_missed' in on DDS_Listen and DDS_GET port Receiver\n")
                     ));
       }
-    //check thread switch for listener 1
-    if (this->thread_id_listener_1_.value () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
-                              "Thread ID for PortStatusListener I not set!\n"));
-      }
-    #if defined (CIAO_DDS4CCM_CONTEXT_SWITCH) && (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (ACE_OS::thr_equal (this->thread_id_listener_1_.value (),
-                                ACE_Thread::self ()))
-      {
-        ACE_DEBUG ((LM_DEBUG, "OK : "
-                              "Thread switch for PortStatusListener I seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_1_.value (),
-                              ACE_Thread::self ()));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
-                              "Thread switch for PortStatusListener I "
-                              "doesn't seem to work! "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_1_.value (),
-                              ACE_Thread::self ()));
-      }
-    #else
-    else if (ACE_OS::thr_equal (this->thread_id_listener_1_.value (),
-                                ACE_Thread::self ()))
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: PortStatusListener I: "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_1_.value (),
-                              ACE_Thread::self ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "OK : PortStatusListener I: "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_1_.value (),
-                              ACE_Thread::self ()));
-      }
-    #endif
-
-    //check thread switch for listener 2
-    if (this->thread_id_listener_2_.value () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
-                              "Thread ID for PortStatusListener II not set!\n"));
-      }
-    #if defined (CIAO_DDS4CCM_CONTEXT_SWITCH) && (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (ACE_OS::thr_equal (this->thread_id_listener_2_.value (),
-                                ACE_Thread::self ()))
-      {
-        ACE_DEBUG ((LM_DEBUG, "OK : "
-                              "Thread switch for PortStatusListener II seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_2_.value (),
-                              ACE_Thread::self ()));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
-                              "Thread switch for PortStatusListener II "
-                              "doesn't seem to work! "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_2_.value (),
-                              ACE_Thread::self ()));
-      }
-    #else
-    else if (ACE_OS::thr_equal (this->thread_id_listener_2_.value (),
-                                ACE_Thread::self ()))
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: PortStatusListener II: "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_2_.value (),
-                              ACE_Thread::self ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "OK : PortStatusListener II: "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_2_.value (),
-                              ACE_Thread::self ()));
-      }
-    #endif
   }
 
   extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h
index 5e9043a6c01..0b7fa8d02d7 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Receiver/PSL_DeadlineTest_Receiver_exec.h
@@ -13,20 +13,15 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/LocalObject.h"
-#include "ace/OS_NS_Thread.h"
-#include "ace/Reactor.h"
 #include "ace/Task.h"
+#include "ace/Reactor.h"
 
 namespace CIAO_PSL_DeadlineTest_Receiver_Impl
 {
   typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, ACE_thread_t> Atomic_ThreadId;
-
+  
   class Receiver_exec_i;
-
-  //============================================================
-  // TestTopic_RawListener_exec_i
-  //============================================================
+  
   class RECEIVER_EXEC_Export TestTopic_RawListener_exec_i
     : public virtual ::CCM_DDS::TestTopic::CCM_Listener,
       public virtual ::CORBA::LocalObject
@@ -46,9 +41,33 @@ namespace CIAO_PSL_DeadlineTest_Receiver_Impl
       const ::CCM_DDS::ReadInfoSeq & info );
   };
 
-  //============================================================
-  // read_action_Generator
-  //============================================================
+  class RECEIVER_EXEC_Export ConnectorStatusListener_exec_i
+    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
+      public virtual ::CORBA::LocalObject
+  {
+  public:
+    ConnectorStatusListener_exec_i (void);
+    virtual ~ConnectorStatusListener_exec_i (void);
+
+    virtual
+    void on_inconsistent_topic( ::DDS::Topic_ptr the_topic, 
+                                const DDS::InconsistentTopicStatus & status);
+    virtual
+    void on_requested_incompatible_qos( ::DDS::DataReader_ptr the_reader,
+                                        const DDS::RequestedIncompatibleQosStatus & status);
+    virtual
+    void on_sample_rejected( ::DDS::DataReader_ptr the_reader,
+                             const DDS::SampleRejectedStatus & status);
+    virtual
+    void on_offered_deadline_missed( ::DDS::DataWriter_ptr the_writer,
+                                     const DDS::OfferedDeadlineMissedStatus & status);
+    virtual
+    void on_offered_incompatible_qos( ::DDS::DataWriter_ptr the_writer,
+                                      const DDS::OfferedIncompatibleQosStatus & status);
+    virtual
+    void on_unexpected_status( ::DDS::Entity_ptr the_entity,
+                               ::DDS::StatusKind  status_kind);
+   };
   class read_action_Generator
     : public ACE_Event_Handler
   {
@@ -57,27 +76,21 @@ namespace CIAO_PSL_DeadlineTest_Receiver_Impl
 
     ~read_action_Generator ();
 
+    /// Handle the timeout.
     virtual int handle_timeout (const ACE_Time_Value &tv,
                                 const void *arg);
 
   private:
+    /// Maintains a handle that actually process the event
     Receiver_exec_i &pulse_callback_;
 
   };
-
-  //============================================================
-  // PortStatusListener_exec_i
-  //============================================================
   class RECEIVER_EXEC_Export PortStatusListener_exec_i
     : public virtual ::CCM_DDS::CCM_PortStatusListener,
       public virtual ::CORBA::LocalObject
   {
   public:
-    PortStatusListener_exec_i (Atomic_Boolean &,
-                               Atomic_Boolean &,
-                               Atomic_ThreadId &,
-                               Atomic_ThreadId &,
-                               int );
+    PortStatusListener_exec_i (Atomic_Boolean &,Atomic_Boolean &, int port_nr);
     virtual ~PortStatusListener_exec_i (void);
 
     virtual void
@@ -93,14 +106,9 @@ namespace CIAO_PSL_DeadlineTest_Receiver_Impl
   private:
     Atomic_Boolean &deadline_port_1_;
     Atomic_Boolean &deadline_port_2_;
-    Atomic_ThreadId &thread_id_1_;
-    Atomic_ThreadId &thread_id_2_;
     int port_nr_;
   };
 
-  //============================================================
-  // Receiver_exec_i
-  //============================================================
   class RECEIVER_EXEC_Export Receiver_exec_i
     : public virtual Receiver_Exec,
       public virtual ::CORBA::LocalObject
@@ -119,6 +127,9 @@ namespace CIAO_PSL_DeadlineTest_Receiver_Impl
     virtual ::CCM_DDS::CCM_PortStatusListener_ptr
     get_info_get_status (void);
 
+    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
+    get_info_out_connector_status (void);
+
     // Operations from Components::SessionComponent.
     virtual void
     set_session_context (
@@ -135,11 +146,8 @@ namespace CIAO_PSL_DeadlineTest_Receiver_Impl
     ::CCM_DDS::TestTopic::Reader_var reader_;
     read_action_Generator * ticker_;
     CORBA::ULong rate_;
-
     Atomic_Boolean deadline_port_1_;
     Atomic_Boolean deadline_port_2_;
-    Atomic_ThreadId thread_id_listener_1_;
-    Atomic_ThreadId thread_id_listener_2_;
 };
 
   extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc
index 39b3145ac3e..5492dc5d2ab 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_PSL_DeadlineTest_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(DDS_PSL_DeadlineTest_Sender_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_PSL_DeadlineTest_Sender_idl_gen) : componentidldefaults {
   after += DDS_PSL_DT_Connector_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_PSL_DeadlineTest_Sender_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_PSL_DeadlineTest_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_PSL_DeadlineTest_Sender_lem_gen) : ciaoidldefaults {
   after += DDS_PSL_DeadlineTest_Sender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
@@ -109,7 +109,7 @@ project(DDS_PSL_DeadlineTest_Sender_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_PSL_DeadlineTest_Sender_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_PSL_DeadlineTest_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      += DDS_PSL_DeadlineTest_Base_stub  DDS_PSL_DeadlineTest_Sender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_PSL_DeadlineTest_Connector_stub DDS_PSL_DeadlineTest_Connector_svnt DDS_PSL_DT_Connector_lem_stub
   sharedname  = Sender_svnt
   libs       += Sender_stub Sender_lem_stub  \
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp
index fda6ac72685..6d201dc7136 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.cpp
@@ -14,55 +14,50 @@
 namespace CIAO_PSL_DeadlineTest_Sender_Impl
 {
   //============================================================
-  // ConnectorStatusListener_exec_i
+  // Facet Executor Implementation Class: ConnectorStatusListener_exec_i
   //============================================================
+  
   ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i ()
   {
   }
-
+  
   ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
   {
   }
-
+  
   // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic (
+  void ConnectorStatusListener_exec_i::on_inconsistent_topic(
     ::DDS::Topic_ptr /*the_topic*/, 
-     const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
+     const DDS::InconsistentTopicStatus & /*status*/){
+   }
 
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
+  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos(
     ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
+     const DDS::RequestedIncompatibleQosStatus & /*status*/)  {
+    }
 
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
+  void ConnectorStatusListener_exec_i::on_sample_rejected(
+     ::DDS::DataReader_ptr /*the_reader*/, 
+     const DDS::SampleRejectedStatus & /*status*/)  {
+   }
 
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed (
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
+  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
+     ::DDS::DataWriter_ptr /*the_writer*/,
+     const DDS::OfferedDeadlineMissedStatus & /*status*/)  {
+    }
 
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos (
-   ::DDS::DataWriter_ptr /*the_writer*/,
-   const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
+  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
+     ::DDS::DataWriter_ptr /*the_writer*/, 
+     const DDS::OfferedIncompatibleQosStatus & /*status*/)  {
+    }
 
-  void ConnectorStatusListener_exec_i::on_unexpected_status (
+  void ConnectorStatusListener_exec_i::on_unexpected_status(
     ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind  /*status_kind*/)
-  {
-  }
+    ::DDS::StatusKind  /*status_kind*/)  {
+    }
 
   //============================================================
-  // pulse_Generator
+  // Pulse generator
   //============================================================
   pulse_Generator::pulse_Generator (Sender_exec_i &callback)
     : pulse_callback_ (callback)
@@ -72,13 +67,14 @@ namespace CIAO_PSL_DeadlineTest_Sender_Impl
   int
   pulse_Generator::handle_timeout (const ACE_Time_Value &, const void *)
   {
+    // Notify the subscribers
     this->pulse_callback_.tick ();
     return 0;
   }
-
   //============================================================
-  // Sender_exec_i
+  // Component Executor Implementation Class: Sender_exec_i
   //============================================================
+
   Sender_exec_i::Sender_exec_i (void)
   {
     this->ticker_ = new pulse_Generator (*this);
@@ -95,12 +91,13 @@ namespace CIAO_PSL_DeadlineTest_Sender_Impl
   }
 
   // Supported operations and attributes.
+
   void
   Sender_exec_i::set_session_context (::Components::SessionContext_ptr ctx)
   {
     this->context_ = ::PSL_DeadlineTest::CCM_Sender_Context::_narrow (ctx);
 
-    if (::CORBA::is_nil (this->context_.in ()))
+    if ( ::CORBA::is_nil (this->context_.in ()))
       {
         throw ::CORBA::INTERNAL ();
       }
@@ -116,22 +113,21 @@ namespace CIAO_PSL_DeadlineTest_Sender_Impl
   Sender_exec_i::tick ()
   {
     for (PSL_DLTest_Table::iterator i = this->_ktests_.begin ();
-         i != this->_ktests_.end ();
-         ++i)
+        i != this->_ktests_.end ();
+        ++i)
       {
          try
-          {
-            if (!CORBA::is_nil (this->writer_))
-              {
-                this->writer_->write_one(i->second,::DDS::HANDLE_NIL);
-                i->second->x++;
-              }
-          }
+         {
+           if (!CORBA::is_nil (this->writer_) ) {
+              this->writer_->write_one(i->second,::DDS::HANDLE_NIL);
+              i->second->x++;
+           }
+         }
          catch (const CCM_DDS::InternalError& )
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while creating topic for <%C>.\n"),
+         {
+           ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while creating topic for <%C>.\n"),
                     i->first.c_str ()));
-          }
+         }
        }
   }
 
@@ -145,10 +141,10 @@ namespace CIAO_PSL_DeadlineTest_Sender_Impl
                 0,
                 ACE_Time_Value (sec, usec),
                 ACE_Time_Value (sec, usec)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
+    {
+      ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
                              ACE_TEXT ("Error scheduling timer")));
-      }
+    }
   }
 
   void
@@ -159,7 +155,7 @@ namespace CIAO_PSL_DeadlineTest_Sender_Impl
     delete this->ticker_;
   }
 
-  void
+ void
   Sender_exec_i::add_instance_of_topic (const char * key, int x)
   {
     TestTopic *new_key = new TestTopic;
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.h
index 2738bafb8a6..524d0acb5cd 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/Sender/PSL_DeadlineTest_Sender_exec.h
@@ -22,55 +22,49 @@ namespace CIAO_PSL_DeadlineTest_Sender_Impl
   typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
 
   class Sender_exec_i;
-
-  //============================================================
-  // pulse_Generator
-  //============================================================
+  
   class pulse_Generator :
     public ACE_Event_Handler
   {
   public:
     pulse_Generator (Sender_exec_i &callback);
+    /// Handle the timeout.
     virtual int handle_timeout (const ACE_Time_Value &tv,
                                 const void *arg);
   private:
+    /// Maintains a handle that actually process the event
     Sender_exec_i &pulse_callback_;
   };
 
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  class SENDER_EXEC_Export ConnectorStatusListener_exec_i
+class SENDER_EXEC_Export ConnectorStatusListener_exec_i
     : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
       public virtual ::CORBA::LocalObject
   {
   public:
     ConnectorStatusListener_exec_i (void);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
+   virtual ~ConnectorStatusListener_exec_i (void);
+    
     virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
+    void on_inconsistent_topic( ::DDS::Topic_ptr the_topic, 
                                 const DDS::InconsistentTopicStatus & status);
     virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
+    void on_requested_incompatible_qos( ::DDS::DataReader_ptr the_reader,
                                         const DDS::RequestedIncompatibleQosStatus & status);
     virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
+    void on_sample_rejected( ::DDS::DataReader_ptr the_reader, 
                              const DDS::SampleRejectedStatus & status);
     virtual
-    void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
+    void on_offered_deadline_missed( ::DDS::DataWriter_ptr the_writer,
                                      const DDS::OfferedDeadlineMissedStatus & status);
     virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
+    void on_offered_incompatible_qos( ::DDS::DataWriter_ptr the_writer, 
                                       const DDS::OfferedIncompatibleQosStatus & status);
     virtual
-    void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                               ::DDS::StatusKind  status_kind);
+    void on_unexpected_status( ::DDS::Entity_ptr the_entity,
+       ::DDS::StatusKind  status_kind);
+  
   };
 
-  //============================================================
-  // Sender_exec_i
-  //============================================================
   class Sender_exec_i
     : public virtual Sender_Exec,
       public virtual ::CORBA::LocalObject
@@ -78,7 +72,7 @@ namespace CIAO_PSL_DeadlineTest_Sender_Impl
   public:
     Sender_exec_i (void);
     virtual ~Sender_exec_i (void);
-
+    virtual void add_instance_of_topic (const char *, int x );
     void tick (void);
 
     virtual void set_session_context (::Components::SessionContext_ptr ctx);
@@ -86,24 +80,19 @@ namespace CIAO_PSL_DeadlineTest_Sender_Impl
     virtual void ccm_activate (void);
     virtual void ccm_passivate (void);
     virtual void ccm_remove (void);
-
     // Port operations.
     virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_test_topic_connector_status(void);
+      get_test_topic_connector_status(void);
 
   private:
     void start (void);
     void stop (void);
-
     pulse_Generator * ticker_;
     ::PSL_DeadlineTest::CCM_Sender_Context_var context_;
     CCM_DDS::TestTopic::Writer_var writer_;
-
     TAO_SYNCH_MUTEX mutex_;
     typedef std::map<ACE_CString, TestTopic_var> PSL_DLTest_Table;
     PSL_DLTest_Table _ktests_;
-
-    void add_instance_of_topic (const char *, int x );
  };
 
   extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
diff --git a/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl
index edfa27e2a1f..fba2b49b0c8 100755
--- a/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/PSLDeadline/descriptors/run_test.pl
@@ -100,8 +100,6 @@ sub kill_open_processes {
     if ($ns_running == 1) {
         $NS->Kill (); $NS->TimedWait (1);
     }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
 }
 
 sub run_node_daemons {
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.idl b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.idl
index 629779106dd..d6f9c20a4cd 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.idl
@@ -1,20 +1,18 @@
 // $Id$
 
 /**
- * @file   PSL_SampleLost_Base.idl
+ * @file   PSL_SampleLost_Base.idl 
  * @author Marijke Hengstmengel <mhengstmengel@remedy.nl>
  */
 
 #ifndef PSL_SAMPLELOST_BASE_IDL
 #define PSL_SAMPLELOST_BASE_IDL
 
-#pragma ndds typesupport "Base/PSL_SampleLost_BaseSupport.h"
-
-struct TestTopic {
-  string key; //@key
-  long x;
-};
 
+  struct TestTopic {
+    string key; //@key
+    long x;
+   };
 typedef sequence<TestTopic> TestTopic_Seq;
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc
index 73ba7640c08..5c627f1b6a3 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Base/PSL_SampleLost_Base.mpc
@@ -1,25 +1,76 @@
 // $Id$
+// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n PSL_SampleLost_Base"
 
-project (DDS_PSL_SampleLost_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
-  sharedname = DDS_PSL_SampleLost_Base_stub
-  dynamicflags += PSL_SAMPLELOST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Gxhst -Sci \
+project(DDS_PSL_SampleLost_Base_idl_gen) : taoidldefaults, anytypecode {
+  custom_only = 1
+  idlflags -= -St -Sa
+  idlflags += -SS -Gxhst \
               -Wb,stub_export_macro=PSL_SAMPLELOST_BASE_STUB_Export \
               -Wb,stub_export_include=PSL_SampleLost_Base_stub_export.h
 
   IDL_Files {
     PSL_SampleLost_Base.idl
   }
+}
 
-  opendds_ts_flags += --export=PSL_SAMPLELOST_BASE_STUB_Export
+project(DDS_PSL_SampleLost_Base_ndds_ts_gen) : ndds_ts_defaults {
+  custom_only = 1
+  after += DDS_PSL_SampleLost_Base_idl_gen
 
-  DDSGenerator_Files {
+  NDDSTypeSupport_Files {
     PSL_SampleLost_Base.idl
   }
+}
+
+project(DDS_PSL_SampleLost_Base_NDDS_TS) : nddslib, taolib {
+  after += DDS_PSL_SampleLost_Base_ndds_ts_gen DDS_PSL_SampleLost_Base_stub
+  libs += DDS_PSL_SampleLost_Base_stub
+  libout = ../lib
+  libpaths    += ../lib
+  sharedname = DDS_PSL_SampleLost_Base_NDDS_TS
+  dynamicflags = NDDS_USER_DLL_EXPORT
+
+  verbatim(gnuace, macros) {
+    override no_hidden_visibility = 1
+  }
 
   Source_Files {
+    PSL_SampleLost_Base.cxx
+    PSL_SampleLost_BasePlugin.cxx
+    PSL_SampleLost_BaseSupport.cxx
+  }
+
+  Header_Files {
+    PSL_SampleLost_Base.h
+    PSL_SampleLost_BasePlugin.h
+    PSL_SampleLost_BaseSupport.h
+  }
+
+  Inline_Files {
+  }
+}
+
+project(DDS_PSL_SampleLost_Base_stub) : ccm_stub {
+  after += DDS_PSL_SampleLost_Base_idl_gen
+  libout = ../lib
+  libpaths += ../lib
+  sharedname = DDS_PSL_SampleLost_Base_stub
+  dynamicflags = PSL_SAMPLELOST_BASE_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    PSL_SampleLost_BaseC.cpp
+  }
+
+  Header_Files {
+    PSL_SampleLost_BaseC.h
+    PSL_SampleLost_Base_stub_export.h
+  }
+
+  Inline_Files {
+    PSL_SampleLost_BaseC.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc
index 5163c759a9b..94653ed3f2b 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_PSL_SampleLost_Base -l .. -o ../lib -u DDS PSL_SampleLost_Connector"
 
-project(DDS_PSL_SL_Connector_idl_gen) : connectoridldefaults, dds4ccm {
+project(DDS_PSL_SL_Connector_idl_gen) : connectoridldefaults {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=PSL_SAMPLELOST_CONNECTOR_STUB_Export \
@@ -10,8 +10,8 @@ project(DDS_PSL_SL_Connector_idl_gen) : connectoridldefaults, dds4ccm {
               -Wb,skel_export_include=PSL_SampleLost_Connector_svnt_export.h \
               -Wb,svnt_export_macro=PSL_SAMPLELOST_CONNECTOR_SVNT_Export \
               -Wb,svnt_export_include=PSL_SampleLost_Connector_svnt_export.h \
-              -Wb,conn_export_macro=PSL_SAMPLELOST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=PSL_SampleLost_Connector_conn_export.h \
+              -Wb,exec_export_macro=PSL_SAMPLELOST_CONNECTOR_EXEC_Export \
+              -Wb,exec_export_include=PSL_SampleLost_Connector_exec_export.h \
               -I ..
 
   IDL_Files {
@@ -19,7 +19,7 @@ project(DDS_PSL_SL_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   }
 }
 
-project(DDS_PSL_SL_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_PSL_SL_Connector_lem_gen) : ciaoidldefaults {
   custom_only = 1
   after += DDS_PSL_SL_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=PSL_SAMPLELOST_CONNECTOR_LEM_STUB_Export \
@@ -85,24 +85,24 @@ project(DDS_PSL_SampleLost_Connector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_PSL_SampleLost_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_PSL_SL_Connector_lem_stub DDS_PSL_SampleLost_Connector_stub DDS4CCM_lem_stub DDS_PSL_SampleLost_Base_stub
+  after   += DDS_PSL_SL_Connector_lem_stub DDS_PSL_SampleLost_Connector_stub DDS4CCM_lem_stub DDS_PSL_SampleLost_Base_NDDS_TS
   sharedname = DDS_PSL_SampleLost_Connector_exec
-  libs += DDS_PSL_SampleLost_Connector_stub DDS_PSL_SL_Connector_lem_stub DDS_PSL_SampleLost_Base_stub DDS4CCM_lem_stub DDS_PSL_SampleLost_Base_stub
+  libs += DDS_PSL_SampleLost_Connector_stub DDS_PSL_SL_Connector_lem_stub DDS_PSL_SampleLost_Base_stub DDS4CCM_lem_stub DDS_PSL_SampleLost_Base_NDDS_TS
   libpaths += ../lib
   libout = ../lib
   includes += ..
-  dynamicflags   = PSL_SAMPLELOST_CONNECTOR_CONN_BUILD_DLL
+  dynamicflags   = PSL_SAMPLELOST_CONNECTOR_EXEC_BUILD_DLL
 
   IDL_Files {
   }
 
   Source_Files {
-    PSL_SampleLost_Connector_conn.cpp
+    PSL_SampleLost_Connector_exec.cpp
   }
 
   Header_Files {
-    PSL_SampleLost_Connector_conn.h
-    PSL_SampleLost_Connector_conn_export.h
+    PSL_SampleLost_Connector_exec.h
+    PSL_SampleLost_Connector_exec_export.h
   }
 
   Inline_Files {
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector_exec.cpp b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector_exec.cpp
new file mode 100644
index 00000000000..8b0760a15f1
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector_exec.cpp
@@ -0,0 +1,29 @@
+// -*- C++ -*-
+// $Id$
+
+#include "PSL_SampleLost_Connector_exec.h"
+
+namespace CIAO_PSL_SampleLost_PSL_SampleLost_Connector_Impl
+{
+  PSL_SampleLost_Connector_exec_i::PSL_SampleLost_Connector_exec_i (void)
+    : DDS_Event_Connector_T<TestTopic_DDS_Traits, TestTopic_Connector_Traits> ()
+  {
+  }
+
+  PSL_SampleLost_Connector_exec_i::~PSL_SampleLost_Connector_exec_i (void)
+  {
+  }
+
+  extern "C" PSL_SAMPLELOST_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_PSL_SampleLost_PSL_SampleLost_Connector_Impl (void)
+  {
+    ::Components::EnterpriseComponent_ptr retval =
+      ::Components::EnterpriseComponent::_nil ();
+
+    ACE_NEW_NORETURN (
+      retval,
+      PSL_SampleLost_Connector_exec_i ()); 
+
+    return retval;
+  }
+}
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector_exec.h
new file mode 100644
index 00000000000..c602bb4c0c5
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Connector/PSL_SampleLost_Connector_exec.h
@@ -0,0 +1,62 @@
+// -*- C++ -*-
+// $Id$
+
+#ifndef PSL_SAMPLELOST_CONNECTOR_EXEC_H_
+#define PSL_SAMPLELOST_CONNECTOR_EXEC_H_
+
+#include /**/ "ace/pre.h"
+
+#include "PSL_SampleLost_ConnectorEC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "PSL_SampleLost_Connector_exec_export.h"
+#include "tao/LocalObject.h"
+
+#include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
+#include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
+
+
+#include "Base/PSL_SampleLost_BaseSupport.h"
+
+namespace CIAO_PSL_SampleLost_PSL_SampleLost_Connector_Impl
+{
+
+  // @from use of PSL_SampleLost as a parameter
+  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+    TestTopic,
+    TestTopicSeq,
+    TestTopicTypeSupport,
+    TestTopicDataWriter,
+    TestTopicDataReader > TestTopic_DDS_Traits;
+
+  typedef CIAO::DDS4CCM::Connector_Traits <
+    ::CIAO_PSL_SampleLost_PSL_SampleLost_Connector_Impl::PSL_SampleLost_Connector_Exec,
+    TestTopic_Seq,
+    ::CCM_DDS::TestTopic::CCM_Writer,
+    ::CCM_DDS::TestTopic::CCM_Updater,
+    ::CCM_DDS::TestTopic::CCM_Getter,
+    ::CCM_DDS::TestTopic::CCM_Reader,
+    ::PSL_SampleLost::CCM_PSL_SampleLost_Connector_Context,
+    ::CCM_DDS::TestTopic::Listener,
+    ::CCM_DDS::TestTopic::StateListener,
+    ::CCM_DDS::ConnectorStatusListener> TestTopic_Connector_Traits;
+
+  class PSL_SAMPLELOST_CONNECTOR_EXEC_Export PSL_SampleLost_Connector_exec_i :
+    public DDS_Event_Connector_T <TestTopic_DDS_Traits, TestTopic_Connector_Traits>
+  {
+  public:
+    PSL_SampleLost_Connector_exec_i (void);
+    virtual ~PSL_SampleLost_Connector_exec_i (void);
+  };
+
+  extern "C" PSL_SAMPLELOST_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_PSL_SampleLost_PSL_SampleLost_Connector_Impl (void);
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc
index b0d5445c89a..20a91079042 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_PSL_SampleLost_Receiver_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_PSL_SampleLost_Receiver_idl_gen) : componentidldefaults {
   custom_only = 1
   after += DDS_PSL_SL_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
@@ -17,7 +17,7 @@ project(DDS_PSL_SampleLost_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_PSL_SampleLost_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_PSL_SampleLost_Receiver_lem_gen) : ciaoidldefaults {
   after += DDS_PSL_SampleLost_Receiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
@@ -107,7 +107,7 @@ project(DDS_PSL_SampleLost_Receiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_PSL_SampleLost_Receiver_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_PSL_SampleLost_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      +=   DDS_PSL_SL_Receiver_lem_stub DDS_PSL_SampleLost_Base_stub DDS_PSL_SampleLost_Connector_stub DDS_PSL_SampleLost_Connector_svnt DDS_PSL_SampleLost_Receiver_exec DDS_PSL_SL_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
   sharedname  = Receiver_svnt
   libs       += Receiver_stub Receiver_lem_stub DDS_PSL_SampleLost_Base_stub DDS_PSL_SampleLost_Connector_stub DDS_PSL_SampleLost_Connector_svnt Receiver_exec DDS_PSL_SL_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp
index 8472532f2e8..697f437ee81 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.cpp
@@ -13,8 +13,8 @@
 
 namespace CIAO_PSL_SampleLost_Receiver_Impl
 {
-  //============================================================
-  // ConnectorStatusListener_exec_i
+//============================================================
+  // Facet Executor Implementation Class: ConnectorStatusListener_exec_i
   //============================================================
   ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (void)
   {
@@ -26,44 +26,35 @@ namespace CIAO_PSL_SampleLost_Receiver_Impl
 
   // Operations from ::CCM_DDS::ConnectorStatusListener
   void ConnectorStatusListener_exec_i::on_inconsistent_topic(
-    ::DDS::Topic_ptr /*the_topic*/,
-    const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
+     ::DDS::Topic_ptr /*the_topic*/,
+     const DDS::InconsistentTopicStatus & /*status*/){
+    }
 
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
+  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos(
     ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
+     const DDS::RequestedIncompatibleQosStatus & /*status*/)  {
+    }
 
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
+  void ConnectorStatusListener_exec_i::on_sample_rejected(
+     ::DDS::DataReader_ptr /*the_reader*/,
+     const DDS::SampleRejectedStatus & /*status*/)  {
+    }
 
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed (
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
+  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
+     ::DDS::DataWriter_ptr /*the_writer*/,
+     const DDS::OfferedDeadlineMissedStatus & /*status*/)  {
+    }
 
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos (
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
+  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
+     ::DDS::DataWriter_ptr /*the_writer*/,
+     const DDS::OfferedIncompatibleQosStatus & /*status*/)  {
+    }
 
-  void ConnectorStatusListener_exec_i::on_unexpected_status (
+  void ConnectorStatusListener_exec_i::on_unexpected_status(
     ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind /*status_kind*/)
-  {
-  }
+    ::DDS::StatusKind /*status_kind*/)  {
+   }
 
-  //============================================================
-  // read_action_Generator
-  //============================================================
   read_action_Generator::read_action_Generator (Receiver_exec_i &callback)
     : pulse_callback_ (callback)
   {
@@ -86,10 +77,10 @@ namespace CIAO_PSL_SampleLost_Receiver_Impl
       }
     return 0;
   }
-
   //============================================================
-  // TestTopic_RawListener_exec_i
+  // Facet Executor Implementation Class: TestTopic_RawListener_exec_i
   //============================================================
+
   TestTopic_RawListener_exec_i::TestTopic_RawListener_exec_i (void)
   {
   }
@@ -116,19 +107,12 @@ namespace CIAO_PSL_SampleLost_Receiver_Impl
     const ::CCM_DDS::ReadInfoSeq & /* info */)
   {
   }
-
   //============================================================
-  // PortStatusListener_exec_i
+  // Facet Executor Implementation Class: PortStatusListener_exec_i
   //============================================================
-  PortStatusListener_exec_i::PortStatusListener_exec_i (Atomic_Boolean &sample_port_1,
-                                                        Atomic_Boolean &sample_port_2,
-                                                        Atomic_ThreadId &thread_id_1,
-                                                        Atomic_ThreadId &thread_id_2,
-                                                        int port_nr)
+  PortStatusListener_exec_i::PortStatusListener_exec_i (Atomic_Boolean &sample_port_1, Atomic_Boolean &sample_port_2,int port_nr)
     : sample_port_1_(sample_port_1),
       sample_port_2_(sample_port_2),
-      thread_id_1_ (thread_id_1),
-      thread_id_2_ (thread_id_2),
       port_nr_(port_nr)
   {
   }
@@ -150,40 +134,24 @@ namespace CIAO_PSL_SampleLost_Receiver_Impl
     ::DDS::DataReader_ptr the_reader,
     const ::DDS::SampleLostStatus & status)
   {
-    if (this->port_nr_ == 1)
-      {
-        this->thread_id_1_ = ACE_Thread::self ();
-      }
-    if (this->port_nr_ == 2)
-      {
-        this->thread_id_2_ = ACE_Thread::self ();
-      }
-
-    if (this->port_nr_ == 1 &&
-        !CORBA::is_nil(the_reader) &&
-        status.total_count > 0)
-      {
-        this->sample_port_1_ = true;
-      }
-
-    if (this->port_nr_ == 2 &&
-        !CORBA::is_nil(the_reader) &&
-        status.total_count > 0)
-      {
-        this->sample_port_2_ = true;
-      }
+    if((this->port_nr_ == 1) && (!CORBA::is_nil(the_reader)) && (status.total_count > 0))
+    {
+      this->sample_port_1_ = true;
+    }
+    if((this->port_nr_ == 2) && (!CORBA::is_nil(the_reader)) && (status.total_count > 0))
+    {
+      this->sample_port_2_ = true;
+    }
   }
 
   //============================================================
-  // Receiver_exec_i
+  // Component Executor Implementation Class: Receiver_exec_iTestTopic_RawListener_exec_i ();
   //============================================================
 
   Receiver_exec_i::Receiver_exec_i (void)
   : rate_ (10),
     sample_port_1_ (false),
-    sample_port_2_ (false),
-    thread_id_listener_1_ (0),
-    thread_id_listener_2_ (0)
+    sample_port_2_ (false)
   {
     this->ticker_ = new read_action_Generator (*this);
   }
@@ -202,30 +170,29 @@ namespace CIAO_PSL_SampleLost_Receiver_Impl
       }
     TestTopic_Seq_var TestTopic_infos;
     ::CCM_DDS::ReadInfoSeq_var readinfoseq;
-    try
-      {
-        this->reader_->read_all(TestTopic_infos.out(), readinfoseq.out());
-        for(CORBA::ULong i = 0; i < readinfoseq->length(); ++i)
-          {
-            ACE_Time_Value tv;
-            tv <<= readinfoseq[i].source_timestamp;
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL ReadInfo ")
-                                  ACE_TEXT ("-> UTC date =%#T\n"),
-                                  &tv));
-          }
-        for(CORBA::ULong i = 0; i < TestTopic_infos->length(); ++i)
-          {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL keyed test info : ")
-                  ACE_TEXT ("Number <%d> : received TestTopic_info for <%C> at %u\n"),
-                i,
-                TestTopic_infos[i].key.in (),
-                TestTopic_infos[i].x));
-          }
-      }
+    try{
+      this->reader_->read_all(TestTopic_infos.out(), readinfoseq.out());
+      for(CORBA::ULong i = 0; i < readinfoseq->length(); ++i)
+        {
+          ACE_Time_Value tv;
+          tv <<= readinfoseq[i].source_timestamp;
+          ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL ReadInfo ")
+                                ACE_TEXT ("-> UTC date =%#T\n"),
+                                &tv));
+        }
+      for(CORBA::ULong i = 0; i < TestTopic_infos->length(); ++i)
+        {
+           ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL keyed test info : ")
+                ACE_TEXT ("Number <%d> : received TestTopic_info for <%C> at %u\n"),
+              i,
+              TestTopic_infos[i].key.in (),
+              TestTopic_infos[i].x));
+         }
+    }
     catch (const CCM_DDS::InternalError& )
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("internal error or no data\n")));
-      }
+    {
+      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("internal error or no data\n")));
+    }
   }
 
   // Component attributes.
@@ -241,22 +208,14 @@ namespace CIAO_PSL_SampleLost_Receiver_Impl
   Receiver_exec_i::get_info_out_status (void)
   {
     ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new PortStatuslistener get_info_out_status\n")));
-    return new PortStatusListener_exec_i (this->sample_port_1_,
-                                          this->sample_port_2_,
-                                          this->thread_id_listener_1_,
-                                          this->thread_id_listener_2_,
-                                          1);
+    return new PortStatusListener_exec_i ( this->sample_port_1_,this->sample_port_2_, 1);
   }
 
   ::CCM_DDS::CCM_PortStatusListener_ptr
   Receiver_exec_i::get_info_get_status (void)
   {
     ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new PortStatuslistener get_info_get_status\n")));
-    return new PortStatusListener_exec_i (this->sample_port_1_,
-                                          this->sample_port_2_,
-                                          this->thread_id_listener_1_,
-                                          this->thread_id_listener_2_,
-                                          2);
+    return new PortStatusListener_exec_i (this->sample_port_1_,this->sample_port_2_, 2);
   }
 
   ::CCM_DDS::CCM_ConnectorStatusListener_ptr
@@ -295,7 +254,7 @@ namespace CIAO_PSL_SampleLost_Receiver_Impl
         ACE_ERROR ((LM_INFO, ACE_TEXT ("Error:  Listener control receptacle is null!\n")));
         throw CORBA::INTERNAL ();
       }
-    lc->mode (::CCM_DDS::NOT_ENABLED);
+       lc->mode (::CCM_DDS::NOT_ENABLED);
 
     // calculate the interval time
     long usec = 1000000 / this->rate_;
@@ -337,97 +296,6 @@ namespace CIAO_PSL_SampleLost_Receiver_Impl
                                ACE_TEXT ("'on_sample_lost' in on DDS_Listen and DDS_GET port Receiver\n")
                     ));
       }
-    //check thread switch for listener 1
-    if (this->thread_id_listener_1_.value () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
-                              "Thread ID for PortStatusListener I not set!\n"));
-      }
-    #if defined (CIAO_DDS4CCM_CONTEXT_SWITCH) && (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (ACE_OS::thr_equal (this->thread_id_listener_1_.value (),
-                                ACE_Thread::self ()))
-      {
-        ACE_DEBUG ((LM_DEBUG, "OK : "
-                              "Thread switch for PortStatusListener I seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_1_.value (),
-                              ACE_Thread::self ()));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
-                              "Thread switch for PortStatusListener I "
-                              "doesn't seem to work! "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_1_.value (),
-                              ACE_Thread::self ()));
-      }
-    #else
-    else if (ACE_OS::thr_equal (this->thread_id_listener_1_.value (),
-                                ACE_Thread::self ()))
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: PortStatusListener I: "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_1_.value (),
-                              ACE_Thread::self ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "OK : PortStatusListener I: "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_1_.value (),
-                              ACE_Thread::self ()));
-      }
-    #endif
-
-    //check thread switch for listener 2
-    if (this->thread_id_listener_2_.value () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
-                              "Thread ID for PortStatusListener II not set!\n"));
-      }
-    #if defined (CIAO_DDS4CCM_CONTEXT_SWITCH) && (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (ACE_OS::thr_equal (this->thread_id_listener_2_.value (),
-                                ACE_Thread::self ()))
-      {
-        ACE_DEBUG ((LM_DEBUG, "OK : "
-                              "Thread switch for PortStatusListener II seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_2_.value (),
-                              ACE_Thread::self ()));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
-                              "Thread switch for PortStatusListener II "
-                              "doesn't seem to work! "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_2_.value (),
-                              ACE_Thread::self ()));
-      }
-    #else
-    else if (ACE_OS::thr_equal (this->thread_id_listener_2_.value (),
-                                ACE_Thread::self ()))
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: PortStatusListener II: "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_2_.value (),
-                              ACE_Thread::self ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "OK : PortStatusListener II: "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_2_.value (),
-                              ACE_Thread::self ()));
-      }
-    #endif
   }
 
   extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h
index e591c7885f6..ae5251e75db 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Receiver/PSL_SampleLost_Receiver_exec.h
@@ -13,20 +13,15 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/LocalObject.h"
-#include "ace/OS_NS_Thread.h"
-#include "ace/Reactor.h"
 #include "ace/Task.h"
+#include "ace/Reactor.h"
 
 namespace CIAO_PSL_SampleLost_Receiver_Impl
 {
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean> Atomic_Boolean;
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, ACE_thread_t> Atomic_ThreadId;
-
+  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
+  
   class Receiver_exec_i;
-
-  //============================================================
-  // TestTopic_RawListener_exec_i
-  //============================================================
+  
   class RECEIVER_EXEC_Export TestTopic_RawListener_exec_i
     : public virtual ::CCM_DDS::TestTopic::CCM_Listener,
       public virtual ::CORBA::LocalObject
@@ -45,13 +40,10 @@ namespace CIAO_PSL_SampleLost_Receiver_Impl
     virtual void
     on_many_data (
       const ::TestTopic_Seq & data,
-      const ::CCM_DDS::ReadInfoSeq & info);
+      const ::CCM_DDS::ReadInfoSeq & info );
   };
 
 
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
   class RECEIVER_EXEC_Export ConnectorStatusListener_exec_i
     : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
       public virtual ::CORBA::LocalObject
@@ -61,28 +53,24 @@ namespace CIAO_PSL_SampleLost_Receiver_Impl
     virtual ~ConnectorStatusListener_exec_i (void);
 
     virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
+    void on_inconsistent_topic( ::DDS::Topic_ptr the_topic, 
                                 const DDS::InconsistentTopicStatus & status);
     virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
+    void on_requested_incompatible_qos( ::DDS::DataReader_ptr the_reader,
                                         const DDS::RequestedIncompatibleQosStatus & status);
     virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
+    void on_sample_rejected( ::DDS::DataReader_ptr the_reader,
                              const DDS::SampleRejectedStatus & status);
     virtual
-    void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
+    void on_offered_deadline_missed( ::DDS::DataWriter_ptr the_writer,
                                      const DDS::OfferedDeadlineMissedStatus & status);
     virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
+    void on_offered_incompatible_qos( ::DDS::DataWriter_ptr the_writer,
                                       const DDS::OfferedIncompatibleQosStatus & status);
     virtual
-    void on_unexpected_status (::DDS::Entity_ptr the_entity,
+    void on_unexpected_status( ::DDS::Entity_ptr the_entity,
                                ::DDS::StatusKind  status_kind);
    };
-
-  //============================================================
-  // read_action_Generator
-  //============================================================
   class read_action_Generator
     : public ACE_Event_Handler
   {
@@ -100,20 +88,12 @@ namespace CIAO_PSL_SampleLost_Receiver_Impl
     Receiver_exec_i &pulse_callback_;
 
   };
-
-  //============================================================
-  // PortStatusListener_exec_i
-  //============================================================
   class RECEIVER_EXEC_Export PortStatusListener_exec_i
     : public virtual ::CCM_DDS::CCM_PortStatusListener,
       public virtual ::CORBA::LocalObject
   {
   public:
-    PortStatusListener_exec_i (Atomic_Boolean &,
-                               Atomic_Boolean &,
-                               Atomic_ThreadId &,
-                               Atomic_ThreadId &,
-                               int port_nr);
+    PortStatusListener_exec_i (Atomic_Boolean &,Atomic_Boolean &, int port_nr);
     virtual ~PortStatusListener_exec_i (void);
 
     virtual void
@@ -129,15 +109,10 @@ namespace CIAO_PSL_SampleLost_Receiver_Impl
   private:
     Atomic_Boolean &sample_port_1_;
     Atomic_Boolean &sample_port_2_;
-    Atomic_ThreadId &thread_id_1_;
-    Atomic_ThreadId &thread_id_2_;
     int port_nr_;
 
   };
 
-  //============================================================
-  // Receiver_exec_i
-  //============================================================
   class RECEIVER_EXEC_Export Receiver_exec_i
     : public virtual Receiver_Exec,
       public virtual ::CORBA::LocalObject
@@ -168,7 +143,7 @@ namespace CIAO_PSL_SampleLost_Receiver_Impl
     virtual void ccm_activate (void);
     virtual void ccm_passivate (void);
     virtual void ccm_remove (void);
-    void read_all (void);
+    void read_all(void);
 
   private:
     ::PSL_SampleLost::CCM_Receiver_Context_var context_;
@@ -177,8 +152,6 @@ namespace CIAO_PSL_SampleLost_Receiver_Impl
     CORBA::ULong rate_;
     Atomic_Boolean sample_port_1_;
     Atomic_Boolean sample_port_2_;
-    Atomic_ThreadId thread_id_listener_1_;
-    Atomic_ThreadId thread_id_listener_2_;
 };
 
   extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc
index 4ddaf76560c..1bac1d3a776 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_PSL_SampleLost_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(DDS_PSL_SampleLost_Sender_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_PSL_SampleLost_Sender_idl_gen) : componentidldefaults {
   after += DDS_PSL_SL_Connector_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_PSL_SampleLost_Sender_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_PSL_SampleLost_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_PSL_SampleLost_Sender_lem_gen) : ciaoidldefaults {
   after += DDS_PSL_SampleLost_Sender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
@@ -109,7 +109,7 @@ project(DDS_PSL_SampleLost_Sender_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_PSL_SampleLost_Sender_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_PSL_SampleLost_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      += DDS_PSL_SampleLost_Base_stub  DDS_PSL_SampleLost_Sender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_PSL_SampleLost_Connector_stub DDS_PSL_SampleLost_Connector_svnt DDS_PSL_SL_Connector_lem_stub
   sharedname  = Sender_svnt
   libs       += Sender_stub Sender_lem_stub  \
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.cpp
index 878c1128866..7e4a938cd28 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.cpp
@@ -10,8 +10,8 @@
 namespace CIAO_PSL_SampleLost_Sender_Impl
 {
 
-  //============================================================
-  // ConnectorStatusListener_exec_i
+  ///============================================================
+  // Facet Executor Implementation Class: ConnectorStatusListener_exec_i
   //============================================================
   ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i ()
   {
@@ -22,44 +22,38 @@ namespace CIAO_PSL_SampleLost_Sender_Impl
   }
 
   // Operations from ::CCM_DDS::ConnectorStatusListener
-  void ConnectorStatusListener_exec_i::on_inconsistent_topic (
-    ::DDS::Topic_ptr /*the_topic*/, 
-     const DDS::InconsistentTopicStatus & /*status*/)
-  {
-  }
+  void ConnectorStatusListener_exec_i::on_inconsistent_topic(
+    ::DDS::Topic_ptr /*the_topic*/,
+     const DDS::InconsistentTopicStatus & /*status*/){
+    }
 
-  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos (
+  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos(
     ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::RequestedIncompatibleQosStatus & /*status*/)
-  {
-  }
+     const DDS::RequestedIncompatibleQosStatus & /*status*/)  {
+    }
 
-  void ConnectorStatusListener_exec_i::on_sample_rejected (
-    ::DDS::DataReader_ptr /*the_reader*/,
-    const DDS::SampleRejectedStatus & /*status*/)
-  {
-  }
+  void ConnectorStatusListener_exec_i::on_sample_rejected(
+     ::DDS::DataReader_ptr /*the_reader*/,
+     const DDS::SampleRejectedStatus & /*status*/)  {
+    }
 
-  void ConnectorStatusListener_exec_i::on_offered_deadline_missed (
-    ::DDS::DataWriter_ptr /*the_writer*/,
-    const DDS::OfferedDeadlineMissedStatus & /*status*/)
-  {
-  }
+  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
+     ::DDS::DataWriter_ptr /*the_writer*/,
+     const DDS::OfferedDeadlineMissedStatus & /*status*/)  {
+    }
 
-  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos (
-   ::DDS::DataWriter_ptr /*the_writer*/,
-   const DDS::OfferedIncompatibleQosStatus & /*status*/)
-  {
-  }
+  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
+     ::DDS::DataWriter_ptr /*the_writer*/,
+     const DDS::OfferedIncompatibleQosStatus & /*status*/)  {
+    }
 
-  void ConnectorStatusListener_exec_i::on_unexpected_status (
+  void ConnectorStatusListener_exec_i::on_unexpected_status(
     ::DDS::Entity_ptr /*the_entity*/,
-    ::DDS::StatusKind  /*status_kind*/)
-  {
-  }
+    ::DDS::StatusKind  /*status_kind*/)  {
+    }
 
   //============================================================
-  // pulse_Generator
+  // Pulse generator
   //============================================================
   pulse_Generator::pulse_Generator (Sender_exec_i &callback)
     : pulse_callback_ (callback)
@@ -69,12 +63,12 @@ namespace CIAO_PSL_SampleLost_Sender_Impl
   int
   pulse_Generator::handle_timeout (const ACE_Time_Value &, const void *)
   {
+    // Notify the subscribers
     this->pulse_callback_.tick ();
     return 0;
   }
-
   //============================================================
-  // Sender_exec_i
+  // Component Executor Implementation Class: Sender_exec_i
   //============================================================
   Sender_exec_i::Sender_exec_i (void)
   {
@@ -92,12 +86,13 @@ namespace CIAO_PSL_SampleLost_Sender_Impl
   }
 
   // Supported operations and attributes.
+
   void
   Sender_exec_i::set_session_context (::Components::SessionContext_ptr ctx)
   {
     this->context_ = ::PSL_SampleLost::CCM_Sender_Context::_narrow (ctx);
 
-    if (::CORBA::is_nil (this->context_.in ()))
+    if ( ::CORBA::is_nil (this->context_.in ()))
       {
         throw ::CORBA::INTERNAL ();
       }
@@ -109,26 +104,25 @@ namespace CIAO_PSL_SampleLost_Sender_Impl
     this->writer_  = this->context_->get_connection_test_topic_write_data ();
   }
 
-  void
+   void
   Sender_exec_i::tick ()
   {
     for (PSL_DLTest_Table::iterator i = this->_ktests_.begin ();
-         i != this->_ktests_.end ();
-         ++i)
+        i != this->_ktests_.end ();
+        ++i)
       {
          try
-          {
-            if (!CORBA::is_nil (this->writer_) )
-              {
-                this->writer_->write_one(i->second,::DDS::HANDLE_NIL);
-                i->second->x++;
-              }
-          }
+         {
+           if (!CORBA::is_nil (this->writer_) ) {
+              this->writer_->write_one(i->second,::DDS::HANDLE_NIL);
+              i->second->x++;
+           }
+         }
          catch (const CCM_DDS::InternalError& )
-          {
-            ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while creating topic for <%C>.\n"),
+         {
+           ACE_ERROR ((LM_ERROR, ACE_TEXT ("Internal Error while creating topic for <%C>.\n"),
                     i->first.c_str ()));
-          }
+         }
        }
   }
 
@@ -142,10 +136,10 @@ namespace CIAO_PSL_SampleLost_Sender_Impl
                 0,
                 ACE_Time_Value (sec, usec),
                 ACE_Time_Value (sec, usec)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
+    {
+      ACE_ERROR ((LM_ERROR, ACE_TEXT ("Sender_exec_i::start : ")
                              ACE_TEXT ("Error scheduling timer")));
-      }
+    }
   }
 
   void
@@ -164,7 +158,6 @@ namespace CIAO_PSL_SampleLost_Sender_Impl
     new_key->x = x;
     this->_ktests_[key] = new_key;
   }
-
   void
   Sender_exec_i::ccm_activate (void)
   {
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.h b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.h
index 2f0503dbb21..2e03384485a 100644
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/Sender/PSL_SampleLost_Sender_exec.h
@@ -22,56 +22,49 @@ namespace CIAO_PSL_SampleLost_Sender_Impl
   typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
 
   class Sender_exec_i;
-
-  //============================================================
-  // Sender_exec_i
-  //============================================================
+  
   class pulse_Generator :
     public ACE_Event_Handler
   {
   public:
     pulse_Generator (Sender_exec_i &callback);
-
+    /// Handle the timeout.
     virtual int handle_timeout (const ACE_Time_Value &tv,
                                 const void *arg);
   private:
+    /// Maintains a handle that actually process the event
     Sender_exec_i &pulse_callback_;
   };
 
-  //============================================================
-  // ConnectorStatusListener_exec_i
-  //============================================================
-  class SENDER_EXEC_Export ConnectorStatusListener_exec_i
+class SENDER_EXEC_Export ConnectorStatusListener_exec_i
     : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
       public virtual ::CORBA::LocalObject
   {
   public:
     ConnectorStatusListener_exec_i (void);
-    virtual ~ConnectorStatusListener_exec_i (void);
-
+   virtual ~ConnectorStatusListener_exec_i (void);
+    
     virtual
-    void on_inconsistent_topic (::DDS::Topic_ptr the_topic,
+    void on_inconsistent_topic( ::DDS::Topic_ptr the_topic, 
                                 const DDS::InconsistentTopicStatus & status);
     virtual
-    void on_requested_incompatible_qos (::DDS::DataReader_ptr the_reader,
+    void on_requested_incompatible_qos( ::DDS::DataReader_ptr the_reader,
                                         const DDS::RequestedIncompatibleQosStatus & status);
     virtual
-    void on_sample_rejected (::DDS::DataReader_ptr the_reader,
+    void on_sample_rejected( ::DDS::DataReader_ptr the_reader, 
                              const DDS::SampleRejectedStatus & status);
     virtual
-    void on_offered_deadline_missed (::DDS::DataWriter_ptr the_writer,
+    void on_offered_deadline_missed( ::DDS::DataWriter_ptr the_writer,
                                      const DDS::OfferedDeadlineMissedStatus & status);
     virtual
-    void on_offered_incompatible_qos (::DDS::DataWriter_ptr the_writer,
+    void on_offered_incompatible_qos( ::DDS::DataWriter_ptr the_writer, 
                                       const DDS::OfferedIncompatibleQosStatus & status);
     virtual
-    void on_unexpected_status (::DDS::Entity_ptr the_entity,
-                               ::DDS::StatusKind  status_kind);
+      void on_unexpected_status( ::DDS::Entity_ptr the_entity,
+       ::DDS::StatusKind  status_kind);
+  
   };
 
-  //============================================================
-  // Sender_exec_i
-  //============================================================
   class Sender_exec_i
     : public virtual Sender_Exec,
       public virtual ::CORBA::LocalObject
@@ -79,7 +72,7 @@ namespace CIAO_PSL_SampleLost_Sender_Impl
   public:
     Sender_exec_i (void);
     virtual ~Sender_exec_i (void);
-
+    virtual void add_instance_of_topic (const char *, int x );
     void tick (void);
 
     virtual void set_session_context (::Components::SessionContext_ptr ctx);
@@ -87,24 +80,21 @@ namespace CIAO_PSL_SampleLost_Sender_Impl
     virtual void ccm_activate (void);
     virtual void ccm_passivate (void);
     virtual void ccm_remove (void);
-
     // Port operations.
     virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
-    get_test_topic_connector_status(void);
+      get_test_topic_connector_status(void);
 
   private:
     void start (void);
     void stop (void);
-
     pulse_Generator * ticker_;
+ 
+ 
     ::PSL_SampleLost::CCM_Sender_Context_var context_;
     CCM_DDS::TestTopic::Writer_var writer_;
-
     TAO_SYNCH_MUTEX mutex_;
     typedef std::map<ACE_CString, TestTopic_var> PSL_DLTest_Table;
     PSL_DLTest_Table _ktests_;
-
-    void add_instance_of_topic (const char *, int x );
  };
   extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
   create_PSL_SampleLost_Sender_Impl (void);
diff --git a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl
index a625ecd9216..dc0c34941c6 100755
--- a/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/PSLSampleLost/descriptors/run_test.pl
@@ -100,8 +100,6 @@ sub kill_open_processes {
     if ($ns_running == 1) {
         $NS->Kill (); $NS->TimedWait (1);
     }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
 }
 
 sub run_node_daemons {
diff --git a/CIAO/connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Starter.mpc b/CIAO/connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Starter.mpc
index adca4b6f90f..28b5497db91 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Starter.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Starter.mpc
@@ -1,7 +1,8 @@
 // $Id$
 
-project(DDS_QueryFilter_Starter_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_QueryFilter_Starter_idl_gen) : componentidldefaults {
   custom_only = 1
+  after += 
   idlflags += -Wb,stub_export_macro=READER_STARTER_STUB_Export \
               -Wb,stub_export_include=QueryFilter_Starter_stub_export.h \
               -Wb,skel_export_macro=READER_STARTER_SVNT_Export \
@@ -16,7 +17,7 @@ project(DDS_QueryFilter_Starter_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_QueryFilter_Starter_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_QueryFilter_Starter_lem_gen) : ciaoidldefaults {
   after += DDS_QueryFilter_Starter_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=READER_STARTER_LEM_STUB_Export \
@@ -56,7 +57,7 @@ project(DDS_QueryFilter_Starter_lem_stub) : ccm_svnt, dds4ccm_base  {
 
 project(DDS_QueryFilter_Starter_stub) : ccm_stub, dds4ccm_base {
   after += DDS_QueryFilter_Starter_idl_gen
-  libs  +=
+  libs  += 
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -81,7 +82,7 @@ project(DDS_QueryFilter_Starter_stub) : ccm_stub, dds4ccm_base {
 }
 
 
-project(DDS_QueryFilter_Starter_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_QueryFilter_Starter_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      +=   DDS_QueryFilter_Starter_lem_stub DDS_QueryFilter_Starter_stub\
                   DDS4CCM_lem_stub DDS4CCM_skel
   sharedname  = QueryFilter_Starter_svnt
diff --git a/CIAO/connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Test_Base.idl
index 85739cbedc6..4a5d03c226b 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Test_Base.idl
@@ -8,8 +8,6 @@
 #ifndef QUERY_FILTER_TEST_BASE_IDL
 #define QUERY_FILTER_TEST_BASE_IDL
 
-#pragma ndds typesupport "Base/QueryFilter_Test_BaseSupport.h"
-
 struct QueryFilterTest {
   string symbol; //@key
   long iteration;
diff --git a/CIAO/connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Test_Base.mpc
index b0fe76f8e8f..8361cb4761b 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryFilter/Base/QueryFilter_Test_Base.mpc
@@ -1,25 +1,76 @@
 // $Id$
+// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n QueryFilter_Test_Base"
 
-project (QueryFilter_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
-  sharedname = QueryFilter_Test_Base_stub
-  dynamicflags += QUERY_FILTER_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Gxhst -Sci \
+project(QueryFilter_Test_Base_idl_gen) : taoidldefaults, anytypecode {
+  custom_only = 1
+  idlflags -= -St -Sa
+  idlflags += -SS -Gxhst \
               -Wb,stub_export_macro=QUERY_FILTER_TEST_BASE_STUB_Export \
               -Wb,stub_export_include=QueryFilter_Test_Base_stub_export.h
 
   IDL_Files {
     QueryFilter_Test_Base.idl
   }
+}
 
-  opendds_ts_flags += --export=QUERY_FILTER_TEST_BASE_STUB_Export
+project(QueryFilter_Test_Base_ndds_ts_gen) : ndds_ts_defaults {
+  custom_only = 1
+  after += QueryFilter_Test_Base_idl_gen
+  ndds_ts_flags += -corba QueryFilter_Test_BaseC.h -orb ACE_TAO1.7
 
-  DDSGenerator_Files {
+  NDDSTypeSupport_Files {
     QueryFilter_Test_Base.idl
   }
+}
+
+project(QueryFilter_Test_Base_NDDS_TS) : nddslib, taolib {
+  after += QueryFilter_Test_Base_ndds_ts_gen QueryFilter_Test_Base_stub
+  libs += QueryFilter_Test_Base_stub
+  libout = ../lib
+  libpaths    += ../lib
+  sharedname = QueryFilter_Test_Base_NDDS_TS
+  dynamicflags = NDDS_USER_DLL_EXPORT
+
+  verbatim(gnuace, macros) {
+    override no_hidden_visibility = 1
+  }
 
   Source_Files {
+    QueryFilter_Test_Base.cxx
+    QueryFilter_Test_BasePlugin.cxx
+    QueryFilter_Test_BaseSupport.cxx
+  }
+
+  Header_Files {
+    QueryFilter_Test_Base.h
+    QueryFilter_Test_BasePlugin.h
+    QueryFilter_Test_BaseSupport.h
+  }
+
+  Inline_Files {
   }
 }
 
+project(QueryFilter_Test_Base_stub) : ccm_stub {
+  after += QueryFilter_Test_Base_idl_gen
+  libout = ../lib
+  libpaths += ../lib
+  sharedname = QueryFilter_Test_Base_stub
+  dynamicflags = QUERY_FILTER_TEST_BASE_STUB_BUILD_DLL STARTER_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    QueryFilter_Test_BaseC.cpp
+  }
+
+  Header_Files {
+    QueryFilter_Test_BaseC.h
+    QueryFilter_Test_Base_stub_export.h
+  }
+
+  Inline_Files {
+    QueryFilter_Test_BaseC.inl
+  }
+}
diff --git a/CIAO/connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector.mpc
index 7b89644b000..2122a4e1f3e 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p QueryFilter_Test_Base -l .. -o ../lib -u DDS QueryFilter_Test_Connector"
 
-project(QueryFilter_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
+project(QueryFilter_Test_Connector_idl_gen) : connectoridldefaults {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=QUERY_FILTER_TEST_CONNECTOR_STUB_Export \
@@ -10,8 +10,8 @@ project(QueryFilter_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
               -Wb,skel_export_include=QueryFilter_Test_Connector_svnt_export.h \
               -Wb,svnt_export_macro=QUERY_FILTER_TEST_CONNECTOR_SVNT_Export \
               -Wb,svnt_export_include=QueryFilter_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=QUERY_FILTER_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=QueryFilter_Test_Connector_conn_export.h \
+              -Wb,exec_export_macro=QUERY_FILTER_TEST_CONNECTOR_EXEC_Export \
+              -Wb,exec_export_include=QueryFilter_Test_Connector_exec_export.h \
               -I ..
 
   IDL_Files {
@@ -19,7 +19,7 @@ project(QueryFilter_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   }
 }
 
-project(QueryFilter_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
+project(QueryFilter_Test_Connector_lem_gen) : ciaoidldefaults {
   custom_only = 1
   after += QueryFilter_Test_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=QUERY_FILTER_TEST_CONNECTOR_LEM_STUB_Export \
@@ -85,24 +85,24 @@ project(QueryFilter_Test_Connector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(QueryFilter_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += QueryFilter_Test_Connector_lem_stub QueryFilter_Test_Connector_stub DDS4CCM_lem_stub QueryFilter_Test_Base_stub
+  after   += QueryFilter_Test_Connector_lem_stub QueryFilter_Test_Connector_stub DDS4CCM_lem_stub QueryFilter_Test_Base_NDDS_TS
   sharedname = QueryFilter_Test_Connector_exec
-  libs += QueryFilter_Test_Connector_stub QueryFilter_Test_Connector_lem_stub QueryFilter_Test_Base_stub DDS4CCM_lem_stub QueryFilter_Test_Base_stub
+  libs += QueryFilter_Test_Connector_stub QueryFilter_Test_Connector_lem_stub QueryFilter_Test_Base_stub DDS4CCM_lem_stub QueryFilter_Test_Base_NDDS_TS
   libpaths += ../lib
   libout = ../lib
   includes += ..
-  dynamicflags   = QUERY_FILTER_TEST_CONNECTOR_CONN_BUILD_DLL
+  dynamicflags   = QUERY_FILTER_TEST_CONNECTOR_EXEC_BUILD_DLL
 
   IDL_Files {
   }
 
   Source_Files {
-    QueryFilter_Test_Connector_conn.cpp
+    QueryFilter_Test_Connector_exec.cpp
   }
 
   Header_Files {
-    QueryFilter_Test_Connector_conn.h
-    QueryFilter_Test_Connector_conn_export.h
+    QueryFilter_Test_Connector_exec.h
+    QueryFilter_Test_Connector_exec_export.h
   }
 
   Inline_Files {
diff --git a/CIAO/connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector_exec.cpp
new file mode 100644
index 00000000000..895f2bb8895
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector_exec.cpp
@@ -0,0 +1,30 @@
+// -*- C++ -*-
+// $Id$
+
+#include "QueryFilter_Test_Connector_exec.h"
+
+namespace CIAO_QueryFilter_Test_QueryFilter_Test_Connector_Impl
+{
+  QueryFilter_Test_Connector_exec_i::QueryFilter_Test_Connector_exec_i (void)
+    : DDS_Event_Connector_T<QueryFilterTest_DDS_Traits, QueryFilterTest_Connector_Traits> ()
+  {
+  }
+
+  QueryFilter_Test_Connector_exec_i::~QueryFilter_Test_Connector_exec_i (void)
+  {
+  }
+
+  extern "C" QUERY_FILTER_TEST_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_QueryFilter_Test_QueryFilter_Test_Connector_Impl (void)
+  {
+    ::Components::EnterpriseComponent_ptr retval =
+      ::Components::EnterpriseComponent::_nil ();
+
+    ACE_NEW_NORETURN (
+      retval,
+      QueryFilter_Test_Connector_exec_i ());
+
+    return retval;
+  }
+}
+
diff --git a/CIAO/connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector_exec.h
new file mode 100644
index 00000000000..5ea1ece500d
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/QueryFilter/Connector/QueryFilter_Test_Connector_exec.h
@@ -0,0 +1,61 @@
+// -*- C++ -*-
+// $Id$
+
+#ifndef QUERY_FILTER_TEST_CONNECTOR_EXEC_H_
+#define QUERY_FILTER_TEST_CONNECTOR_EXEC_H_
+
+#include /**/ "ace/pre.h"
+
+#include "QueryFilter_Test_ConnectorEC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "QueryFilter_Test_Connector_exec_export.h"
+#include "tao/LocalObject.h"
+
+#include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
+#include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
+
+#include "Base/QueryFilter_Test_BaseSupport.h"
+
+namespace CIAO_QueryFilter_Test_QueryFilter_Test_Connector_Impl
+{
+
+  // @from use of QueryFilterTest as a parameter
+  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+    QueryFilterTest,
+    QueryFilterTestSeq,
+    QueryFilterTestTypeSupport,
+    QueryFilterTestDataWriter,
+    QueryFilterTestDataReader > QueryFilterTest_DDS_Traits;
+
+  typedef CIAO::DDS4CCM::Connector_Traits <
+    ::CIAO_QueryFilter_Test_QueryFilter_Test_Connector_Impl::QueryFilter_Test_Connector_Exec,
+    QueryFilterTest_Seq,
+    ::CCM_DDS::QueryFilterTest::CCM_Writer,
+    ::CCM_DDS::QueryFilterTest::CCM_Updater,
+    ::CCM_DDS::QueryFilterTest::CCM_Getter,
+    ::CCM_DDS::QueryFilterTest::CCM_Reader,
+    ::QueryFilter_Test::CCM_QueryFilter_Test_Connector_Context,
+    ::CCM_DDS::QueryFilterTest::Listener,
+    ::CCM_DDS::QueryFilterTest::StateListener,
+    ::CCM_DDS::ConnectorStatusListener> QueryFilterTest_Connector_Traits;
+
+  class QUERY_FILTER_TEST_CONNECTOR_EXEC_Export QueryFilter_Test_Connector_exec_i :
+    public DDS_Event_Connector_T <QueryFilterTest_DDS_Traits, QueryFilterTest_Connector_Traits>
+  {
+  public:
+    QueryFilter_Test_Connector_exec_i (void);
+    virtual ~QueryFilter_Test_Connector_exec_i (void);
+  };
+
+  extern "C" QUERY_FILTER_TEST_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_QueryFilter_Test_QueryFilter_Test_Connector_Impl (void);
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
diff --git a/CIAO/connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver.mpc
index 08a37a3729c..93b94220a17 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(QueryFilter_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
+project(QueryFilter_Test_Receiver_idl_gen) : componentidldefaults {
   custom_only = 1
   after += QueryFilter_Test_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
@@ -17,7 +17,7 @@ project(QueryFilter_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(QueryFilter_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
+project(QueryFilter_Test_Receiver_lem_gen) : ciaoidldefaults {
   after += QueryFilter_Test_Receiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
@@ -118,7 +118,7 @@ project(QueryFilter_Test_Receiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(QueryFilter_Test_Receiver_svnt) : ciao_servant, dds4ccm_base {
+project(QueryFilter_Test_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      +=   QueryFilter_Test_Receiver_lem_stub QueryFilter_Test_Base_stub \
                   QueryFilter_Test_Connector_stub QueryFilter_Test_Connector_svnt \
                   QueryFilter_Test_Receiver_exec QueryFilter_Test_Connector_lem_stub \
diff --git a/CIAO/connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp
index 901247483b2..74aa58a1107 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.cpp
@@ -21,25 +21,19 @@
 namespace CIAO_QueryFilter_Test_Receiver_Impl
 {
   //============================================================
-  // read_action_Generator
+  // ReadHandler
   //============================================================
-  read_action_Generator::read_action_Generator (Receiver_exec_i &callback, int run)
+  ReadHandler::ReadHandler (Receiver_exec_i &callback,
+                            CORBA::UShort run)
     : callback_ (callback),
       run_ (run)
   {
   }
 
-  read_action_Generator::~read_action_Generator ()
-  {
-  }
-
   int
-  read_action_Generator::handle_timeout (const ACE_Time_Value &, const void *)
+  ReadHandler::handle_exception (ACE_HANDLE)
   {
-    ACE_DEBUG ((LM_DEBUG, "Checking if last sample "
-                          "is available in DDS...\n"));
-    if (this->callback_.check_last ())
-      this->callback_.run (this->run_);
+    this->callback_.run (this->run_);
     return 0;
   }
 
@@ -66,7 +60,9 @@ namespace CIAO_QueryFilter_Test_Receiver_Impl
   void
   Starter_exec_i::start_read (CORBA::UShort run)
   {
-    this->callback_.start_read (run);
+    while (!this->callback_.check_last ())
+      ACE_OS::sleep (1);
+    this->callback_.start (run);
   }
 
   //============================================================
@@ -77,8 +73,7 @@ namespace CIAO_QueryFilter_Test_Receiver_Impl
       keys_ (5),
       has_run_ (false),
       current_min_iteration_ (ACE_OS::atoi (MIN_ITERATION_1)),
-      current_max_iteration_ (ACE_OS::atoi (MAX_ITERATION_1)),
-      ticker_ (0)
+      current_max_iteration_ (ACE_OS::atoi (MAX_ITERATION_1))
   {
   }
 
@@ -308,39 +303,15 @@ namespace CIAO_QueryFilter_Test_Receiver_Impl
   }
 
   void
-  Receiver_exec_i::set_filter ()
+  Receiver_exec_i::start (CORBA::UShort run)
   {
-    CCM_DDS::QueryFilter filter;
-    filter.query = CORBA::string_dup (QUERY);
-    filter.query_parameters.length (2);
-    filter.query_parameters[0] = CORBA::string_dup (MIN_ITERATION_1);
-    filter.query_parameters[1] = CORBA::string_dup (MAX_ITERATION_1);
-    this->reader_->filter (filter);
-  }
-
-  void
-  Receiver_exec_i::start_read (CORBA::UShort run)
-  {
-    this->ticker_ = new read_action_Generator (*this, run);
-    if (this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->schedule_timer (
-                                          this->ticker_,
-                                          0,
-                                          ACE_Time_Value(1, 0),
-                                          ACE_Time_Value(1, 0)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, "Unable to schedule Timer\n"));
-      }
+    ReadHandler *rh = new ReadHandler (*this, run);
+    this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->notify (rh);
   }
 
   void
   Receiver_exec_i::run (CORBA::UShort run)
   {
-    if (this->ticker_)
-      {
-        this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->cancel_timer (this->ticker_);
-        delete this->ticker_;
-        this->ticker_ = 0;
-      }
     this->has_run_ = true;
     ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::run - "
                           "Starting run number <%d>\n",
@@ -349,8 +320,6 @@ namespace CIAO_QueryFilter_Test_Receiver_Impl
     {
       case 1:
         {
-          test_exception ();
-          set_filter ();
           read_all ();
           check_filter ();
           test_set_query_parameters ();
@@ -431,6 +400,15 @@ namespace CIAO_QueryFilter_Test_Receiver_Impl
   {
     this->reader_ = this->context_->get_connection_info_out_data();
     this->restarter_ = this->context_->get_connection_writer_restart ();
+
+    test_exception ();
+
+    CCM_DDS::QueryFilter filter;
+    filter.query = CORBA::string_dup (QUERY);
+    filter.query_parameters.length (2);
+    filter.query_parameters[0] = CORBA::string_dup (MIN_ITERATION_1);
+    filter.query_parameters[1] = CORBA::string_dup (MAX_ITERATION_1);
+    this->reader_->filter (filter);
 }
 
   void
@@ -448,10 +426,6 @@ namespace CIAO_QueryFilter_Test_Receiver_Impl
             ACE_TEXT ("the expected number of DATA_ON_READER ")
             ACE_TEXT ("events.\n")));
       }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Finished query filter test.\n")));
-      }
   }
 
   extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
diff --git a/CIAO/connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.h
index be998f3307a..ef2cf636973 100644
--- a/CIAO/connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/QueryFilter/Receiver/QueryFilter_Test_Receiver_exec.h
@@ -21,23 +21,18 @@ namespace CIAO_QueryFilter_Test_Receiver_Impl
   class Receiver_exec_i;
 
   //============================================================
-  // read_action_Generator
+  // ReadHandler
   //============================================================
-  class read_action_Generator
-    : public ACE_Event_Handler
+  class ReadHandler :
+    public ACE_Event_Handler
   {
   public:
-    read_action_Generator (Receiver_exec_i &callback,
-                           int run);
-
-    ~read_action_Generator ();
-
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
+    ReadHandler (Receiver_exec_i &callback,
+                 CORBA::UShort run);
+    virtual int handle_exception (ACE_HANDLE fc = ACE_INVALID_HANDLE);
   private:
     Receiver_exec_i &callback_;
-    int run_;
-
+    CORBA::UShort run_;
   };
 
   //============================================================
@@ -84,7 +79,7 @@ namespace CIAO_QueryFilter_Test_Receiver_Impl
     get_reader_start ();
 
     bool check_last ();
-    void start_read (CORBA::UShort run);
+    void start (CORBA::UShort run);
     void run (CORBA::UShort run);
 
     ::CORBA::UShort iterations (void);
@@ -117,13 +112,10 @@ namespace CIAO_QueryFilter_Test_Receiver_Impl
     int current_min_iteration_;
     int current_max_iteration_;
 
-    read_action_Generator *ticker_;
-
     void read_all (void);
     void check_filter (void);
     void test_exception (void);
     void test_set_query_parameters (void);
-    void set_filter (void);
   };
 
   extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
diff --git a/CIAO/connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender.mpc
index faa7da39896..db521cac19a 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/QueryFilter/Sender/QueryFilter_Test_Sender.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p QueryFilter_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(QueryFilter_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
+project(QueryFilter_Test_Sender_idl_gen) : componentidldefaults {
   after += QueryFilter_Test_Connector_idl_gen DDS_Starter_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(QueryFilter_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(QueryFilter_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
+project(QueryFilter_Test_Sender_lem_gen) : ciaoidldefaults {
   after += QueryFilter_Test_Sender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
@@ -118,7 +118,7 @@ project(QueryFilter_Test_Sender_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(QueryFilter_Test_Sender_svnt) : ciao_servant, dds4ccm_base {
+project(QueryFilter_Test_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      += QueryFilter_Test_Base_stub  QueryFilter_Test_Sender_lem_stub \
                 DDS4CCM_lem_stub DDS4CCM_skel QueryFilter_Test_Connector_stub \
                 QueryFilter_Test_Connector_svnt QueryFilter_Test_Connector_lem_stub \
diff --git a/CIAO/connectors/dds4ccm/tests/QueryFilter/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/QueryFilter/descriptors/run_test.pl
index 4d9ba95b5f7..77540054018 100755
--- a/CIAO/connectors/dds4ccm/tests/QueryFilter/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/QueryFilter/descriptors/run_test.pl
@@ -44,6 +44,11 @@ $tg_executor = 0;
 $status = 0;
 $cdp_file = "Plan.cdp";
 
+# $ENV {'CIAO_LOG_LEVEL'} = 2;
+# $ENV {'DANCE_LOG_LEVEL'} = 2;
+# $ENV {'DDS4CCM_NDDS_LOG_VERBOSITY'} = 9;
+
+
 sub create_targets {
     #   naming service
     $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
@@ -100,8 +105,6 @@ sub kill_open_processes {
     if ($ns_running == 1) {
         $NS->Kill (); $NS->TimedWait (1);
     }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
 }
 
 sub run_node_daemons {
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.idl b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.idl
index 29903ba6b30..f975b2258cc 100644
--- a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.idl
+++ b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.idl
@@ -12,7 +12,6 @@
 
 interface ReaderStarter
 {
-  void start_read ();
   void read_no_data ();
   void set_reader_properties (in unsigned short nr_keys,
                               in unsigned short nr_iterations);
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc
index 07ac012bf4f..04559f02c42 100755
--- a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Starter.mpc
@@ -1,8 +1,8 @@
 // $Id$
 
-project(DDS_Reader_Starter_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_Reader_Starter_idl_gen) : componentidldefaults {
   custom_only = 1
-  after +=
+  after += 
   idlflags += -Wb,stub_export_macro=READER_STARTER_STUB_Export \
               -Wb,stub_export_include=Reader_Starter_stub_export.h \
               -Wb,skel_export_macro=READER_STARTER_SVNT_Export \
@@ -17,7 +17,7 @@ project(DDS_Reader_Starter_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_Reader_Starter_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_Reader_Starter_lem_gen) : ciaoidldefaults {
   after += DDS_Reader_Starter_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=READER_STARTER_LEM_STUB_Export \
@@ -57,7 +57,7 @@ project(DDS_Reader_Starter_lem_stub) : ccm_svnt, dds4ccm_base  {
 
 project(DDS_Reader_Starter_stub) : ccm_stub, dds4ccm_base {
   after += DDS_Reader_Starter_idl_gen
-  libs  +=
+  libs  += 
   libpaths += ../lib
   libout = ../lib
   includes += ..
@@ -82,7 +82,7 @@ project(DDS_Reader_Starter_stub) : ccm_stub, dds4ccm_base {
 }
 
 
-project(DDS_Reader_Starter_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_Reader_Starter_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      +=   DDS_Reader_Starter_lem_stub DDS_Reader_Starter_stub\
                   DDS4CCM_lem_stub DDS4CCM_skel
   sharedname  = Reader_Starter_svnt
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl
index e6390261dfc..75bb02f07e6 100644
--- a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.idl
@@ -8,8 +8,6 @@
 #ifndef READER_TEST_BASE_IDL
 #define READER_TEST_BASE_IDL
 
-#pragma ndds typesupport "Base/Reader_Test_BaseSupport.h"
-
 struct ReaderTest {
   string key; //@key
   long iteration;
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc
index db8b2f2e8c5..4675b2e663f 100755
--- a/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Reader/Base/Reader_Test_Base.mpc
@@ -1,25 +1,75 @@
 // $Id$
+// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n Reader_Test_Base"
 
-project (DDS_Reader_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
-  sharedname = DDS_Reader_Test_Base_stub
-  dynamicflags += READER_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Gxhst -Sci \
+project(DDS_Reader_Test_Base_idl_gen) : taoidldefaults, anytypecode {
+  custom_only = 1
+  idlflags -= -St -Sa
+  idlflags += -SS -Gxhst \
               -Wb,stub_export_macro=READER_TEST_BASE_STUB_Export \
               -Wb,stub_export_include=Reader_Test_Base_stub_export.h
 
   IDL_Files {
     Reader_Test_Base.idl
   }
+}
 
-  opendds_ts_flags += --export=READER_TEST_BASE_STUB_Export
+project(DDS_Reader_Test_Base_ndds_ts_gen) : ndds_ts_defaults {
+  custom_only = 1
+  after += DDS_Reader_Test_Base_idl_gen
 
-  DDSGenerator_Files {
+  NDDSTypeSupport_Files {
     Reader_Test_Base.idl
   }
+}
+
+project(DDS_Reader_Test_Base_NDDS_TS) : nddslib, taolib {
+  after += DDS_Reader_Test_Base_ndds_ts_gen DDS_Reader_Test_Base_stub
+  libs += DDS_Reader_Test_Base_stub
+  libout = ../lib
+  libpaths    += ../lib
+  sharedname = DDS_Reader_Test_Base_NDDS_TS
+  dynamicflags = NDDS_USER_DLL_EXPORT
+
+  verbatim(gnuace, macros) {
+    override no_hidden_visibility = 1
+  }
 
   Source_Files {
+    Reader_Test_Base.cxx
+    Reader_Test_BasePlugin.cxx
+    Reader_Test_BaseSupport.cxx
+  }
+
+  Header_Files {
+    Reader_Test_Base.h
+    Reader_Test_BasePlugin.h
+    Reader_Test_BaseSupport.h
+  }
+
+  Inline_Files {
   }
 }
 
+project(DDS_Reader_Test_Base_stub) : ccm_stub {
+  after += DDS_Reader_Test_Base_idl_gen
+  libout = ../lib
+  libpaths += ../lib
+  sharedname = DDS_Reader_Test_Base_stub
+  dynamicflags = READER_TEST_BASE_STUB_BUILD_DLL STARTER_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    Reader_Test_BaseC.cpp
+  }
+
+  Header_Files {
+    Reader_Test_BaseC.h
+    Reader_Test_Base_stub_export.h
+  }
+
+  Inline_Files {
+    Reader_Test_BaseC.inl
+  }
+}
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc
index 6f5085d706d..ec301ff7346 100755
--- a/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_Reader_Test_Base -l .. -o ../lib -u DDS Reader_Test_Connector"
 
-project(DDS_Reader_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
+project(DDS_Reader_Test_Connector_idl_gen) : connectoridldefaults {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=READER_TEST_CONNECTOR_STUB_Export \
@@ -10,8 +10,8 @@ project(DDS_Reader_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
               -Wb,skel_export_include=Reader_Test_Connector_svnt_export.h \
               -Wb,svnt_export_macro=READER_TEST_CONNECTOR_SVNT_Export \
               -Wb,svnt_export_include=Reader_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=READER_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Reader_Test_Connector_conn_export.h \
+              -Wb,exec_export_macro=READER_TEST_CONNECTOR_EXEC_Export \
+              -Wb,exec_export_include=Reader_Test_Connector_exec_export.h \
               -I ..
 
   IDL_Files {
@@ -19,7 +19,7 @@ project(DDS_Reader_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   }
 }
 
-project(DDS_Reader_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_Reader_Test_Connector_lem_gen) : ciaoidldefaults {
   custom_only = 1
   after += DDS_Reader_Test_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=READER_TEST_CONNECTOR_LEM_STUB_Export \
@@ -85,24 +85,24 @@ project(DDS_Reader_Test_Connector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_Reader_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_Reader_Test_Connector_lem_stub DDS_Reader_Test_Connector_stub DDS4CCM_lem_stub DDS_Reader_Test_Base_stub
+  after   += DDS_Reader_Test_Connector_lem_stub DDS_Reader_Test_Connector_stub DDS4CCM_lem_stub DDS_Reader_Test_Base_NDDS_TS
   sharedname = DDS_Reader_Test_Connector_exec
-  libs += DDS_Reader_Test_Connector_stub DDS_Reader_Test_Connector_lem_stub DDS_Reader_Test_Base_stub DDS4CCM_lem_stub DDS_Reader_Test_Base_stub
+  libs += DDS_Reader_Test_Connector_stub DDS_Reader_Test_Connector_lem_stub DDS_Reader_Test_Base_stub DDS4CCM_lem_stub DDS_Reader_Test_Base_NDDS_TS
   libpaths += ../lib
   libout = ../lib
   includes += ..
-  dynamicflags   = READER_TEST_CONNECTOR_CONN_BUILD_DLL
+  dynamicflags   = READER_TEST_CONNECTOR_EXEC_BUILD_DLL
 
   IDL_Files {
   }
 
   Source_Files {
-    Reader_Test_Connector_conn.cpp
+    Reader_Test_Connector_exec.cpp
   }
 
   Header_Files {
-    Reader_Test_Connector_conn.h
-    Reader_Test_Connector_conn_export.h
+    Reader_Test_Connector_exec.h
+    Reader_Test_Connector_exec_export.h
   }
 
   Inline_Files {
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector_exec.cpp b/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector_exec.cpp
new file mode 100644
index 00000000000..9514cd0ad80
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector_exec.cpp
@@ -0,0 +1,30 @@
+// -*- C++ -*-
+// $Id$
+
+#include "Reader_Test_Connector_exec.h"
+
+namespace CIAO_Reader_Test_Reader_Test_Connector_Impl
+{
+  Reader_Test_Connector_exec_i::Reader_Test_Connector_exec_i (void)
+    : DDS_Event_Connector_T<ReaderTest_DDS_Traits, ReaderTest_Connector_Traits> ()
+  {
+  }
+
+  Reader_Test_Connector_exec_i::~Reader_Test_Connector_exec_i (void)
+  {
+  }
+
+  extern "C" READER_TEST_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_Reader_Test_Reader_Test_Connector_Impl (void)
+  {
+    ::Components::EnterpriseComponent_ptr retval =
+      ::Components::EnterpriseComponent::_nil ();
+
+    ACE_NEW_NORETURN (
+      retval,
+      Reader_Test_Connector_exec_i ());
+
+    return retval;
+  }
+}
+
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector_exec.h
new file mode 100644
index 00000000000..082b47c5c01
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/Reader/Connector/Reader_Test_Connector_exec.h
@@ -0,0 +1,61 @@
+// -*- C++ -*-
+// $Id$
+
+#ifndef READER_TEST_CONNECTOR_EXEC_H_
+#define READER_TEST_CONNECTOR_EXEC_H_
+
+#include /**/ "ace/pre.h"
+
+#include "Reader_Test_ConnectorEC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "Reader_Test_Connector_exec_export.h"
+#include "tao/LocalObject.h"
+
+#include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
+#include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
+
+#include "Base/Reader_Test_BaseSupport.h"
+
+namespace CIAO_Reader_Test_Reader_Test_Connector_Impl
+{
+
+  // @from use of ReaderTest as a parameter
+  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+    ReaderTest,
+    ReaderTestSeq,
+    ReaderTestTypeSupport,
+    ReaderTestDataWriter,
+    ReaderTestDataReader > ReaderTest_DDS_Traits;
+
+  typedef CIAO::DDS4CCM::Connector_Traits <
+    ::CIAO_Reader_Test_Reader_Test_Connector_Impl::Reader_Test_Connector_Exec,
+    ReaderTest_Seq,
+    ::CCM_DDS::ReaderTest::CCM_Writer,
+    ::CCM_DDS::ReaderTest::CCM_Updater,
+    ::CCM_DDS::ReaderTest::CCM_Getter,
+    ::CCM_DDS::ReaderTest::CCM_Reader,
+    ::Reader_Test::CCM_Reader_Test_Connector_Context,
+    ::CCM_DDS::ReaderTest::Listener,
+    ::CCM_DDS::ReaderTest::StateListener,
+    ::CCM_DDS::ConnectorStatusListener> ReaderTest_Connector_Traits;
+
+  class READER_TEST_CONNECTOR_EXEC_Export Reader_Test_Connector_exec_i :
+    public DDS_Event_Connector_T <ReaderTest_DDS_Traits, ReaderTest_Connector_Traits>
+  {
+  public:
+    Reader_Test_Connector_exec_i (void);
+    virtual ~Reader_Test_Connector_exec_i (void);
+  };
+
+  extern "C" READER_TEST_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_Reader_Test_Reader_Test_Connector_Impl (void);
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.idl b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.idl
index a1c6ccaa8d9..b851535c4df 100644
--- a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.idl
@@ -18,6 +18,7 @@ module Reader_Test
     port CCM_DDS::ReaderTest::DDS_Listen info_out;
 
     provides ReaderStarter reader_start;
+    provides CCM_DDS::ConnectorStatusListener info_out_connector_status;
   };
 };
 
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc
index d089841d4dd..e5a9b873ec8 100755
--- a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_Reader_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_Reader_Test_Receiver_idl_gen) : componentidldefaults {
   custom_only = 1
   after += DDS_Reader_Test_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
@@ -17,7 +17,7 @@ project(DDS_Reader_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_Reader_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_Reader_Test_Receiver_lem_gen) : ciaoidldefaults {
   after += DDS_Reader_Test_Receiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
@@ -118,7 +118,7 @@ project(DDS_Reader_Test_Receiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_Reader_Test_Receiver_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_Reader_Test_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      +=   DDS_Reader_Test_Receiver_lem_stub DDS_Reader_Test_Base_stub \
                   DDS_Reader_Test_Connector_stub DDS_Reader_Test_Connector_svnt \
                   DDS_Reader_Test_Receiver_exec DDS_Reader_Test_Connector_lem_stub \
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp
index 1b2569b29a3..b2bbeb0c3d0 100644
--- a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.cpp
@@ -4,32 +4,64 @@
 
 #include "Reader_Test_Receiver_exec.h"
 #include "ciao/Logger/Log_Macros.h"
-#include "ace/OS_NS_unistd.h"
-#include "tao/ORB_Core.h"
-#include "ace/Reactor.h"
 
 namespace CIAO_Reader_Test_Receiver_Impl
 {
   //============================================================
-  // read_action_Generator
+  // ConnectorStatusListener_exec_i
   //============================================================
-  read_action_Generator::read_action_Generator (Receiver_exec_i &callback)
-    : callback_ (callback)
+  ConnectorStatusListener_exec_i::ConnectorStatusListener_exec_i (Receiver_exec_i &callback)
+    : callback_ (callback),
+      has_run_ (false)
   {
   }
 
-  read_action_Generator::~read_action_Generator ()
+  ConnectorStatusListener_exec_i::~ConnectorStatusListener_exec_i (void)
   {
   }
 
-  int
-  read_action_Generator::handle_timeout (const ACE_Time_Value &, const void *)
+  // Operations from ::CCM_DDS::ConnectorStatusListener
+  void ConnectorStatusListener_exec_i::on_inconsistent_topic(
+     ::DDS::Topic_ptr ,
+     const DDS::InconsistentTopicStatus & )
   {
-    ACE_DEBUG ((LM_DEBUG, "Checking if last sample "
-                          "is available in DDS...\n"));
-    if (this->callback_.check_last ())
-      this->callback_.run ();
-    return 0;
+  }
+
+  void ConnectorStatusListener_exec_i::on_requested_incompatible_qos(
+    ::DDS::DataReader_ptr ,
+     const DDS::RequestedIncompatibleQosStatus & )
+  {
+  }
+
+  void ConnectorStatusListener_exec_i::on_sample_rejected(
+     ::DDS::DataReader_ptr ,
+     const DDS::SampleRejectedStatus & )
+  {
+  }
+
+  void ConnectorStatusListener_exec_i::on_offered_deadline_missed(
+     ::DDS::DataWriter_ptr ,
+     const DDS::OfferedDeadlineMissedStatus & )
+  {
+  }
+
+  void ConnectorStatusListener_exec_i::on_offered_incompatible_qos(
+     ::DDS::DataWriter_ptr ,
+     const DDS::OfferedIncompatibleQosStatus & )
+  {
+  }
+
+  void ConnectorStatusListener_exec_i::on_unexpected_status(
+    ::DDS::Entity_ptr /*the_entity*/,
+    ::DDS::StatusKind  status_kind)
+  {
+    if (status_kind == ::DDS::DATA_ON_READERS_STATUS &&
+        !this->has_run_ &&
+        this->callback_.check_last ())
+      {
+        this->has_run_ = true;
+        this->callback_.run ();
+      }
   }
 
   //============================================================
@@ -53,12 +85,6 @@ namespace CIAO_Reader_Test_Receiver_Impl
   }
 
   void
-  Starter_exec_i::start_read ()
-  {
-    this->callback_.start_read ();
-  }
-
-  void
   Starter_exec_i::read_no_data ()
   {
     this->callback_.read_no_data ();
@@ -72,7 +98,6 @@ namespace CIAO_Reader_Test_Receiver_Impl
       keys_ (5),
       has_run_ (false)
   {
-    this->ticker_ = new read_action_Generator (*this);
   }
 
   Receiver_exec_i::~Receiver_exec_i (void)
@@ -85,28 +110,21 @@ namespace CIAO_Reader_Test_Receiver_Impl
   {
     try
       {
-        if (!CORBA::is_nil (this->reader_))
-          {
-            ReaderTest readertest_info;
-            ::CCM_DDS::ReadInfo readinfo;
-            char key[100];
-            ACE_OS::sprintf (key, "KEY_%d", this->keys_);
-            readertest_info.key = CORBA::string_dup (key);
-            this->reader_->read_one_last (
-                    readertest_info,
-                    readinfo,
-                    ::DDS::HANDLE_NIL);
-            ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::check_last: "
-                                  "key <%C> - iteration <%d>\n",
-                                  readertest_info.key.in (),
-                                  readertest_info.iteration));
-            return readertest_info.iteration == this->iterations_;
-          }
+        ReaderTest readertest_info;
+        ::CCM_DDS::ReadInfo readinfo;
+        char key[100];
+        ACE_OS::sprintf (key, "KEY_%d", this->keys_);
+        readertest_info.key = CORBA::string_dup (key);
+        this->reader_->read_one_last (
+                readertest_info,
+                readinfo,
+                ::DDS::HANDLE_NIL);
+        return readertest_info.iteration == this->iterations_;
       }
     catch (...)
       {
-        ACE_ERROR ((LM_ERROR, "Receiver_exec_i::check_last: "
-                              "Unexpected exception caught\n"));
+        // no need to catch. An error is given
+        // when this example didn't run at all.
       }
     return false;
   }
@@ -502,10 +520,6 @@ namespace CIAO_Reader_Test_Receiver_Impl
   void
   Receiver_exec_i::run ()
   {
-    this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->cancel_timer (this->ticker_);
-    delete this->ticker_;
-    this->ticker_ = 0;
-
     this->has_run_ = true;
     read_all ();
     read_last ();
@@ -518,19 +532,6 @@ namespace CIAO_Reader_Test_Receiver_Impl
     test_exception_with_handles ();
   }
 
-  void
-  Receiver_exec_i::start_read ()
-  {
-    if (this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->schedule_timer (
-                                          this->ticker_,
-                                          0,
-                                          ACE_Time_Value(1, 0),
-                                          ACE_Time_Value(1, 0)) == -1)
-      {
-        ACE_ERROR ((LM_ERROR, "Unable to schedule Timer\n"));
-      }
-  }
-
   ::CORBA::UShort
   Receiver_exec_i::iterations (void)
   {
@@ -568,6 +569,12 @@ namespace CIAO_Reader_Test_Receiver_Impl
     return 0;
   }
 
+  ::CCM_DDS::CCM_ConnectorStatusListener_ptr
+  Receiver_exec_i::get_info_out_connector_status (void)
+  {
+    return new ConnectorStatusListener_exec_i (*this);
+  }
+
   ::CCM_ReaderStarter_ptr
   Receiver_exec_i::get_reader_start ()
   {
@@ -606,19 +613,12 @@ namespace CIAO_Reader_Test_Receiver_Impl
   void
   Receiver_exec_i::ccm_remove (void)
   {
-    if (this->ticker_)
-      {
-        ACE_ERROR ((LM_ERROR, "Still checking DDS upon exit\n"));
-        this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->cancel_timer (this->ticker_);
-        delete this->ticker_;
-        this->ticker_ = 0;
-      }
-
     if (!this->has_run_)
       {
         ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: ")
             ACE_TEXT ("Test did not run: Didn't receive ")
-            ACE_TEXT ("the expected number of samples\n")));
+            ACE_TEXT ("the expected number of DATA_ON_READERS")
+            ACE_TEXT ("events.\n")));
       }
   }
 
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h
index 2d7a6251d7d..552639b0cd8 100644
--- a/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/Reader/Receiver/Reader_Test_Receiver_exec.h
@@ -21,23 +21,40 @@ namespace CIAO_Reader_Test_Receiver_Impl
   class Receiver_exec_i;
 
   //============================================================
-  // read_action_Generator
+  // ConnectorStatusListener_exec_i
   //============================================================
-  class read_action_Generator
-    : public ACE_Event_Handler
+  class RECEIVER_EXEC_Export ConnectorStatusListener_exec_i
+    : public virtual ::CCM_DDS::CCM_ConnectorStatusListener,
+      public virtual ::CORBA::LocalObject
   {
   public:
-    read_action_Generator (Receiver_exec_i &callback);
-
-    ~read_action_Generator ();
-
-    virtual int handle_timeout (const ACE_Time_Value &tv,
-                                const void *arg);
+    ConnectorStatusListener_exec_i (Receiver_exec_i &);
+    virtual ~ConnectorStatusListener_exec_i (void);
+
+    virtual
+    void on_inconsistent_topic( ::DDS::Topic_ptr ,
+                              const DDS::InconsistentTopicStatus & );
+    virtual
+    void on_requested_incompatible_qos( ::DDS::DataReader_ptr ,
+                              const DDS::RequestedIncompatibleQosStatus & );
+    virtual
+    void on_sample_rejected( ::DDS::DataReader_ptr ,
+                              const DDS::SampleRejectedStatus & );
+    virtual
+    void on_offered_deadline_missed( ::DDS::DataWriter_ptr ,
+                              const DDS::OfferedDeadlineMissedStatus & );
+    virtual
+    void on_offered_incompatible_qos( ::DDS::DataWriter_ptr ,
+                              const DDS::OfferedIncompatibleQosStatus & );
+    virtual
+    void on_unexpected_status( ::DDS::Entity_ptr ,
+                              ::DDS::StatusKind );
   private:
+    /// Maintains a handle that actually process the event
     Receiver_exec_i &callback_;
-
+    bool has_run_;
   };
- 
+
   //============================================================
   // Starter_exec_i
   //============================================================
@@ -53,7 +70,6 @@ namespace CIAO_Reader_Test_Receiver_Impl
                   CORBA::UShort nr_iterations);
 
     virtual void read_no_data ();
-    virtual void start_read ();
 
   private:
     Receiver_exec_i &callback_;
@@ -70,6 +86,9 @@ namespace CIAO_Reader_Test_Receiver_Impl
     Receiver_exec_i (void);
     virtual ~Receiver_exec_i (void);
 
+    // Supported operations and attributes.
+    // Component attributes.
+
     // Port operations.
     virtual ::CCM_DDS::ReaderTest::CCM_Listener_ptr
     get_info_out_data_listener (void);
@@ -80,10 +99,12 @@ namespace CIAO_Reader_Test_Receiver_Impl
     virtual ::CCM_ReaderStarter_ptr
     get_reader_start ();
 
-    void read_no_data ();
-    void start_read ();
+    virtual ::CCM_DDS::CCM_ConnectorStatusListener_ptr
+    get_info_out_connector_status (void);
+
     bool check_last ();
     void run (void);
+    void read_no_data ();
 
     ::CORBA::UShort iterations (void);
 
@@ -106,10 +127,10 @@ namespace CIAO_Reader_Test_Receiver_Impl
 
   private:
     ::Reader_Test::CCM_Receiver_Context_var context_;
-    ::CCM_DDS::ReaderTest::Reader_var reader_;
-    CORBA::UShort iterations_;
-    CORBA::UShort keys_;
-    CORBA::Boolean has_run_;
+    ::CCM_DDS::ReaderTest::Reader_var       reader_;
+    CORBA::UShort   iterations_;
+    CORBA::UShort   keys_;
+    bool            has_run_;
 
     void read_all ();
     void read_last ();
@@ -118,8 +139,6 @@ namespace CIAO_Reader_Test_Receiver_Impl
     void test_exception ();
     void test_exception_with_handles ();
 
-    read_action_Generator *ticker_;
-
     typedef std::map<ACE_CString, DDS::InstanceHandle_t> Handle_Table;
     Handle_Table handles_;
   };
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc
index 6679ff15677..cf787193a97 100755
--- a/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_Reader_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(DDS_Reader_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_Reader_Test_Sender_idl_gen) : componentidldefaults {
   after += DDS_Reader_Test_Connector_idl_gen DDS_Starter_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_Reader_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_Reader_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_Reader_Test_Sender_lem_gen) : ciaoidldefaults {
   after += DDS_Reader_Test_Sender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
@@ -117,7 +117,7 @@ project(DDS_Reader_Test_Sender_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_Reader_Test_Sender_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_Reader_Test_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      += DDS_Reader_Test_Base_stub  DDS_Reader_Test_Sender_lem_stub \
                 DDS4CCM_lem_stub DDS4CCM_skel DDS_Reader_Test_Connector_stub \
                 DDS_Reader_Test_Connector_svnt DDS_Reader_Test_Connector_lem_stub \
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp
index 59f8299b61d..fbc9386f53c 100644
--- a/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Reader/Sender/Reader_Test_Sender_exec.cpp
@@ -88,7 +88,6 @@ namespace CIAO_Reader_Test_Sender_Impl
         else
           {
             ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Unable to start the reader\n")));
-            return;
           }
         for (CORBA::UShort iter_key = 1; iter_key < this->keys_ + 1; ++iter_key)
           {
@@ -104,7 +103,6 @@ namespace CIAO_Reader_Test_Sender_Impl
                             key, iter));
               }
           }
-        this->starter_->start_read ();
       }
   }
 
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/Reader/descriptors/Plan.cdp
index 718e64b1b42..ae1366ef41c 100644
--- a/CIAO/connectors/dds4ccm/tests/Reader/descriptors/Plan.cdp
+++ b/CIAO/connectors/dds4ccm/tests/Reader/descriptors/Plan.cdp
@@ -249,7 +249,7 @@
           <kind>tk_ulong</kind>
         </type>
         <value>
-          <ulong>50</ulong>
+          <ulong>10</ulong>
         </value>
       </value>
     </configProperty>
@@ -276,6 +276,26 @@
   </connection>
 
   <connection>
+    <name>info_out_connector_status_rec</name>
+    <deployRequirement>
+      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
+      <resourceType>Local_Interface</resourceType>
+    </deployRequirement>
+    <internalEndpoint>
+      <portName>info_out_connector_status</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="ReceiverComponentInstance" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>error_listener</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="Reader_Test_ConnectorComponentInstance2" />
+    </internalEndpoint>
+  </connection>
+
+  <connection>
     <name>info_out_connector_status_sender</name>
     <deployRequirement>
       <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
diff --git a/CIAO/connectors/dds4ccm/tests/Reader/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/Reader/descriptors/run_test.pl
index 4d9ba95b5f7..7c358cba8bf 100755
--- a/CIAO/connectors/dds4ccm/tests/Reader/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/Reader/descriptors/run_test.pl
@@ -100,8 +100,6 @@ sub kill_open_processes {
     if ($ns_running == 1) {
         $NS->Kill (); $NS->TimedWait (1);
     }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
 }
 
 sub run_node_daemons {
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.idl b/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.idl
index 30c652b7c9f..690d2a1e23e 100644
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.idl
@@ -1,20 +1,18 @@
 // $Id$
 
 /**
- * @file   SL_Disabled_Base.idl
+ * @file   SL_Disabled_Base.idl 
  * @author Marijke Hengstmengel <mhengstmengel@remedy.nl>
  */
 
 #ifndef SL_DISABLED_BASE_IDL
 #define SL_DISABLED_BASE_IDL
 
-#pragma ndds typesupport "Base/SL_Disabled_BaseSupport.h"
-
-struct TestTopic {
-  string key; //@key
-  long x;
-};
 
+  struct TestTopic {
+    string key; //@key
+    long x;
+   };
 typedef sequence<TestTopic> TestTopic_Seq;
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc b/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc
index f05c18bdc40..6deddfa04d0 100644
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Base/SL_Disabled_Base.mpc
@@ -1,25 +1,76 @@
 // $Id$
+// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n SL_Disabled_Base"
 
-project (DDS_SL_Disabled_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
-  sharedname = DDS_SL_Disabled_Base_stub
-  dynamicflags += SL_DISABLED_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Gxhst -Sci \
+project(DDS_SL_Disabled_Base_idl_gen) : taoidldefaults, anytypecode {
+  custom_only = 1
+  idlflags -= -St -Sa
+  idlflags += -SS -Gxhst \
               -Wb,stub_export_macro=SL_DISABLED_BASE_STUB_Export \
               -Wb,stub_export_include=SL_Disabled_Base_stub_export.h
 
   IDL_Files {
     SL_Disabled_Base.idl
   }
+}
 
-  opendds_ts_flags += --export=SL_DISABLED_BASE_STUB_Export
+project(DDS_SL_Disabled_Base_ndds_ts_gen) : ndds_ts_defaults {
+  custom_only = 1
+  after += DDS_SL_Disabled_Base_idl_gen
 
-  DDSGenerator_Files {
+  NDDSTypeSupport_Files {
     SL_Disabled_Base.idl
   }
+}
+
+project(DDS_SL_Disabled_Base_NDDS_TS) : nddslib, taolib {
+  after += DDS_SL_Disabled_Base_ndds_ts_gen DDS_SL_Disabled_Base_stub
+  libs += DDS_SL_Disabled_Base_stub
+  libout = ../lib
+  libpaths    += ../lib
+  sharedname = DDS_SL_Disabled_Base_NDDS_TS
+  dynamicflags = NDDS_USER_DLL_EXPORT
+
+  verbatim(gnuace, macros) {
+    override no_hidden_visibility = 1
+  }
 
   Source_Files {
+    SL_Disabled_Base.cxx
+    SL_Disabled_BasePlugin.cxx
+    SL_Disabled_BaseSupport.cxx
+  }
+
+  Header_Files {
+    SL_Disabled_Base.h
+    SL_Disabled_BasePlugin.h
+    SL_Disabled_BaseSupport.h
+  }
+
+  Inline_Files {
+  }
+}
+
+project(DDS_SL_Disabled_Base_stub) : ccm_stub {
+  after += DDS_SL_Disabled_Base_idl_gen
+  libout = ../lib
+  libpaths += ../lib
+  sharedname = DDS_SL_Disabled_Base_stub
+  dynamicflags = SL_DISABLED_BASE_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    SL_Disabled_BaseC.cpp
+  }
+
+  Header_Files {
+    SL_Disabled_BaseC.h
+    SL_Disabled_Base_stub_export.h
+  }
+
+  Inline_Files {
+    SL_Disabled_BaseC.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc b/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc
index 10358979cc9..907c7ff5172 100644
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_SL_Disabled_Base -l .. -o ../lib -u DDS SL_Disabled_Connector"
 
-project(DDS_SL_OC_Connector_idl_gen) : connectoridldefaults, dds4ccm {
+project(DDS_SL_OC_Connector_idl_gen) : connectoridldefaults {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SL_DISABLED_CONNECTOR_STUB_Export \
@@ -10,8 +10,8 @@ project(DDS_SL_OC_Connector_idl_gen) : connectoridldefaults, dds4ccm {
               -Wb,skel_export_include=SL_Disabled_Connector_svnt_export.h \
               -Wb,svnt_export_macro=SL_DISABLED_CONNECTOR_SVNT_Export \
               -Wb,svnt_export_include=SL_Disabled_Connector_svnt_export.h \
-              -Wb,conn_export_macro=SL_DISABLED_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=SL_Disabled_Connector_conn_export.h \
+              -Wb,exec_export_macro=SL_DISABLED_CONNECTOR_EXEC_Export \
+              -Wb,exec_export_include=SL_Disabled_Connector_exec_export.h \
               -I ..
 
   IDL_Files {
@@ -19,7 +19,7 @@ project(DDS_SL_OC_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   }
 }
 
-project(DDS_SL_OC_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_SL_OC_Connector_lem_gen) : ciaoidldefaults {
   custom_only = 1
   after += DDS_SL_OC_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=SL_DISABLED_CONNECTOR_LEM_STUB_Export \
@@ -85,24 +85,24 @@ project(DDS_SL_Disabled_Connector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_SL_Disabled_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_SL_OC_Connector_lem_stub DDS_SL_Disabled_Connector_stub DDS4CCM_lem_stub DDS_SL_Disabled_Base_stub
+  after   += DDS_SL_OC_Connector_lem_stub DDS_SL_Disabled_Connector_stub DDS4CCM_lem_stub DDS_SL_Disabled_Base_NDDS_TS
   sharedname = DDS_SL_Disabled_Connector_exec
-  libs += DDS_SL_Disabled_Connector_stub DDS_SL_OC_Connector_lem_stub DDS_SL_Disabled_Base_stub DDS4CCM_lem_stub DDS_SL_Disabled_Base_stub
+  libs += DDS_SL_Disabled_Connector_stub DDS_SL_OC_Connector_lem_stub DDS_SL_Disabled_Base_stub DDS4CCM_lem_stub DDS_SL_Disabled_Base_NDDS_TS
   libpaths += ../lib
   libout = ../lib
   includes += ..
-  dynamicflags   = SL_DISABLED_CONNECTOR_CONN_BUILD_DLL
+  dynamicflags   = SL_DISABLED_CONNECTOR_EXEC_BUILD_DLL
 
   IDL_Files {
   }
 
   Source_Files {
-    SL_Disabled_Connector_conn.cpp
+    SL_Disabled_Connector_exec.cpp
   }
 
   Header_Files {
-    SL_Disabled_Connector_conn.h
-    SL_Disabled_Connector_conn_export.h
+    SL_Disabled_Connector_exec.h
+    SL_Disabled_Connector_exec_export.h
   }
 
   Inline_Files {
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector_exec.cpp b/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector_exec.cpp
new file mode 100644
index 00000000000..af02d5b3b0f
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector_exec.cpp
@@ -0,0 +1,30 @@
+// -*- C++ -*-
+// $Id$
+
+#include "SL_Disabled_Connector_exec.h"
+
+namespace CIAO_SL_Disabled_SL_Disabled_Connector_Impl
+{
+  SL_Disabled_Connector_exec_i::SL_Disabled_Connector_exec_i (void)
+    : DDS_State_Connector_T<TestTopic_DDS_Traits, TestTopic_Connector_Traits> ()
+  {
+  }
+
+  SL_Disabled_Connector_exec_i::~SL_Disabled_Connector_exec_i (void)
+  {
+  }
+
+  extern "C" SL_DISABLED_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_SL_Disabled_SL_Disabled_Connector_Impl (void)
+  {
+    ::Components::EnterpriseComponent_ptr retval =
+      ::Components::EnterpriseComponent::_nil ();
+
+    ACE_NEW_NORETURN (
+      retval,
+      SL_Disabled_Connector_exec_i ());
+
+    return retval;
+  }
+}
+
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector_exec.h
new file mode 100644
index 00000000000..82af39b1bb6
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Connector/SL_Disabled_Connector_exec.h
@@ -0,0 +1,62 @@
+// -*- C++ -*-
+// $Id$
+
+#ifndef SL_DISABLED_CONNECTOR_EXEC_H_
+#define SL_DISABLED_CONNECTOR_EXEC_H_
+
+#include /**/ "ace/pre.h"
+
+#include "SL_Disabled_ConnectorEC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "SL_Disabled_Connector_exec_export.h"
+#include "tao/LocalObject.h"
+
+#include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
+#include "dds4ccm/impl/ndds/DDS_State_Connector_T.h"
+
+
+#include "Base/SL_Disabled_BaseSupport.h"
+
+namespace CIAO_SL_Disabled_SL_Disabled_Connector_Impl
+{
+
+  // @from use of SL_Disabled as a parameter
+  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+    TestTopic,
+    TestTopicSeq,
+    TestTopicTypeSupport,
+    TestTopicDataWriter,
+    TestTopicDataReader > TestTopic_DDS_Traits;
+
+  typedef CIAO::DDS4CCM::Connector_Traits <
+    ::CIAO_SL_Disabled_SL_Disabled_Connector_Impl::SL_Disabled_Connector_Exec,
+    TestTopic_Seq,
+    ::CCM_DDS::TestTopic::CCM_Writer,
+    ::CCM_DDS::TestTopic::CCM_Updater,
+    ::CCM_DDS::TestTopic::CCM_Getter,
+    ::CCM_DDS::TestTopic::CCM_Reader,
+    ::SL_Disabled::CCM_SL_Disabled_Connector_Context,
+    ::CCM_DDS::TestTopic::Listener,
+    ::CCM_DDS::TestTopic::StateListener,
+    ::CCM_DDS::ConnectorStatusListener> TestTopic_Connector_Traits;
+
+  class SL_DISABLED_CONNECTOR_EXEC_Export SL_Disabled_Connector_exec_i :
+    public DDS_State_Connector_T <TestTopic_DDS_Traits, TestTopic_Connector_Traits>
+  {
+  public:
+    SL_Disabled_Connector_exec_i (void);
+    virtual ~SL_Disabled_Connector_exec_i (void);
+  };
+
+  extern "C" SL_DISABLED_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_SL_Disabled_SL_Disabled_Connector_Impl (void);
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc
index a3cae392d76..1b60ea7f442 100644
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_SL_Disabled_Receiver_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_SL_Disabled_Receiver_idl_gen) : componentidldefaults {
   custom_only = 1
   after += DDS_SL_OC_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
@@ -17,7 +17,7 @@ project(DDS_SL_Disabled_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_SL_Disabled_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_SL_Disabled_Receiver_lem_gen) : ciaoidldefaults {
   after += DDS_SL_Disabled_Receiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
@@ -107,7 +107,7 @@ project(DDS_SL_Disabled_Receiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_SL_Disabled_Receiver_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_SL_Disabled_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      +=   DDS_SL_OC_Receiver_lem_stub DDS_SL_Disabled_Base_stub DDS_SL_Disabled_Connector_stub DDS_SL_Disabled_Connector_svnt DDS_SL_Disabled_Receiver_exec DDS_SL_OC_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
   sharedname  = Receiver_svnt
   libs       += Receiver_stub Receiver_lem_stub DDS_SL_Disabled_Base_stub DDS_SL_Disabled_Connector_stub DDS_SL_Disabled_Connector_svnt Receiver_exec DDS_SL_OC_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp
index 4c49156a772..13bbd647a98 100644
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.cpp
@@ -13,8 +13,8 @@
 
 namespace CIAO_SL_Disabled_Receiver_Impl
 {
-  //============================================================
-  // read_action_Generator
+//============================================================
+  // Facet Executor Implementation Class: ConnectorStatusListener_exec_i
   //============================================================
   read_action_Generator::read_action_Generator (Receiver_exec_i &callback)
     : pulse_callback_ (callback)
@@ -38,9 +38,8 @@ namespace CIAO_SL_Disabled_Receiver_Impl
       }
     return 0;
   }
-
   //============================================================
-  // StateListener_exec_i
+  // Facet Executor Implementation Class: StateListener_exec_i
   //============================================================
   StateListener_exec_i::StateListener_exec_i (Atomic_Boolean &no_operation)
     :no_operation_(no_operation)
@@ -75,20 +74,46 @@ namespace CIAO_SL_Disabled_Receiver_Impl
 
   void
   StateListener_exec_i::on_deletion (const ::TestTopic & /*datum*/,
-                                     const ::CCM_DDS::ReadInfo & /*info*/)
+                                    const ::CCM_DDS::ReadInfo & /*info*/)
   {
     this->no_operation_ = false;
   }
+  //============================================================
+  // Facet Executor Implementation Class: PortStatusListener_exec_i
+  //============================================================
+  PortStatusListener_exec_i::PortStatusListener_exec_i ()
+  {
+  }
+
+  PortStatusListener_exec_i::~PortStatusListener_exec_i (void)
+  {
+  }
+
+  // Operations from ::CCM_DDS::PortStatusListener
+  void
+  PortStatusListener_exec_i::on_requested_deadline_missed (
+    ::DDS::DataReader_ptr /* the_reader */,
+    const ::DDS::RequestedDeadlineMissedStatus & /* status */)
+  {
+  }
+
+  void
+  PortStatusListener_exec_i::on_sample_lost (
+    ::DDS::DataReader_ptr /* the_reader */,
+    const ::DDS::SampleLostStatus & /* status */)
+  {
+  }
 
   //============================================================
-  // Receiver_exec_i
+  // Component Executor Implementation Class: Receiver_exec_iTestTopic_RawListener_exec_i ();
   //============================================================
+
   Receiver_exec_i::Receiver_exec_i (void)
   : rate_ (10),
-    no_operation_ (true),
-    updater_data_ (false)
+    no_operation_(true),
+    updater_data_(false)
   {
-    this->ticker_ = new read_action_Generator (*this);
+    this->ticker_ = new read_action_Generator (*this); 
   }
 
   Receiver_exec_i::~Receiver_exec_i (void)
@@ -108,7 +133,7 @@ namespace CIAO_SL_Disabled_Receiver_Impl
     try
       {
         this->reader_->read_all(TestTopic_infos.out(), readinfoseq.out());
-        for (CORBA::ULong i = 0; i < readinfoseq->length(); ++i)
+        for(CORBA::ULong i = 0; i < readinfoseq->length(); ++i)
           {
             this->updater_data_ = true;
             ACE_Time_Value tv;
@@ -117,7 +142,7 @@ namespace CIAO_SL_Disabled_Receiver_Impl
                                   ACE_TEXT ("-> UTC date =%#T\n"),
                                   &tv));
           }
-        for (CORBA::ULong i = 0; i < TestTopic_infos->length(); ++i)
+        for(CORBA::ULong i = 0; i < TestTopic_infos->length(); ++i)
           {
             ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL keyed test info : ")
                        ACE_TEXT ("Number <%d> : received TestTopic_info for <%C> at %u\n"),
@@ -131,13 +156,13 @@ namespace CIAO_SL_Disabled_Receiver_Impl
         ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("internal error or no data\n")));
       }
   }
-
+  // Component attributes.
   // Port operations.
   ::CCM_DDS::CCM_PortStatusListener_ptr
   Receiver_exec_i::get_info_out_status (void)
   {
     ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new PortStatuslistener\n")));
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
+    return new PortStatusListener_exec_i ();
   }
 
   ::CCM_DDS::TestTopic::CCM_StateListener_ptr
@@ -162,7 +187,7 @@ namespace CIAO_SL_Disabled_Receiver_Impl
   void
   Receiver_exec_i::configuration_complete (void)
   {
-    this->reader_ = this->context_->get_connection_info_out_data ();
+    this->reader_ = this->context_->get_connection_info_out_data();
   }
 
   void
@@ -200,18 +225,18 @@ namespace CIAO_SL_Disabled_Receiver_Impl
   void
   Receiver_exec_i::ccm_remove (void)
   {
-    if (!this->no_operation_.value ()|| !this->updater_data_.value())
+    if(!this->no_operation_.value ()|| !this->updater_data_.value())
       {
 
-         ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Received an unexpected ")
-                               ACE_TEXT (" operation. StateListener or Updater doesn't work in Receiver")
+         ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: did receive an unexpected ")
+                               ACE_TEXT (" operation from StateListener or Updater doesn't work in Receiver")
                     ));
       }
 
     else
       {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK : Haven't received an  unexpected ")
-                              ACE_TEXT (" oparation from StateListener in Receiver")
+        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK : Haven't received tan  unexpected ")
+                               ACE_TEXT (" oparation from StateListener in Receiver")
                    ));
       }
   }
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h
index e0434eed7da..010934d80ba 100644
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Receiver/SL_Disabled_Receiver_exec.h
@@ -21,10 +21,6 @@ namespace CIAO_SL_Disabled_Receiver_Impl
   typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
 
   class Receiver_exec_i;
-
-  //============================================================
-  // read_action_Generator
-  //============================================================
   class read_action_Generator
     : public ACE_Event_Handler
   {
@@ -33,17 +29,33 @@ namespace CIAO_SL_Disabled_Receiver_Impl
 
     ~read_action_Generator ();
 
+    /// Handle the timeout.
     virtual int handle_timeout (const ACE_Time_Value &tv,
                                 const void *arg);
 
   private:
+    /// Maintains a handle that actually process the event
     Receiver_exec_i &pulse_callback_;
 
   };
+  class RECEIVER_EXEC_Export PortStatusListener_exec_i
+    : public virtual ::CCM_DDS::CCM_PortStatusListener,
+      public virtual ::CORBA::LocalObject
+  {
+  public:
+    PortStatusListener_exec_i (void);
+    virtual ~PortStatusListener_exec_i (void);
 
-  //============================================================
-  // StateListener_exec_i
-  //============================================================
+    virtual void
+    on_requested_deadline_missed (
+      ::DDS::DataReader_ptr the_reader,
+      const ::DDS::RequestedDeadlineMissedStatus & status);
+
+    virtual void
+    on_sample_lost (
+      ::DDS::DataReader_ptr the_reader,
+      const ::DDS::SampleLostStatus & status);
+  };
   class RECEIVER_EXEC_Export StateListener_exec_i
     : public virtual ::CCM_DDS::TestTopic::CCM_StateListener,
       public virtual ::CORBA::LocalObject
@@ -72,9 +84,6 @@ namespace CIAO_SL_Disabled_Receiver_Impl
      Atomic_Boolean &no_operation_;
    };
 
-  //============================================================
-  // Receiver_exec_i
-  //============================================================
   class RECEIVER_EXEC_Export Receiver_exec_i
     : public virtual Receiver_Exec,
       public virtual ::CORBA::LocalObject
@@ -99,16 +108,15 @@ namespace CIAO_SL_Disabled_Receiver_Impl
     virtual void ccm_activate (void);
     virtual void ccm_passivate (void);
     virtual void ccm_remove (void);
-    void read_all (void);
+    void read_all(void);
 
   private:
     ::SL_Disabled::CCM_Receiver_Context_var context_;
     ::CCM_DDS::TestTopic::Reader_var reader_;
     read_action_Generator * ticker_;
-
     CORBA::ULong rate_;
     Atomic_Boolean no_operation_;
-    Atomic_Boolean updater_data_;
+    Atomic_Boolean updater_data_; 
 };
   extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
   create_SL_Disabled_Receiver_Impl (void);
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc b/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc
index 43f66775112..6a3ce5fc359 100644
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/Sender/SL_Disabled_Sender.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_SL_Disabled_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(DDS_SL_Disabled_Sender_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_SL_Disabled_Sender_idl_gen) : componentidldefaults {
   after += DDS_SL_OC_Connector_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_SL_Disabled_Sender_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_SL_Disabled_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_SL_Disabled_Sender_lem_gen) : ciaoidldefaults {
   after += DDS_SL_Disabled_Sender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
@@ -109,7 +109,7 @@ project(DDS_SL_Disabled_Sender_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_SL_Disabled_Sender_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_SL_Disabled_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      += DDS_SL_Disabled_Base_stub  DDS_SL_Disabled_Sender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_SL_Disabled_Connector_stub DDS_SL_Disabled_Connector_svnt DDS_SL_OC_Connector_lem_stub
   sharedname  = Sender_svnt
   libs       += Sender_stub Sender_lem_stub  \
diff --git a/CIAO/connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl
index edfa27e2a1f..fba2b49b0c8 100755
--- a/CIAO/connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/SLDisabled/descriptors/run_test.pl
@@ -100,8 +100,6 @@ sub kill_open_processes {
     if ($ns_running == 1) {
         $NS->Kill (); $NS->TimedWait (1);
     }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
 }
 
 sub run_node_daemons {
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.idl b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.idl
index dcf046718a4..30b2bb8b2f0 100644
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.idl
@@ -1,20 +1,18 @@
 // $Id$
 
 /**
- * @file   SL_ManyByMany_Base.idl
+ * @file   SL_ManyByMany_Base.idl 
  * @author Marijke Hengstmengel <mhengstmengel@remedy.nl>
  */
 
 #ifndef SL_MANYBYMANY_BASE_IDL
 #define SL_MANYBYMANY_BASE_IDL
 
-#pragma ndds typesupport "Base/SL_ManyByMany_BaseSupport.h"
-
-struct TestTopic {
-  string key; //@key
-  long x;
-};
 
+  struct TestTopic {
+    string key; //@key
+    long x;
+   };
 typedef sequence<TestTopic> TestTopic_Seq;
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc
index d100439ea63..9549ce8f754 100644
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Base/SL_ManyByMany_Base.mpc
@@ -1,25 +1,76 @@
 // $Id$
+// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n SL_ManyByMany_Base"
 
-project (DDS_SL_ManyByMany_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
-  sharedname = DDS_SL_ManyByMany_Base_stub
-  dynamicflags += SL_MANYBYMANY_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Gxhst -Sci \
+project(DDS_SL_ManyByMany_Base_idl_gen) : taoidldefaults, anytypecode {
+  custom_only = 1
+  idlflags -= -St -Sa
+  idlflags += -SS -Gxhst \
               -Wb,stub_export_macro=SL_MANYBYMANY_BASE_STUB_Export \
               -Wb,stub_export_include=SL_ManyByMany_Base_stub_export.h
 
   IDL_Files {
     SL_ManyByMany_Base.idl
   }
+}
 
-  opendds_ts_flags += --export=SL_MANYBYMANY_BASE_STUB_Export
+project(DDS_SL_ManyByMany_Base_ndds_ts_gen) : ndds_ts_defaults {
+  custom_only = 1
+  after += DDS_SL_ManyByMany_Base_idl_gen
 
-  DDSGenerator_Files {
+  NDDSTypeSupport_Files {
     SL_ManyByMany_Base.idl
   }
+}
+
+project(DDS_SL_ManyByMany_Base_NDDS_TS) : nddslib, taolib {
+  after += DDS_SL_ManyByMany_Base_ndds_ts_gen DDS_SL_ManyByMany_Base_stub
+  libs += DDS_SL_ManyByMany_Base_stub
+  libout = ../lib
+  libpaths    += ../lib
+  sharedname = DDS_SL_ManyByMany_Base_NDDS_TS
+  dynamicflags = NDDS_USER_DLL_EXPORT
+
+  verbatim(gnuace, macros) {
+    override no_hidden_visibility = 1
+  }
 
   Source_Files {
+    SL_ManyByMany_Base.cxx
+    SL_ManyByMany_BasePlugin.cxx
+    SL_ManyByMany_BaseSupport.cxx
+  }
+
+  Header_Files {
+    SL_ManyByMany_Base.h
+    SL_ManyByMany_BasePlugin.h
+    SL_ManyByMany_BaseSupport.h
+  }
+
+  Inline_Files {
+  }
+}
+
+project(DDS_SL_ManyByMany_Base_stub) : ccm_stub {
+  after += DDS_SL_ManyByMany_Base_idl_gen
+  libout = ../lib
+  libpaths += ../lib
+  sharedname = DDS_SL_ManyByMany_Base_stub
+  dynamicflags = SL_MANYBYMANY_BASE_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    SL_ManyByMany_BaseC.cpp
+  }
+
+  Header_Files {
+    SL_ManyByMany_BaseC.h
+    SL_ManyByMany_Base_stub_export.h
+  }
+
+  Inline_Files {
+    SL_ManyByMany_BaseC.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc
index 62a73316511..806d22e501b 100644
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_SL_ManyByMany_Base -l .. -o ../lib -u DDS SL_ManyByMany_Connector"
 
-project(DDS_SL_MBM_Connector_idl_gen) : connectoridldefaults, dds4ccm {
+project(DDS_SL_MBM_Connector_idl_gen) : connectoridldefaults {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SL_MANYBYMANY_CONNECTOR_STUB_Export \
@@ -10,8 +10,8 @@ project(DDS_SL_MBM_Connector_idl_gen) : connectoridldefaults, dds4ccm {
               -Wb,skel_export_include=SL_ManyByMany_Connector_svnt_export.h \
               -Wb,svnt_export_macro=SL_MANYBYMANY_CONNECTOR_SVNT_Export \
               -Wb,svnt_export_include=SL_ManyByMany_Connector_svnt_export.h \
-              -Wb,conn_export_macro=SL_MANYBYMANY_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=SL_ManyByMany_Connector_conn_export.h \
+              -Wb,exec_export_macro=SL_MANYBYMANY_CONNECTOR_EXEC_Export \
+              -Wb,exec_export_include=SL_ManyByMany_Connector_exec_export.h \
               -I ..
 
   IDL_Files {
@@ -19,7 +19,7 @@ project(DDS_SL_MBM_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   }
 }
 
-project(DDS_SL_MBM_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_SL_MBM_Connector_lem_gen) : ciaoidldefaults {
   custom_only = 1
   after += DDS_SL_MBM_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=SL_MANYBYMANY_CONNECTOR_LEM_STUB_Export \
@@ -85,24 +85,24 @@ project(DDS_SL_ManyByMany_Connector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_SL_ManyByMany_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_SL_MBM_Connector_lem_stub DDS_SL_ManyByMany_Connector_stub DDS4CCM_lem_stub DDS_SL_ManyByMany_Base_stub
+  after   += DDS_SL_MBM_Connector_lem_stub DDS_SL_ManyByMany_Connector_stub DDS4CCM_lem_stub DDS_SL_ManyByMany_Base_NDDS_TS
   sharedname = DDS_SL_ManyByMany_Connector_exec
-  libs += DDS_SL_ManyByMany_Connector_stub DDS_SL_MBM_Connector_lem_stub DDS_SL_ManyByMany_Base_stub DDS4CCM_lem_stub DDS_SL_ManyByMany_Base_stub
+  libs += DDS_SL_ManyByMany_Connector_stub DDS_SL_MBM_Connector_lem_stub DDS_SL_ManyByMany_Base_stub DDS4CCM_lem_stub DDS_SL_ManyByMany_Base_NDDS_TS
   libpaths += ../lib
   libout = ../lib
   includes += ..
-  dynamicflags   = SL_MANYBYMANY_CONNECTOR_CONN_BUILD_DLL
+  dynamicflags   = SL_MANYBYMANY_CONNECTOR_EXEC_BUILD_DLL
 
   IDL_Files {
   }
 
   Source_Files {
-    SL_ManyByMany_Connector_conn.cpp
+    SL_ManyByMany_Connector_exec.cpp
   }
 
   Header_Files {
-    SL_ManyByMany_Connector_conn.h
-    SL_ManyByMany_Connector_conn_export.h
+    SL_ManyByMany_Connector_exec.h
+    SL_ManyByMany_Connector_exec_export.h
   }
 
   Inline_Files {
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector_exec.cpp b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector_exec.cpp
new file mode 100644
index 00000000000..59cf616b22e
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector_exec.cpp
@@ -0,0 +1,30 @@
+// -*- C++ -*-
+// $Id$
+
+#include "SL_ManyByMany_Connector_exec.h"
+
+namespace CIAO_SL_ManyByMany_SL_ManyByMany_Connector_Impl
+{
+  SL_ManyByMany_Connector_exec_i::SL_ManyByMany_Connector_exec_i (void)
+    : DDS_State_Connector_T<TestTopic_DDS_Traits, TestTopic_Connector_Traits> ()
+  {
+  }
+
+  SL_ManyByMany_Connector_exec_i::~SL_ManyByMany_Connector_exec_i (void)
+  {
+  }
+
+  extern "C" SL_MANYBYMANY_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_SL_ManyByMany_SL_ManyByMany_Connector_Impl (void)
+  {
+    ::Components::EnterpriseComponent_ptr retval =
+      ::Components::EnterpriseComponent::_nil ();
+
+    ACE_NEW_NORETURN (
+      retval,
+      SL_ManyByMany_Connector_exec_i ());
+
+    return retval;
+  }
+}
+
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector_exec.h
new file mode 100644
index 00000000000..a1b6888f2eb
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Connector/SL_ManyByMany_Connector_exec.h
@@ -0,0 +1,62 @@
+// -*- C++ -*-
+// $Id$
+
+#ifndef SL_MANYBYMANY_CONNECTOR_EXEC_H_
+#define SL_MANYBYMANY_CONNECTOR_EXEC_H_
+
+#include /**/ "ace/pre.h"
+
+#include "SL_ManyByMany_ConnectorEC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "SL_ManyByMany_Connector_exec_export.h"
+#include "tao/LocalObject.h"
+
+#include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
+#include "dds4ccm/impl/ndds/DDS_State_Connector_T.h"
+
+
+#include "Base/SL_ManyByMany_BaseSupport.h"
+
+namespace CIAO_SL_ManyByMany_SL_ManyByMany_Connector_Impl
+{
+
+  // @from use of SL_ManyByMany as a parameter
+  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+    TestTopic,
+    TestTopicSeq,
+    TestTopicTypeSupport,
+    TestTopicDataWriter,
+    TestTopicDataReader > TestTopic_DDS_Traits;
+
+  typedef CIAO::DDS4CCM::Connector_Traits <
+    ::CIAO_SL_ManyByMany_SL_ManyByMany_Connector_Impl::SL_ManyByMany_Connector_Exec,
+    TestTopic_Seq,
+    ::CCM_DDS::TestTopic::CCM_Writer,
+    ::CCM_DDS::TestTopic::CCM_Updater,
+    ::CCM_DDS::TestTopic::CCM_Getter,
+    ::CCM_DDS::TestTopic::CCM_Reader,
+    ::SL_ManyByMany::CCM_SL_ManyByMany_Connector_Context,
+    ::CCM_DDS::TestTopic::Listener,
+    ::CCM_DDS::TestTopic::StateListener,
+    ::CCM_DDS::ConnectorStatusListener> TestTopic_Connector_Traits;
+
+  class SL_MANYBYMANY_CONNECTOR_EXEC_Export SL_ManyByMany_Connector_exec_i :
+    public DDS_State_Connector_T <TestTopic_DDS_Traits, TestTopic_Connector_Traits>
+  {
+  public:
+    SL_ManyByMany_Connector_exec_i (void);
+    virtual ~SL_ManyByMany_Connector_exec_i (void);
+  };
+
+  extern "C" SL_MANYBYMANY_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_SL_ManyByMany_SL_ManyByMany_Connector_Impl (void);
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc
index 116d76ed1df..ab57fdd0a70 100644
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Receiver/SL_ManyByMany_Receiver.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_SL_ManyByMany_Receiver_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_SL_ManyByMany_Receiver_idl_gen) : componentidldefaults {
   custom_only = 1
   after += DDS_SL_MBM_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
@@ -17,7 +17,7 @@ project(DDS_SL_ManyByMany_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_SL_ManyByMany_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_SL_ManyByMany_Receiver_lem_gen) : ciaoidldefaults {
   after += DDS_SL_ManyByMany_Receiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
@@ -107,7 +107,7 @@ project(DDS_SL_ManyByMany_Receiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_SL_ManyByMany_Receiver_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_SL_ManyByMany_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      +=   DDS_SL_MBM_Receiver_lem_stub DDS_SL_ManyByMany_Base_stub DDS_SL_ManyByMany_Connector_stub DDS_SL_ManyByMany_Connector_svnt DDS_SL_ManyByMany_Receiver_exec DDS_SL_MBM_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
   sharedname  = Receiver_svnt
   libs       += Receiver_stub Receiver_lem_stub DDS_SL_ManyByMany_Base_stub DDS_SL_ManyByMany_Connector_stub DDS_SL_ManyByMany_Connector_svnt Receiver_exec DDS_SL_MBM_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc
index 6ca574dfe16..a45e20fb4a9 100644
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/Sender/SL_ManyByMany_Sender.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_SL_ManyByMany_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(DDS_SL_ManyByMany_Sender_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_SL_ManyByMany_Sender_idl_gen) : componentidldefaults {
   after += DDS_SL_MBM_Connector_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_SL_ManyByMany_Sender_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_SL_ManyByMany_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_SL_ManyByMany_Sender_lem_gen) : ciaoidldefaults {
   after += DDS_SL_ManyByMany_Sender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
@@ -109,7 +109,7 @@ project(DDS_SL_ManyByMany_Sender_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_SL_ManyByMany_Sender_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_SL_ManyByMany_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      += DDS_SL_ManyByMany_Base_stub  DDS_SL_ManyByMany_Sender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_SL_ManyByMany_Connector_stub DDS_SL_ManyByMany_Connector_svnt DDS_SL_MBM_Connector_lem_stub
   sharedname  = Sender_svnt
   libs       += Sender_stub Sender_lem_stub  \
diff --git a/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl
index edfa27e2a1f..fba2b49b0c8 100755
--- a/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/SLManyByMany/descriptors/run_test.pl
@@ -100,8 +100,6 @@ sub kill_open_processes {
     if ($ns_running == 1) {
         $NS->Kill (); $NS->TimedWait (1);
     }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
 }
 
 sub run_node_daemons {
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.idl b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.idl
index 2c1f11e1068..4f607f9eb5f 100644
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.idl
@@ -1,20 +1,18 @@
 // $Id$
 
 /**
- * @file   SL_OneByOne_Base.idl
+ * @file   SL_OneByOne_Base.idl 
  * @author Marijke Hengstmengel <mhengstmengel@remedy.nl>
  */
 
 #ifndef SL_ONEBYONE_BASE_IDL
 #define SL_ONEBYONE_BASE_IDL
 
-#pragma ndds typesupport "Base/SL_OneByOne_BaseSupport.h"
-
-struct TestTopic {
-  string key; //@key
-  long x;
-};
 
+  struct TestTopic {
+    string key; //@key
+    long x;
+   };
 typedef sequence<TestTopic> TestTopic_Seq;
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc
index a20b85c42e8..1d7342c2940 100644
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Base/SL_OneByOne_Base.mpc
@@ -1,25 +1,76 @@
 // $Id$
+// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n SL_OneByOne_Base"
 
-project (DDS_SL_OneByOne_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
-  sharedname = DDS_SL_OneByOne_Base_stub
-  dynamicflags += SL_ONEBYONE_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Gxhst -Sci \
+project(DDS_SL_OneByOne_Base_idl_gen) : taoidldefaults, anytypecode {
+  custom_only = 1
+  idlflags -= -St -Sa
+  idlflags += -SS -Gxhst \
               -Wb,stub_export_macro=SL_ONEBYONE_BASE_STUB_Export \
               -Wb,stub_export_include=SL_OneByOne_Base_stub_export.h
 
   IDL_Files {
     SL_OneByOne_Base.idl
   }
+}
 
-  opendds_ts_flags += --export=SL_ONEBYONE_BASE_STUB_Export
+project(DDS_SL_OneByOne_Base_ndds_ts_gen) : ndds_ts_defaults {
+  custom_only = 1
+  after += DDS_SL_OneByOne_Base_idl_gen
 
-  DDSGenerator_Files {
+  NDDSTypeSupport_Files {
     SL_OneByOne_Base.idl
   }
+}
+
+project(DDS_SL_OneByOne_Base_NDDS_TS) : nddslib, taolib {
+  after += DDS_SL_OneByOne_Base_ndds_ts_gen DDS_SL_OneByOne_Base_stub
+  libs += DDS_SL_OneByOne_Base_stub
+  libout = ../lib
+  libpaths    += ../lib
+  sharedname = DDS_SL_OneByOne_Base_NDDS_TS
+  dynamicflags = NDDS_USER_DLL_EXPORT
+
+  verbatim(gnuace, macros) {
+    override no_hidden_visibility = 1
+  }
 
   Source_Files {
+    SL_OneByOne_Base.cxx
+    SL_OneByOne_BasePlugin.cxx
+    SL_OneByOne_BaseSupport.cxx
+  }
+
+  Header_Files {
+    SL_OneByOne_Base.h
+    SL_OneByOne_BasePlugin.h
+    SL_OneByOne_BaseSupport.h
+  }
+
+  Inline_Files {
+  }
+}
+
+project(DDS_SL_OneByOne_Base_stub) : ccm_stub {
+  after += DDS_SL_OneByOne_Base_idl_gen
+  libout = ../lib
+  libpaths += ../lib
+  sharedname = DDS_SL_OneByOne_Base_stub
+  dynamicflags = SL_ONEBYONE_BASE_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    SL_OneByOne_BaseC.cpp
+  }
+
+  Header_Files {
+    SL_OneByOne_BaseC.h
+    SL_OneByOne_Base_stub_export.h
+  }
+
+  Inline_Files {
+    SL_OneByOne_BaseC.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc
index f1213f4f2bb..2d82c85b948 100644
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SLOneByOne_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_SL_OneByOne_Base -l .. -o ../lib -u DDS SL_OneByOne_Connector"
 
-project(DDS_SL_OBO_Connector_idl_gen) : connectoridldefaults, dds4ccm {
+project(DDS_SL_OBO_Connector_idl_gen) : connectoridldefaults {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SL_ONEBYONE_CONNECTOR_STUB_Export \
@@ -10,8 +10,8 @@ project(DDS_SL_OBO_Connector_idl_gen) : connectoridldefaults, dds4ccm {
               -Wb,skel_export_include=SL_OneByOne_Connector_svnt_export.h \
               -Wb,svnt_export_macro=SL_ONEBYONE_CONNECTOR_SVNT_Export \
               -Wb,svnt_export_include=SL_OneByOne_Connector_svnt_export.h \
-              -Wb,conn_export_macro=SL_ONEBYONE_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=SL_OneByOne_Connector_conn_export.h \
+              -Wb,exec_export_macro=SL_ONEBYONE_CONNECTOR_EXEC_Export \
+              -Wb,exec_export_include=SL_OneByOne_Connector_exec_export.h \
               -I ..
 
   IDL_Files {
@@ -19,7 +19,7 @@ project(DDS_SL_OBO_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   }
 }
 
-project(DDS_SL_OBO_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_SL_OBO_Connector_lem_gen) : ciaoidldefaults {
   custom_only = 1
   after += DDS_SL_OBO_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=SL_ONEBYONE_CONNECTOR_LEM_STUB_Export \
@@ -85,24 +85,24 @@ project(DDS_SL_OneByOne_Connector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_SL_OneByOne_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_SL_OBO_Connector_lem_stub DDS_SL_OneByOne_Connector_stub DDS4CCM_lem_stub DDS_SL_OneByOne_Base_stub
+  after   += DDS_SL_OBO_Connector_lem_stub DDS_SL_OneByOne_Connector_stub DDS4CCM_lem_stub DDS_SL_OneByOne_Base_NDDS_TS
   sharedname = DDS_SL_OneByOne_Connector_exec
-  libs += DDS_SL_OneByOne_Connector_stub DDS_SL_OBO_Connector_lem_stub DDS_SL_OneByOne_Base_stub DDS4CCM_lem_stub DDS_SL_OneByOne_Base_stub
+  libs += DDS_SL_OneByOne_Connector_stub DDS_SL_OBO_Connector_lem_stub DDS_SL_OneByOne_Base_stub DDS4CCM_lem_stub DDS_SL_OneByOne_Base_NDDS_TS
   libpaths += ../lib
   libout = ../lib
   includes += ..
-  dynamicflags   = SL_ONEBYONE_CONNECTOR_CONN_BUILD_DLL
+  dynamicflags   = SL_ONEBYONE_CONNECTOR_EXEC_BUILD_DLL
 
   IDL_Files {
   }
 
   Source_Files {
-    SL_OneByOne_Connector_conn.cpp
+    SL_OneByOne_Connector_exec.cpp
   }
 
   Header_Files {
-    SL_OneByOne_Connector_conn.h
-    SL_OneByOne_Connector_conn_export.h
+    SL_OneByOne_Connector_exec.h
+    SL_OneByOne_Connector_exec_export.h
   }
 
   Inline_Files {
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector_exec.cpp b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector_exec.cpp
new file mode 100644
index 00000000000..a6c71d256e3
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector_exec.cpp
@@ -0,0 +1,30 @@
+// -*- C++ -*-
+// $Id$
+
+#include "SL_OneByOne_Connector_exec.h"
+
+namespace CIAO_SL_OneByOne_SL_OneByOne_Connector_Impl
+{
+  SL_OneByOne_Connector_exec_i::SL_OneByOne_Connector_exec_i (void)
+    : DDS_State_Connector_T<TestTopic_DDS_Traits, TestTopic_Connector_Traits> ()
+  {
+  }
+
+  SL_OneByOne_Connector_exec_i::~SL_OneByOne_Connector_exec_i (void)
+  {
+  }
+
+  extern "C" SL_ONEBYONE_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_SL_OneByOne_SL_OneByOne_Connector_Impl (void)
+  {
+    ::Components::EnterpriseComponent_ptr retval =
+      ::Components::EnterpriseComponent::_nil ();
+
+    ACE_NEW_NORETURN (
+      retval,
+      SL_OneByOne_Connector_exec_i ());
+
+    return retval;
+  }
+}
+
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector_exec.h
new file mode 100644
index 00000000000..dab43355cd4
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Connector/SL_OneByOne_Connector_exec.h
@@ -0,0 +1,62 @@
+// -*- C++ -*-
+// $Id$
+
+#ifndef SL_ONEBYONE_CONNECTOR_EXEC_H_
+#define SL_ONEBYONE_CONNECTOR_EXEC_H_
+
+#include /**/ "ace/pre.h"
+
+#include "SL_OneByOne_ConnectorEC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "SL_OneByOne_Connector_exec_export.h"
+#include "tao/LocalObject.h"
+
+#include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
+#include "dds4ccm/impl/ndds/DDS_State_Connector_T.h"
+
+
+#include "Base/SL_OneByOne_BaseSupport.h"
+
+namespace CIAO_SL_OneByOne_SL_OneByOne_Connector_Impl
+{
+
+  // @from use of SL_OneByOne as a parameter
+  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+    TestTopic,
+    TestTopicSeq,
+    TestTopicTypeSupport,
+    TestTopicDataWriter,
+    TestTopicDataReader > TestTopic_DDS_Traits;
+
+  typedef CIAO::DDS4CCM::Connector_Traits <
+    ::CIAO_SL_OneByOne_SL_OneByOne_Connector_Impl::SL_OneByOne_Connector_Exec,
+    TestTopic_Seq,
+    ::CCM_DDS::TestTopic::CCM_Writer,
+    ::CCM_DDS::TestTopic::CCM_Updater,
+    ::CCM_DDS::TestTopic::CCM_Getter,
+    ::CCM_DDS::TestTopic::CCM_Reader,
+    ::SL_OneByOne::CCM_SL_OneByOne_Connector_Context,
+    ::CCM_DDS::TestTopic::Listener,
+    ::CCM_DDS::TestTopic::StateListener,
+    ::CCM_DDS::ConnectorStatusListener> TestTopic_Connector_Traits;
+
+  class SL_ONEBYONE_CONNECTOR_EXEC_Export SL_OneByOne_Connector_exec_i :
+    public DDS_State_Connector_T <TestTopic_DDS_Traits, TestTopic_Connector_Traits>
+  {
+  public:
+    SL_OneByOne_Connector_exec_i (void);
+    virtual ~SL_OneByOne_Connector_exec_i (void);
+  };
+
+  extern "C" SL_ONEBYONE_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_SL_OneByOne_SL_OneByOne_Connector_Impl (void);
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.mpc
index e8e2edad607..6204a41230c 100644
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_SL_OneByOne_Receiver_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_SL_OneByOne_Receiver_idl_gen) : componentidldefaults {
   custom_only = 1
   after += DDS_SL_OBO_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
@@ -17,7 +17,7 @@ project(DDS_SL_OneByOne_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_SL_OneByOne_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_SL_OneByOne_Receiver_lem_gen) : ciaoidldefaults {
   after += DDS_SL_OneByOne_Receiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
@@ -107,7 +107,7 @@ project(DDS_SL_OneByOne_Receiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_SL_OneByOne_Receiver_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_SL_OneByOne_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      +=   DDS_SL_OBO_Receiver_lem_stub DDS_SL_OneByOne_Base_stub DDS_SL_OneByOne_Connector_stub DDS_SL_OneByOne_Connector_svnt DDS_SL_OneByOne_Receiver_exec DDS_SL_OBO_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
   sharedname  = Receiver_svnt
   libs       += Receiver_stub Receiver_lem_stub DDS_SL_OneByOne_Base_stub DDS_SL_OneByOne_Connector_stub DDS_SL_OneByOne_Connector_svnt Receiver_exec DDS_SL_OBO_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp
index 2d49c410d4c..06c67eee60a 100644
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.cpp
@@ -13,19 +13,42 @@
 
 namespace CIAO_SL_OneByOne_Receiver_Impl
 {
+//============================================================
+  // Facet Executor Implementation Class: ConnectorStatusListener_exec_i
   //============================================================
-  // StateListener_exec_i
+  read_action_Generator::read_action_Generator (Receiver_exec_i &callback)
+    : pulse_callback_ (callback)
+  {
+  }
+
+  read_action_Generator::~read_action_Generator ()
+  {
+  }
+
+  int
+  read_action_Generator::handle_timeout (const ACE_Time_Value &, const void *)
+  {
+    try
+      {
+        this->pulse_callback_.read_all();
+      }
+    catch (...)
+      {
+        // @todo
+      }
+    return 0;
+  }
   //============================================================
-  StateListener_exec_i::StateListener_exec_i (Atomic_Boolean &on_many_updates,
+  // Facet Executor Implementation Class: StateListener_exec_i
+  //============================================================
+  StateListener_exec_i::StateListener_exec_i (Atomic_Boolean &no_operation,
                                               Atomic_Boolean &on_creation,
                                               Atomic_Boolean &on_one_update,
-                                              Atomic_Boolean &on_deletion,
-                                              Atomic_ThreadId &thread_id)
-    : on_many_updates_ (on_many_updates),
-      on_creation_ (on_creation),
-      on_one_update_ (on_one_update),
-      on_deletion_ (on_deletion),
-      thread_id_  (thread_id)
+                                              Atomic_Boolean &on_deletion)
+    :no_operation_(no_operation),
+     on_creation_(on_creation),
+     on_one_update_(on_one_update),
+     on_deletion_(on_deletion)
   {
   }
 
@@ -38,36 +61,25 @@ namespace CIAO_SL_OneByOne_Receiver_Impl
   StateListener_exec_i::on_creation (const ::TestTopic & datum,
                                      const ::CCM_DDS::ReadInfo & info)
   {
-    this->thread_id_ = ACE_Thread::self ();
-    if (!datum.key.in() == 0 && info.instance_status == CCM_DDS::INSTANCE_CREATED)
+    if((!datum.key.in()==0) && (info.instance_status == CCM_DDS::INSTANCE_CREATED))
       {
         this->on_creation_ = true;
       }
-    ACE_DEBUG ((LM_DEBUG, "StateListener_exec_i::on_creation - "
-                          "Received sample: key <%C> - iteration <%d>\n",
-                          datum.key.in (),
-                          datum.x));
   }
 
   void
   StateListener_exec_i::on_one_update (const ::TestTopic & datum,
                                        const ::CCM_DDS::ReadInfo & info)
   {
-    if (info.instance_status != CCM_DDS::INSTANCE_UPDATED)
+    if(info.instance_status != CCM_DDS::INSTANCE_UPDATED)
       {
         ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: did not receive the expected info.status ")
                               ACE_TEXT ("'CCM_DDS::INSTANCE_UPDATED'")
                               ACE_TEXT ("  with operation 'on_one_update' from StateListener in Receiver\n")
-                    ));
+                    )); 
 
       }
-
-    ACE_DEBUG ((LM_DEBUG, "StateListener_exec_i::on_one_update - "
-                          "Received sample: key <%C> - iteration <%d>\n",
-                          datum.key.in (),
-                          datum.x));
-
-    if (!datum.key.in() == 0 && info.instance_status == CCM_DDS::INSTANCE_UPDATED)
+    if((!datum.key.in()==0) && (info.instance_status == CCM_DDS::INSTANCE_UPDATED))
       {
         this->on_one_update_ = true;
       }
@@ -77,64 +89,124 @@ namespace CIAO_SL_OneByOne_Receiver_Impl
   StateListener_exec_i::on_many_updates (const ::TestTopic_Seq & /*data*/,
                                          const ::CCM_DDS::ReadInfoSeq & /*infos*/)
   {
-    this->on_many_updates_ = true;
+    this->no_operation_ = false;
   }
 
   void
   StateListener_exec_i::on_deletion (const ::TestTopic & datum,
                                     const ::CCM_DDS::ReadInfo & info)
   {
-    if (info.instance_status != CCM_DDS::INSTANCE_DELETED)
+     if(info.instance_status != CCM_DDS::INSTANCE_DELETED)
       {
         ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: did not receive the expected info.status ")
-                              ACE_TEXT ("'CCM_DDS::INSTANCE_DELETED' ")
-                              ACE_TEXT ("with operation 'on_deletion' from StateListener in Receiver\n")
+                              ACE_TEXT ("'CCM_DDS::INSTANCE_DELETED'")
+                              ACE_TEXT ("  with operation 'on_deletion' from StateListener in Receiver\n")
                     ));
 
       }
-    if (!datum.key.in() == 0 && info.instance_status == CCM_DDS::INSTANCE_DELETED)
-      {
-        this->on_deletion_ = true;
-      }
-    ACE_DEBUG ((LM_DEBUG, "StateListener_exec_i::on_deletion - "
-                      "Received sample: key <%C> - iteration <%d>\n",
-                      datum.key.in (),
-                      datum.x));
+     if((!datum.key.in()==0) && (info.instance_status == CCM_DDS::INSTANCE_DELETED))
+       {
+         this->on_deletion_ = true;
+       }
+  }
+  //============================================================
+  // Facet Executor Implementation Class: PortStatusListener_exec_i
+  //============================================================
+  PortStatusListener_exec_i::PortStatusListener_exec_i ()
+  {
+  }
+
+  PortStatusListener_exec_i::~PortStatusListener_exec_i (void)
+  {
+  }
+
+  // Operations from ::CCM_DDS::PortStatusListener
+  void
+  PortStatusListener_exec_i::on_requested_deadline_missed (
+    ::DDS::DataReader_ptr /* the_reader */,
+    const ::DDS::RequestedDeadlineMissedStatus & /* status */)
+  {
+  }
+
+  void
+  PortStatusListener_exec_i::on_sample_lost (
+    ::DDS::DataReader_ptr /* the_reader */,
+    const ::DDS::SampleLostStatus & /* status */)
+  {
   }
 
   //============================================================
-  // Receiver_exec_i
+  // Component Executor Implementation Class: Receiver_exec_iTestTopic_RawListener_exec_i ();
   //============================================================
+
   Receiver_exec_i::Receiver_exec_i (void)
-    : on_many_updates_ (false),
-      updater_data_ (false),
-      on_creation_ (false),
-      on_one_update_ (false),
-      on_deletion_ (false),
-      thread_id_listener_ (0)
+  : rate_ (10),
+    no_operation_(true),
+    updater_data_(false),
+    on_creation_(false),
+    on_one_update_(false),
+    on_deletion_(false)
   {
+    this->ticker_ = new read_action_Generator (*this); 
   }
 
   Receiver_exec_i::~Receiver_exec_i (void)
   {
   }
 
+  // Supported operations and attributes.
+  void
+  Receiver_exec_i::read_all (void)
+  {
+    if (CORBA::is_nil (this->reader_.in ()))
+      {
+        return;
+      }
+    TestTopic_Seq_var TestTopic_infos;
+    ::CCM_DDS::ReadInfoSeq_var readinfoseq;
+    try
+      {
+        this->reader_->read_all(TestTopic_infos.out(), readinfoseq.out());
+        for(CORBA::ULong i = 0; i < readinfoseq->length(); ++i)
+          {
+            this->updater_data_ = true;
+          ACE_Time_Value tv;
+          tv <<= readinfoseq[i].source_timestamp;
+          ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL ReadInfo ")
+                                ACE_TEXT ("-> UTC date =%#T\n"),
+                                &tv));
+          }
+        for(CORBA::ULong i = 0; i < TestTopic_infos->length(); ++i)
+          {
+            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL keyed test info : ")
+                       ACE_TEXT ("Number <%d> : received TestTopic_info for <%C> at %u\n"),
+                        i,
+                        TestTopic_infos[i].key.in (),
+                        TestTopic_infos[i].x));
+          }
+      }
+    catch (const CCM_DDS::InternalError& )
+      {
+        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("internal error or no data\n")));
+      }
+  }
+
   // Component attributes.
   // Port operations.
   ::CCM_DDS::CCM_PortStatusListener_ptr
   Receiver_exec_i::get_info_out_status (void)
   {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
+    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new PortStatuslistener\n")));
+    return new PortStatusListener_exec_i ();
   }
 
   ::CCM_DDS::TestTopic::CCM_StateListener_ptr
-  Receiver_exec_i::get_info_out_data_listener (void)
+    Receiver_exec_i::get_info_out_data_listener (void)
   {
-    return new StateListener_exec_i (this->on_many_updates_,
+    return new StateListener_exec_i(this->no_operation_,
                                      this->on_creation_,
                                      this->on_one_update_,
-                                     this->on_deletion_,
-                                     this->thread_id_listener_);
+                                     this->on_deletion_);
   }
 
   // Operations from Components::SessionComponent.
@@ -153,6 +225,7 @@ namespace CIAO_SL_OneByOne_Receiver_Impl
   void
   Receiver_exec_i::configuration_complete (void)
   {
+    this->reader_ = this->context_->get_connection_info_out_data();
   }
 
   void
@@ -163,44 +236,56 @@ namespace CIAO_SL_OneByOne_Receiver_Impl
 
     if (CORBA::is_nil (lc.in ()))
       {
-         ACE_ERROR ((LM_ERROR, ACE_TEXT ("Error:  Listener control receptacle is null!\n")));
+         ACE_ERROR ((LM_INFO, ACE_TEXT ("Error:  Listener control receptacle is null!\n")));
         throw CORBA::INTERNAL ();
       }
+
     lc->mode (::CCM_DDS::ONE_BY_ONE);
+    // calculate the interval time
+    long usec = 1000000 / this->rate_;
+    if (this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->schedule_timer (
+                                          this->ticker_,
+                                          0,
+                                          ACE_Time_Value(3, usec),
+                                          ACE_Time_Value(3, usec)) == -1)
+      {
+        ACE_ERROR ((LM_ERROR, "Unable to schedule Timer\n"));
+      }
   }
 
   void
   Receiver_exec_i::ccm_passivate (void)
   {
+    this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->cancel_timer (this->ticker_);
+    delete this->ticker_;
   }
 
   void
   Receiver_exec_i::ccm_remove (void)
   {
     CORBA::Boolean no_error = true;
-    if (this->on_many_updates_.value ())
+    if(!this->no_operation_.value ())
       {
          no_error = false;
-         ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: Received unexpected ")
-                               ACE_TEXT ("operation 'on_many_updates' from StateListener in Receiver\n")
+         ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: did receive an unexpected ")
+                               ACE_TEXT (" operation 'on_many_updates' from StateListener in Receiver\n")
                     ));
       }
-
-    if (!this->on_creation_.value ())
+    if(!this->on_creation_ .value ())
       {
          no_error = false;
          ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: didn't receive the expected ")
                                ACE_TEXT (" operation 'on_creation' from StateListener in Receiver\n")
                     ));
       }
-    if (!this->on_one_update_.value  ())
+    if(!this->on_one_update_.value  ())
       {
          no_error = false;
-         ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: didn't receive the expected ")
+         ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR:didn't receive the expected ")
                                ACE_TEXT (" operation 'on_one_update' from StateListener in Receiver\n")
                     ));
       }
-    if (!this->on_deletion_.value ())
+    if(!this->on_deletion_.value ())
       {
          no_error = false;
          ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: didn't receive the expected ")
@@ -208,57 +293,12 @@ namespace CIAO_SL_OneByOne_Receiver_Impl
                     ));
       }
 
-    if (no_error)
+    if(no_error==true)
       {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK: Have received the expected ")
+        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("OK : Have received the  expected ")
                                ACE_TEXT (" operations for ONE_BY_ONE from StateListener in Receiver\n")
                    ));
       }
-
-    if (this->thread_id_listener_.value () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
-                              "Thread ID for StatusListener not set!\n"));
-      }
-    #if defined (CIAO_DDS4CCM_CONTEXT_SWITCH) && (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (ACE_OS::thr_equal (this->thread_id_listener_.value (),
-                                ACE_Thread::self ()))
-      {
-        ACE_DEBUG ((LM_DEBUG, "OK: "
-                              "Thread switch for StatusListener seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_.value (),
-                              ACE_Thread::self ()));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
-                              "Thread switch for StatusListener "
-                              "doesn't seem to work! "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_.value (),
-                              ACE_Thread::self ()));
-      }
-    #else
-    else if (ACE_OS::thr_equal (this->thread_id_listener_.value (),
-                                ACE_Thread::self ()))
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: StatusListener: "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_.value (),
-                              ACE_Thread::self ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "OK: StatusListener: "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_.value (),
-                              ACE_Thread::self ()));
-      }
-    #endif
   }
 
   extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h
index 6b712bd005b..0016ca59dd1 100644
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Receiver/SL_OneByOne_Receiver_exec.h
@@ -13,30 +13,55 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/LocalObject.h"
-#include "ace/OS_NS_Thread.h"
-#include "ace/Reactor.h"
 #include "ace/Task.h"
+#include "ace/Reactor.h"
 
 namespace CIAO_SL_OneByOne_Receiver_Impl
 {
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean> Atomic_Boolean;
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, ACE_thread_t> Atomic_ThreadId;
+  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
 
   class Receiver_exec_i;
+  class read_action_Generator
+    : public ACE_Event_Handler
+  {
+  public:
+    read_action_Generator (Receiver_exec_i &callback);
+
+    ~read_action_Generator ();
+
+    /// Handle the timeout.
+    virtual int handle_timeout (const ACE_Time_Value &tv,
+                                const void *arg);
+
+  private:
+    /// Maintains a handle that actually process the event
+    Receiver_exec_i &pulse_callback_;
+
+  };
+  class RECEIVER_EXEC_Export PortStatusListener_exec_i
+    : public virtual ::CCM_DDS::CCM_PortStatusListener,
+      public virtual ::CORBA::LocalObject
+  {
+  public:
+    PortStatusListener_exec_i (void);
+    virtual ~PortStatusListener_exec_i (void);
+
+    virtual void
+    on_requested_deadline_missed (
+      ::DDS::DataReader_ptr the_reader,
+      const ::DDS::RequestedDeadlineMissedStatus & status);
 
-  //============================================================
-  // StateListener_exec_i
-  //============================================================
+    virtual void
+    on_sample_lost (
+      ::DDS::DataReader_ptr the_reader,
+      const ::DDS::SampleLostStatus & status);
+  };
   class RECEIVER_EXEC_Export StateListener_exec_i
     : public virtual ::CCM_DDS::TestTopic::CCM_StateListener,
       public virtual ::CORBA::LocalObject
   {
   public:
-    StateListener_exec_i (Atomic_Boolean &,
-                          Atomic_Boolean &,
-                          Atomic_Boolean &,
-                          Atomic_Boolean &,
-                          Atomic_ThreadId &);
+    StateListener_exec_i (Atomic_Boolean &, Atomic_Boolean &, Atomic_Boolean &, Atomic_Boolean &);
     virtual ~StateListener_exec_i (void);
 
     virtual void
@@ -56,16 +81,12 @@ namespace CIAO_SL_OneByOne_Receiver_Impl
         const ::TestTopic & datum,
         const ::CCM_DDS::ReadInfo & info);
   private:
-     Atomic_Boolean &on_many_updates_;
+     Atomic_Boolean &no_operation_;
      Atomic_Boolean &on_creation_;
      Atomic_Boolean &on_one_update_;
      Atomic_Boolean &on_deletion_;
-     Atomic_ThreadId &thread_id_;
-  };
+ };
 
-  //============================================================
-  // Receiver_exec_i
-  //============================================================
   class RECEIVER_EXEC_Export Receiver_exec_i
     : public virtual Receiver_Exec,
       public virtual ::CORBA::LocalObject
@@ -90,17 +111,19 @@ namespace CIAO_SL_OneByOne_Receiver_Impl
     virtual void ccm_activate (void);
     virtual void ccm_passivate (void);
     virtual void ccm_remove (void);
+    void read_all(void);
 
   private:
     ::SL_OneByOne::CCM_Receiver_Context_var context_;
-
-    Atomic_Boolean on_many_updates_;
-    Atomic_Boolean updater_data_;
+    ::CCM_DDS::TestTopic::Reader_var reader_;
+    read_action_Generator * ticker_;
+    CORBA::ULong rate_;
+    Atomic_Boolean no_operation_;
+    Atomic_Boolean updater_data_; 
     Atomic_Boolean on_creation_;
     Atomic_Boolean on_one_update_;
     Atomic_Boolean on_deletion_;
-    Atomic_ThreadId thread_id_listener_;
-  };
+};
   extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
   create_SL_OneByOne_Receiver_Impl (void);
 }
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc
index 347d73bca4e..783a2d3cea6 100644
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_SL_OneByOne_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(DDS_SL_OneByOne_Sender_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_SL_OneByOne_Sender_idl_gen) : componentidldefaults {
   after += DDS_SL_OBO_Connector_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_SL_OneByOne_Sender_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_SL_OneByOne_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_SL_OneByOne_Sender_lem_gen) : ciaoidldefaults {
   after += DDS_SL_OneByOne_Sender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
@@ -109,7 +109,7 @@ project(DDS_SL_OneByOne_Sender_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_SL_OneByOne_Sender_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_SL_OneByOne_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      += DDS_SL_OneByOne_Base_stub  DDS_SL_OneByOne_Sender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_SL_OneByOne_Connector_stub DDS_SL_OneByOne_Connector_svnt DDS_SL_OBO_Connector_lem_stub
   sharedname  = Sender_svnt
   libs       += Sender_stub Sender_lem_stub  \
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.cpp
index 04d1db02184..f84f87a241d 100644
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/Sender/SL_OneByOne_Sender_exec.cpp
@@ -103,12 +103,12 @@ namespace CIAO_SL_OneByOne_Sender_Impl
   CORBA::Boolean
   Sender_exec_i::delete_one()
   {
-    //delete registered instance with DDS::HANDLE_NIL
+    //delete registerd instance with DDS::HANDLE_NIL
     CORBA::Boolean result = true;
     TestTopic i = this->topic_seq_one_[0];
     try
       {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Updater: delete_one with registered instance with DDS::HANDLE_NIL, key <%C>\n"),
+        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Updater: delete_one with registerd instance with DDS::HANDLE_NIL, key <%C>\n"),
                       i.key.in()));
         this->updater_->delete_one(i, DDS::HANDLE_NIL);
       }
diff --git a/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl
index edfa27e2a1f..fba2b49b0c8 100755
--- a/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/SLOneByOne/descriptors/run_test.pl
@@ -100,8 +100,6 @@ sub kill_open_processes {
     if ($ns_running == 1) {
         $NS->Kill (); $NS->TimedWait (1);
     }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
 }
 
 sub run_node_daemons {
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl
index ee64e289c16..f94c2877dc2 100644
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.idl
@@ -8,8 +8,6 @@
 #ifndef SETCONNECTORATTRIBUTE_BASE_IDL
 #define SETCONNECTORATTRIBUTE_BASE_IDL
 
-#pragma ndds typesupport "Base/SetConnectorAttribute_BaseSupport.h"
-
 struct SetConnectorAttributeTest {
   string key;
   long iteration;
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc
index de8eca7dbb7..8376568d111 100644
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Base/SetConnectorAttribute_Base.mpc
@@ -1,25 +1,76 @@
 // $Id$
+// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n SetConnectorAttribute_Base"
 
-project (DDS_SCABase_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
-  sharedname = DDS_SCABase_stub
-  dynamicflags += SETCONNECTORATTRIBUTE_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Gxhst -Sci \
+project(DDS_SCABase_idl_gen) : taoidldefaults, anytypecode {
+  custom_only = 1
+  idlflags -= -St -Sa
+  idlflags += -SS -Gxhst \
               -Wb,stub_export_macro=SETCONNECTORATTRIBUTE_BASE_STUB_Export \
               -Wb,stub_export_include=SetConnectorAttribute_Base_stub_export.h
 
   IDL_Files {
     SetConnectorAttribute_Base.idl
   }
+}
 
-  opendds_ts_flags += --export=SETCONNECTORATTRIBUTE_BASE_STUB_Export
+project(DDS_SCABase_ndds_ts_gen) : ndds_ts_defaults {
+  custom_only = 1
+  after += DDS_SCABase_idl_gen
 
-  DDSGenerator_Files {
+  NDDSTypeSupport_Files {
     SetConnectorAttribute_Base.idl
   }
+}
+
+project(DDS_SCABase_NDDS_TS) : nddslib, taolib {
+  after += DDS_SCABase_ndds_ts_gen DDS_SCABase_stub
+  libs += DDS_SCABase_stub
+  libout = ../lib
+  libpaths    += ../lib
+  sharedname = DDS_SCABase_NDDS_TS
+  dynamicflags = NDDS_USER_DLL_EXPORT
+
+  verbatim(gnuace, macros) {
+    override no_hidden_visibility = 1
+  }
 
   Source_Files {
+    SetConnectorAttribute_Base.cxx
+    SetConnectorAttribute_BasePlugin.cxx
+    SetConnectorAttribute_BaseSupport.cxx
+  }
+
+  Header_Files {
+    SetConnectorAttribute_Base.h
+    SetConnectorAttribute_BasePlugin.h
+    SetConnectorAttribute_BaseSupport.h
+  }
+
+  Inline_Files {
+  }
+}
+
+project(DDS_SCABase_stub) : ccm_stub {
+  after += DDS_SCABase_idl_gen
+  libout = ../lib
+  libpaths += ../lib
+  sharedname = DDS_SCABase_stub
+  dynamicflags = SETCONNECTORATTRIBUTE_BASE_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    SetConnectorAttribute_BaseC.cpp
+  }
+
+  Header_Files {
+    SetConnectorAttribute_BaseC.h
+    SetConnectorAttribute_Base_stub_export.h
+  }
+
+  Inline_Files {
+    SetConnectorAttribute_BaseC.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc
index b5b6cf6eba2..f70f65f8915 100644
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_SCABase -l .. -o ../lib -u DDS SetConnectorAttribute_Connector"
 
-project(DDS_SCAConnector_idl_gen) : connectoridldefaults, dds4ccm {
+project(DDS_SCAConnector_idl_gen) : connectoridldefaults {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SETCONNECTORATTRIBUTE_CONNECTOR_STUB_Export \
@@ -10,8 +10,8 @@ project(DDS_SCAConnector_idl_gen) : connectoridldefaults, dds4ccm {
               -Wb,skel_export_include=SetConnectorAttribute_Connector_svnt_export.h \
               -Wb,svnt_export_macro=SETCONNECTORATTRIBUTE_CONNECTOR_SVNT_Export \
               -Wb,svnt_export_include=SetConnectorAttribute_Connector_svnt_export.h \
-              -Wb,conn_export_macro=SETCONNECTORATTRIBUTE_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=SetConnectorAttribute_Connector_conn_export.h \
+              -Wb,exec_export_macro=SETCONNECTORATTRIBUTE_CONNECTOR_EXEC_Export \
+              -Wb,exec_export_include=SetConnectorAttribute_Connector_exec_export.h \
               -I ..
 
   IDL_Files {
@@ -19,7 +19,7 @@ project(DDS_SCAConnector_idl_gen) : connectoridldefaults, dds4ccm {
   }
 }
 
-project(DDS_SCAConnector_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_SCAConnector_lem_gen) : ciaoidldefaults {
   custom_only = 1
   after += DDS_SCAConnector_idl_gen
   idlflags += -Wb,stub_export_macro=SETCONNECTORATTRIBUTE_CONNECTOR_LEM_STUB_Export \
@@ -85,24 +85,24 @@ project(DDS_SCAConnector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_SCAConnector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_SCAConnector_lem_stub DDS_SCAConnector_stub DDS4CCM_lem_stub DDS_SCABase_stub
+  after   += DDS_SCAConnector_lem_stub DDS_SCAConnector_stub DDS4CCM_lem_stub DDS_SCABase_NDDS_TS
   sharedname = DDS_SCAConnector_exec
-  libs += DDS_SCAConnector_stub DDS_SCAConnector_lem_stub DDS_SCABase_stub DDS4CCM_lem_stub DDS_SCABase_stub
+  libs += DDS_SCAConnector_stub DDS_SCAConnector_lem_stub DDS_SCABase_stub DDS4CCM_lem_stub DDS_SCABase_NDDS_TS
   libpaths += ../lib
   libout = ../lib
   includes += ..
-  dynamicflags   = SETCONNECTORATTRIBUTE_CONNECTOR_CONN_BUILD_DLL
+  dynamicflags   = SETCONNECTORATTRIBUTE_CONNECTOR_EXEC_BUILD_DLL
 
   IDL_Files {
   }
 
   Source_Files {
-    SetConnectorAttribute_Connector_conn.cpp
+    SetConnectorAttribute_Connector_exec.cpp
   }
 
   Header_Files {
-    SetConnectorAttribute_Connector_conn.h
-    SetConnectorAttribute_Connector_conn_export.h
+    SetConnectorAttribute_Connector_exec.h
+    SetConnectorAttribute_Connector_exec_export.h
   }
 
   Inline_Files {
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector_exec.cpp b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector_exec.cpp
new file mode 100644
index 00000000000..d63820cf838
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector_exec.cpp
@@ -0,0 +1,178 @@
+// -*- C++ -*-
+// $Id$
+
+#include "SetConnectorAttribute_Connector_exec.h"
+
+#define DOMAIN_ID_TO_TEST 100
+#define QOS_PROFILE_TO_TEST "'qos profile'"
+#define TOPIC_NAME_TO_TEST "SetConnectorAttribute"
+#define KEY_FIELDS_PREFIX_TO_TEST "string_%d"
+#define NO_OFF_KEY_FIELDS_TO_TEST 5
+
+namespace CIAO_SetConnectorAttribute_SetConnectorAttribute_Connector_Impl
+{
+  SetConnectorAttribute_Connector_exec_i::SetConnectorAttribute_Connector_exec_i (void)
+    : DDS_Event_Connector_T<SetConnectorAttributeTest_DDS_Traits, SetConnectorAttributeTest_Connector_Traits> ()
+  {
+  }
+
+  SetConnectorAttribute_Connector_exec_i::~SetConnectorAttribute_Connector_exec_i (void)
+  {
+  }
+
+  void
+  SetConnectorAttribute_Connector_exec_i::test_domain_id ()
+  {
+    try
+      {
+        DDS::DomainId_t id = this->domain_id ();
+        if (id != DOMAIN_ID_TO_TEST)
+          {
+            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: ")
+                ACE_TEXT ("Domain ID not set properly; set <%d> - should be <%d>\n"),
+                id, DOMAIN_ID_TO_TEST));
+          }
+        else
+          {
+            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("domain_id has been properly set\n")));
+          }
+      }
+    catch (const CORBA::Exception& ex)
+      {
+        ex._tao_print_exception ("Exception caught:");
+        ACE_ERROR ((LM_ERROR,
+          ACE_TEXT ("ERROR: test_domain_id : Exception caught\n")));
+      }
+    catch (...)
+      {
+        ACE_ERROR ((LM_ERROR,
+          ACE_TEXT ("ERROR: test_domain_id : Unknown exception caught\n")));
+      }
+  }
+
+  void
+  SetConnectorAttribute_Connector_exec_i::test_qos_profile ()
+  {
+    try
+      {
+        char * profile =  this->qos_profile ();
+        if (ACE_OS::strcmp (profile, QOS_PROFILE_TO_TEST) != 0)
+          {
+            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: ")
+                ACE_TEXT ("QOS profile not set properly; set <%C> - should be <%C>\n"),
+                profile, QOS_PROFILE_TO_TEST));
+          }
+        else
+          {
+            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("qos_profile has been properly set\n")));
+          }
+      }
+    catch (const CORBA::Exception& ex)
+      {
+        ex._tao_print_exception ("Exception caught:");
+        ACE_ERROR ((LM_ERROR,
+          ACE_TEXT ("ERROR: test_qos_profile : Exception caught\n")));
+      }
+    catch (...)
+      {
+        ACE_ERROR ((LM_ERROR,
+          ACE_TEXT ("ERROR: test_qos_profile : Unknown exception caught\n")));
+      }
+  }
+
+  void
+  SetConnectorAttribute_Connector_exec_i::test_topic_name ()
+  {
+    try
+      {
+        char * topic_name =  this->topic_name ();
+        if (ACE_OS::strcmp (topic_name, TOPIC_NAME_TO_TEST) != 0)
+          {
+            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: ")
+                ACE_TEXT ("Topic name not set properly; set <%C> - should be <%C>\n"),
+                topic_name, TOPIC_NAME_TO_TEST));
+          }
+        else
+          {
+            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("topic_name has been properly set\n")));
+          }
+      }
+    catch (const CORBA::Exception& ex)
+      {
+        ex._tao_print_exception ("Exception caught:");
+        ACE_ERROR ((LM_ERROR,
+          ACE_TEXT ("ERROR: test_topic_name : Exception caught\n")));
+      }
+    catch (...)
+      {
+        ACE_ERROR ((LM_ERROR,
+          ACE_TEXT ("ERROR: test_topic_name : Unknown exception caught\n")));
+      }
+  }
+
+  void
+  SetConnectorAttribute_Connector_exec_i::test_key_fields ()
+  {
+    try
+      {
+        ::DDS::StringSeq_var key_fields = this->key_fields ();
+        if (key_fields->length () != NO_OFF_KEY_FIELDS_TO_TEST)
+          {
+            ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: ")
+                ACE_TEXT ("Incorrect size of key fields; set <%C> - should be <%C>\n"),
+                key_fields->length (), NO_OFF_KEY_FIELDS_TO_TEST));
+          }
+        for (CORBA::ULong i = 0; i < key_fields->length (); ++i)
+          {
+            char tmp[256];
+            ACE_OS::sprintf (tmp, KEY_FIELDS_PREFIX_TO_TEST, i+1);
+            if (ACE_OS::strcmp (tmp, (*key_fields)[i].in ()) != 0)
+              {
+                ACE_ERROR ((LM_ERROR, ACE_TEXT ("ERROR: ")
+                    ACE_TEXT ("Incorrect string found in key fields; ")
+                    ACE_TEXT ("index <%d> - set <%C> - should be <%C>\n"),
+                    i, (*key_fields)[i].in (), tmp));
+              }
+            else
+              {
+                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("keyfield %d has been properly set\n"), i));
+              }
+          }
+      }
+    catch (const CORBA::Exception& ex)
+      {
+        ex._tao_print_exception ("Exception caught:");
+        ACE_ERROR ((LM_ERROR,
+          ACE_TEXT ("ERROR: test_key_fields : Exception caught\n")));
+      }
+    catch (...)
+      {
+        ACE_ERROR ((LM_ERROR,
+          ACE_TEXT ("ERROR: test_key_fields : Unknown exception caught\n")));
+      }
+  }
+
+
+  void
+  SetConnectorAttribute_Connector_exec_i::ccm_activate ()
+  {
+    test_key_fields ();
+    test_domain_id ();
+    test_qos_profile ();
+    test_topic_name ();
+  }
+
+  extern "C" SETCONNECTORATTRIBUTE_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_SetConnectorAttribute_SetConnectorAttribute_Connector_Impl (void)
+  {
+    ::Components::EnterpriseComponent_ptr retval =
+      ::Components::EnterpriseComponent::_nil ();
+
+    ACE_NEW_NORETURN (
+      retval,
+      SetConnectorAttribute_Connector_exec_i ());
+
+    return retval;
+  }
+}
+
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector_exec.h
new file mode 100644
index 00000000000..c7c4879f886
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/Connector/SetConnectorAttribute_Connector_exec.h
@@ -0,0 +1,67 @@
+// -*- C++ -*-
+// $Id$
+
+#ifndef SETCONNECTORATTRIBUTE_CONNECTOR_EXEC_H_
+#define SETCONNECTORATTRIBUTE_CONNECTOR_EXEC_H_
+
+#include /**/ "ace/pre.h"
+
+#include "SetConnectorAttribute_ConnectorEC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "SetConnectorAttribute_Connector_exec_export.h"
+#include "tao/LocalObject.h"
+
+#include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
+#include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
+
+#include "Base/SetConnectorAttribute_BaseSupport.h"
+
+namespace CIAO_SetConnectorAttribute_SetConnectorAttribute_Connector_Impl
+{
+  // @from use of SetConnectorAttributeTest as a parameter
+  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+    SetConnectorAttributeTest,
+    SetConnectorAttributeTestSeq,
+    SetConnectorAttributeTestTypeSupport,
+    SetConnectorAttributeTestDataWriter,
+    SetConnectorAttributeTestDataReader > SetConnectorAttributeTest_DDS_Traits;
+
+  typedef CIAO::DDS4CCM::Connector_Traits <
+    ::CIAO_SetConnectorAttribute_SetConnectorAttribute_Connector_Impl::SetConnectorAttribute_Connector_Exec,
+    SetConnectorAttributeTest_Seq,
+    ::CCM_DDS::SetConnectorAttributeTest::CCM_Writer,
+    ::CCM_DDS::SetConnectorAttributeTest::CCM_Updater,
+    ::CCM_DDS::SetConnectorAttributeTest::CCM_Getter,
+    ::CCM_DDS::SetConnectorAttributeTest::CCM_Reader,
+    ::SetConnectorAttribute::CCM_SetConnectorAttribute_Connector_Context,
+    ::CCM_DDS::SetConnectorAttributeTest::Listener,
+    ::CCM_DDS::SetConnectorAttributeTest::StateListener,
+    ::CCM_DDS::ConnectorStatusListener> SetConnectorAttributeTest_Connector_Traits;
+
+  class SETCONNECTORATTRIBUTE_CONNECTOR_EXEC_Export SetConnectorAttribute_Connector_exec_i :
+    public DDS_Event_Connector_T <SetConnectorAttributeTest_DDS_Traits, SetConnectorAttributeTest_Connector_Traits>
+  {
+  public:
+    SetConnectorAttribute_Connector_exec_i (void);
+    virtual ~SetConnectorAttribute_Connector_exec_i (void);
+
+    void ccm_activate (void);
+  private:
+    void test_domain_id ();
+    void test_qos_profile ();
+    void test_topic_name ();
+    void test_key_fields ();
+  };
+
+  extern "C" SETCONNECTORATTRIBUTE_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_SetConnectorAttribute_SetConnectorAttribute_Connector_Impl (void);
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
diff --git a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl
index e91dc5b9c10..bbb29e79d89 100755
--- a/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/SetConnectorAttributes/descriptors/run_test.pl
@@ -100,8 +100,6 @@ sub kill_open_processes {
     if ($ns_running == 1) {
         $NS->Kill (); $NS->TimedWait (1);
     }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
 }
 
 sub run_node_daemons {
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl
index 1726cbb00b1..e32a0498e6b 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.idl
@@ -8,8 +8,6 @@
 #ifndef BASE_IDL
 #define BASE_IDL
 
-#pragma ndds typesupport "Base/BaseSupport.h"
-
 struct SharedDPTest1 {
   string key1;
   long iteration1;
@@ -17,15 +15,15 @@ struct SharedDPTest1 {
 typedef sequence<SharedDPTest1> SharedDPTest1_Seq;
 
 struct SharedDPTest2 {
-  string key2;
-  long iteration2;
-};
-typedef sequence<SharedDPTest2> SharedDPTest2_Seq;
+   string key2;
+   long iteration2;
+ };
+ typedef sequence<SharedDPTest2> SharedDPTest2_Seq;
 
-struct SharedDPTest3 {
-  string key3;
-  long iteration3;
-};
-typedef sequence<SharedDPTest3> SharedDPTest3_Seq;
+ struct SharedDPTest3 {
+   string key3;
+   long iteration3;
+ };
+ typedef sequence<SharedDPTest3> SharedDPTest3_Seq;
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.mpc
index 5330c678e29..ddd7cb0fb57 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Base/Base.mpc
@@ -1,25 +1,77 @@
 // $Id$
+// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n Base"
 
-project (DDS_SharedDP_DDBase_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
-  sharedname = DDS_SharedDP_DDBase_stub
-  dynamicflags += BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Gxhst -Sci \
-              -Wb,stub_export_macro=BASE_STUB_Export \
+project(DDS_SharedDP_DDBase_idl_gen) : taoidldefaults, anytypecode {
+  custom_only = 1
+  idlflags -= -St -Sa
+  idlflags += -SS -Gxhst \
+              -Wb,stub_export_macro=Base_STUB_Export \
               -Wb,stub_export_include=Base_stub_export.h
 
   IDL_Files {
     Base.idl
   }
+}
 
-  opendds_ts_flags += --export=BASE_STUB_Export
+project(DDS_SharedDP_DDBase_ndds_ts_gen) : ndds_ts_defaults {
+  custom_only = 1
+  after += DDS_SharedDP_DDBase_idl_gen
+  ndds_ts_flags += -corba BaseC.h -orb ACE_TAO1.7
 
-  DDSGenerator_Files {
+  NDDSTypeSupport_Files {
     Base.idl
   }
+}
+
+project(DDS_SharedDP_DDBase_NDDS_TS) : nddslib, taolib {
+  after += DDS_SharedDP_DDBase_ndds_ts_gen DDS_SharedDP_DDBase_stub
+  libs += DDS_SharedDP_DDBase_stub
+  libout = ../lib
+  libpaths    += ../lib
+  sharedname = DDS_SharedDP_DDBase_NDDS_TS
+  dynamicflags = NDDS_USER_DLL_EXPORT
+
+  verbatim(gnuace, macros) {
+    override no_hidden_visibility = 1
+  }
 
   Source_Files {
+    Base.cxx
+    BasePlugin.cxx
+    BaseSupport.cxx
+  }
+
+  Header_Files {
+    Base.h
+    BasePlugin.h
+    BaseSupport.h
+  }
+
+  Inline_Files {
+  }
+}
+
+project(DDS_SharedDP_DDBase_stub) : ccm_stub {
+  after += DDS_SharedDP_DDBase_idl_gen
+  libout = ../lib
+  libpaths += ../lib
+  sharedname = DDS_SharedDP_DDBase_stub
+  dynamicflags = Base_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    BaseC.cpp
+  }
+
+  Header_Files {
+    BaseC.h
+    Base_stub_export.h
+  }
+
+  Inline_Files {
+    BaseC.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc
index e5a1dc9fb37..5384c5c7a82 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_SharedDPBase -l ../lib -o ../lib -c controller -u DDS Component"
 
-project(DDS_SharedDP_DDComponent_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_SharedDP_DDComponent_idl_gen) : componentidldefaults   {
   after += DDS_SharedDP_Connector1_idl_gen DDS_SharedDP_Connector2_idl_gen \
            DDS_SharedDP_Connector3_idl_gen
   custom_only = 1
@@ -20,7 +20,7 @@ project(DDS_SharedDP_DDComponent_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_SharedDP_DDComponent_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_SharedDP_DDComponent_lem_gen) : ciaoidldefaults {
   after += DDS_SharedDP_DDComponent_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=COMPONENT_LEM_STUB_Export \
@@ -86,7 +86,7 @@ project(DDS_SharedDP_DDComponent_stub) : ccm_stub, dds4ccm_base {
   }
 }
 
-project(DDS_SharedDP_DDComponent_exec) : ciao_executor, dds4ccm_base, dds4ccm_impl {
+project(DDS_SharedDP_DDComponent_exec) : ciao_executor, nddslib, dds4ccm_base {
   after   += DDS_SharedDP_DDComponent_lem_stub DDS_SharedDP_DDComponent_stub \
              DDS_SharedDP_Connector1_lem_stub DDS_SharedDP_Connector1_stub \
              DDS_SharedDP_Connector2_lem_stub DDS_SharedDP_Connector2_stub \
@@ -97,7 +97,7 @@ project(DDS_SharedDP_DDComponent_exec) : ciao_executor, dds4ccm_base, dds4ccm_im
           DDS_Connector1_lem_stub DDS_Connector1_stub \
           DDS_Connector2_lem_stub DDS_Connector2_stub \
           DDS_Connector3_lem_stub DDS_Connector3_stub \
-          DDS4CCM_lem_stub
+          DDS4CCM_lem_stub CIAO_DDS4CCM_NDDS_Impl
   libpaths += ../lib
   includes += ..
   libout = ../lib
@@ -120,7 +120,7 @@ project(DDS_SharedDP_DDComponent_exec) : ciao_executor, dds4ccm_base, dds4ccm_im
 }
 
 
-project(DDS_SharedDP_DDComponent_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_SharedDP_DDComponent_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      += DDS_SharedDP_DDBase_stub  DDS_SharedDP_DDComponent_lem_stub \
                 DDS4CCM_lem_stub DDS4CCM_skel \
                 DDS_SharedDP_Connector1_stub DDS_SharedDP_Connector1_svnt  DDS_SharedDP_Connector1_lem_stub \
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp
index 2ce802f3c73..11262103f9b 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Component/Component_exec.cpp
@@ -46,8 +46,8 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl
       {
         DDS::DataWriter_var dw1 =
           this->context_->get_connection_write1_dds_entity ();
-        CIAO::DDS4CCM::CCM_DDS_DataWriter_i *rti_rd1 =
-           dynamic_cast <CIAO::DDS4CCM::CCM_DDS_DataWriter_i *> (dw1.in ());
+        CIAO::DDS4CCM::RTI::RTI_DataWriter_i *rti_rd1 =
+           dynamic_cast <CIAO::DDS4CCM::RTI::RTI_DataWriter_i *> (dw1.in ());
         DDSDataWriter * dds_dw1 = rti_rd1->get_impl ();
         DDSPublisher * dds_p1 = dds_dw1->get_publisher ();
         this->dds_dp1_ = dds_p1->get_participant ();
@@ -61,8 +61,8 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl
       {
         DDS::DataWriter_var dw2 =
           this->context_->get_connection_write2_dds_entity ();
-        CIAO::DDS4CCM::CCM_DDS_DataWriter_i *rti_rd2 =
-           dynamic_cast <CIAO::DDS4CCM::CCM_DDS_DataWriter_i *> (dw2.in ());
+        CIAO::DDS4CCM::RTI::RTI_DataWriter_i *rti_rd2 =
+           dynamic_cast <CIAO::DDS4CCM::RTI::RTI_DataWriter_i *> (dw2.in ());
         DDSDataWriter * dds_dw2 = rti_rd2->get_impl ();
         DDSPublisher * dds_p2 = dds_dw2->get_publisher ();
         this->dds_dp2_ = dds_p2->get_participant ();
@@ -76,8 +76,8 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl
       {
         DDS::DataWriter_var dw3 =
           this->context_->get_connection_write3_dds_entity ();
-        CIAO::DDS4CCM::CCM_DDS_DataWriter_i *rti_rd3 =
-           dynamic_cast <CIAO::DDS4CCM::CCM_DDS_DataWriter_i *> (dw3.in ());
+        CIAO::DDS4CCM::RTI::RTI_DataWriter_i *rti_rd3 =
+           dynamic_cast <CIAO::DDS4CCM::RTI::RTI_DataWriter_i *> (dw3.in ());
         DDSDataWriter * dds_dw3 = rti_rd3->get_impl ();
         DDSPublisher * dds_p3 = dds_dw3->get_publisher ();
         this->dds_dp3_ = dds_p3->get_participant ();
@@ -104,7 +104,7 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl
   {
     if (this->dds_dp1_ != this->dds_dp2_)
       {
-        ACE_ERROR ((LM_ERROR, "ERROR: Connector 1 and 2 don't seem to "
+        ACE_ERROR ((LM_ERROR, "ERROR: Connector 1 and 2 doesn't seem to "
                               "share the same DomainParticipant\n"));
       }
     else
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc
index b93bc91bfa1..ac63ba51983 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_SharedDP_Connector1_idl_gen) : connectoridldefaults, dds4ccm {
+project(DDS_SharedDP_Connector1_idl_gen) : connectoridldefaults {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR1_STUB_Export \
@@ -9,8 +9,8 @@ project(DDS_SharedDP_Connector1_idl_gen) : connectoridldefaults, dds4ccm {
               -Wb,skel_export_include=Connector1_svnt_export.h \
               -Wb,svnt_export_macro=SHAREDDP_CONNECTOR1_SVNT_Export \
               -Wb,svnt_export_include=Connector1_svnt_export.h \
-              -Wb,conn_export_macro=SHAREDDP_CONNECTOR1_CONN_Export \
-              -Wb,conn_export_include=Connector1_conn_export.h \
+              -Wb,exec_export_macro=SHAREDDP_CONNECTOR1_EXEC_Export \
+              -Wb,exec_export_include=Connector1_exec_export.h \
               -I ..
 
   IDL_Files {
@@ -18,7 +18,7 @@ project(DDS_SharedDP_Connector1_idl_gen) : connectoridldefaults, dds4ccm {
   }
 }
 
-project(DDS_SharedDP_Connector1_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_SharedDP_Connector1_lem_gen) : ciaoidldefaults {
   custom_only = 1
   after += DDS_SharedDP_Connector1_idl_gen
   idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR1_LEM_STUB_Export \
@@ -84,24 +84,24 @@ project(DDS_SharedDP_Connector1_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_SharedDP_Connector1_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_SharedDP_Connector1_lem_stub DDS_SharedDP_Connector1_stub DDS4CCM_lem_stub DDS_SharedDP_DDBase_stub
+  after   += DDS_SharedDP_Connector1_lem_stub DDS_SharedDP_Connector1_stub DDS4CCM_lem_stub DDS_SharedDP_DDBase_NDDS_TS
   sharedname = DDS_Connector1_exec
-  libs += DDS_Connector1_stub DDS_Connector1_lem_stub DDS_SharedDP_DDBase_stub DDS4CCM_lem_stub DDS_SharedDP_DDBase_stub
+  libs += DDS_Connector1_stub DDS_Connector1_lem_stub DDS_SharedDP_DDBase_stub DDS4CCM_lem_stub DDS_SharedDP_DDBase_NDDS_TS
   libpaths += ../lib
   libout = ../lib
   includes += ..
-  dynamicflags   = SHAREDDP_CONNECTOR1_CONN_BUILD_DLL
+  dynamicflags   = SHAREDDP_CONNECTOR1_EXEC_BUILD_DLL
 
   IDL_Files {
   }
 
   Source_Files {
-    Connector1_conn.cpp
+    Connector1_exec.cpp
   }
 
   Header_Files {
-    Connector1_conn.h
-    Connector1_conn_export.h
+    Connector1_exec.h
+    Connector1_exec_export.h
   }
 
   Inline_Files {
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1_exec.cpp b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1_exec.cpp
new file mode 100644
index 00000000000..c96e393cf22
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1_exec.cpp
@@ -0,0 +1,30 @@
+// -*- C++ -*-
+// $Id$
+
+#include "Connector1_exec.h"
+
+namespace CIAO_SharedDP_Connector1_Connector1_Impl
+{
+  Connector1_exec_i::Connector1_exec_i (void)
+    : DDS_Event_Connector_T<SharedDPTest1_DDS_Traits, SharedDPTest1_Connector_Traits> ()
+  {
+  }
+
+  Connector1_exec_i::~Connector1_exec_i (void)
+  {
+  }
+
+  extern "C" SHAREDDP_CONNECTOR1_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_SharedDP_Connector1_Impl (void)
+  {
+    ::Components::EnterpriseComponent_ptr retval =
+      ::Components::EnterpriseComponent::_nil ();
+
+    ACE_NEW_NORETURN (
+      retval,
+      Connector1_exec_i ());
+
+    return retval;
+  }
+}
+
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1_exec.h b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1_exec.h
new file mode 100644
index 00000000000..c49871e5722
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector1/Connector1_exec.h
@@ -0,0 +1,60 @@
+// -*- C++ -*-
+// $Id$
+
+#ifndef CONNECTOR1_EXEC_H_
+#define CONNECTOR1_EXEC_H_
+
+#include /**/ "ace/pre.h"
+
+#include "Connector1EC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "Connector1_exec_export.h"
+#include "tao/LocalObject.h"
+
+#include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
+#include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
+
+#include "Base/BaseSupport.h"
+
+namespace CIAO_SharedDP_Connector1_Connector1_Impl
+{
+
+  typedef CIAO::DDS4CCM::RTI::Type_Traits <
+    SharedDPTest1,
+    SharedDPTest1Seq,
+    SharedDPTest1TypeSupport,
+    SharedDPTest1DataWriter,
+    SharedDPTest1DataReader > SharedDPTest1_DDS_Traits;
+
+  typedef CIAO::DDS4CCM::Connector_Traits <
+    ::CIAO_SharedDP_Connector1_Connector1_Impl::Connector1_Exec,
+    SharedDPTest1_Seq,
+    ::CCM_DDS::SharedDPTest1::CCM_Writer,
+    ::CCM_DDS::SharedDPTest1::CCM_Updater,
+    ::CCM_DDS::SharedDPTest1::CCM_Getter,
+    ::CCM_DDS::SharedDPTest1::CCM_Reader,
+    ::SharedDP_Connector1::CCM_Connector1_Context,
+    ::CCM_DDS::SharedDPTest1::Listener,
+    ::CCM_DDS::SharedDPTest1::StateListener,
+    ::CCM_DDS::ConnectorStatusListener> SharedDPTest1_Connector_Traits;
+
+  class SHAREDDP_CONNECTOR1_EXEC_Export Connector1_exec_i :
+    public DDS_Event_Connector_T <SharedDPTest1_DDS_Traits, SharedDPTest1_Connector_Traits>
+  {
+  public:
+    Connector1_exec_i (void);
+    virtual ~Connector1_exec_i (void);
+  };
+
+  extern "C" SHAREDDP_CONNECTOR1_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_SharedDP_Connector1_Impl (void);
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* CONNECTOR1_EXEC_H_ */
+
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc
index f1e2dc87137..45c81b405d2 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_SharedDP_Connector2_idl_gen) : connectoridldefaults, dds4ccm {
+project(DDS_SharedDP_Connector2_idl_gen) : connectoridldefaults {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR2_STUB_Export \
@@ -9,8 +9,8 @@ project(DDS_SharedDP_Connector2_idl_gen) : connectoridldefaults, dds4ccm {
               -Wb,skel_export_include=Connector2_svnt_export.h \
               -Wb,svnt_export_macro=SHAREDDP_CONNECTOR2_SVNT_Export \
               -Wb,svnt_export_include=Connector2_svnt_export.h \
-              -Wb,conn_export_macro=SHAREDDP_CONNECTOR2_CONN_Export \
-              -Wb,conn_export_include=Connector2_conn_export.h \
+              -Wb,exec_export_macro=SHAREDDP_CONNECTOR2_EXEC_Export \
+              -Wb,exec_export_include=Connector2_exec_export.h \
               -I ..
 
   IDL_Files {
@@ -18,7 +18,7 @@ project(DDS_SharedDP_Connector2_idl_gen) : connectoridldefaults, dds4ccm {
   }
 }
 
-project(DDS_SharedDP_Connector2_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_SharedDP_Connector2_lem_gen) : ciaoidldefaults {
   custom_only = 1
   after += DDS_SharedDP_Connector2_idl_gen
   idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR2_LEM_STUB_Export \
@@ -84,24 +84,24 @@ project(DDS_SharedDP_Connector2_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_SharedDP_Connector2_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_SharedDP_Connector2_lem_stub DDS_SharedDP_Connector2_stub DDS4CCM_lem_stub DDS_SharedDP_DDBase_stub
+  after   += DDS_SharedDP_Connector2_lem_stub DDS_SharedDP_Connector2_stub DDS4CCM_lem_stub DDS_SharedDP_DDBase_NDDS_TS
   sharedname = DDS_Connector2_exec
-  libs += DDS_Connector2_stub DDS_Connector2_lem_stub DDS_SharedDP_DDBase_stub DDS4CCM_lem_stub DDS_SharedDP_DDBase_stub
+  libs += DDS_Connector2_stub DDS_Connector2_lem_stub DDS_SharedDP_DDBase_stub DDS4CCM_lem_stub DDS_SharedDP_DDBase_NDDS_TS
   libpaths += ../lib
   libout = ../lib
   includes += ..
-  dynamicflags   = SHAREDDP_CONNECTOR2_CONN_BUILD_DLL
+  dynamicflags   = SHAREDDP_CONNECTOR2_EXEC_BUILD_DLL
 
   IDL_Files {
   }
 
   Source_Files {
-    Connector2_conn.cpp
+    Connector2_exec.cpp
   }
 
   Header_Files {
-    Connector2_conn.h
-    Connector2_conn_export.h
+    Connector2_exec.h
+    Connector2_exec_export.h
   }
 
   Inline_Files {
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2_exec.cpp b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2_exec.cpp
new file mode 100644
index 00000000000..4a2a09d7ff7
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2_exec.cpp
@@ -0,0 +1,30 @@
+// -*- C++ -*-
+// $Id$
+
+#include "Connector2_exec.h"
+
+namespace CIAO_SharedDP_Connector2_Connector2_Impl
+{
+  Connector2_exec_i::Connector2_exec_i (void)
+    : DDS_Event_Connector_T<SharedDPTest2_DDS_Traits, SharedDPTest2_Connector_Traits> ()
+  {
+  }
+
+  Connector2_exec_i::~Connector2_exec_i (void)
+  {
+  }
+
+  extern "C" SHAREDDP_CONNECTOR2_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_SharedDP_Connector2_Impl (void)
+  {
+    ::Components::EnterpriseComponent_ptr retval =
+      ::Components::EnterpriseComponent::_nil ();
+
+    ACE_NEW_NORETURN (
+      retval,
+      Connector2_exec_i ());
+
+    return retval;
+  }
+}
+
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2_exec.h b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2_exec.h
new file mode 100644
index 00000000000..e8cda623b2c
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector2/Connector2_exec.h
@@ -0,0 +1,60 @@
+// -*- C++ -*-
+// $Id$
+
+#ifndef CONNECTOR2_EXEC_H_
+#define CONNECTOR2_EXEC_H_
+
+#include /**/ "ace/pre.h"
+
+#include "Connector2EC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "Connector2_exec_export.h"
+#include "tao/LocalObject.h"
+
+#include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
+#include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
+
+#include "Base/BaseSupport.h"
+
+namespace CIAO_SharedDP_Connector2_Connector2_Impl
+{
+
+  typedef CIAO::DDS4CCM::RTI::Type_Traits <
+    SharedDPTest2,
+    SharedDPTest2Seq,
+    SharedDPTest2TypeSupport,
+    SharedDPTest2DataWriter,
+    SharedDPTest2DataReader > SharedDPTest2_DDS_Traits;
+
+  typedef CIAO::DDS4CCM::Connector_Traits <
+    ::CIAO_SharedDP_Connector2_Connector2_Impl::Connector2_Exec,
+    SharedDPTest2_Seq,
+    ::CCM_DDS::SharedDPTest2::CCM_Writer,
+    ::CCM_DDS::SharedDPTest2::CCM_Updater,
+    ::CCM_DDS::SharedDPTest2::CCM_Getter,
+    ::CCM_DDS::SharedDPTest2::CCM_Reader,
+    ::SharedDP_Connector2::CCM_Connector2_Context,
+    ::CCM_DDS::SharedDPTest2::Listener,
+    ::CCM_DDS::SharedDPTest2::StateListener,
+    ::CCM_DDS::ConnectorStatusListener> SharedDPTest2_Connector_Traits;
+
+  class SHAREDDP_CONNECTOR2_EXEC_Export Connector2_exec_i :
+    public DDS_Event_Connector_T <SharedDPTest2_DDS_Traits, SharedDPTest2_Connector_Traits>
+  {
+  public:
+    Connector2_exec_i (void);
+    virtual ~Connector2_exec_i (void);
+  };
+
+  extern "C" SHAREDDP_CONNECTOR2_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_SharedDP_Connector2_Impl (void);
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* CONNECTOR2_EXEC_H_ */
+
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc
index ad8d9ad0eea..4dd2572ec6b 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_SharedDP_Connector3_idl_gen) : connectoridldefaults, dds4ccm {
+project(DDS_SharedDP_Connector3_idl_gen) : connectoridldefaults {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR3_STUB_Export \
@@ -9,8 +9,8 @@ project(DDS_SharedDP_Connector3_idl_gen) : connectoridldefaults, dds4ccm {
               -Wb,skel_export_include=Connector3_svnt_export.h \
               -Wb,svnt_export_macro=SHAREDDP_CONNECTOR3_SVNT_Export \
               -Wb,svnt_export_include=Connector3_svnt_export.h \
-              -Wb,conn_export_macro=SHAREDDP_CONNECTOR3_CONN_Export \
-              -Wb,conn_export_include=Connector3_conn_export.h \
+              -Wb,exec_export_macro=SHAREDDP_CONNECTOR3_EXEC_Export \
+              -Wb,exec_export_include=Connector3_exec_export.h \
               -I ..
 
   IDL_Files {
@@ -18,7 +18,7 @@ project(DDS_SharedDP_Connector3_idl_gen) : connectoridldefaults, dds4ccm {
   }
 }
 
-project(DDS_SharedDP_Connector3_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_SharedDP_Connector3_lem_gen) : ciaoidldefaults {
   custom_only = 1
   after += DDS_SharedDP_Connector3_idl_gen
   idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR3_LEM_STUB_Export \
@@ -84,24 +84,24 @@ project(DDS_SharedDP_Connector3_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_SharedDP_Connector3_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_SharedDP_Connector3_lem_stub DDS_SharedDP_Connector3_stub DDS4CCM_lem_stub DDS_SharedDP_DDBase_stub
+  after   += DDS_SharedDP_Connector3_lem_stub DDS_SharedDP_Connector3_stub DDS4CCM_lem_stub DDS_SharedDP_DDBase_NDDS_TS
   sharedname = DDS_Connector3_exec
-  libs += DDS_Connector3_stub DDS_Connector3_lem_stub DDS_SharedDP_DDBase_stub DDS4CCM_lem_stub DDS_SharedDP_DDBase_stub
+  libs += DDS_Connector3_stub DDS_Connector3_lem_stub DDS_SharedDP_DDBase_stub DDS4CCM_lem_stub DDS_SharedDP_DDBase_NDDS_TS
   libpaths += ../lib
   libout = ../lib
   includes += ..
-  dynamicflags   = SHAREDDP_CONNECTOR3_CONN_BUILD_DLL
+  dynamicflags   = SHAREDDP_CONNECTOR3_EXEC_BUILD_DLL
 
   IDL_Files {
   }
 
   Source_Files {
-    Connector3_conn.cpp
+    Connector3_exec.cpp
   }
 
   Header_Files {
-    Connector3_conn.h
-    Connector3_conn_export.h
+    Connector3_exec.h
+    Connector3_exec_export.h
   }
 
   Inline_Files {
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3_exec.cpp b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3_exec.cpp
new file mode 100644
index 00000000000..6a9b80bd087
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3_exec.cpp
@@ -0,0 +1,30 @@
+// -*- C++ -*-
+// $Id$
+
+#include "Connector3_exec.h"
+
+namespace CIAO_SharedDP_Connector3_Connector3_Impl
+{
+  Connector3_exec_i::Connector3_exec_i (void)
+    : DDS_Event_Connector_T<SharedDPTest3_DDS_Traits, SharedDPTest3_Connector_Traits> ()
+  {
+  }
+
+  Connector3_exec_i::~Connector3_exec_i (void)
+  {
+  }
+
+  extern "C" SHAREDDP_CONNECTOR3_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_SharedDP_Connector3_Impl (void)
+  {
+    ::Components::EnterpriseComponent_ptr retval =
+      ::Components::EnterpriseComponent::_nil ();
+
+    ACE_NEW_NORETURN (
+      retval,
+      Connector3_exec_i ());
+
+    return retval;
+  }
+}
+
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3_exec.h b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3_exec.h
new file mode 100644
index 00000000000..0b4bda534f2
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/Connector3/Connector3_exec.h
@@ -0,0 +1,60 @@
+// -*- C++ -*-
+// $Id$
+
+#ifndef CONNECTOR3_EXEC_H_
+#define CONNECTOR3_EXEC_H_
+
+#include /**/ "ace/pre.h"
+
+#include "Connector3EC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "Connector3_exec_export.h"
+#include "tao/LocalObject.h"
+
+#include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
+#include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
+
+#include "Base/BaseSupport.h"
+
+namespace CIAO_SharedDP_Connector3_Connector3_Impl
+{
+
+  typedef CIAO::DDS4CCM::RTI::Type_Traits <
+    SharedDPTest3,
+    SharedDPTest3Seq,
+    SharedDPTest3TypeSupport,
+    SharedDPTest3DataWriter,
+    SharedDPTest3DataReader > SharedDPTest3_DDS_Traits;
+
+  typedef CIAO::DDS4CCM::Connector_Traits <
+    ::CIAO_SharedDP_Connector3_Connector3_Impl::Connector3_Exec,
+    SharedDPTest3_Seq,
+    ::CCM_DDS::SharedDPTest3::CCM_Writer,
+    ::CCM_DDS::SharedDPTest3::CCM_Updater,
+    ::CCM_DDS::SharedDPTest3::CCM_Getter,
+    ::CCM_DDS::SharedDPTest3::CCM_Reader,
+    ::SharedDP_Connector3::CCM_Connector3_Context,
+    ::CCM_DDS::SharedDPTest3::Listener,
+    ::CCM_DDS::SharedDPTest3::StateListener,
+    ::CCM_DDS::ConnectorStatusListener> SharedDPTest3_Connector_Traits;
+
+  class SHAREDDP_CONNECTOR3_EXEC_Export Connector3_exec_i :
+    public DDS_Event_Connector_T <SharedDPTest3_DDS_Traits, SharedDPTest3_Connector_Traits>
+  {
+  public:
+    Connector3_exec_i (void);
+    virtual ~Connector3_exec_i (void);
+  };
+
+  extern "C" SHAREDDP_CONNECTOR3_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_SharedDP_Connector3_Impl (void);
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* CONNECTOR3_EXEC_H_ */
+
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Plan.cdp
index a8991de43aa..ac028c15099 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Plan.cdp
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/Plan.cdp
@@ -18,7 +18,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_SharedDP_Connector1_Connector1_Impl</string>
+          <string>create_SharedDP_Connector1_Impl</string>
         </value>
       </value>
     </execParameter>
@@ -69,7 +69,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_SharedDP_Connector2_Connector2_Impl</string>
+          <string>create_SharedDP_Connector2_Impl</string>
         </value>
       </value>
     </execParameter>
@@ -120,7 +120,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_SharedDP_Connector3_Connector3_Impl</string>
+          <string>create_SharedDP_Connector3_Impl</string>
         </value>
       </value>
     </execParameter>
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/run_test.pl
index 34e80ff8c33..3ac194b1607 100755
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/DifferentDatatype/descriptors/run_test.pl
@@ -100,8 +100,6 @@ sub kill_open_processes {
     if ($ns_running == 1) {
         $NS->Kill (); $NS->TimedWait (1);
     }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
 }
 
 sub run_node_daemons {
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl
index a1e539029f7..e29e4fd9d5f 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.idl
@@ -8,8 +8,6 @@
 #ifndef BASE_IDL
 #define BASE_IDL
 
-#pragma ndds typesupport "Base/BaseSupport.h"
-
 struct SharedDPTest {
   string key;
   long iteration;
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.mpc
index 9059a10ccf6..1dc9440651c 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Base/Base.mpc
@@ -1,25 +1,76 @@
 // $Id$
+// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n Base"
 
-project (DDS_SharedDPBase_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
-  sharedname = DDS_SharedDPBase_stub
-  dynamicflags += BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Gxhst -Sci \
-              -Wb,stub_export_macro=BASE_STUB_Export \
+project(DDS_SharedDPBase_idl_gen) : taoidldefaults, anytypecode {
+  custom_only = 1
+  idlflags -= -St -Sa
+  idlflags += -SS -Gxhst \
+              -Wb,stub_export_macro=Base_STUB_Export \
               -Wb,stub_export_include=Base_stub_export.h
 
   IDL_Files {
     Base.idl
   }
+}
 
-  opendds_ts_flags += --export=BASE_STUB_Export
+project(DDS_SharedDPBase_ndds_ts_gen) : ndds_ts_defaults {
+  custom_only = 1
+  after += DDS_SharedDPBase_idl_gen
 
-  DDSGenerator_Files {
+  NDDSTypeSupport_Files {
     Base.idl
   }
+}
+
+project(DDS_SharedDPBase_NDDS_TS) : nddslib, taolib {
+  after += DDS_SharedDPBase_ndds_ts_gen DDS_SharedDPBase_stub
+  libs += DDS_SharedDPBase_stub
+  libout = ../lib
+  libpaths    += ../lib
+  sharedname = DDS_SharedDPBase_NDDS_TS
+  dynamicflags = NDDS_USER_DLL_EXPORT
+
+  verbatim(gnuace, macros) {
+    override no_hidden_visibility = 1
+  }
 
   Source_Files {
+    Base.cxx
+    BasePlugin.cxx
+    BaseSupport.cxx
+  }
+
+  Header_Files {
+    Base.h
+    BasePlugin.h
+    BaseSupport.h
+  }
+
+  Inline_Files {
+  }
+}
+
+project(DDS_SharedDPBase_stub) : ccm_stub {
+  after += DDS_SharedDPBase_idl_gen
+  libout = ../lib
+  libpaths += ../lib
+  sharedname = DDS_SharedDPBase_stub
+  dynamicflags = Base_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    BaseC.cpp
+  }
+
+  Header_Files {
+    BaseC.h
+    Base_stub_export.h
+  }
+
+  Inline_Files {
+    BaseC.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.idl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.idl
index 04d944e7db1..8fee2499815 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.idl
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.idl
@@ -18,7 +18,6 @@ module SharedDP
     port CCM_DDS::SharedDPTest::DDS_Write write1;
     port CCM_DDS::SharedDPTest::DDS_Write write2;
     port CCM_DDS::SharedDPTest::DDS_Write write3;
-    port CCM_DDS::SharedDPTest::DDS_Write write4;
   };
 };
 
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc
index b49e7da658d..d1854b56941 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_SharedDPBase -l ../lib -o ../lib -c controller -u DDS Component"
 
-project(DDS_SharedDPComponent_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_SharedDPComponent_idl_gen) : componentidldefaults   {
   after += DDS_SharedDP_Connector_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=COMPONENT_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_SharedDPComponent_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_SharedDPComponent_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_SharedDPComponent_lem_gen) : ciaoidldefaults {
   after += DDS_SharedDPComponent_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=COMPONENT_LEM_STUB_Export \
@@ -84,14 +84,14 @@ project(DDS_SharedDPComponent_stub) : ccm_stub, dds4ccm_base {
   }
 }
 
-project(DDS_SharedDPComponent_exec) : ciao_executor, dds4ccm_base, dds4ccm_impl {
+project(DDS_SharedDPComponent_exec) : ciao_executor, nddslib, dds4ccm_base {
   after   += DDS_SharedDPComponent_lem_stub DDS_SharedDPComponent_stub \
              DDS_SharedDP_Connector_lem_stub DDS_SharedDP_Connector_stub \
              DDS4CCM_lem_stub
   sharedname = Component_exec
   libs += Component_stub Component_lem_stub DDS_SharedDPBase_stub \
           DDS_Connector_lem_stub DDS_Connector_stub \
-          DDS4CCM_lem_stub
+          DDS4CCM_lem_stub CIAO_DDS4CCM_NDDS_Impl
   libpaths += ../lib
   includes += ..
   libout = ../lib
@@ -114,7 +114,7 @@ project(DDS_SharedDPComponent_exec) : ciao_executor, dds4ccm_base, dds4ccm_impl
 }
 
 
-project(DDS_SharedDPComponent_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_SharedDPComponent_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      += DDS_SharedDPBase_stub  DDS_SharedDPComponent_lem_stub \
                 DDS4CCM_lem_stub DDS4CCM_skel \
                 DDS_SharedDP_Connector_stub DDS_SharedDP_Connector_svnt \
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp
index 7431f179ebc..11262103f9b 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.cpp
@@ -1,10 +1,6 @@
 // -*- C++ -*-
 // $Id$
 
-// Test whether Connector 1,2 and 3 are sharing the same DomainParticipant.
-// Connector 4 should have a different DomainParticipant.
-// Also test whether Connector 1 and 2 share the same topic.
-
 #include "Component_exec.h"
 #include "ciao/Logger/Log_Macros.h"
 
@@ -12,11 +8,6 @@
 
 #include "dds4ccm/impl/ndds/DataWriter.h"
 
-const char * tp_name_conn_1_ = "SharedDP";
-const char * tp_name_conn_2_ = "SharedDP";
-const char * tp_name_conn_3_ = "SharedDP1";
-const char * tp_name_conn_4_ = "StandaloneDP";
-
 namespace CIAO_SharedDP_SharedDPComponent_Impl
 {
   //============================================================
@@ -51,19 +42,15 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl
   void
   Component_exec_i::ccm_activate (void)
   {
-    const DDS_Duration_t dur = { 1, 0 };
     try
       {
         DDS::DataWriter_var dw1 =
           this->context_->get_connection_write1_dds_entity ();
-        CIAO::DDS4CCM::CCM_DDS_DataWriter_i *rti_rd1 =
-           dynamic_cast <CIAO::DDS4CCM::CCM_DDS_DataWriter_i *> (dw1.in ());
+        CIAO::DDS4CCM::RTI::RTI_DataWriter_i *rti_rd1 =
+           dynamic_cast <CIAO::DDS4CCM::RTI::RTI_DataWriter_i *> (dw1.in ());
         DDSDataWriter * dds_dw1 = rti_rd1->get_impl ();
         DDSPublisher * dds_p1 = dds_dw1->get_publisher ();
         this->dds_dp1_ = dds_p1->get_participant ();
-        this->dds_tp1_ = this->dds_dp1_->find_topic (
-                                    CORBA::string_dup (tp_name_conn_1_),
-                                    dur);
       }
     catch (...)
       {
@@ -74,14 +61,11 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl
       {
         DDS::DataWriter_var dw2 =
           this->context_->get_connection_write2_dds_entity ();
-        CIAO::DDS4CCM::CCM_DDS_DataWriter_i *rti_rd2 =
-           dynamic_cast <CIAO::DDS4CCM::CCM_DDS_DataWriter_i *> (dw2.in ());
+        CIAO::DDS4CCM::RTI::RTI_DataWriter_i *rti_rd2 =
+           dynamic_cast <CIAO::DDS4CCM::RTI::RTI_DataWriter_i *> (dw2.in ());
         DDSDataWriter * dds_dw2 = rti_rd2->get_impl ();
         DDSPublisher * dds_p2 = dds_dw2->get_publisher ();
         this->dds_dp2_ = dds_p2->get_participant ();
-        this->dds_tp2_ = this->dds_dp2_->find_topic (
-                                    CORBA::string_dup (tp_name_conn_2_),
-                                    dur);
       }
     catch (...)
       {
@@ -92,32 +76,11 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl
       {
         DDS::DataWriter_var dw3 =
           this->context_->get_connection_write3_dds_entity ();
-        CIAO::DDS4CCM::CCM_DDS_DataWriter_i *rti_rd3 =
-           dynamic_cast <CIAO::DDS4CCM::CCM_DDS_DataWriter_i *> (dw3.in ());
+        CIAO::DDS4CCM::RTI::RTI_DataWriter_i *rti_rd3 =
+           dynamic_cast <CIAO::DDS4CCM::RTI::RTI_DataWriter_i *> (dw3.in ());
         DDSDataWriter * dds_dw3 = rti_rd3->get_impl ();
         DDSPublisher * dds_p3 = dds_dw3->get_publisher ();
         this->dds_dp3_ = dds_p3->get_participant ();
-        this->dds_tp3_ = this->dds_dp3_->find_topic (
-                                    CORBA::string_dup (tp_name_conn_3_),
-                                    dur);
-      }
-    catch (...)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Unable to create dds_entity for writer3\n"));
-      }
-
-    try
-      {
-        DDS::DataWriter_var dw4 =
-          this->context_->get_connection_write4_dds_entity ();
-        CIAO::DDS4CCM::CCM_DDS_DataWriter_i *rti_rd4 =
-           dynamic_cast <CIAO::DDS4CCM::CCM_DDS_DataWriter_i *> (dw4.in ());
-        DDSDataWriter * dds_dw4 = rti_rd4->get_impl ();
-        DDSPublisher * dds_p4 = dds_dw4->get_publisher ();
-        this->dds_dp4_ = dds_p4->get_participant ();
-        this->dds_tp4_ = this->dds_dp4_->find_topic (
-                                    CORBA::string_dup (tp_name_conn_4_),
-                                    dur);
       }
     catch (...)
       {
@@ -134,26 +97,14 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl
       ACE_ERROR ((LM_ERROR, "ERROR: DomainParticipant for Connector 2 seems to be NIL\n"));
     if (!this->dds_dp3_)
       ACE_ERROR ((LM_ERROR, "ERROR: DomainParticipant for Connector 3 seems to be NIL\n"));
-    if (!this->dds_dp4_)
-      ACE_ERROR ((LM_ERROR, "ERROR: DomainParticipant for Connector 4 seems to be NIL\n"));
-
-    if (!this->dds_tp1_)
-      ACE_ERROR ((LM_ERROR, "ERROR: Topic for Connector 1 seems to be NIL\n"));
-    if (!this->dds_tp2_)
-      ACE_ERROR ((LM_ERROR, "ERROR: Topic for Connector 2 seems to be NIL\n"));
-    if (!this->dds_tp3_)
-      ACE_ERROR ((LM_ERROR, "ERROR: Topic for Connector 3 seems to be NIL\n"));
-    if (!this->dds_tp4_)
-      ACE_ERROR ((LM_ERROR, "ERROR: Topic for Connector 4 seems to be NIL\n"));
   }
 
   void
   Component_exec_i::ccm_remove (void)
   {
-    //check shared DomainParticipants
     if (this->dds_dp1_ != this->dds_dp2_)
       {
-        ACE_ERROR ((LM_ERROR, "ERROR: Connector 1 and 2 don't seem to "
+        ACE_ERROR ((LM_ERROR, "ERROR: Connector 1 and 2 doesn't seem to "
                               "share the same DomainParticipant\n"));
       }
     else
@@ -161,43 +112,16 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl
         ACE_DEBUG ((LM_DEBUG, "Connector 1 and 2 seems to  "
                               "share the same DomainParticipant\n"));
       }
-    if (this->dds_dp1_ == this->dds_dp4_)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Connector 1 and 4 seem to "
-                              "share the same DomainParticipant\n"));
-      }
-    if (this->dds_dp2_ == this->dds_dp4_)
+    if (this->dds_dp1_ == this->dds_dp3_)
       {
-        ACE_ERROR ((LM_ERROR, "ERROR: Connector 2 and 4 seem to "
+        ACE_ERROR ((LM_ERROR, "ERROR: Connector 1 and 3 seem to "
                               "share the same DomainParticipant\n"));
       }
-    if (this->dds_dp3_ == this->dds_dp4_)
+    if (this->dds_dp2_ == this->dds_dp3_)
       {
-        ACE_ERROR ((LM_ERROR, "ERROR: Connector 3 and 4 seem to "
+        ACE_ERROR ((LM_ERROR, "ERROR: Connector 2 and 3 seem to "
                               "share the same DomainParticipant\n"));
       }
-
-    //check shared Topics
-    if (this->dds_tp1_ != this->dds_tp2_)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Connector 1 and 2 don't seem to "
-                              "share the same Topic\n"));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "Connector 1 and 2 seems to  "
-                              "share the same Topic\n"));
-      }
-    if (this->dds_tp1_ == this->dds_tp3_)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Connector 1 and 3 seem to "
-                              "share the same Topic\n"));
-      }
-    if (this->dds_tp1_ == this->dds_tp4_)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Connector 1 and 4 seem to "
-                              "share the same Topic\n"));
-      }
   }
 
   extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.h b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.h
index 2efc3b0a958..341c942af15 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Component/Component_exec.h
@@ -18,9 +18,7 @@
 class SharedDPTest1DataWriter;
 class SharedDPTest2DataWriter;
 class SharedDPTest3DataWriter;
-class SharedDPTest4DataWriter;
 class DDSDomainParticipant;
-class DDSTopic;
 
 namespace CIAO_SharedDP_SharedDPComponent_Impl
 {
@@ -46,17 +44,10 @@ namespace CIAO_SharedDP_SharedDPComponent_Impl
     SharedDPTest1DataWriter * writer1_;
     SharedDPTest2DataWriter * writer2_;
     SharedDPTest3DataWriter * writer3_;
-    SharedDPTest4DataWriter * writer4_;
 
-    DDSDomainParticipant * dds_dp1_;
-    DDSDomainParticipant * dds_dp2_;
-    DDSDomainParticipant * dds_dp3_;
-    DDSDomainParticipant * dds_dp4_;
-
-    DDSTopic * dds_tp1_;
-    DDSTopic * dds_tp2_;
-    DDSTopic * dds_tp3_;
-    DDSTopic * dds_tp4_;
+    DDSDomainParticipant *  dds_dp1_;
+    DDSDomainParticipant *  dds_dp2_;
+    DDSDomainParticipant *  dds_dp3_;
   };
 
   extern "C" COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc
index 7f3b173b1e4..be6412faa42 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_SharedDP_Connector_idl_gen) : connectoridldefaults, dds4ccm {
+project(DDS_SharedDP_Connector_idl_gen) : connectoridldefaults {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR_STUB_Export \
@@ -9,8 +9,8 @@ project(DDS_SharedDP_Connector_idl_gen) : connectoridldefaults, dds4ccm {
               -Wb,skel_export_include=Connector_svnt_export.h \
               -Wb,svnt_export_macro=SHAREDDP_CONNECTOR_SVNT_Export \
               -Wb,svnt_export_include=Connector_svnt_export.h \
-              -Wb,conn_export_macro=SHAREDDP_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Connector_conn_export.h \
+              -Wb,exec_export_macro=SHAREDDP_CONNECTOR_EXEC_Export \
+              -Wb,exec_export_include=Connector_exec_export.h \
               -I ..
 
   IDL_Files {
@@ -18,7 +18,7 @@ project(DDS_SharedDP_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   }
 }
 
-project(DDS_SharedDP_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_SharedDP_Connector_lem_gen) : ciaoidldefaults {
   custom_only = 1
   after += DDS_SharedDP_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=SHAREDDP_CONNECTOR_LEM_STUB_Export \
@@ -84,24 +84,24 @@ project(DDS_SharedDP_Connector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_SharedDP_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_SharedDP_Connector_lem_stub DDS_SharedDP_Connector_stub DDS4CCM_lem_stub DDS_SharedDPBase_stub
+  after   += DDS_SharedDP_Connector_lem_stub DDS_SharedDP_Connector_stub DDS4CCM_lem_stub DDS_SharedDPBase_NDDS_TS
   sharedname = DDS_Connector_exec
-  libs += DDS_Connector_stub DDS_Connector_lem_stub DDS_SharedDPBase_stub DDS4CCM_lem_stub DDS_SharedDPBase_stub
+  libs += DDS_Connector_stub DDS_Connector_lem_stub DDS_SharedDPBase_stub DDS4CCM_lem_stub DDS_SharedDPBase_NDDS_TS
   libpaths += ../lib
   libout = ../lib
   includes += ..
-  dynamicflags   = SHAREDDP_CONNECTOR_CONN_BUILD_DLL
+  dynamicflags   = SHAREDDP_CONNECTOR_EXEC_BUILD_DLL
 
   IDL_Files {
   }
 
   Source_Files {
-    Connector_conn.cpp
+    Connector_exec.cpp
   }
 
   Header_Files {
-    Connector_conn.h
-    Connector_conn_export.h
+    Connector_exec.h
+    Connector_exec_export.h
   }
 
   Inline_Files {
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector_exec.cpp b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector_exec.cpp
new file mode 100644
index 00000000000..c04f3dc437e
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector_exec.cpp
@@ -0,0 +1,30 @@
+// -*- C++ -*-
+// $Id$
+
+#include "Connector_exec.h"
+
+namespace CIAO_SharedDP_Connector_SDP_Connector_Impl
+{
+  Connector_exec_i::Connector_exec_i (void)
+    : DDS_Event_Connector_T<SharedDPTest_DDS_Traits, SharedDPTest_Connector_Traits> ()
+  {
+  }
+
+  Connector_exec_i::~Connector_exec_i (void)
+  {
+  }
+
+  extern "C" SHAREDDP_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_SharedDP_Connector_Impl (void)
+  {
+    ::Components::EnterpriseComponent_ptr retval =
+      ::Components::EnterpriseComponent::_nil ();
+
+    ACE_NEW_NORETURN (
+      retval,
+      Connector_exec_i ());
+
+    return retval;
+  }
+}
+
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector_exec.h b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector_exec.h
new file mode 100644
index 00000000000..d3eba02e8a2
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/Connector/Connector_exec.h
@@ -0,0 +1,60 @@
+// -*- C++ -*-
+// $Id$
+
+#ifndef CONNECTOR_EXEC_H_
+#define CONNECTOR_EXEC_H_
+
+#include /**/ "ace/pre.h"
+
+#include "ConnectorEC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "Connector_exec_export.h"
+#include "tao/LocalObject.h"
+
+#include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
+#include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
+
+#include "Base/BaseSupport.h"
+
+namespace CIAO_SharedDP_Connector_SDP_Connector_Impl
+{
+
+  typedef CIAO::DDS4CCM::RTI::Type_Traits <
+    SharedDPTest,
+    SharedDPTestSeq,
+    SharedDPTestTypeSupport,
+    SharedDPTestDataWriter,
+    SharedDPTestDataReader > SharedDPTest_DDS_Traits;
+
+  typedef CIAO::DDS4CCM::Connector_Traits <
+    ::CIAO_SharedDP_Connector_SDP_Connector_Impl::SDP_Connector_Exec,
+    SharedDPTest_Seq,
+    ::CCM_DDS::SharedDPTest::CCM_Writer,
+    ::CCM_DDS::SharedDPTest::CCM_Updater,
+    ::CCM_DDS::SharedDPTest::CCM_Getter,
+    ::CCM_DDS::SharedDPTest::CCM_Reader,
+    ::SharedDP_Connector::CCM_SDP_Connector_Context,
+    ::CCM_DDS::SharedDPTest::Listener,
+    ::CCM_DDS::SharedDPTest::StateListener,
+    ::CCM_DDS::ConnectorStatusListener> SharedDPTest_Connector_Traits;
+
+  class SHAREDDP_CONNECTOR_EXEC_Export Connector_exec_i :
+    public DDS_Event_Connector_T <SharedDPTest_DDS_Traits, SharedDPTest_Connector_Traits>
+  {
+  public:
+    Connector_exec_i (void);
+    virtual ~Connector_exec_i (void);
+  };
+
+  extern "C" SHAREDDP_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_SharedDP_Connector_Impl (void);
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* CONNECTOR_EXEC_H_ */
+
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Plan.cdp
index 47769f4777e..d96516c171b 100644
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Plan.cdp
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/Plan.cdp
@@ -18,7 +18,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_SharedDP_Connector_SDP_Connector_Impl</string>
+          <string>create_SharedDP_Connector_Impl</string>
         </value>
       </value>
     </execParameter>
@@ -150,7 +150,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>SharedDP</string>
+          <string>SharedDP2</string>
         </value>
       </value>
     </configProperty>
@@ -179,35 +179,6 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>SharedDP1</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>qos_profile</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Shared_Library#Shared_Profile</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="Connector4Instance">
-    <name>Connector4Instance</name>
-    <node>ComponentNode</node>
-    <source/>
-    <implementation xmi:idref="ConnectorImplementation" />
-    <configProperty>
-      <name>topic_name</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
           <string>StandaloneDP</string>
         </value>
       </value>
@@ -292,26 +263,6 @@
     </internalEndpoint>
   </connection>
 
-  <connection>
-    <name>writer_connection4</name>
-    <deployRequirement>
-      <name>edu.dre.vanderbilt.DAnCE.ConnectionType</name>
-      <resourceType>Local_Interface</resourceType>
-    </deployRequirement>
-    <internalEndpoint>
-      <portName>write4_dds_entity</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="ComponentInstance" />
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>supplier_dds_entity</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="Connector4Instance" />
-    </internalEndpoint>
-  </connection>
-
   <artifact xmi:id="Component_ExecArtifact">
     <name>Component_exec</name>
     <source/>
diff --git a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test.pl
index 34e80ff8c33..409229c36d4 100755
--- a/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/SharedDomainParticipant/SameDatatype/descriptors/run_test.pl
@@ -44,6 +44,9 @@ $tg_executor = 0;
 $status = 0;
 $cdp_file = "Plan.cdp";
 
+$ENV {'CIAO_TRACE_ENABLE'} = 0;
+$ENV {'DANCE_TRACE_ENABLE'} = 0;
+
 sub create_targets {
     #   naming service
     $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
@@ -100,8 +103,6 @@ sub kill_open_processes {
     if ($ns_running == 1) {
         $NS->Kill (); $NS->TimedWait (1);
     }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
 }
 
 sub run_node_daemons {
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl
index 93c221b118d..7173b6abaa6 100644
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.idl
@@ -8,8 +8,6 @@
 #ifndef STATE_CONNECTION_TEST_BASE_IDL
 #define STATE_CONNECTION_TEST_BASE_IDL
 
-#pragma ndds typesupport "Base/State_Connection_Test_BaseSupport.h"
-
 struct State_ConnectionTest {
   string key; //@key
   long iteration;
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc
index 934f01f2a27..156756cbafd 100644
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Base/State_Connection_Test_Base.mpc
@@ -1,25 +1,75 @@
 // $Id$
 
-project (DDS_SCT_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
-  sharedname = DDS_SCT_Base_stub
-  dynamicflags += STATE_CONNECTION_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Gxhst -Sci \
+project(DDS_SCT_Base_idl_gen) : taoidldefaults, anytypecode {
+  custom_only = 1
+  idlflags -= -St -Sa
+  idlflags += -SS -Gxhst \
               -Wb,stub_export_macro=STATE_CONNECTION_TEST_BASE_STUB_Export \
               -Wb,stub_export_include=State_Connection_Test_Base_stub_export.h
 
   IDL_Files {
     State_Connection_Test_Base.idl
   }
+}
 
-  opendds_ts_flags += --export=STATE_CONNECTION_TEST_BASE_STUB_Export
+project(DDS_SCT_Base_ndds_ts_gen) : ndds_ts_defaults {
+  custom_only = 1
+  after += DDS_SCT_Base_idl_gen
 
-  DDSGenerator_Files {
+  NDDSTypeSupport_Files {
     State_Connection_Test_Base.idl
   }
+}
+
+project(DDS_SCT_Base_NDDS_TS) : nddslib, taolib {
+  after += DDS_SCT_Base_ndds_ts_gen DDS_SCT_Base_stub
+  libs += DDS_SCT_Base_stub
+  libout = ../lib
+  libpaths    += ../lib
+  sharedname = DDS_SCT_Base_NDDS_TS
+  dynamicflags = NDDS_USER_DLL_EXPORT
+
+  verbatim(gnuace, macros) {
+    override no_hidden_visibility = 1
+  }
 
   Source_Files {
+    State_Connection_Test_Base.cxx
+    State_Connection_Test_BasePlugin.cxx
+    State_Connection_Test_BaseSupport.cxx
+  }
+
+  Header_Files {
+    State_Connection_Test_Base.h
+    State_Connection_Test_BasePlugin.h
+    State_Connection_Test_BaseSupport.h
+  }
+
+  Inline_Files {
+  }
+}
+
+project(DDS_SCT_Base_stub) : ccm_stub {
+  after += DDS_SCT_Base_idl_gen
+  libout = ../lib
+  libpaths += ../lib
+  sharedname = DDS_SCT_Base_stub
+  dynamicflags = STATE_CONNECTION_TEST_BASE_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    State_Connection_Test_BaseC.cpp
+  }
+
+  Header_Files {
+    State_Connection_Test_BaseC.h
+    State_Connection_Test_Base_stub_export.h
+  }
+
+  Inline_Files {
+    State_Connection_Test_BaseC.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc
index 6aab30884a2..69b403ed561 100644
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_SCT_Base -l .. -o ../lib -u DDS State_Connection_Test_Connector"
 
-project(DDS_SCT_Connector_idl_gen) : connectoridldefaults, dds4ccm {
+project(DDS_SCT_Connector_idl_gen) : connectoridldefaults {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=STATE_CONNECTION_CONNECTOR_STUB_Export \
@@ -10,8 +10,8 @@ project(DDS_SCT_Connector_idl_gen) : connectoridldefaults, dds4ccm {
               -Wb,skel_export_include=State_Connection_Test_Connector_svnt_export.h \
               -Wb,svnt_export_macro=STATE_CONNECTION_CONNECTOR_SVNT_Export \
               -Wb,svnt_export_include=State_Connection_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=STATE_CONNECTION_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=State_Connection_Test_Connector_conn_export.h \
+              -Wb,exec_export_macro=STATE_CONNECTION_CONNECTOR_EXEC_Export \
+              -Wb,exec_export_include=State_Connection_Test_Connector_exec_export.h \
               -I ..
 
   IDL_Files {
@@ -19,7 +19,7 @@ project(DDS_SCT_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   }
 }
 
-project(DDS_SCT_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_SCT_Connector_lem_gen) : ciaoidldefaults {
   custom_only = 1
   after += DDS_SCT_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=STATE_CONNECTION_CONNECTOR_LEM_STUB_Export \
@@ -85,24 +85,24 @@ project(DDS_SCT_Connector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_SCT_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_SCT_Connector_lem_stub DDS_SCT_Connector_stub DDS4CCM_lem_stub DDS_SCT_Base_stub
+  after   += DDS_SCT_Connector_lem_stub DDS_SCT_Connector_stub DDS4CCM_lem_stub DDS_SCT_Base_NDDS_TS
   sharedname = DDS_SCT_Connector_exec
-  libs += DDS_SCT_Connector_stub DDS_SCT_Connector_lem_stub DDS_SCT_Base_stub DDS4CCM_lem_stub DDS_SCT_Base_stub
+  libs += DDS_SCT_Connector_stub DDS_SCT_Connector_lem_stub DDS_SCT_Base_stub DDS4CCM_lem_stub DDS_SCT_Base_NDDS_TS
   libpaths += ../lib
   libout = ../lib
   includes += ..
-  dynamicflags   = STATE_CONNECTION_CONNECTOR_CONN_BUILD_DLL
+  dynamicflags   = STATE_CONNECTION_CONNECTOR_EXEC_BUILD_DLL
 
   IDL_Files {
   }
 
   Source_Files {
-    State_Connection_Test_Connector_conn.cpp
+    State_Connection_Test_Connector_exec.cpp
   }
 
   Header_Files {
-    State_Connection_Test_Connector_conn.h
-    State_Connection_Test_Connector_conn_export.h
+    State_Connection_Test_Connector_exec.h
+    State_Connection_Test_Connector_exec_export.h
   }
 
   Inline_Files {
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector_exec.cpp b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector_exec.cpp
new file mode 100644
index 00000000000..59e0fba271c
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector_exec.cpp
@@ -0,0 +1,30 @@
+// -*- C++ -*-
+// $Id$
+
+#include "State_Connection_Test_Connector_exec.h"
+
+namespace CIAO_State_Connection_Test_State_Connection_Test_Connector_Impl
+{
+  State_Connection_Test_Connector_exec_i::State_Connection_Test_Connector_exec_i ()
+    : DDS_State_Connector_T<State_ConnectionTest_DDS_Traits, State_ConnectionTest_Connector_Traits> ()
+  {
+  }
+
+  State_Connection_Test_Connector_exec_i::~State_Connection_Test_Connector_exec_i (void)
+  {
+  }
+
+  extern "C" STATE_CONNECTION_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_State_Connection_Test_State_Connection_Test_Connector_Impl (void)
+  {
+    ::Components::EnterpriseComponent_ptr retval =
+      ::Components::EnterpriseComponent::_nil ();
+
+    ACE_NEW_NORETURN (
+      retval,
+      State_Connection_Test_Connector_exec_i ());
+
+    return retval;
+  }
+}
+
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector_exec.h
new file mode 100644
index 00000000000..3d95ba70bd3
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Connector/State_Connection_Test_Connector_exec.h
@@ -0,0 +1,61 @@
+// -*- C++ -*-
+// $Id$
+
+#ifndef STATE_CONNECTION_TEST_CONNECTOR_EXEC_H_
+#define STATE_CONNECTION_TEST_CONNECTOR_EXEC_H_
+
+#include /**/ "ace/pre.h"
+
+#include "State_Connection_Test_ConnectorEC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "State_Connection_Test_Connector_exec_export.h"
+#include "tao/LocalObject.h"
+
+#include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
+#include "dds4ccm/impl/ndds/DDS_State_Connector_T.h"
+
+#include "Base/State_Connection_Test_BaseSupport.h"
+
+namespace CIAO_State_Connection_Test_State_Connection_Test_Connector_Impl
+{
+
+  // @from use of State_ConnectionTest as a parameter
+  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+    State_ConnectionTest,
+    State_ConnectionTestSeq,
+    State_ConnectionTestTypeSupport,
+    State_ConnectionTestDataWriter,
+    State_ConnectionTestDataReader > State_ConnectionTest_DDS_Traits;
+
+  typedef CIAO::DDS4CCM::Connector_Traits <
+    ::CIAO_State_Connection_Test_State_Connection_Test_Connector_Impl::State_Connection_Test_Connector_Exec,
+    State_ConnectionTest_Seq,
+    ::CCM_DDS::State_ConnectionTest::CCM_Writer,
+    ::CCM_DDS::State_ConnectionTest::CCM_Updater,
+    ::CCM_DDS::State_ConnectionTest::CCM_Getter,
+    ::CCM_DDS::State_ConnectionTest::CCM_Reader,
+    ::State_Connection_Test::CCM_State_Connection_Test_Connector_Context,
+    ::CCM_DDS::State_ConnectionTest::Listener,
+    ::CCM_DDS::State_ConnectionTest::StateListener,
+    ::CCM_DDS::ConnectorStatusListener> State_ConnectionTest_Connector_Traits;
+
+  class STATE_CONNECTION_CONNECTOR_EXEC_Export State_Connection_Test_Connector_exec_i :
+    public DDS_State_Connector_T <State_ConnectionTest_DDS_Traits, State_ConnectionTest_Connector_Traits>
+  {
+  public:
+    State_Connection_Test_Connector_exec_i ();
+    virtual ~State_Connection_Test_Connector_exec_i (void);
+  };
+
+  extern "C" STATE_CONNECTION_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_State_Connection_Test_State_Connection_Test_Connector_Impl (void);
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.mpc
index bedaeac439f..b56f86f819b 100644
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Receiver/State_Connection_Test_Receiver.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_SCT_Receiver_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_SCT_Receiver_idl_gen) : componentidldefaults {
   custom_only = 1
   after += DDS_SCT_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
@@ -17,7 +17,7 @@ project(DDS_SCT_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_SCT_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_SCT_Receiver_lem_gen) : ciaoidldefaults {
   after += DDS_SCT_Receiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
@@ -107,7 +107,7 @@ project(DDS_SCT_Receiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_SCT_Receiver_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_SCT_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      +=   DDS_SCT_Receiver_lem_stub DDS_SCT_Base_stub DDS_SCT_Connector_stub DDS_SCT_Connector_svnt DDS_SCT_Receiver_exec DDS_SCT_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
   sharedname  = Receiver_svnt
   libs       += Receiver_stub Receiver_lem_stub DDS_SCT_Base_stub DDS_SCT_Connector_stub DDS_SCT_Connector_svnt Receiver_exec DDS_SCT_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc
index 97b11af7e00..0be09735985 100644
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/Sender/State_Connection_Test_Sender.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_SCT_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(DDS_SCT_Sender_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_SCT_Sender_idl_gen) : componentidldefaults {
   after += DDS_SCT_Connector_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_SCT_Sender_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_SCT_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_SCT_Sender_lem_gen) : ciaoidldefaults {
   after += DDS_SCT_Sender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
@@ -109,7 +109,7 @@ project(DDS_SCT_Sender_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_SCT_Sender_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_SCT_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      += DDS_SCT_Base_stub  DDS_SCT_Sender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_SCT_Connector_stub DDS_SCT_Connector_svnt  DDS_SCT_Connector_lem_stub
   sharedname  = Sender_svnt
   libs       += Sender_stub Sender_lem_stub  \
diff --git a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl
index a625ecd9216..dc0c34941c6 100755
--- a/CIAO/connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/State_Connection_Test/descriptors/run_test.pl
@@ -100,8 +100,6 @@ sub kill_open_processes {
     if ($ns_running == 1) {
         $NS->Kill (); $NS->TimedWait (1);
     }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
 }
 
 sub run_node_daemons {
diff --git a/CIAO/connectors/dds4ccm/tests/TimeConversion/Time_Conversion.mpc b/CIAO/connectors/dds4ccm/tests/TimeConversion/Time_Conversion.mpc
deleted file mode 100644
index d5c8fa72c37..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TimeConversion/Time_Conversion.mpc
+++ /dev/null
@@ -1,12 +0,0 @@
-// $Id$
-
-project(DDS_TimeConversion) : taodefaults, acedefaults, ciao_connector_base, aceexe, taoexe {
-  after += DDS4CCM_stub
-  includes += $(CIAO_ROOT)
-  libs  += DDS4CCM_stub
-  exename = TimeConversion
-
-  Source_Files {
-    time_conversion.cpp
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/TimeConversion/run_test.pl b/CIAO/connectors/dds4ccm/tests/TimeConversion/run_test.pl
deleted file mode 100755
index bd6bc129d77..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TimeConversion/run_test.pl
+++ /dev/null
@@ -1,25 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-     & eval 'exec perl -S $0 $argv:q'
-     if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib "$ENV{ACE_ROOT}/bin";
-use PerlACE::TestTarget;
-
-my $program = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
-
-$PROG = $program->CreateProcess ("TimeConversion", "");
-$program_status = $PROG->Spawn ();
-
-if ($program_status != 0) {
-    print STDERR "ERROR: TimeConversion returned $program_status\n";
-    exit 1;
-}
-
-sleep ($program->ProcessStartWaitInterval());
-
-$program_status = $PROG->Kill ();
-
-exit 0;
diff --git a/CIAO/connectors/dds4ccm/tests/TimeConversion/time_conversion.cpp b/CIAO/connectors/dds4ccm/tests/TimeConversion/time_conversion.cpp
deleted file mode 100644
index 4273125bbe3..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TimeConversion/time_conversion.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-// $Id$
-
-#include "dds4ccm/impl/ndds/TimeUtilities.h"
-#include "ace/OS_NS_sys_time.h"
-
-int
-ACE_TMAIN(int , ACE_TCHAR **)
-{
-  try
-    {
-      ::DDS::Time_t dds_time;
-      ACE_Time_Value ace_time = ACE_OS::gettimeofday ();
-
-      dds_time <<= ace_time;
-      if (dds_time.sec != ace_time.sec ())
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR : TimeConversion - Conversion from "
-                                "ACE_Time_Value to DDS::Time_t "
-                                "seconds expected <%u> - seconds found <%u>\n",
-                                ace_time.sec (), dds_time.sec));
-        }
-      else
-        {
-          ACE_DEBUG ((LM_DEBUG, "TimeConversion - Conversion from "
-                                "ACE_Time_Value to DDS::Time_t "
-                                "regarding seconds succeeded\n"));
-        }
-      if (dds_time.nanosec / 1000 != static_cast <CORBA::ULong>(ace_time.usec ()))
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR : TimeConversion - Conversion from "
-                                "ACE_Time_Value to DDS::Time_t "
-                                "micro seconds expected <%u> - micro seconds found <%u>\n",
-                                ace_time.usec (), dds_time.nanosec/1000));
-        }
-      else
-        {
-          ACE_DEBUG ((LM_DEBUG, "TimeConversion - Conversion from "
-                                "ACE_Time_Value to DDS::Time_t "
-                                "regarding micro seconds succeeded\n"));
-        }
-
-      ::DDS::Time_t dds_now;
-      ACE_Time_Value ace_now = ACE_OS::gettimeofday ();
-      dds_now <<= ace_now;
-      //create real nanoseconds.
-      dds_now.nanosec = 1234567890;
-      ace_time <<= dds_now;
-
-      if (ace_time.sec () != dds_now.sec)
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR : TimeConversion - Conversion from "
-                                "DDS::Time_t to ACE_Time_Value "
-                                "seconds expected <%u> - seconds found <%u>\n",
-                                dds_now.sec, ace_time.sec ()));
-        }
-      else
-        {
-          ACE_DEBUG ((LM_DEBUG, "TimeConversion - Conversion from "
-                                "DDS::Time_t to ACE_Time_Value "
-                                "regarding seconds succeeded\n"));
-        }
-      // The resolution of an ACE_Time_Value is less than the resolution of a
-      // DDS::Time_T. Therefor don't multiply ace_time.usec by 1000 but devide
-      // dds_time.nanosec by 1000.
-      if (static_cast<CORBA::ULong>(ace_time.usec ()) != dds_now.nanosec/1000)
-        {
-          ACE_ERROR ((LM_ERROR, "ERROR : TimeConversion - Conversion from "
-                                "DDS::Time_t to ACE_Time_Value "
-                                "nano seconds expected <%u> - nano seconds found <%u>\n",
-                                dds_now.nanosec/1000, ace_time.usec ()));
-        }
-      else
-        {
-          ACE_DEBUG ((LM_DEBUG, "TimeConversion - Conversion from "
-                                "DDS::Time_t to ACE_Time_Value "
-                                "regarding nano seconds succeeded\n"));
-        }
-    }
-  catch (const CORBA::Exception& ex)
-    {
-      ex._tao_print_exception ("Exception caught:");
-      return 1;
-    }
-
-  return 0;
-}
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl b/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl
deleted file mode 100644
index 838c79d4fa7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-// $Id$
-
-/**
- * @file TwoTopics_Base.idl
- * @author Marcel Smit <msmit@remedy.nl>
- */
-
-#ifndef TWOTOPICS_BASE_IDL
-#define TWOTOPICS_BASE_IDL
-
-#pragma ndds typesupport "Base/TwoTopics_BaseSupport.h"
-
-struct HelloTopic {
-  string hello; //@key
-  long iteration;
-};
-typedef sequence<HelloTopic> HelloTopic_Seq;
-
-struct GoodbyeTopic {
-  string goodbye; //@key
-  long iteration;
-};
-typedef sequence<GoodbyeTopic> GoodbyeTopic_Seq;
-
-#endif
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc b/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc
deleted file mode 100755
index fbd6e94ac3d..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TwoTopics/Base/TwoTopics_Base.mpc
+++ /dev/null
@@ -1,25 +0,0 @@
-// $Id$
-
-project (DDS_TwoTopics_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
-  sharedname = DDS_TwoTopics_Base_stub
-  dynamicflags += TWOTOPICS_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Gxhst -Sci \
-              -Wb,stub_export_macro=TWOTOPICS_TEST_BASE_STUB_Export \
-              -Wb,stub_export_include=TwoTopics_Base_stub_export.h
-
-  IDL_Files {
-    TwoTopics_Base.idl
-  }
-
-  opendds_ts_flags += --export=TWOTOPICS_TEST_BASE_STUB_Export
-
-  DDSGenerator_Files {
-    TwoTopics_Base.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl b/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl
deleted file mode 100644
index 584b9d684f6..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.idl
+++ /dev/null
@@ -1,31 +0,0 @@
-// $Id$
-
-/**
- * @file TwoTopics_Connector.idl
- * @author Marcel Smit <msmit@remedy.nl>
- */
-
-#ifndef TWOTOPICS_CONNECTOR_IDL_
-#define TWOTOPICS_CONNECTOR_IDL_
-
-#include  <Components.idl>
-#include "Base/TwoTopics_Base.idl"
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
-
-#pragma ciao lem "Connector/TwoTopics_ConnectorE.idl"
-#pragma ndds typesupport "Base/TwoTopics_BaseSupport.h"
-
-module TT_Connector
-{
-  module ::CCM_DDS::Typed < HelloTopic, HelloTopic_Seq> HelloConn;
-  connector TwoTopicsHello_Connector : HelloConn::DDS_Event
-  {
-  };
-
-  module ::CCM_DDS::Typed < GoodbyeTopic, GoodbyeTopic_Seq> GoodbyeConn;
-  connector TwoTopicsGoodbye_Connector : GoodbyeConn::DDS_Event
-  {
-  };
-};
-
-#endif /* TWOTOPICS_CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc b/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc
deleted file mode 100755
index baaa0cf09fb..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TwoTopics/Connector/TwoTopics_Connector.mpc
+++ /dev/null
@@ -1,145 +0,0 @@
-// $Id$
-// This file is generated with "generate_component_mpc.pl -p DDS_TwoTopics_Base -l .. -o ../lib -u DDS TwoTopics_Connector"
-
-project(DDS_TwoTopics_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  after += DDS4CCM_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=TWOTOPICS_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=TwoTopics_Connector_stub_export.h \
-              -Wb,skel_export_macro=TWOTOPICS_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=TwoTopics_Connector_svnt_export.h \
-              -Wb,svnt_export_macro=TWOTOPICS_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=TwoTopics_Connector_svnt_export.h \
-              -Wb,conn_export_macro=TWOTOPICS_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=TwoTopics_Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    TwoTopics_Connector.idl
-  }
-}
-
-project(DDS_TwoTopics_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  custom_only = 1
-  after += DDS_TwoTopics_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=TWOTOPICS_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=TwoTopics_Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
-
-  IDL_Files {
-    TwoTopics_ConnectorE.idl
-  }
-}
-
-project(DDS_TwoTopics_Connector_lem_stub) : ccm_svnt, dds4ccm_base {
-  after += DDS_TwoTopics_Connector_lem_gen DDS_TwoTopics_Connector_stub DDS_TwoTopics_Base_stub DDS4CCM_lem_stub
-  libs  += DDS_TwoTopics_Base_stub DDS_TwoTopics_Connector_stub DDS4CCM_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_TwoTopics_Connector_lem_stub
-  dynamicflags   = TWOTOPICS_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TwoTopics_ConnectorEC.cpp
-  }
-
-  Header_Files {
-    TwoTopics_ConnectorEC.h
-    TwoTopics_Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    TwoTopics_ConnectorEC.inl
-  }
-}
-
-project(DDS_TwoTopics_Connector_stub) : ccm_stub, dds4ccm_base {
-  after += DDS_TwoTopics_Connector_idl_gen DDS_TwoTopics_Base_stub
-  libs  += DDS_TwoTopics_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_TwoTopics_Connector_stub
-  dynamicflags   = TWOTOPICS_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TwoTopics_ConnectorC.cpp
-  }
-
-  Header_Files {
-    TwoTopics_ConnectorC.h
-    TwoTopics_Connector_stub_export.h
-  }
-
-  Inline_Files {
-    TwoTopics_ConnectorC.inl
-  }
-}
-
-project(DDS_TwoTopics_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_TwoTopics_Connector_lem_stub DDS_TwoTopics_Connector_stub DDS4CCM_lem_stub DDS_TwoTopics_Base_stub
-  sharedname = DDS_TwoTopics_Connector_exec
-  libs += DDS_TwoTopics_Connector_stub DDS_TwoTopics_Connector_lem_stub DDS_TwoTopics_Base_stub DDS4CCM_lem_stub DDS_TwoTopics_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags   = TWOTOPICS_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TwoTopics_Connector_conn.cpp
-  }
-
-  Header_Files {
-    TwoTopics_Connector_conn.h
-    TwoTopics_Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_TwoTopics_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  after      += DDS_TwoTopics_Connector_lem_stub DDS_TwoTopics_Connector_exec DDS_TwoTopics_Connector_stub DDS4CCM_lem_stub
-  sharedname  = DDS_TwoTopics_Connector_svnt
-  libs       += DDS_TwoTopics_Connector_stub \
-                DDS_TwoTopics_Connector_lem_stub  \
-                DDS_TwoTopics_Base_stub \
-                DDS_TwoTopics_Connector_exec \
-                DDS4CCM_lem_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags = TWOTOPICS_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TwoTopics_ConnectorS.cpp
-    TwoTopics_Connector_svnt.cpp
-  }
-
-  Header_Files {
-    TwoTopics_ConnectorS.h
-    TwoTopics_Connector_svnt.h
-    TwoTopics_Connector_svnt_export.h
-  }
-
-  Inline_Files {
-    TwoTopics_ConnectorS.inl
-  }
-}
-
-
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl
deleted file mode 100644
index 4e1fffa994c..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.idl
+++ /dev/null
@@ -1,66 +0,0 @@
-// $Id$
-
-/**
- * @file Connector.idl
- * @author Marcel Smit <msmit@remedy.nl>
- */
-
-#ifndef CONNECTOR_IDL_
-#define CONNECTOR_IDL_
-
-#include  <Components.idl>
-#include "Hello/HelloGoodbye.idl"
-#include "Goodbye/HelloGoodbye.idl"
-
-#include "connectors/dds4ccm/idl/ccm_dds.idl"
-
-#pragma ciao lem "Connector/ConnectorE.idl"
-#pragma ndds typesupport "Hello/HelloGoodbyeSupport.h"
-#pragma ndds typesupport "Goodbye/HelloGoodbyeSupport.h"
-
-module Hello
-{
-  // Hello connector
-  module ::CCM_DDS::Typed < HelloGoodbye, HelloGoodbye_Seq> HelloConn;
-  connector Hello_Connector : HelloConn::DDS_Event
-  {
-  };
-};
-
-module Goodbye
-{
-  // Goodbye connector
-  module ::CCM_DDS::Typed < HelloGoodbye, HelloGoodbye_Seq> GoodbyeConn;
-  connector Goodbye_Connector : GoodbyeConn::DDS_Event
-  {
-  };
-};
-
-module HelloGoodbye
-{
-  // Hello connector
-  module ::CCM_DDS::Typed < ::Hello::HelloGoodbye, ::Hello::HelloGoodbye_Seq> HelloConn;
-  connector Hello_Connector : HelloConn::DDS_Event
-  {
-  };
-
-  // Goodbye connector
-  module ::CCM_DDS::Typed < ::Goodbye::HelloGoodbye, ::Goodbye::HelloGoodbye_Seq> GoodbyeConn;
-  connector Goodbye_Connector : GoodbyeConn::DDS_Event
-  {
-  };
-};
-
-// Hello connector
-module ::CCM_DDS::Typed < ::Hello::HelloGoodbye, ::Hello::HelloGoodbye_Seq> HelloConn;
-connector Hello_Connector : HelloConn::DDS_Event
-{
-};
-
-// Goodbye connector
-module ::CCM_DDS::Typed < ::Goodbye::HelloGoodbye, ::Goodbye::HelloGoodbye_Seq> GoodbyeConn;
-connector Goodbye_Connector : GoodbyeConn::DDS_Event
-{
-};
-
-#endif /* CONNECTOR_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc
deleted file mode 100644
index 3764b7ee0ef..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Connector/Connector.mpc
+++ /dev/null
@@ -1,158 +0,0 @@
-// $Id$
-
-project(DDS_TTDN_Connector_idl_gen) : connectoridldefaults, dds4ccm {
-  requires += dummy_label
-  after += DDS4CCM_idl_gen
-  custom_only = 1
-  idlflags += -Wb,stub_export_macro=TWOTOPICSDIFFERENTNS_CONNECTOR_STUB_Export \
-              -Wb,stub_export_include=Connector_stub_export.h \
-              -Wb,skel_export_macro=TWOTOPICSDIFFERENTNS_CONNECTOR_SVNT_Export \
-              -Wb,skel_export_include=Connector_svnt_export.h \
-              -Wb,svnt_export_macro=TWOTOPICSDIFFERENTNS_CONNECTOR_SVNT_Export \
-              -Wb,svnt_export_include=Connector_svnt_export.h \
-              -Wb,conn_export_macro=TWOTOPICSDIFFERENTNS_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Connector_conn_export.h \
-              -I ..
-
-  IDL_Files {
-    Connector.idl
-  }
-}
-
-project(DDS_TTDN_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
-  requires += dummy_label
-  custom_only = 1
-  after += DDS_TTDN_Connector_idl_gen
-  idlflags += -Wb,stub_export_macro=TWOTOPICSDIFFERENTNS_CONNECTOR_LEM_STUB_Export \
-              -Wb,stub_export_include=Connector_lem_stub_export.h \
-              -SS -Gxhst \
-              -I .. -I $(CIAO_ROOT)/connectors -I$(CIAO_ROOT)/connectors/dds4ccm/idl
-
-  IDL_Files {
-    ConnectorE.idl
-  }
-}
-
-project(DDS_TTDN_Connector_lem_stub) : ccm_svnt, dds4ccm_base {
-  requires += dummy_label
-  after += DDS_TTDN_Connector_lem_gen DDS_TTDN_Connector_stub \
-           DDS_Goodbye_Namespace_Base_stub DDS_Hello_Namespace_Base_stub \
-           DDS4CCM_lem_stub
-  libs  += DDS_Connector_stub DDS4CCM_lem_stub \
-           DDS_Goodbye_Namespace_Base_stub DDS_Hello_Namespace_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Connector_lem_stub
-  dynamicflags   = TWOTOPICSDIFFERENTNS_CONNECTOR_LEM_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ConnectorEC.cpp
-  }
-
-  Header_Files {
-    ConnectorEC.h
-    Connector_lem_stub_export.h
-  }
-
-  Inline_Files {
-    ConnectorEC.inl
-  }
-}
-
-project(DDS_TTDN_Connector_stub) : ccm_stub, dds4ccm_base {
-  requires += dummy_label
-  after += DDS_TTDN_Connector_idl_gen \
-           DDS_Goodbye_Namespace_Base_stub DDS_Hello_Namespace_Base_stub
-  libs  += DDS_Goodbye_Namespace_Base_stub DDS_Hello_Namespace_Base_stub
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  sharedname = DDS_Connector_stub
-  dynamicflags   = TWOTOPICSDIFFERENTNS_CONNECTOR_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ConnectorC.cpp
-  }
-
-  Header_Files {
-    ConnectorC.h
-    Connector_stub_export.h
-  }
-
-  Inline_Files {
-    ConnectorC.inl
-  }
-}
-
-project(DDS_TTDN_Connector_exec) : ciao_executor, dds4ccm_impl {
-  requires += dummy_label
-  after += DDS_TTDN_Connector_lem_stub DDS_TTDN_Connector_stub DDS4CCM_lem_stub \
-           DDS_Goodbye_Namespace_Base_stub DDS_Hello_Namespace_Base_stub \
-           DDS_Goodbye_Namespace_Base_stub DDS_Hello_Namespace_Base_stub
-  libs  += DDS_Connector_stub DDS_Connector_lem_stub DDS4CCM_lem_stub \
-           DDS_Goodbye_Namespace_Base_stub DDS_Hello_Namespace_Base_stub \
-           DDS_Goodbye_Namespace_Base_stub DDS_Hello_Namespace_Base_stub
-  sharedname = DDS_Connector_exec
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags   = TWOTOPICSDIFFERENTNS_CONNECTOR_CONN_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Connector_conn.cpp
-  }
-
-  Header_Files {
-    Connector_conn.h
-    Connector_conn_export.h
-  }
-
-  Inline_Files {
-  }
-}
-
-
-project(DDS_TTDN_Connector_svnt) : ciao_servant, dds4ccm_impl {
-  requires += dummy_label
-  after      += DDS_TTDN_Connector_lem_stub DDS_TTDN_Connector_exec \
-                DDS_Goodbye_Namespace_Base_stub DDS_Hello_Namespace_Base_stub \
-                DDS_TTDN_Connector_stub DDS4CCM_lem_stub
-  libs       += DDS_Connector_stub \
-                DDS_Connector_lem_stub  \
-                DDS_Goodbye_Namespace_Base_stub DDS_Hello_Namespace_Base_stub \
-                DDS_Connector_exec \
-                DDS4CCM_lem_stub
-  sharedname  = DDS_Connector_svnt
-  libpaths += ../lib
-  libout = ../lib
-  includes += ..
-  dynamicflags = TWOTOPICSDIFFERENTNS_CONNECTOR_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    ConnectorS.cpp
-    Connector_svnt.cpp
-  }
-
-  Header_Files {
-    ConnectorS.h
-    Connector_svnt.h
-    Connector_svnt_export.h
-  }
-
-  Inline_Files {
-    ConnectorS.inl
-  }
-}
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.idl b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.idl
deleted file mode 100644
index d8619d0487a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.idl
+++ /dev/null
@@ -1,20 +0,0 @@
-// $Id$
-
-/**
- * @file HelloGoodbye.idl
- * @author Marcel Smit <msmit@remedy.nl>
- */
-
-#ifndef GOODBYE_IDL_
-#define GOODBYE_IDL_
-
-module Goodbye
-{
-  struct HelloGoodbye {
-    string goodbye;  //@key
-    long iteration;
-  };
-  typedef sequence<HelloGoodbye> HelloGoodbye_Seq;
-};
-
-#endif /* GOODBYE_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.mpc b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.mpc
deleted file mode 100644
index 344414bb8a7..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Goodbye/HelloGoodbye.mpc
+++ /dev/null
@@ -1,25 +0,0 @@
-// $Id$
-
-project (DDS_Goodbye_Namespace_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
-  sharedname = DDS_Goodbye_Namespace_Base_stub
-  dynamicflags += GOODBYE_NAMESPACE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Gxhst -Sci \
-              -Wb,stub_export_macro=GOODBYE_NAMESPACE_STUB_Export \
-              -Wb,stub_export_include=Goodbye_stub_export.h
-
-  IDL_Files {
-    HelloGoodbye.idl
-  }
-
-  opendds_ts_flags += --export=GOODBYE_NAMESPACE_STUB_Export
-
-  DDSGenerator_Files {
-    HelloGoodbye.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.idl b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.idl
deleted file mode 100644
index f27e983e812..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.idl
+++ /dev/null
@@ -1,21 +0,0 @@
-// $Id$
-
-/**
- * @file HelloGoodbye.idl
- * @author Marcel Smit <msmit@remedy.nl>
- */
-
-#ifndef HELLO_IDL_
-#define HELLO_IDL_
-
-module Hello
-{
-  struct HelloGoodbye {
-    string hello;  //@key
-    long iteration;
-  };
-  typedef sequence<HelloGoodbye> HelloGoodbye_Seq;
-};
-
-
-#endif /* HELLO_IDL_ */
diff --git a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.mpc b/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.mpc
deleted file mode 100644
index 1bfad211f1a..00000000000
--- a/CIAO/connectors/dds4ccm/tests/TwoTopicsDifferentNs/Hello/HelloGoodbye.mpc
+++ /dev/null
@@ -1,25 +0,0 @@
-// $Id$
-
-project (DDS_Hello_Namespace_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
-  sharedname = DDS_Hello_Namespace_Base_stub
-  dynamicflags += HELLO_NAMESPACE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Gxhst -Sci \
-              -Wb,stub_export_macro=HELLO_NAMESPACE_STUB_Export \
-              -Wb,stub_export_include=Hello_stub_export.h
-
-  IDL_Files {
-    HelloGoodbye.idl
-  }
-
-  opendds_ts_flags += --export=HELLO_NAMESPACE_STUB_Export
-
-  DDSGenerator_Files {
-    HelloGoodbye.idl
-  }
-
-  Source_Files {
-  }
-}
-
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.idl
index 9938aba2067..bd796050ab3 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.idl
@@ -8,8 +8,6 @@
 #ifndef UNKEYED_TEST_BASE_IDL
 #define UNKEYED_TEST_BASE_IDL
 
-#pragma ndds typesupport "Base/Unkeyed_Test_BaseSupport.h"
-
 struct UnkeyedTest {
   string key;
   long iteration;
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc
index 4430bee10b0..d4637595a6e 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Base/Unkeyed_Test_Base.mpc
@@ -1,25 +1,76 @@
 // $Id$
+// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n Unkeyed_Test_Base"
 
-project (DDS_Unkeyed_Test_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
-  sharedname = DDS_Unkeyed_Test_Base_stub
-  dynamicflags += UNKEYED_TEST_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Gxhst -Sci \
+project(DDS_Unkeyed_Test_Base_idl_gen) : taoidldefaults, anytypecode {
+  custom_only = 1
+  idlflags -= -St -Sa
+  idlflags += -SS -Gxhst \
               -Wb,stub_export_macro=UNKEYED_TEST_BASE_STUB_Export \
               -Wb,stub_export_include=Unkeyed_Test_Base_stub_export.h
 
   IDL_Files {
     Unkeyed_Test_Base.idl
   }
+}
 
-  opendds_ts_flags += --export=UNKEYED_TEST_BASE_STUB_Export
+project(DDS_Unkeyed_Test_Base_ndds_ts_gen) : ndds_ts_defaults {
+  custom_only = 1
+  after += DDS_Unkeyed_Test_Base_idl_gen
 
-  DDSGenerator_Files {
+  NDDSTypeSupport_Files {
     Unkeyed_Test_Base.idl
   }
+}
+
+project(DDS_Unkeyed_Test_Base_NDDS_TS) : nddslib, taolib {
+  after += DDS_Unkeyed_Test_Base_ndds_ts_gen DDS_Unkeyed_Test_Base_stub
+  libs += DDS_Unkeyed_Test_Base_stub
+  libout = ../lib
+  libpaths    += ../lib
+  sharedname = DDS_Unkeyed_Test_Base_NDDS_TS
+  dynamicflags = NDDS_USER_DLL_EXPORT
+
+  verbatim(gnuace, macros) {
+    override no_hidden_visibility = 1
+  }
 
   Source_Files {
+    Unkeyed_Test_Base.cxx
+    Unkeyed_Test_BasePlugin.cxx
+    Unkeyed_Test_BaseSupport.cxx
+  }
+
+  Header_Files {
+    Unkeyed_Test_Base.h
+    Unkeyed_Test_BasePlugin.h
+    Unkeyed_Test_BaseSupport.h
+  }
+
+  Inline_Files {
+  }
+}
+
+project(DDS_Unkeyed_Test_Base_stub) : ccm_stub {
+  after += DDS_Unkeyed_Test_Base_idl_gen
+  libout = ../lib
+  libpaths += ../lib
+  sharedname = DDS_Unkeyed_Test_Base_stub
+  dynamicflags = UNKEYED_TEST_BASE_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    Unkeyed_Test_BaseC.cpp
+  }
+
+  Header_Files {
+    Unkeyed_Test_BaseC.h
+    Unkeyed_Test_Base_stub_export.h
+  }
+
+  Inline_Files {
+    Unkeyed_Test_BaseC.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc
index daf5747ca7f..fa1404e4d57 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_Unkeyed_Test_Base -l .. -o ../lib -u DDS Unkeyed_Test_Connector"
 
-project(DDS_Unkeyed_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
+project(DDS_Unkeyed_Test_Connector_idl_gen) : connectoridldefaults {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=UNKEYED_TEST_CONNECTOR_STUB_Export \
@@ -10,8 +10,8 @@ project(DDS_Unkeyed_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
               -Wb,skel_export_include=Unkeyed_Test_Connector_svnt_export.h \
               -Wb,svnt_export_macro=UNKEYED_TEST_CONNECTOR_SVNT_Export \
               -Wb,svnt_export_include=Unkeyed_Test_Connector_svnt_export.h \
-              -Wb,conn_export_macro=UNKEYED_TEST_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Unkeyed_Test_Connector_conn_export.h \
+              -Wb,exec_export_macro=UNKEYED_TEST_CONNECTOR_EXEC_Export \
+              -Wb,exec_export_include=Unkeyed_Test_Connector_exec_export.h \
               -I ..
 
   IDL_Files {
@@ -19,7 +19,7 @@ project(DDS_Unkeyed_Test_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   }
 }
 
-project(DDS_Unkeyed_Test_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_Unkeyed_Test_Connector_lem_gen) : ciaoidldefaults {
   custom_only = 1
   after += DDS_Unkeyed_Test_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=UNKEYED_TEST_CONNECTOR_LEM_STUB_Export \
@@ -85,24 +85,24 @@ project(DDS_Unkeyed_Test_Connector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_Unkeyed_Test_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_Unkeyed_Test_Connector_lem_stub DDS_Unkeyed_Test_Connector_stub DDS4CCM_lem_stub DDS_Unkeyed_Test_Base_stub
+  after   += DDS_Unkeyed_Test_Connector_lem_stub DDS_Unkeyed_Test_Connector_stub DDS4CCM_lem_stub DDS_Unkeyed_Test_Base_NDDS_TS
   sharedname = DDS_Unkeyed_Test_Connector_exec
-  libs += DDS_Unkeyed_Test_Connector_stub DDS_Unkeyed_Test_Connector_lem_stub DDS_Unkeyed_Test_Base_stub DDS4CCM_lem_stub DDS_Unkeyed_Test_Base_stub
+  libs += DDS_Unkeyed_Test_Connector_stub DDS_Unkeyed_Test_Connector_lem_stub DDS_Unkeyed_Test_Base_stub DDS4CCM_lem_stub DDS_Unkeyed_Test_Base_NDDS_TS
   libpaths += ../lib
   libout = ../lib
   includes += ..
-  dynamicflags   = UNKEYED_TEST_CONNECTOR_CONN_BUILD_DLL
+  dynamicflags   = UNKEYED_TEST_CONNECTOR_EXEC_BUILD_DLL
 
   IDL_Files {
   }
 
   Source_Files {
-    Unkeyed_Test_Connector_conn.cpp
+    Unkeyed_Test_Connector_exec.cpp
   }
 
   Header_Files {
-    Unkeyed_Test_Connector_conn.h
-    Unkeyed_Test_Connector_conn_export.h
+    Unkeyed_Test_Connector_exec.h
+    Unkeyed_Test_Connector_exec_export.h
   }
 
   Inline_Files {
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector_exec.cpp b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector_exec.cpp
new file mode 100644
index 00000000000..76143802475
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector_exec.cpp
@@ -0,0 +1,30 @@
+// -*- C++ -*-
+// $Id$
+
+#include "Unkeyed_Test_Connector_exec.h"
+
+namespace CIAO_Unkeyed_Test_Unkeyed_Test_Connector_Impl
+{
+  Unkeyed_Test_Connector_exec_i::Unkeyed_Test_Connector_exec_i (void)
+    : DDS_Event_Connector_T<UnkeyedTest_DDS_Traits, UnkeyedTest_Connector_Traits> ()
+  {
+  }
+
+  Unkeyed_Test_Connector_exec_i::~Unkeyed_Test_Connector_exec_i (void)
+  {
+  }
+
+  extern "C" UNKEYED_TEST_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_Unkeyed_Test_Unkeyed_Test_Connector_Impl (void)
+  {
+    ::Components::EnterpriseComponent_ptr retval =
+      ::Components::EnterpriseComponent::_nil ();
+
+    ACE_NEW_NORETURN (
+      retval,
+      Unkeyed_Test_Connector_exec_i ());
+
+    return retval;
+  }
+}
+
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector_exec.h
new file mode 100644
index 00000000000..5357bfb56cc
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Connector/Unkeyed_Test_Connector_exec.h
@@ -0,0 +1,60 @@
+// -*- C++ -*-
+// $Id$
+
+#ifndef UNKEYED_TEST_CONNECTOR_EXEC_H_
+#define UNKEYED_TEST_CONNECTOR_EXEC_H_
+
+#include /**/ "ace/pre.h"
+
+#include "Unkeyed_Test_ConnectorEC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "Unkeyed_Test_Connector_exec_export.h"
+#include "tao/LocalObject.h"
+
+#include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
+#include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
+
+#include "Base/Unkeyed_Test_BaseSupport.h"
+
+namespace CIAO_Unkeyed_Test_Unkeyed_Test_Connector_Impl
+{
+  // @from use of UnkeyedTest as a parameter
+  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+    UnkeyedTest,
+    UnkeyedTestSeq,
+    UnkeyedTestTypeSupport,
+    UnkeyedTestDataWriter,
+    UnkeyedTestDataReader > UnkeyedTest_DDS_Traits;
+
+  typedef CIAO::DDS4CCM::Connector_Traits <
+    ::CIAO_Unkeyed_Test_Unkeyed_Test_Connector_Impl::Unkeyed_Test_Connector_Exec,
+    UnkeyedTest_Seq,
+    ::CCM_DDS::UnkeyedTest::CCM_Writer,
+    ::CCM_DDS::UnkeyedTest::CCM_Updater,
+    ::CCM_DDS::UnkeyedTest::CCM_Getter,
+    ::CCM_DDS::UnkeyedTest::CCM_Reader,
+    ::Unkeyed_Test::CCM_Unkeyed_Test_Connector_Context,
+    ::CCM_DDS::UnkeyedTest::Listener,
+    ::CCM_DDS::UnkeyedTest::StateListener,
+    ::CCM_DDS::ConnectorStatusListener> UnkeyedTest_Connector_Traits;
+
+  class UNKEYED_TEST_CONNECTOR_EXEC_Export Unkeyed_Test_Connector_exec_i :
+    public DDS_Event_Connector_T <UnkeyedTest_DDS_Traits, UnkeyedTest_Connector_Traits>
+  {
+  public:
+    Unkeyed_Test_Connector_exec_i (void);
+    virtual ~Unkeyed_Test_Connector_exec_i (void);
+  };
+
+  extern "C" UNKEYED_TEST_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_Unkeyed_Test_Unkeyed_Test_Connector_Impl (void);
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.mpc
index dbfac305cbf..31ed67921a2 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Receiver/Unkeyed_Test_Receiver.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_Unkeyed_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_Unkeyed_Test_Receiver_idl_gen) : componentidldefaults {
   custom_only = 1
   after += DDS_Unkeyed_Test_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
@@ -17,7 +17,7 @@ project(DDS_Unkeyed_Test_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_Unkeyed_Test_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_Unkeyed_Test_Receiver_lem_gen) : ciaoidldefaults {
   after += DDS_Unkeyed_Test_Receiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
@@ -107,7 +107,7 @@ project(DDS_Unkeyed_Test_Receiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_Unkeyed_Test_Receiver_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_Unkeyed_Test_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      +=   DDS_Unkeyed_Test_Receiver_lem_stub DDS_Unkeyed_Test_Base_stub DDS_Unkeyed_Test_Connector_stub DDS_Unkeyed_Test_Connector_svnt DDS_Unkeyed_Test_Receiver_exec DDS_Unkeyed_Test_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
   sharedname  = Receiver_svnt
   libs       += Receiver_stub Receiver_lem_stub DDS_Unkeyed_Test_Base_stub DDS_Unkeyed_Test_Connector_stub DDS_Unkeyed_Test_Connector_svnt Receiver_exec DDS_Unkeyed_Test_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc
index 547001eafca..54725ed48ff 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/Sender/Unkeyed_Test_Sender.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_Unkeyed_Test_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(DDS_Unkeyed_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_Unkeyed_Test_Sender_idl_gen) : componentidldefaults {
   after += DDS_Unkeyed_Test_Connector_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_Unkeyed_Test_Sender_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_Unkeyed_Test_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_Unkeyed_Test_Sender_lem_gen) : ciaoidldefaults {
   after += DDS_Unkeyed_Test_Sender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
@@ -109,7 +109,7 @@ project(DDS_Unkeyed_Test_Sender_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_Unkeyed_Test_Sender_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_Unkeyed_Test_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      += DDS_Unkeyed_Test_Base_stub  DDS_Unkeyed_Test_Sender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_Unkeyed_Test_Connector_stub DDS_Unkeyed_Test_Connector_svnt  DDS_Unkeyed_Test_Connector_lem_stub
   sharedname  = Sender_svnt
   libs       += Sender_stub Sender_lem_stub  \
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl
index 4c584d6e11a..6f82b757a0a 100755
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedSamples/descriptors/run_test.pl
@@ -100,8 +100,6 @@ sub kill_open_processes {
     if ($ns_running == 1) {
         $NS->Kill (); $NS->TimedWait (1);
     }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
 }
 
 sub run_node_daemons {
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl
index 29af435017c..e7265724b5b 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.idl
@@ -8,8 +8,6 @@
 #ifndef WRITER_BASE_IDL
 #define WRITER_BASE_IDL
 
-#pragma ndds typesupport "Base/Writer_BaseSupport.h"
-
 typedef sequence<octet> Octet_Seq;
 
 struct WriterTest {
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc
index 4379b403d1b..2211293fef0 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Base/Writer_Base.mpc
@@ -1,25 +1,76 @@
 // $Id$
+// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n Writer_Base"
 
-project (DDS_UnkeyedWriterBase_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
-  sharedname = DDS_UnkeyedWriterBase_stub
-  dynamicflags += WRITER_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Gxhst -Sci \
+project(DDS_UnkeyedWriterBase_idl_gen) : taoidldefaults, anytypecode {
+  custom_only = 1
+  idlflags -= -St -Sa
+  idlflags += -SS -Gxhst \
               -Wb,stub_export_macro=WRITER_BASE_STUB_Export \
               -Wb,stub_export_include=Writer_Base_stub_export.h
 
   IDL_Files {
     Writer_Base.idl
   }
+}
 
-  opendds_ts_flags += --export=WRITER_BASE_STUB_Export
+project(DDS_UnkeyedWriterBase_ndds_ts_gen) : ndds_ts_defaults {
+  custom_only = 1
+  after += DDS_UnkeyedWriterBase_idl_gen
 
-  DDSGenerator_Files {
+  NDDSTypeSupport_Files {
     Writer_Base.idl
   }
+}
+
+project(DDS_UnkeyedWriterBase_NDDS_TS) : nddslib, taolib {
+  after += DDS_UnkeyedWriterBase_ndds_ts_gen DDS_UnkeyedWriterBase_stub
+  libs += DDS_UnkeyedWriterBase_stub
+  libout = ../lib
+  libpaths    += ../lib
+  sharedname = DDS_UnkeyedWriterBase_NDDS_TS
+  dynamicflags = NDDS_USER_DLL_EXPORT
+
+  verbatim(gnuace, macros) {
+    override no_hidden_visibility = 1
+  }
 
   Source_Files {
+    Writer_Base.cxx
+    Writer_BasePlugin.cxx
+    Writer_BaseSupport.cxx
+  }
+
+  Header_Files {
+    Writer_Base.h
+    Writer_BasePlugin.h
+    Writer_BaseSupport.h
+  }
+
+  Inline_Files {
+  }
+}
+
+project(DDS_UnkeyedWriterBase_stub) : ccm_stub {
+  after += DDS_UnkeyedWriterBase_idl_gen
+  libout = ../lib
+  libpaths += ../lib
+  sharedname = DDS_UnkeyedWriterBase_stub
+  dynamicflags = WRITER_BASE_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    Writer_BaseC.cpp
+  }
+
+  Header_Files {
+    Writer_BaseC.h
+    Writer_Base_stub_export.h
+  }
+
+  Inline_Files {
+    Writer_BaseC.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc
index 511459c884e..90a14400171 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_UnkeyedWriterBase -l .. -o ../lib -u DDS Writer_Connector"
 
-project(DDS_UnkeyedWriterConnector_idl_gen) : connectoridldefaults, dds4ccm {
+project(DDS_UnkeyedWriterConnector_idl_gen) : connectoridldefaults {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=WRITER_CONNECTOR_STUB_Export \
@@ -10,8 +10,8 @@ project(DDS_UnkeyedWriterConnector_idl_gen) : connectoridldefaults, dds4ccm {
               -Wb,skel_export_include=Writer_Connector_svnt_export.h \
               -Wb,svnt_export_macro=WRITER_CONNECTOR_SVNT_Export \
               -Wb,svnt_export_include=Writer_Connector_svnt_export.h \
-              -Wb,conn_export_macro=WRITER_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Writer_Connector_conn_export.h \
+              -Wb,exec_export_macro=WRITER_CONNECTOR_EXEC_Export \
+              -Wb,exec_export_include=Writer_Connector_exec_export.h \
               -I ..
 
   IDL_Files {
@@ -19,7 +19,7 @@ project(DDS_UnkeyedWriterConnector_idl_gen) : connectoridldefaults, dds4ccm {
   }
 }
 
-project(DDS_UnkeyedWriterConnector_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_UnkeyedWriterConnector_lem_gen) : ciaoidldefaults {
   custom_only = 1
   after += DDS_UnkeyedWriterConnector_idl_gen
   idlflags += -Wb,stub_export_macro=WRITER_CONNECTOR_LEM_STUB_Export \
@@ -85,24 +85,24 @@ project(DDS_UnkeyedWriterConnector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_UnkeyedWriterConnector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_UnkeyedWriterConnector_lem_stub DDS_UnkeyedWriterConnector_stub DDS4CCM_lem_stub DDS_UnkeyedWriterBase_stub
+  after   += DDS_UnkeyedWriterConnector_lem_stub DDS_UnkeyedWriterConnector_stub DDS4CCM_lem_stub DDS_UnkeyedWriterBase_NDDS_TS
   sharedname = DDS_UnkeyedWriterConnector_exec
-  libs += DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterConnector_lem_stub DDS_UnkeyedWriterBase_stub DDS4CCM_lem_stub DDS_UnkeyedWriterBase_stub
+  libs += DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterConnector_lem_stub DDS_UnkeyedWriterBase_stub DDS4CCM_lem_stub DDS_UnkeyedWriterBase_NDDS_TS
   libpaths += ../lib
   libout = ../lib
   includes += ..
-  dynamicflags   = WRITER_CONNECTOR_CONN_BUILD_DLL
+  dynamicflags   = WRITER_CONNECTOR_EXEC_BUILD_DLL
 
   IDL_Files {
   }
 
   Source_Files {
-    Writer_Connector_conn.cpp
+    Writer_Connector_exec.cpp
   }
 
   Header_Files {
-    Writer_Connector_conn.h
-    Writer_Connector_conn_export.h
+    Writer_Connector_exec.h
+    Writer_Connector_exec_export.h
   }
 
   Inline_Files {
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector_exec.cpp b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector_exec.cpp
new file mode 100644
index 00000000000..81585b43a78
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector_exec.cpp
@@ -0,0 +1,30 @@
+// -*- C++ -*-
+// $Id$
+
+#include "Writer_Connector_exec.h"
+
+namespace CIAO_Writer_Writer_Connector_Impl
+{
+  Writer_Connector_exec_i::Writer_Connector_exec_i (void)
+    : DDS_Event_Connector_T<WriterTest_DDS_Traits, WriterTest_Connector_Traits> ()
+  {
+  }
+
+  Writer_Connector_exec_i::~Writer_Connector_exec_i (void)
+  {
+  }
+
+  extern "C" WRITER_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_Writer_Writer_Connector_Impl (void)
+  {
+    ::Components::EnterpriseComponent_ptr retval =
+      ::Components::EnterpriseComponent::_nil ();
+
+    ACE_NEW_NORETURN (
+      retval,
+      Writer_Connector_exec_i ());
+
+    return retval;
+  }
+}
+
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector_exec.h
new file mode 100644
index 00000000000..05f2d6bee47
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Connector/Writer_Connector_exec.h
@@ -0,0 +1,60 @@
+// -*- C++ -*-
+// $Id$
+
+#ifndef WRITER_CONNECTOR_EXEC_H_
+#define WRITER_CONNECTOR_EXEC_H_
+
+#include /**/ "ace/pre.h"
+
+#include "Writer_ConnectorEC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "Writer_Connector_exec_export.h"
+#include "tao/LocalObject.h"
+
+#include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
+#include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
+
+#include "Base/Writer_BaseSupport.h"
+
+namespace CIAO_Writer_Writer_Connector_Impl
+{
+  // @from use of WriterTest as a parameter
+  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+    WriterTest,
+    WriterTestSeq,
+    WriterTestTypeSupport,
+    WriterTestDataWriter,
+    WriterTestDataReader > WriterTest_DDS_Traits;
+
+  typedef CIAO::DDS4CCM::Connector_Traits <
+    ::CIAO_Writer_Writer_Connector_Impl::Writer_Connector_Exec,
+    WriterTest_Seq,
+    ::CCM_DDS::WriterTest::CCM_Writer,
+    ::CCM_DDS::WriterTest::CCM_Updater,
+    ::CCM_DDS::WriterTest::CCM_Getter,
+    ::CCM_DDS::WriterTest::CCM_Reader,
+    ::Writer::CCM_Writer_Connector_Context,
+    ::CCM_DDS::WriterTest::Listener,
+    ::CCM_DDS::WriterTest::StateListener,
+    ::CCM_DDS::ConnectorStatusListener> WriterTest_Connector_Traits;
+
+  class WRITER_CONNECTOR_EXEC_Export Writer_Connector_exec_i :
+    public DDS_Event_Connector_T <WriterTest_DDS_Traits, WriterTest_Connector_Traits>
+  {
+  public:
+    Writer_Connector_exec_i (void);
+    virtual ~Writer_Connector_exec_i (void);
+  };
+
+  extern "C" WRITER_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_Writer_Writer_Connector_Impl (void);
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc
index 27862554d8d..044252195eb 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Receiver/Writer_Receiver.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_UnkeyedWriterReceiver_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_UnkeyedWriterReceiver_idl_gen) : componentidldefaults {
   custom_only = 1
   after += DDS_UnkeyedWriterConnector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
@@ -17,7 +17,7 @@ project(DDS_UnkeyedWriterReceiver_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_UnkeyedWriterReceiver_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_UnkeyedWriterReceiver_lem_gen) : ciaoidldefaults {
   after += DDS_UnkeyedWriterReceiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
@@ -107,7 +107,7 @@ project(DDS_UnkeyedWriterReceiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_UnkeyedWriterReceiver_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_UnkeyedWriterReceiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      +=   DDS_UnkeyedWriterReceiver_lem_stub DDS_UnkeyedWriterBase_stub DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterConnector_svnt DDS_UnkeyedWriterReceiver_exec DDS_UnkeyedWriterConnector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
   sharedname  = Receiver_svnt
   libs       += Receiver_stub Receiver_lem_stub DDS_UnkeyedWriterBase_stub DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterConnector_svnt Receiver_exec DDS_UnkeyedWriterConnector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc
index 643847c1268..394e0de58e4 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_UnkeyedWriterBase -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(DDS_UnkeyedWriterSender_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_UnkeyedWriterSender_idl_gen) : componentidldefaults {
   after += DDS_UnkeyedWriterConnector_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_UnkeyedWriterSender_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_UnkeyedWriterSender_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_UnkeyedWriterSender_lem_gen) : ciaoidldefaults {
   after += DDS_UnkeyedWriterSender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
@@ -109,7 +109,7 @@ project(DDS_UnkeyedWriterSender_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_UnkeyedWriterSender_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_UnkeyedWriterSender_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      += DDS_UnkeyedWriterBase_stub  DDS_UnkeyedWriterSender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_UnkeyedWriterConnector_stub DDS_UnkeyedWriterConnector_svnt  DDS_UnkeyedWriterConnector_lem_stub
   sharedname  = Sender_svnt
   libs       += Sender_stub Sender_lem_stub  \
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp
index 82c6b4e6def..8a10218545a 100644
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/Sender/Writer_Sender_exec.cpp
@@ -162,7 +162,7 @@ namespace CIAO_Writer_Sender_Impl
         catch (const CCM_DDS::InternalError& )
           {
             ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Sender_exec_i::test_exception: ")
-                        ACE_TEXT ("OK: Expected InternalErr received\n")));
+                        ACE_TEXT ("OK: Expected InternalErr received")));
           }
         ++this->last_key;
       }
diff --git a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl
index 5aa7222b7e4..e8e74b5f9e1 100755
--- a/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/UnkeyedWriter/descriptors/run_test.pl
@@ -100,8 +100,6 @@ sub kill_open_processes {
     if ($ns_running == 1) {
         $NS->Kill (); $NS->TimedWait (1);
     }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
 }
 
 sub run_node_daemons {
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl b/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl
index 1f6805b69f5..907f7b4a885 100644
--- a/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.idl
@@ -8,8 +8,6 @@
 #ifndef UPDATER_BASE_IDL
 #define UPDATER_BASE_IDL
 
-#pragma ndds typesupport "Base/Updater_BaseSupport.h"
-
 struct TestTopic {
   string key; //@key
   long x;
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc b/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc
index 51b2decdfeb..f7dbf24108e 100644
--- a/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Updater/Base/Updater_Base.mpc
@@ -1,25 +1,76 @@
 // $Id$
+// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n Updater_Base"
 
-project (DDS_Updater_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
-  sharedname = DDS_Updater_Base_stub
-  dynamicflags += UPDATER_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Gxhst -Sci \
+project(DDS_Updater_Base_idl_gen) : taoidldefaults, anytypecode {
+  custom_only = 1
+  idlflags -= -St -Sa
+  idlflags += -SS -Gxhst \
               -Wb,stub_export_macro=UPDATER_BASE_STUB_Export \
               -Wb,stub_export_include=Updater_Base_stub_export.h
 
   IDL_Files {
     Updater_Base.idl
   }
+}
 
-  opendds_ts_flags += --export=UPDATER_BASE_STUB_Export
+project(DDS_Updater_Base_ndds_ts_gen) : ndds_ts_defaults {
+  custom_only = 1
+  after += DDS_Updater_Base_idl_gen
 
-  DDSGenerator_Files {
+  NDDSTypeSupport_Files {
     Updater_Base.idl
   }
+}
+
+project(DDS_Updater_Base_NDDS_TS) : nddslib, taolib {
+  after += DDS_Updater_Base_ndds_ts_gen DDS_Updater_Base_stub
+  libs += DDS_Updater_Base_stub
+  libout = ../lib
+  libpaths    += ../lib
+  sharedname = DDS_Updater_Base_NDDS_TS
+  dynamicflags = NDDS_USER_DLL_EXPORT
+
+  verbatim(gnuace, macros) {
+    override no_hidden_visibility = 1
+  }
 
   Source_Files {
+    Updater_Base.cxx
+    Updater_BasePlugin.cxx
+    Updater_BaseSupport.cxx
+  }
+
+  Header_Files {
+    Updater_Base.h
+    Updater_BasePlugin.h
+    Updater_BaseSupport.h
+  }
+
+  Inline_Files {
+  }
+}
+
+project(DDS_Updater_Base_stub) : ccm_stub {
+  after += DDS_Updater_Base_idl_gen
+  libout = ../lib
+  libpaths += ../lib
+  sharedname = DDS_Updater_Base_stub
+  dynamicflags = UPDATER_BASE_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    Updater_BaseC.cpp
+  }
+
+  Header_Files {
+    Updater_BaseC.h
+    Updater_Base_stub_export.h
+  }
+
+  Inline_Files {
+    Updater_BaseC.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc b/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc
index a5dc883e437..f8b441f5734 100644
--- a/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_Updater_Base -l .. -o ../lib -u DDS Updater_Connector"
 
-project(DDS_UPDATER_Connector_idl_gen) : connectoridldefaults, dds4ccm {
+project(DDS_UPDATER_Connector_idl_gen) : connectoridldefaults {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=UPDATER_CONNECTOR_STUB_Export \
@@ -10,8 +10,8 @@ project(DDS_UPDATER_Connector_idl_gen) : connectoridldefaults, dds4ccm {
               -Wb,skel_export_include=Updater_Connector_svnt_export.h \
               -Wb,svnt_export_macro=UPDATER_CONNECTOR_SVNT_Export \
               -Wb,svnt_export_include=Updater_Connector_svnt_export.h \
-              -Wb,conn_export_macro=UPDATER_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=Updater_Connector_conn_export.h \
+              -Wb,exec_export_macro=UPDATER_CONNECTOR_EXEC_Export \
+              -Wb,exec_export_include=Updater_Connector_exec_export.h \
               -I ..
 
   IDL_Files {
@@ -19,7 +19,7 @@ project(DDS_UPDATER_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   }
 }
 
-project(DDS_UPDATER_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_UPDATER_Connector_lem_gen) : ciaoidldefaults {
   custom_only = 1
   after += DDS_UPDATER_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=UPDATER_CONNECTOR_LEM_STUB_Export \
@@ -85,24 +85,24 @@ project(DDS_Updater_Connector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_Updater_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_UPDATER_Connector_lem_stub DDS_Updater_Connector_stub DDS4CCM_lem_stub DDS_Updater_Base_stub
+  after   += DDS_UPDATER_Connector_lem_stub DDS_Updater_Connector_stub DDS4CCM_lem_stub DDS_Updater_Base_NDDS_TS
   sharedname = DDS_Updater_Connector_exec
-  libs += DDS_Updater_Connector_stub DDS_UPDATER_Connector_lem_stub DDS_Updater_Base_stub DDS4CCM_lem_stub DDS_Updater_Base_stub
+  libs += DDS_Updater_Connector_stub DDS_UPDATER_Connector_lem_stub DDS_Updater_Base_stub DDS4CCM_lem_stub DDS_Updater_Base_NDDS_TS
   libpaths += ../lib
   libout = ../lib
   includes += ..
-  dynamicflags   = UPDATER_CONNECTOR_CONN_BUILD_DLL
+  dynamicflags   = UPDATER_CONNECTOR_EXEC_BUILD_DLL
 
   IDL_Files {
   }
 
   Source_Files {
-    Updater_Connector_conn.cpp
+    Updater_Connector_exec.cpp
   }
 
   Header_Files {
-    Updater_Connector_conn.h
-    Updater_Connector_conn_export.h
+    Updater_Connector_exec.h
+    Updater_Connector_exec_export.h
   }
 
   Inline_Files {
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector_exec.cpp b/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector_exec.cpp
new file mode 100644
index 00000000000..1c366b91ea1
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector_exec.cpp
@@ -0,0 +1,30 @@
+// -*- C++ -*-
+// $Id$
+
+#include "Updater_Connector_exec.h"
+
+namespace CIAO_Updater_Updater_Connector_Impl
+{
+  Updater_Connector_exec_i::Updater_Connector_exec_i (void)
+    : DDS_State_Connector_T<TestTopic_DDS_Traits, TestTopic_Connector_Traits> ()
+  {
+  }
+
+  Updater_Connector_exec_i::~Updater_Connector_exec_i (void)
+  {
+  }
+
+  extern "C" UPDATER_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_Updater_Updater_Connector_Impl (void)
+  {
+    ::Components::EnterpriseComponent_ptr retval =
+      ::Components::EnterpriseComponent::_nil ();
+
+    ACE_NEW_NORETURN (
+      retval,
+      Updater_Connector_exec_i ());
+
+    return retval;
+  }
+}
+
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector_exec.h
new file mode 100644
index 00000000000..6f01473e5a6
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/Updater/Connector/Updater_Connector_exec.h
@@ -0,0 +1,60 @@
+// -*- C++ -*-
+// $Id$
+
+#ifndef UPDATER_CONNECTOR_EXEC_H_
+#define UPDATER_CONNECTOR_EXEC_H_
+
+#include /**/ "ace/pre.h"
+
+#include "Updater_ConnectorEC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "Updater_Connector_exec_export.h"
+#include "tao/LocalObject.h"
+
+#include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
+#include "dds4ccm/impl/ndds/DDS_State_Connector_T.h"
+
+#include "Base/Updater_BaseSupport.h"
+
+namespace CIAO_Updater_Updater_Connector_Impl
+{
+  // @from use of TestTopic as a parameter
+  typedef CIAO::DDS4CCM::RTI::Type_Traits <
+    TestTopic,
+    TestTopicSeq,
+    TestTopicTypeSupport,
+    TestTopicDataWriter,
+    TestTopicDataReader > TestTopic_DDS_Traits;
+
+  typedef CIAO::DDS4CCM::Connector_Traits <
+    ::CIAO_Updater_Updater_Connector_Impl::Updater_Connector_Exec,
+    TestTopic_Seq,
+    ::CCM_DDS::TestTopic::CCM_Writer,
+    ::CCM_DDS::TestTopic::CCM_Updater,
+    ::CCM_DDS::TestTopic::CCM_Getter,
+    ::CCM_DDS::TestTopic::CCM_Reader,
+    ::Updater::CCM_Updater_Connector_Context,
+    ::CCM_DDS::TestTopic::Listener,
+    ::CCM_DDS::TestTopic::StateListener,
+    ::CCM_DDS::ConnectorStatusListener> TestTopic_Connector_Traits;
+
+  class UPDATER_CONNECTOR_EXEC_Export Updater_Connector_exec_i :
+    public DDS_State_Connector_T <TestTopic_DDS_Traits, TestTopic_Connector_Traits>
+  {
+  public:
+    Updater_Connector_exec_i (void);
+    virtual ~Updater_Connector_exec_i (void);
+  };
+
+  extern "C" UPDATER_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_Updater_Updater_Connector_Impl (void);
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.idl b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.idl
index 1a819121236..71016514b2b 100644
--- a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.idl
+++ b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.idl
@@ -14,8 +14,10 @@ module Updater
 {
   component Receiver
   {
-    port CCM_DDS::TestTopic::DDS_Listen info_out;
-  };
+    //port CCM_DDS::TestTopic::DDS_Get info_get;
+    port CCM_DDS::TestTopic::DDS_StateListen info_out;
+    //provides CCM_DDS::ConnectorStatusListener info_out_connector_status;
+   };
 };
 
 #endif
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc
index 7ce29bcf3db..9e092ef2551 100644
--- a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_Updater_Receiver_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_Updater_Receiver_idl_gen) : componentidldefaults {
   custom_only = 1
   after += DDS_UPDATER_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
@@ -17,7 +17,7 @@ project(DDS_Updater_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_Updater_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_Updater_Receiver_lem_gen) : ciaoidldefaults {
   after += DDS_Updater_Receiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
@@ -107,7 +107,7 @@ project(DDS_Updater_Receiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_Updater_Receiver_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_Updater_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      +=   DDS_UPDATER_Receiver_lem_stub DDS_Updater_Base_stub DDS_Updater_Connector_stub DDS_Updater_Connector_svnt DDS_Updater_Receiver_exec DDS_UPDATER_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
   sharedname  = Receiver_svnt
   libs       += Receiver_stub Receiver_lem_stub DDS_Updater_Base_stub DDS_Updater_Connector_stub DDS_Updater_Connector_svnt Receiver_exec DDS_UPDATER_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp
index 2ecc96a3d84..22cfe953976 100644
--- a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp
+++ b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.cpp
@@ -12,79 +12,150 @@
 
 namespace CIAO_Updater_Receiver_Impl
 {
-  //============================================================
-  // ListenOneByOneTest_Listener_exec_i
-  //============================================================
-  ListenOneByOneTest_Listener_exec_i::ListenOneByOneTest_Listener_exec_i (
-                                                      Atomic_ThreadId &thread_id)
-    : thread_id_ (thread_id)
+ 
+  read_action_Generator::read_action_Generator (Receiver_exec_i &callback)
+    : pulse_callback_ (callback)
   {
   }
 
-  ListenOneByOneTest_Listener_exec_i::~ListenOneByOneTest_Listener_exec_i (void)
+  read_action_Generator::~read_action_Generator ()
   {
   }
 
-  void
-  ListenOneByOneTest_Listener_exec_i::on_one_data (
-                                  const TestTopic & an_instance,
-                                  const ::CCM_DDS::ReadInfo & info)
-  {
-    this->thread_id_ = ACE_Thread::self ();
-    ACE_DEBUG ((LM_DEBUG, "ListenOneByOneTest_Listener_exec_i::on_one_data: "
-                            "key <%C> - iteration <%d>\n",
-                            an_instance.key.in (),
-                            an_instance.x));
-    if (!info.instance_handle.isValid)
+  int
+  read_action_Generator::handle_timeout (const ACE_Time_Value &, const void *)
+  {
+    try
       {
-        ACE_ERROR ((LM_ERROR, "ERROR: ListenOneByOneTest_Listener_exec_i::on_one_data: "
-                            "instance handle seems to be invalid "
-                            "key <%C> - iteration <%d>\n",
-                            an_instance.key.in (),
-                            an_instance.x));
+      //   this->pulse_callback_.read_all();
       }
-    if (info.source_timestamp.sec == 0 &&
-        info.source_timestamp.nanosec == 0)
+    catch (...)
       {
-        ACE_ERROR ((LM_ERROR, "ERROR: ListenOneByOneTest_Listener_exec_i::on_one_data: "
-                            "source timestamp seems to be invalid (nil) "
-                            "key <%C> - iteration <%d>\n",
-                            an_instance.key.in (),
-                            an_instance.x));
+        // @todo
       }
+    return 0;
+  }
+  //============================================================
+  // Facet Executor Implementation Class: StateListener_exec_i
+  //============================================================
+  StateListener_exec_i::StateListener_exec_i (void)
+  {
+  }
+
+  StateListener_exec_i::~StateListener_exec_i (void)
+  {
+  }
+
+  // Operations from ::CCM_DDS::StateListener
+  void
+      StateListener_exec_i::on_creation (const ::TestTopic & /*datum*/,
+        const ::CCM_DDS::ReadInfo & /*info*/)
+  {}
+  
+   void
+      StateListener_exec_i::on_one_update (
+        const ::TestTopic & /*datum*/,
+        const ::CCM_DDS::ReadInfo & /*info*/)
+   {}
+      
+   void
+      StateListener_exec_i::on_many_updates (
+        const ::TestTopic_Seq & /*data*/,
+        const ::CCM_DDS::ReadInfoSeq & /*infos*/)
+   {}
+   void
+      StateListener_exec_i::on_deletion (
+        const ::TestTopic & /*datum*/,
+        const ::CCM_DDS::ReadInfo & /*info*/)
+   {}
+  //============================================================
+  // Facet Executor Implementation Class: PortStatusListener_exec_i
+  //============================================================
+  PortStatusListener_exec_i::PortStatusListener_exec_i ()
+  {
+  }
+
+  PortStatusListener_exec_i::~PortStatusListener_exec_i (void)
+  {
+  }
+
+  // Operations from ::CCM_DDS::PortStatusListener
+  void
+    PortStatusListener_exec_i::on_requested_deadline_missed (
+    ::DDS::DataReader_ptr /* the_reader */,
+    const ::DDS::RequestedDeadlineMissedStatus & /* status */)
+  {
   }
 
   void
-  ListenOneByOneTest_Listener_exec_i::on_many_data (
-                                  const TestTopic_Seq & ,
-                                  const ::CCM_DDS::ReadInfoSeq & )
+  PortStatusListener_exec_i::on_sample_lost (
+    ::DDS::DataReader_ptr /* the_reader */,
+    const ::DDS::SampleLostStatus & /* status */)
   {
   }
 
   //============================================================
-  // Receiver_exec_i
+  // Component Executor Implementation Class: Receiver_exec_iTestTopic_RawListener_exec_i ();
   //============================================================
+
   Receiver_exec_i::Receiver_exec_i (void)
-    : thread_id_listener_ (0)
+  : rate_ (10)
   {
+    this->ticker_ = new read_action_Generator (*this); 
   }
 
   Receiver_exec_i::~Receiver_exec_i (void)
   {
   }
 
+  // Supported operations and attributes.
+  void
+  Receiver_exec_i::read_all (void)
+  {
+    if (CORBA::is_nil (this->reader_.in ()))
+      {
+        return;
+      }
+    TestTopic_Seq_var TestTopic_infos;
+    ::CCM_DDS::ReadInfoSeq_var readinfoseq;
+    try{
+      this->reader_->read_all(TestTopic_infos.out(), readinfoseq.out());
+      for(CORBA::ULong i = 0; i < readinfoseq->length(); ++i)
+        {
+          ACE_Time_Value tv;
+          tv <<= readinfoseq[i].source_timestamp;
+          ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL ReadInfo ")
+                                ACE_TEXT ("-> UTC date =%#T\n"),
+                                &tv));
+        }
+      for(CORBA::ULong i = 0; i < TestTopic_infos->length(); ++i)
+        {
+           ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("READ_ALL keyed test info : ")
+                ACE_TEXT ("Number <%d> : received TestTopic_info for <%C> at %u\n"),
+              i,
+              TestTopic_infos[i].key.in (),
+              TestTopic_infos[i].x));
+        }
+    }
+    catch( const CCM_DDS::InternalError& )
+    {
+      ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("internal error or no data\n")));
+    }
+  }
+  // Component attributes.
   // Port operations.
+  
   ::CCM_DDS::CCM_PortStatusListener_ptr
   Receiver_exec_i::get_info_out_status (void)
   {
-    return ::CCM_DDS::CCM_PortStatusListener::_nil ();
+    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("new PortStatuslistener\n")));
+    return new PortStatusListener_exec_i ();
   }
 
-  ::CCM_DDS::TestTopic::CCM_Listener_ptr
+  ::CCM_DDS::TestTopic::CCM_StateListener_ptr
     Receiver_exec_i::get_info_out_data_listener (void)
   {
-    return new ListenOneByOneTest_Listener_exec_i (
-                                  this->thread_id_listener_);
+    return new StateListener_exec_i();
   }
 
   // Operations from Components::SessionComponent.
@@ -103,69 +174,44 @@ namespace CIAO_Updater_Receiver_Impl
   void
   Receiver_exec_i::configuration_complete (void)
   {
+    this->reader_ = this->context_->get_connection_info_out_data();
   }
 
   void
   Receiver_exec_i::ccm_activate (void)
   {
-    ::CCM_DDS::DataListenerControl_var dlc =
-        this->context_->get_connection_info_out_data_control ();
-    dlc->mode (::CCM_DDS::ONE_BY_ONE);
+    ::CCM_DDS::StateListenerControl_var lc =
+    this->context_->get_connection_info_out_data_control ();
+
+     if (CORBA::is_nil (lc.in ()))
+      {
+         ACE_ERROR ((LM_INFO, ACE_TEXT ("Error:  Listener control receptacle is null!\n")));
+        throw CORBA::INTERNAL ();
+      }
+    
+       lc->mode (::CCM_DDS::NOT_ENABLED);
+    // calculate the interval time
+    long usec = 1000000 / this->rate_;
+    if (this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->schedule_timer (
+                                          this->ticker_,
+                                          0,
+                                          ACE_Time_Value(3, usec),
+                                          ACE_Time_Value(3, usec)) == -1)
+      {
+        ACE_ERROR ((LM_ERROR, "Unable to schedule Timer\n"));
+      }
   }
 
   void
   Receiver_exec_i::ccm_passivate (void)
   {
+    this->context_->get_CCM_object()->_get_orb ()->orb_core ()->reactor ()->cancel_timer (this->ticker_);
+    delete this->ticker_;
   }
 
   void
   Receiver_exec_i::ccm_remove (void)
   {
-    if (this->thread_id_listener_.value () == 0)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: "
-                              "Thread ID for ReaderListener not set!\n"));
-      }
-    #if defined (CIAO_DDS4CCM_CONTEXT_SWITCH) && (CIAO_DDS4CCM_CONTEXT_SWITCH == 1)
-    else if (ACE_OS::thr_equal (this->thread_id_listener_.value (),
-                                ACE_Thread::self ()))
-      {
-        ACE_DEBUG ((LM_DEBUG, "ONE_BY_ONE: "
-                              "Thread switch for ReaderListener seems OK. "
-                              "(DDS uses the CCM thread for its callback) "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_.value (),
-                              ACE_Thread::self ()));
-      }
-    else
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: ONE_BY_ONE: "
-                              "Thread switch for ReaderListener "
-                              "doesn't seem to work! "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_.value (),
-                              ACE_Thread::self ()));
-      }
-    #else
-    else if (ACE_OS::thr_equal (this->thread_id_listener_.value (),
-                                ACE_Thread::self ()))
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: ONE_BY_ONE: ReaderListener: "
-                              "DDS seems to use a CCM thread for its callback: "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_.value (),
-                              ACE_Thread::self ()));
-      }
-    else
-      {
-        ACE_DEBUG ((LM_DEBUG, "ONE_BY_ONE: ReaderListener: "
-                              "DDS seems to use its own thread for its callback: "
-                              "listener <%u> - component <%u>\n",
-                              this->thread_id_listener_.value (),
-                              ACE_Thread::self ()));
-      }
-    #endif
-
   }
 
   extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h
index adb45df3aa1..deb3efc0e75 100644
--- a/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h
+++ b/CIAO/connectors/dds4ccm/tests/Updater/Receiver/Updater_Receiver_exec.h
@@ -13,43 +13,79 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/LocalObject.h"
-#include "ace/OS_NS_Thread.h"
-#include "ace/Reactor.h"
 #include "ace/Task.h"
+#include "ace/Reactor.h"
 
 namespace CIAO_Updater_Receiver_Impl
 {
   typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, CORBA::Boolean > Atomic_Boolean;
-  typedef ACE_Atomic_Op <TAO_SYNCH_MUTEX, ACE_thread_t> Atomic_ThreadId;
-
+  
   class Receiver_exec_i;
+   
+  class read_action_Generator
+    : public ACE_Event_Handler
+  {
+  public:
+    read_action_Generator (Receiver_exec_i &callback);
+
+    ~read_action_Generator ();
 
-  //============================================================
-  // ListenOneByOneTest_Listener_exec_i
-  //============================================================
-  class RECEIVER_EXEC_Export ListenOneByOneTest_Listener_exec_i
-    : public virtual ::CCM_DDS::TestTopic::CCM_Listener,
+    /// Handle the timeout.
+    virtual int handle_timeout (const ACE_Time_Value &tv,
+                                const void *arg);
+
+  private:
+    /// Maintains a handle that actually process the event
+    Receiver_exec_i &pulse_callback_;
+
+  };
+  class RECEIVER_EXEC_Export PortStatusListener_exec_i
+    : public virtual ::CCM_DDS::CCM_PortStatusListener,
       public virtual ::CORBA::LocalObject
   {
   public:
-    ListenOneByOneTest_Listener_exec_i (Atomic_ThreadId &);
-    virtual ~ListenOneByOneTest_Listener_exec_i (void);
+    PortStatusListener_exec_i (void);
+    virtual ~PortStatusListener_exec_i (void);
 
     virtual void
-    on_one_data (
-      const TestTopic& an_instance,
-      const ::CCM_DDS::ReadInfo & info);
+    on_requested_deadline_missed (
+      ::DDS::DataReader_ptr the_reader,
+      const ::DDS::RequestedDeadlineMissedStatus & status);
+
     virtual void
-    on_many_data (
-      const TestTopic_Seq & an_instance,
-      const ::CCM_DDS::ReadInfoSeq & info);
-  private:
-    Atomic_ThreadId &thread_id_;
+    on_sample_lost (
+      ::DDS::DataReader_ptr the_reader,
+      const ::DDS::SampleLostStatus & status);
   };
+  class RECEIVER_EXEC_Export StateListener_exec_i
+    : public virtual ::CCM_DDS::TestTopic::CCM_StateListener,
+      public virtual ::CORBA::LocalObject
+  {
+  public:
+    StateListener_exec_i (void);
+    virtual ~StateListener_exec_i (void);
+    
+    virtual void
+      on_creation (
+        const ::TestTopic & datum,
+        const ::CCM_DDS::ReadInfo & info);
+
+    virtual void
+      on_one_update (
+        const ::TestTopic & datum,
+        const ::CCM_DDS::ReadInfo & info);
+
+    virtual void
+      on_many_updates (
+        const ::TestTopic_Seq & data,
+        const ::CCM_DDS::ReadInfoSeq & infos);
+
+    virtual void
+      on_deletion (
+        const ::TestTopic & datum,
+        const ::CCM_DDS::ReadInfo & info);
+   };
 
-  //============================================================
-  // Receiver_exec_i
-  //============================================================
   class RECEIVER_EXEC_Export Receiver_exec_i
     : public virtual Receiver_Exec,
       public virtual ::CORBA::LocalObject
@@ -59,7 +95,7 @@ namespace CIAO_Updater_Receiver_Impl
     virtual ~Receiver_exec_i (void);
 
     // Port operations.
-    virtual ::CCM_DDS::TestTopic::CCM_Listener_ptr
+    virtual ::CCM_DDS::TestTopic::CCM_StateListener_ptr
     get_info_out_data_listener (void);
 
     virtual ::CCM_DDS::CCM_PortStatusListener_ptr
@@ -75,10 +111,13 @@ namespace CIAO_Updater_Receiver_Impl
     virtual void ccm_activate (void);
     virtual void ccm_passivate (void);
     virtual void ccm_remove (void);
+    void read_all(void);
 
   private:
     ::Updater::CCM_Receiver_Context_var context_;
-    Atomic_ThreadId thread_id_listener_;
+    ::CCM_DDS::TestTopic::Reader_var reader_;
+    read_action_Generator * ticker_;
+    CORBA::ULong rate_;
 };
 
   extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc b/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc
index d1097877d1d..c4ca357c402 100644
--- a/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/Updater/Sender/Updater_Sender.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_Updater_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(DDS_Updater_Sender_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_Updater_Sender_idl_gen) : componentidldefaults {
   after += DDS_UPDATER_Connector_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_Updater_Sender_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_Updater_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_Updater_Sender_lem_gen) : ciaoidldefaults {
   after += DDS_Updater_Sender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
@@ -109,7 +109,7 @@ project(DDS_Updater_Sender_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_Updater_Sender_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_Updater_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      += DDS_Updater_Base_stub  DDS_Updater_Sender_lem_stub DDS4CCM_lem_stub DDS4CCM_skel DDS_Updater_Connector_stub DDS_Updater_Connector_svnt DDS_UPDATER_Connector_lem_stub
   sharedname  = Sender_svnt
   libs       += Sender_stub Sender_lem_stub  \
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/Updater/descriptors/Plan.cdp
index 2cb74af488c..d00075d94c4 100644
--- a/CIAO/connectors/dds4ccm/tests/Updater/descriptors/Plan.cdp
+++ b/CIAO/connectors/dds4ccm/tests/Updater/descriptors/Plan.cdp
@@ -227,7 +227,7 @@
       <instance xmi:idref="ReceiverComponentInstance" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>push_observer_data_control</portName>
+      <portName>push_state_observer_data_control</portName>
       <provider>true</provider>
       <kind>Facet</kind>
       <instance xmi:idref="Updater_ConnectorComponentInstance2" />
@@ -246,7 +246,7 @@
       <instance xmi:idref="ReceiverComponentInstance" />
     </internalEndpoint>
     <internalEndpoint>
-      <portName>push_observer_data_listener</portName>
+      <portName>push_state_observer_data_listener</portName>
       <provider>false</provider>
       <kind>SimplexReceptacle</kind>
       <instance xmi:idref="Updater_ConnectorComponentInstance2" />
@@ -271,6 +271,21 @@
       <instance xmi:idref="Updater_ConnectorComponentInstance2" />
     </internalEndpoint>
   </connection>
+  <!--connection>
+    <name>_listener</name>
+    <internalEndpoint>
+      <portName>info_out_data_listener</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="ReceiverComponentInstance" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>push_consumer_data_listener</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="Updater_ConnectorComponentInstance2" />
+    </internalEndpoint>
+  </connection-->
   <connection>
     <name>info_out_data</name>
     <deployRequirement>
@@ -290,6 +305,36 @@
       <instance xmi:idref="Updater_ConnectorComponentInstance2" />
     </internalEndpoint>
   </connection>
+  <!-->connection>
+    <name>info_out_connector_status_receiver</name>
+    <internalEndpoint>
+      <portName>info_out_connector_status</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="ReceiverComponentInstance" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>error_listener</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="Updater_ConnectorComponentInstance2" />
+    </internalEndpoint>
+  </connection-->
+  <!-->connection>
+    <name>test_topic_connector_status_sender</name>
+    <internalEndpoint>
+      <portName>test_topic_connector_status</portName>
+      <provider>true</provider>
+      <kind>Facet</kind>
+      <instance xmi:idref="SenderComponentInstance" />
+    </internalEndpoint>
+    <internalEndpoint>
+      <portName>error_listener</portName>
+      <provider>false</provider>
+      <kind>SimplexReceptacle</kind>
+      <instance xmi:idref="Updater_ConnectorComponentInstance" />
+    </internalEndpoint>
+  </connection-->
   <connection>
     <name>updater_connection</name>
     <deployRequirement>
diff --git a/CIAO/connectors/dds4ccm/tests/Updater/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/Updater/descriptors/run_test.pl
index 91f09e912e2..66131f97fdb 100755
--- a/CIAO/connectors/dds4ccm/tests/Updater/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/Updater/descriptors/run_test.pl
@@ -100,8 +100,6 @@ sub kill_open_processes {
     if ($ns_running == 1) {
         $NS->Kill (); $NS->TimedWait (1);
     }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
 }
 
 sub run_node_daemons {
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl
index 886f6a47324..2b5ef96e244 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.idl
@@ -1,32 +1,30 @@
 // $Id$
 
 /**
- * @file   VTopic_Base.idl
+ * @file   VTopic_Base.idl 
  * @author Marijke Hengstmengel <mhengstmengel@remedy.nl>
  */
 
 #ifndef VTOPIC_BASE_IDL
 #define VTOPIC_BASE_IDL
 
-#pragma ndds typesupport "Base/VTopic_BaseSupport.h"
 
-struct TestTopic {
-  string key; //@key
-  long x;
-};
-
-// String
-struct TopicString {
-  string key; //@key
-  string x_str;
-};
-
-// Arrays
-struct TopicArray {
-  string key; //@key
-  octet x_array[5];
- };
+  struct TestTopic {
+    string key; //@key
+    long x;
+   };
+  //string
+  struct TopicString {
+    string key; //@key
+    string x_str;
+   };
 
+  //arrays
+  struct TopicArray {
+    string key; //@key
+    octet x_array[5];
+   };
+ 
 //unions
 /*  union X_Union switch (short) {
     case 0:
@@ -38,22 +36,22 @@ struct TopicArray {
   struct TopicUnion {
     string key; //@key
     X_Union x_uni;
-
+ 
    };
 
  */
 
-struct test {
-  short x_test;
-  string x_teststr;
-};
-typedef sequence<test> test_seq;
+  struct test {
+    short x_test;
+    string x_teststr;
+  };
+  typedef sequence<test> test_seq;
 
-// Sequence
-struct TopicSeq {
-  string key; //@key
-  test_seq x_seq;
-};
+  //sequence
+  struct TopicSeq {
+    string key; //@key
+    test_seq x_seq;
+   };
 
   typedef sequence<TestTopic> TestTopic_Seq;
   typedef sequence<TopicString> TopicString_Seq;
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc
index c6fc6f2306c..30478eb529b 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Base/VTopic_Base.mpc
@@ -1,25 +1,76 @@
 // $Id$
+// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n VTopic_Base"
 
-project (DDS_VTopic_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
-  sharedname = DDS_VTopic_Base_stub
-  dynamicflags += VTOPIC_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Gxhst -Sci \
+project(DDS_VTopic_Base_idl_gen) : taoidldefaults, anytypecode {
+  custom_only = 1
+  idlflags -= -St -Sa
+  idlflags += -SS -Gxhst \
               -Wb,stub_export_macro=VTOPIC_BASE_STUB_Export \
               -Wb,stub_export_include=VTopic_Base_stub_export.h
 
   IDL_Files {
     VTopic_Base.idl
   }
+}
 
-  opendds_ts_flags += --export=VTOPIC_BASE_STUB_Export
+project(DDS_VTopic_Base_ndds_ts_gen) : ndds_ts_defaults   {
+  custom_only = 1
+  after += DDS_VTopic_Base_idl_gen
 
-  DDSGenerator_Files {
+  NDDSTypeSupport_Files {
     VTopic_Base.idl
   }
+}
+
+project(DDS_VTopic_Base_NDDS_TS) : nddslib, taolib {
+  after += DDS_VTopic_Base_ndds_ts_gen DDS_VTopic_Base_stub
+  libs += DDS_VTopic_Base_stub
+  libout = ../lib
+  libpaths    += ../lib
+  sharedname = DDS_VTopic_Base_NDDS_TS
+  dynamicflags = NDDS_USER_DLL_EXPORT
+
+  verbatim(gnuace, macros) {
+    override no_hidden_visibility = 1
+  }
 
   Source_Files {
+    VTopic_Base.cxx
+    VTopic_BasePlugin.cxx
+    VTopic_BaseSupport.cxx
+  }
+
+  Header_Files {
+    VTopic_Base.h
+    VTopic_BasePlugin.h
+    VTopic_BaseSupport.h
+  }
+
+  Inline_Files {
+  }
+}
+
+project(DDS_VTopic_Base_stub) : ccm_stub {
+  after += DDS_VTopic_Base_idl_gen
+  libout = ../lib
+  libpaths += ../lib
+  sharedname = DDS_VTopic_Base_stub
+  dynamicflags = VTOPIC_BASE_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    VTopic_BaseC.cpp
+  }
+
+  Header_Files {
+    VTopic_BaseC.h
+    VTopic_Base_stub_export.h
+  }
+
+  Inline_Files {
+    VTopic_BaseC.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc
index db5fab8544d..f3e1e85564e 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_VTopic_Base -l .. -o ../lib -u DDS VT_Array_Connector"
 
-project(DDS_VT_ARRAY_Connector_idl_gen) : connectoridldefaults, dds4ccm {
+project(DDS_VT_ARRAY_Connector_idl_gen) : connectoridldefaults {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=VT_ARRAY_CONNECTOR_STUB_Export \
@@ -10,8 +10,8 @@ project(DDS_VT_ARRAY_Connector_idl_gen) : connectoridldefaults, dds4ccm {
               -Wb,skel_export_include=VT_Array_Connector_svnt_export.h \
               -Wb,svnt_export_macro=VT_ARRAY_CONNECTOR_SVNT_Export \
               -Wb,svnt_export_include=VT_Array_Connector_svnt_export.h \
-              -Wb,conn_export_macro=VT_ARRAY_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=VT_Array_Connector_conn_export.h \
+              -Wb,exec_export_macro=VT_ARRAY_CONNECTOR_EXEC_Export \
+              -Wb,exec_export_include=VT_Array_Connector_exec_export.h \
               -I ..
 
   IDL_Files {
@@ -19,7 +19,7 @@ project(DDS_VT_ARRAY_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   }
 }
 
-project(DDS_VT_ARRAY_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_VT_ARRAY_Connector_lem_gen) : ciaoidldefaults {
   custom_only = 1
   after += DDS_VT_ARRAY_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=VT_ARRAY_CONNECTOR_LEM_STUB_Export \
@@ -85,24 +85,24 @@ project(DDS_VT_Array_Connector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_VT_Array_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_VT_ARRAY_Connector_lem_stub DDS_VT_Array_Connector_stub DDS4CCM_lem_stub DDS_VTopic_Base_stub
+  after   += DDS_VT_ARRAY_Connector_lem_stub DDS_VT_Array_Connector_stub DDS4CCM_lem_stub DDS_VTopic_Base_NDDS_TS
   sharedname = DDS_VT_Array_Connector_exec
-  libs += DDS_VT_Array_Connector_stub DDS_VT_ARRAY_Connector_lem_stub DDS_VTopic_Base_stub DDS4CCM_lem_stub DDS_VTopic_Base_stub
+  libs += DDS_VT_Array_Connector_stub DDS_VT_ARRAY_Connector_lem_stub DDS_VTopic_Base_stub DDS4CCM_lem_stub DDS_VTopic_Base_NDDS_TS
   libpaths += ../lib
   libout = ../lib
   includes += ..
-  dynamicflags   = VT_ARRAY_CONNECTOR_CONN_BUILD_DLL
+  dynamicflags   = VT_ARRAY_CONNECTOR_EXEC_BUILD_DLL
 
   IDL_Files {
   }
 
   Source_Files {
-    VT_Array_Connector_conn.cpp
+    VT_Array_Connector_exec.cpp
   }
 
   Header_Files {
-    VT_Array_Connector_conn.h
-    VT_Array_Connector_conn_export.h
+    VT_Array_Connector_exec.h
+    VT_Array_Connector_exec_export.h
   }
 
   Inline_Files {
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector_exec.cpp b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector_exec.cpp
new file mode 100644
index 00000000000..42a6e16f51d
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector_exec.cpp
@@ -0,0 +1,28 @@
+// -*- C++ -*-
+// $Id$
+
+#include "VT_Array_Connector_exec.h"
+
+namespace CIAO_VT_Array_VT_Array_Connector_Impl
+{
+  VT_Array_Connector_exec_i::VT_Array_Connector_exec_i (void)
+    : DDS_Event_Connector_T<TopicArray_DDS_Traits, TopicArray_Connector_Traits> ()
+  {
+  }
+
+  VT_Array_Connector_exec_i::~VT_Array_Connector_exec_i (void)
+  {
+  }
+
+  extern "C" VT_ARRAY_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_VT_Array_VT_Array_Connector_Impl (void)
+  {
+    ::Components::EnterpriseComponent_ptr retval =
+      ::Components::EnterpriseComponent::_nil ();
+
+    ACE_NEW_NORETURN (
+      retval,
+      VT_Array_Connector_exec_i ()); 
+    return retval;
+  }
+}
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector_exec.h
new file mode 100644
index 00000000000..16c6a193313
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Array/VT_Array_Connector_exec.h
@@ -0,0 +1,61 @@
+// -*- C++ -*-
+// $Id$
+
+#ifndef VT_ARRAY_CONNECTOR_EXEC_H_
+#define VT_ARRAY_CONNECTOR_EXEC_H_
+
+#include /**/ "ace/pre.h"
+
+#include "VT_Array_ConnectorEC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "VT_Array_Connector_exec_export.h"
+#include "tao/LocalObject.h"
+
+#include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
+#include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
+
+
+#include "Base/VTopic_BaseSupport.h"
+
+namespace CIAO_VT_Array_VT_Array_Connector_Impl
+{
+
+  // @from use of VTopic as a parameter
+  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+    TopicArray,
+    TopicArraySeq,
+    TopicArrayTypeSupport,
+    TopicArrayDataWriter,
+    TopicArrayDataReader > TopicArray_DDS_Traits;
+
+  typedef CIAO::DDS4CCM::Connector_Traits <
+    ::CIAO_VTopic_VT_Array_Connector_Impl::VT_Array_Connector_Exec,
+    TopicArray_Seq,
+    ::CCM_DDS::TopicArray::CCM_Writer,
+    ::CCM_DDS::TopicArray::CCM_Updater,
+    ::CCM_DDS::TopicArray::CCM_Getter,
+    ::CCM_DDS::TopicArray::CCM_Reader,
+    ::VTopic::CCM_VT_Array_Connector_Context,
+    ::CCM_DDS::TopicArray::Listener,
+    ::CCM_DDS::TopicArray::StateListener,
+    ::CCM_DDS::ConnectorStatusListener> TopicArray_Connector_Traits;
+
+  class VT_ARRAY_CONNECTOR_EXEC_Export VT_Array_Connector_exec_i :
+    public DDS_Event_Connector_T <TopicArray_DDS_Traits, TopicArray_Connector_Traits>
+  {
+  public:
+    VT_Array_Connector_exec_i (void);
+    virtual ~VT_Array_Connector_exec_i (void);
+  };
+
+  extern "C" VT_ARRAY_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_VT_Array_VT_Array_Connector_Impl (void);
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc
index a94c92eecc2..9dbf0fa7e60 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_VTopic_Base -l .. -o ../lib -u DDS VT_Seq_Connector"
 
-project(DDS_VT_SEQ_Connector_idl_gen) : connectoridldefaults, dds4ccm {
+project(DDS_VT_SEQ_Connector_idl_gen) : connectoridldefaults {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=VT_SEQ_CONNECTOR_STUB_Export \
@@ -10,8 +10,8 @@ project(DDS_VT_SEQ_Connector_idl_gen) : connectoridldefaults, dds4ccm {
               -Wb,skel_export_include=VT_Seq_Connector_svnt_export.h \
               -Wb,svnt_export_macro=VT_SEQ_CONNECTOR_SVNT_Export \
               -Wb,svnt_export_include=VT_Seq_Connector_svnt_export.h \
-              -Wb,conn_export_macro=VT_SEQ_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=VT_Seq_Connector_conn_export.h \
+              -Wb,exec_export_macro=VT_SEQ_CONNECTOR_EXEC_Export \
+              -Wb,exec_export_include=VT_Seq_Connector_exec_export.h \
               -I ..
 
   IDL_Files {
@@ -19,7 +19,7 @@ project(DDS_VT_SEQ_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   }
 }
 
-project(DDS_VT_SEQ_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_VT_SEQ_Connector_lem_gen) : ciaoidldefaults {
   custom_only = 1
   after += DDS_VT_SEQ_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=VT_SEQ_CONNECTOR_LEM_STUB_Export \
@@ -85,24 +85,24 @@ project(DDS_VT_Seq_Connector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_VT_Seq_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_VT_SEQ_Connector_lem_stub DDS_VT_Seq_Connector_stub DDS4CCM_lem_stub DDS_VTopic_Base_stub
+  after   += DDS_VT_SEQ_Connector_lem_stub DDS_VT_Seq_Connector_stub DDS4CCM_lem_stub DDS_VTopic_Base_NDDS_TS
   sharedname = DDS_VT_Seq_Connector_exec
-  libs += DDS_VT_Seq_Connector_stub DDS_VT_SEQ_Connector_lem_stub DDS_VTopic_Base_stub DDS4CCM_lem_stub DDS_VTopic_Base_stub
+  libs += DDS_VT_Seq_Connector_stub DDS_VT_SEQ_Connector_lem_stub DDS_VTopic_Base_stub DDS4CCM_lem_stub DDS_VTopic_Base_NDDS_TS
   libpaths += ../lib
   libout = ../lib
   includes += ..
-  dynamicflags   = VT_SEQ_CONNECTOR_CONN_BUILD_DLL
+  dynamicflags   = VT_SEQ_CONNECTOR_EXEC_BUILD_DLL
 
   IDL_Files {
   }
 
   Source_Files {
-    VT_Seq_Connector_conn.cpp
+    VT_Seq_Connector_exec.cpp
   }
 
   Header_Files {
-    VT_Seq_Connector_conn.h
-    VT_Seq_Connector_conn_export.h
+    VT_Seq_Connector_exec.h
+    VT_Seq_Connector_exec_export.h
   }
 
   Inline_Files {
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector_exec.cpp b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector_exec.cpp
new file mode 100644
index 00000000000..8d30dfae0f3
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector_exec.cpp
@@ -0,0 +1,28 @@
+// -*- C++ -*-
+// $Id$
+
+#include "VT_Seq_Connector_exec.h"
+
+namespace CIAO_VT_Seq_VT_Seq_Connector_Impl
+{
+  VT_Seq_Connector_exec_i::VT_Seq_Connector_exec_i (void)
+    : DDS_Event_Connector_T<TopicSeq_DDS_Traits, TopicSeq_Connector_Traits> ()
+  {
+  }
+
+  VT_Seq_Connector_exec_i::~VT_Seq_Connector_exec_i (void)
+  {
+  }
+
+  extern "C" VT_SEQ_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_VT_Seq_VT_Seq_Connector_Impl (void)
+  {
+    ::Components::EnterpriseComponent_ptr retval =
+      ::Components::EnterpriseComponent::_nil ();
+
+    ACE_NEW_NORETURN (
+      retval,
+      VT_Seq_Connector_exec_i ()); 
+    return retval;
+  }
+}
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector_exec.h
new file mode 100644
index 00000000000..57537c89c53
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_Seq/VT_Seq_Connector_exec.h
@@ -0,0 +1,61 @@
+// -*- C++ -*-
+// $Id$
+
+#ifndef VT_SEQ_CONNECTOR_EXEC_H_
+#define VT_SEQ_CONNECTOR_EXEC_H_
+
+#include /**/ "ace/pre.h"
+
+#include "VT_Seq_ConnectorEC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "VT_Seq_Connector_exec_export.h"
+#include "tao/LocalObject.h"
+
+#include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
+#include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
+
+
+#include "Base/VTopic_BaseSupport.h"
+
+namespace CIAO_VT_Seq_VT_Seq_Connector_Impl
+{
+
+  // @from use of VTopic as a parameter
+  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+    TopicSeq,
+    TopicSeqSeq,
+    TopicSeqTypeSupport,
+    TopicSeqDataWriter,
+    TopicSeqDataReader > TopicSeq_DDS_Traits;
+
+  typedef CIAO::DDS4CCM::Connector_Traits <
+    ::CIAO_VTopic_VT_Seq_Connector_Impl::VT_Seq_Connector_Exec,
+    TopicSeq_Seq,
+    ::CCM_DDS::TopicSeq::CCM_Writer,
+    ::CCM_DDS::TopicSeq::CCM_Updater,
+    ::CCM_DDS::TopicSeq::CCM_Getter,
+    ::CCM_DDS::TopicSeq::CCM_Reader,
+    ::VTopic::CCM_VT_Seq_Connector_Context,
+    ::CCM_DDS::TopicSeq::Listener,
+    ::CCM_DDS::TopicSeq::StateListener,
+    ::CCM_DDS::ConnectorStatusListener> TopicSeq_Connector_Traits;
+
+  class VT_SEQ_CONNECTOR_EXEC_Export VT_Seq_Connector_exec_i :
+    public DDS_Event_Connector_T <TopicSeq_DDS_Traits, TopicSeq_Connector_Traits>
+  {
+  public:
+    VT_Seq_Connector_exec_i (void);
+    virtual ~VT_Seq_Connector_exec_i (void);
+  };
+
+  extern "C" VT_SEQ_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_VT_Seq_VT_Seq_Connector_Impl (void);
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc
index 4d5468ae4a6..bfa3ed35f98 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_VTopic_Base -l .. -o ../lib -u DDS VT_String_Connector"
 
-project(DDS_VT_STRING_Connector_idl_gen) : connectoridldefaults, dds4ccm {
+project(DDS_VT_STRING_Connector_idl_gen) : connectoridldefaults {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=VT_STRING_CONNECTOR_STUB_Export \
@@ -10,8 +10,8 @@ project(DDS_VT_STRING_Connector_idl_gen) : connectoridldefaults, dds4ccm {
               -Wb,skel_export_include=VT_String_Connector_svnt_export.h \
               -Wb,svnt_export_macro=VT_STRING_CONNECTOR_SVNT_Export \
               -Wb,svnt_export_include=VT_String_Connector_svnt_export.h \
-              -Wb,conn_export_macro=VT_STRING_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=VT_String_Connector_conn_export.h \
+              -Wb,exec_export_macro=VT_STRING_CONNECTOR_EXEC_Export \
+              -Wb,exec_export_include=VT_String_Connector_exec_export.h \
               -I ..
 
   IDL_Files {
@@ -19,7 +19,7 @@ project(DDS_VT_STRING_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   }
 }
 
-project(DDS_VT_STRING_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_VT_STRING_Connector_lem_gen) : ciaoidldefaults {
   custom_only = 1
   after += DDS_VT_STRING_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=VT_STRING_CONNECTOR_LEM_STUB_Export \
@@ -85,24 +85,24 @@ project(DDS_VT_String_Connector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_VT_String_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_VT_STRING_Connector_lem_stub DDS_VT_String_Connector_stub DDS4CCM_lem_stub DDS_VTopic_Base_stub
+  after   += DDS_VT_STRING_Connector_lem_stub DDS_VT_String_Connector_stub DDS4CCM_lem_stub DDS_VTopic_Base_NDDS_TS
   sharedname = DDS_VT_String_Connector_exec
-  libs += DDS_VT_String_Connector_stub DDS_VT_STRING_Connector_lem_stub DDS_VTopic_Base_stub DDS4CCM_lem_stub DDS_VTopic_Base_stub
+  libs += DDS_VT_String_Connector_stub DDS_VT_STRING_Connector_lem_stub DDS_VTopic_Base_stub DDS4CCM_lem_stub DDS_VTopic_Base_NDDS_TS
   libpaths += ../lib
   libout = ../lib
   includes += ..
-  dynamicflags   = VT_STRING_CONNECTOR_CONN_BUILD_DLL
+  dynamicflags   = VT_STRING_CONNECTOR_EXEC_BUILD_DLL
 
   IDL_Files {
   }
 
   Source_Files {
-    VT_String_Connector_conn.cpp
+    VT_String_Connector_exec.cpp
   }
 
   Header_Files {
-    VT_String_Connector_conn.h
-    VT_String_Connector_conn_export.h
+    VT_String_Connector_exec.h
+    VT_String_Connector_exec_export.h
   }
 
   Inline_Files {
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector_exec.cpp b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector_exec.cpp
new file mode 100644
index 00000000000..a7f916ffd84
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector_exec.cpp
@@ -0,0 +1,28 @@
+// -*- C++ -*-
+// $Id$
+
+#include "VT_String_Connector_exec.h"
+
+namespace CIAO_VT_String_VT_String_Connector_Impl
+{
+  VT_String_Connector_exec_i::VT_String_Connector_exec_i (void)
+    : DDS_Event_Connector_T<TopicString_DDS_Traits, TopicString_Connector_Traits> ()
+  {
+  }
+
+  VT_String_Connector_exec_i::~VT_String_Connector_exec_i (void)
+  {
+  }
+
+  extern "C" VT_STRING_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_VT_String_VT_String_Connector_Impl (void)
+  {
+    ::Components::EnterpriseComponent_ptr retval =
+      ::Components::EnterpriseComponent::_nil ();
+
+    ACE_NEW_NORETURN (
+      retval,
+      VT_String_Connector_exec_i ()); 
+    return retval;
+  }
+}
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector_exec.h
new file mode 100644
index 00000000000..a234cce78d7
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Conn_String/VT_String_Connector_exec.h
@@ -0,0 +1,61 @@
+// -*- C++ -*-
+// $Id$
+
+#ifndef VT_STRING_CONNECTOR_EXEC_H_
+#define VT_STRING_CONNECTOR_EXEC_H_
+
+#include /**/ "ace/pre.h"
+
+#include "VT_String_ConnectorEC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "VT_String_Connector_exec_export.h"
+#include "tao/LocalObject.h"
+
+#include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
+#include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
+
+
+#include "Base/VTopic_BaseSupport.h"
+
+namespace CIAO_VT_String_VT_String_Connector_Impl
+{
+
+  // @from use of VTopic as a parameter
+  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+    TopicString,
+    TopicStringSeq,
+    TopicStringTypeSupport,
+    TopicStringDataWriter,
+    TopicStringDataReader > TopicString_DDS_Traits;
+
+  typedef CIAO::DDS4CCM::Connector_Traits <
+    ::CIAO_VTopic_VT_String_Connector_Impl::VT_String_Connector_Exec,
+    TopicString_Seq,
+    ::CCM_DDS::TopicString::CCM_Writer,
+    ::CCM_DDS::TopicString::CCM_Updater,
+    ::CCM_DDS::TopicString::CCM_Getter,
+    ::CCM_DDS::TopicString::CCM_Reader,
+    ::VTopic::CCM_VT_String_Connector_Context,
+    ::CCM_DDS::TopicString::Listener,
+    ::CCM_DDS::TopicString::StateListener,
+    ::CCM_DDS::ConnectorStatusListener> TopicString_Connector_Traits;
+
+  class VT_STRING_CONNECTOR_EXEC_Export VT_String_Connector_exec_i :
+    public DDS_Event_Connector_T <TopicString_DDS_Traits, TopicString_Connector_Traits>
+  {
+  public:
+    VT_String_Connector_exec_i (void);
+    virtual ~VT_String_Connector_exec_i (void);
+  };
+
+  extern "C" VT_STRING_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_VT_String_VT_String_Connector_Impl (void);
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc
index 861bcd0e2e9..12f4292097c 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_VTopic_Base -l .. -o ../lib -u DDS VTopic_Connector"
 
-project(DDS_VTopic_Connector_idl_gen) : connectoridldefaults, dds4ccm {
+project(DDS_VTopic_Connector_idl_gen) : connectoridldefaults {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=VTOPIC_CONNECTOR_STUB_Export \
@@ -10,8 +10,8 @@ project(DDS_VTopic_Connector_idl_gen) : connectoridldefaults, dds4ccm {
               -Wb,skel_export_include=VTopic_Connector_svnt_export.h \
               -Wb,svnt_export_macro=VTOPIC_CONNECTOR_SVNT_Export \
               -Wb,svnt_export_include=VTopic_Connector_svnt_export.h \
-              -Wb,conn_export_macro=VTOPIC_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=VTopic_Connector_conn_export.h \
+              -Wb,exec_export_macro=VTOPIC_CONNECTOR_EXEC_Export \
+              -Wb,exec_export_include=VTopic_Connector_exec_export.h \
               -I ..
 
   IDL_Files {
@@ -19,7 +19,7 @@ project(DDS_VTopic_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   }
 }
 
-project(DDS_VTopic_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_VTopic_Connector_lem_gen) : ciaoidldefaults {
   custom_only = 1
   after += DDS_VTopic_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=VTOPIC_CONNECTOR_LEM_STUB_Export \
@@ -85,24 +85,24 @@ project(DDS_VTopic_Connector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_VTopic_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_VTopic_Connector_lem_stub DDS_VTopic_Connector_stub DDS4CCM_lem_stub DDS_VTopic_Base_stub
+  after   += DDS_VTopic_Connector_lem_stub DDS_VTopic_Connector_stub DDS4CCM_lem_stub DDS_VTopic_Base_NDDS_TS
   sharedname = DDS_VTopic_Connector_exec
-  libs += DDS_VTopic_Connector_stub DDS_VTopic_Connector_lem_stub DDS_VTopic_Base_stub DDS4CCM_lem_stub DDS_VTopic_Base_stub
+  libs += DDS_VTopic_Connector_stub DDS_VTopic_Connector_lem_stub DDS_VTopic_Base_stub DDS4CCM_lem_stub DDS_VTopic_Base_NDDS_TS
   libpaths += ../lib
   libout = ../lib
   includes += ..
-  dynamicflags   = VTOPIC_CONNECTOR_CONN_BUILD_DLL
+  dynamicflags   = VTOPIC_CONNECTOR_EXEC_BUILD_DLL
 
   IDL_Files {
   }
 
   Source_Files {
-    VTopic_Connector_conn.cpp
+    VTopic_Connector_exec.cpp
   }
 
   Header_Files {
-    VTopic_Connector_conn.h
-    VTopic_Connector_conn_export.h
+    VTopic_Connector_exec.h
+    VTopic_Connector_exec_export.h
   }
 
   Inline_Files {
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector_exec.cpp b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector_exec.cpp
new file mode 100644
index 00000000000..8c6e210ecc3
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector_exec.cpp
@@ -0,0 +1,29 @@
+// -*- C++ -*-
+// $Id$
+
+#include "VTopic_Connector_exec.h"
+
+namespace CIAO_VTopic_VTopic_Connector_Impl
+{
+  VTopic_Connector_exec_i::VTopic_Connector_exec_i (void)
+    : DDS_Event_Connector_T<TestTopic_DDS_Traits, TestTopic_Connector_Traits> ()
+  {
+  }
+
+  VTopic_Connector_exec_i::~VTopic_Connector_exec_i (void)
+  {
+  }
+
+  extern "C" VTOPIC_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_VTopic_VTopic_Connector_Impl (void)
+  {
+    ::Components::EnterpriseComponent_ptr retval =
+      ::Components::EnterpriseComponent::_nil ();
+
+    ACE_NEW_NORETURN (
+      retval,
+      VTopic_Connector_exec_i ()); 
+    return retval;
+  }
+}
+
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector_exec.h
new file mode 100644
index 00000000000..74ab18badbe
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Connector/VTopic_Connector_exec.h
@@ -0,0 +1,62 @@
+// -*- C++ -*-
+// $Id$
+
+#ifndef VTOPIC_CONNECTOR_EXEC_H_
+#define VTOPIC_CONNECTOR_EXEC_H_
+
+#include /**/ "ace/pre.h"
+
+#include "VTopic_ConnectorEC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "VTopic_Connector_exec_export.h"
+#include "tao/LocalObject.h"
+
+#include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
+#include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
+
+
+#include "Base/VTopic_BaseSupport.h"
+
+namespace CIAO_VTopic_VTopic_Connector_Impl
+{
+
+  // @from use of VTopic as a parameter
+  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+    TestTopic,
+    TestTopicSeq,
+    TestTopicTypeSupport,
+    TestTopicDataWriter,
+    TestTopicDataReader > TestTopic_DDS_Traits;
+
+  typedef CIAO::DDS4CCM::Connector_Traits <
+    ::CIAO_VTopic_VTopic_Connector_Impl::VTopic_Connector_Exec,
+    TestTopic_Seq,
+    ::CCM_DDS::TestTopic::CCM_Writer,
+    ::CCM_DDS::TestTopic::CCM_Updater,
+    ::CCM_DDS::TestTopic::CCM_Getter,
+    ::CCM_DDS::TestTopic::CCM_Reader,
+    ::VTopic::CCM_VTopic_Connector_Context,
+    ::CCM_DDS::TestTopic::Listener,
+    ::CCM_DDS::TestTopic::StateListener,
+    ::CCM_DDS::ConnectorStatusListener> TestTopic_Connector_Traits;
+
+  class VTOPIC_CONNECTOR_EXEC_Export VTopic_Connector_exec_i :
+    public DDS_Event_Connector_T <TestTopic_DDS_Traits, TestTopic_Connector_Traits>
+  {
+  public:
+    VTopic_Connector_exec_i (void);
+    virtual ~VTopic_Connector_exec_i (void);
+  };
+
+  extern "C" VTOPIC_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_VTopic_VTopic_Connector_Impl (void);
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc
index 88a3788a0db..9e931317015 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Receiver/VTopic_Receiver.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project(DDS_VTopic_Receiver_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_VTopic_Receiver_idl_gen) : componentidldefaults   {
   after += DDS_VTopic_Connector_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
@@ -18,7 +18,7 @@ project(DDS_VTopic_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_VTopic_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_VTopic_Receiver_lem_gen) : ciaoidldefaults {
   after += DDS_VTopic_Receiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
@@ -30,7 +30,7 @@ project(DDS_VTopic_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
   }
 }
 
-project(DDS_VTopic_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
+project(DDS_VTopic_Receiver_lem_stub) : ccm_svnt, dds4ccm_base   {
   after += DDS_VTopic_Receiver_lem_gen DDS_VTopic_Receiver_stub DDS_VTopic_Base_stub
   libs  += DDS_VTopic_Base_stub Receiver_stub
   libpaths += ../lib
@@ -56,7 +56,7 @@ project(DDS_VTopic_Receiver_lem_stub) : ccm_svnt, dds4ccm_base {
   }
 }
 
-project(DDS_VTopic_Receiver_stub) : ccm_stub, dds4ccm_base {
+project(DDS_VTopic_Receiver_stub) : ccm_stub, dds4ccm_base   {
   after += DDS_VTopic_Receiver_idl_gen DDS_VTopic_Base_stub DDS_VTopic_Connector_lem_stub  DDS_VT_String_Connector_lem_stub DDS_VT_Array_Connector_lem_stub DDS_VT_Seq_Connector_lem_stub DDS_VTopic_Connector_stub DDS_VT_Array_Connector_stub  DDS_VT_String_Connector_stub DDS_VT_Seq_Connector_stub
   libs  += DDS_VTopic_Base_stub DDS_VTopic_Connector_stub  DDS_VT_Array_Connector_stub DDS_VT_String_Connector_stub  DDS_VT_Seq_Connector_stub
   includes += ..
@@ -82,7 +82,7 @@ project(DDS_VTopic_Receiver_stub) : ccm_stub, dds4ccm_base {
   }
 }
 
-project(DDS_VTopic_Receiver_exec) : ciao_executor, dds4ccm_base {
+project(DDS_VTopic_Receiver_exec) : ciao_executor, dds4ccm_base   {
   after   += DDS_VTopic_Receiver_lem_stub DDS_VTopic_Receiver_stub DDS_VTopic_Connector_lem_stub  DDS_VT_Array_Connector_lem_stub DDS_VT_String_Connector_lem_stub DDS_VT_Seq_Connector_lem_stub DDS_VTopic_Connector_stub   DDS_VT_Array_Connector_stub DDS_VT_String_Connector_stub DDS_VT_Seq_Connector_stub DDS4CCM_lem_stub
   sharedname = Receiver_exec
   libs += Receiver_stub Receiver_lem_stub DDS_VTopic_Base_stub DDS_VTopic_Connector_lem_stub DDS_VTopic_Connector_stub DDS_VT_Array_Connector_stub DDS_VT_String_Connector_stub DDS_VT_Seq_Connector_stub DDS4CCM_lem_stub
@@ -108,7 +108,7 @@ project(DDS_VTopic_Receiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_VTopic_Receiver_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_VTopic_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      += DDS_VTopic_Base_stub  DDS_VTopic_Receiver_lem_stub DDS4CCM_lem_stub \
                 DDS4CCM_skel DDS_VTopic_Connector_stub DDS_VT_Array_Connector_stub  DDS_VT_String_Connector_stub DDS_VT_Seq_Connector_stub \
                 DDS_VTopic_Connector_svnt DDS_VT_Array_Connector_svnt DDS_VT_String_Connector_svnt DDS_VT_Seq_Connector_svnt \
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc
index 5935fa1d1e2..e1709ea22a7 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/Sender/VTopic_Sender.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_VTopic_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(DDS_VTopic_Sender_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_VTopic_Sender_idl_gen) : componentidldefaults   {
   after += DDS_VTopic_Connector_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
@@ -19,7 +19,7 @@ project(DDS_VTopic_Sender_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_VTopic_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_VTopic_Sender_lem_gen) : ciaoidldefaults {
   after += DDS_VTopic_Sender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
@@ -31,7 +31,7 @@ project(DDS_VTopic_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
   }
 }
 
-project(DDS_VTopic_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
+project(DDS_VTopic_Sender_lem_stub) : ccm_svnt, dds4ccm_base   {
   after += DDS_VTopic_Sender_lem_gen DDS_VTopic_Sender_stub DDS_VTopic_Base_stub
   libs  += DDS_VTopic_Base_stub Sender_stub
   libpaths += ../lib
@@ -57,7 +57,7 @@ project(DDS_VTopic_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
   }
 }
 
-project(DDS_VTopic_Sender_stub) : ccm_stub, dds4ccm_base {
+project(DDS_VTopic_Sender_stub) : ccm_stub, dds4ccm_base   {
   after += DDS_VTopic_Sender_idl_gen DDS_VTopic_Base_stub DDS_VTopic_Connector_lem_stub  DDS_VT_String_Connector_lem_stub DDS_VT_Array_Connector_lem_stub DDS_VT_Seq_Connector_lem_stub DDS_VTopic_Connector_stub DDS_VT_Array_Connector_stub  DDS_VT_String_Connector_stub DDS_VT_Seq_Connector_stub
   libs  += DDS_VTopic_Base_stub DDS_VTopic_Connector_stub  DDS_VT_Array_Connector_stub DDS_VT_String_Connector_stub  DDS_VT_Seq_Connector_stub
   includes += ..
@@ -83,7 +83,7 @@ project(DDS_VTopic_Sender_stub) : ccm_stub, dds4ccm_base {
   }
 }
 
-project(DDS_VTopic_Sender_exec) : ciao_executor, dds4ccm_base {
+project(DDS_VTopic_Sender_exec) : ciao_executor, dds4ccm_base   {
   after   += DDS_VTopic_Sender_lem_stub DDS_VTopic_Sender_stub DDS_VTopic_Connector_lem_stub  DDS_VT_Array_Connector_lem_stub DDS_VT_String_Connector_lem_stub DDS_VT_Seq_Connector_lem_stub DDS_VTopic_Connector_stub   DDS_VT_Array_Connector_stub DDS_VT_String_Connector_stub DDS_VT_Seq_Connector_stub DDS4CCM_lem_stub
   sharedname = Sender_exec
   libs += Sender_stub Sender_lem_stub DDS_VTopic_Base_stub DDS_VTopic_Connector_lem_stub DDS_VTopic_Connector_stub DDS_VT_Array_Connector_stub DDS_VT_String_Connector_stub DDS_VT_Seq_Connector_stub DDS4CCM_lem_stub
@@ -109,7 +109,7 @@ project(DDS_VTopic_Sender_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_VTopic_Sender_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_VTopic_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      += DDS_VTopic_Base_stub  DDS_VTopic_Sender_lem_stub DDS4CCM_lem_stub \
                 DDS4CCM_skel DDS_VTopic_Connector_stub DDS_VT_Array_Connector_stub  DDS_VT_String_Connector_stub DDS_VT_Seq_Connector_stub \
                 DDS_VTopic_Connector_svnt DDS_VT_Array_Connector_svnt DDS_VT_String_Connector_svnt DDS_VT_Seq_Connector_svnt \
@@ -126,7 +126,7 @@ project(DDS_VTopic_Sender_svnt) : ciao_servant, dds4ccm_base {
                 DDS_VTopic_Connector_svnt \
                 DDS_VT_Array_Connector_svnt \
                 DDS_VT_String_Connector_svnt \
-                DDS_VT_Seq_Connector_svnt
+                DDS_VT_Seq_Connector_svnt 
   libpaths += ../lib
   libout = ../lib
   includes += ..
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/Plan.cdp
index db172c0ec60..7d5d4f75c17 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/Plan.cdp
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/Plan.cdp
@@ -123,7 +123,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_VTopic_VT_String_Connector_Impl</string>
+          <string>create_VT_String_VT_String_Connector_Impl</string>
         </value>
       </value>
     </execParameter>
@@ -175,7 +175,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_VTopic_VT_Array_Connector_Impl</string>
+          <string>create_VT_Array_VT_Array_Connector_Impl</string>
         </value>
       </value>
     </execParameter>
@@ -227,7 +227,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_VTopic_VT_Seq_Connector_Impl</string>
+          <string>create_VT_Seq_VT_Seq_Connector_Impl</string>
         </value>
       </value>
     </execParameter>
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl
index 6065a5cc28b..2767b0eff24 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsEvent/descriptors/run_test.pl
@@ -100,8 +100,6 @@ sub kill_open_processes {
     if ($ns_running == 1) {
         $NS->Kill (); $NS->TimedWait (1);
     }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
 }
 
 sub run_node_daemons {
@@ -218,8 +216,8 @@ for ($i = 0; $i < $nr_daemon; ++$i) {
     }
 }
 
-print "Sleeping 10 seconds to allow task to complete\n";
-sleep (10);
+print "Sleeping 30 seconds to allow task to complete\n";
+sleep (30);
 
 # Invoke executor - stop the application -.
 print "Invoking executor - stop the application -\n";
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl
index 89a8f92a67e..acc56bae754 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.idl
@@ -1,14 +1,13 @@
 // $Id$
 
 /**
- * @file   VTopics_Base.idl
+ * @file   VTopics_Base.idl 
  * @author Marijke Hengstmengel <mhengstmengel@remedy.nl>
  */
 
 #ifndef VTOPICS_BASE_IDL
 #define VTOPICS_BASE_IDL
 
-#pragma ndds typesupport "Base/VTopics_BaseSupport.h"
 
   struct TestTopic {
     string key; //@key
@@ -19,7 +18,7 @@
     string key; //@key
     string x_str;
    };
-
+ 
   //arrays
   struct TopicArray {
     string key; //@key
@@ -37,7 +36,7 @@
   struct TopicUnion {
     string key; //@key
     X_Union x_uni;
-
+ 
    };
 
  */
@@ -53,7 +52,7 @@
     string key; //@key
     test_seq x_seq;
    };
-
+  
 
   typedef sequence<TestTopic> TestTopic_Seq;
   typedef sequence<TopicString> TopicString_Seq;
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc
index a3845bb2b50..454f0ed4a13 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Base/VTopics_Base.mpc
@@ -1,25 +1,76 @@
 // $Id$
+// This file is generated with "generate_component_mpc.pl -o ../lib -u DDS -n VTopics_Base"
 
-project (DDS_VTopics_Base_stub) : taoidldefaults, anytypecode, dds4ccm_ts_default {
-  sharedname = DDS_VTopics_Base_stub
-  dynamicflags += VTOPICS_BASE_STUB_BUILD_DLL
-  libout = ../lib
-
-  idlflags += -SS -Gxhst -Sci \
+project(DDS_VTopics_Base_idl_gen) : taoidldefaults, anytypecode {
+  custom_only = 1
+  idlflags -= -St -Sa
+  idlflags += -SS -Gxhst \
               -Wb,stub_export_macro=VTOPICS_BASE_STUB_Export \
               -Wb,stub_export_include=VTopics_Base_stub_export.h
 
   IDL_Files {
     VTopics_Base.idl
   }
+}
 
-  opendds_ts_flags += --export=VTOPICS_BASE_STUB_Export
+project(DDS_VTopics_Base_ndds_ts_gen) : ndds_ts_defaults   {
+  custom_only = 1
+  after += DDS_VTopics_Base_idl_gen
 
-  DDSGenerator_Files {
+  NDDSTypeSupport_Files {
     VTopics_Base.idl
   }
+}
+
+project(DDS_VTopics_Base_NDDS_TS) : nddslib, taolib {
+  after += DDS_VTopics_Base_ndds_ts_gen DDS_VTopics_Base_stub
+  libs += DDS_VTopics_Base_stub
+  libout = ../lib
+  libpaths    += ../lib
+  sharedname = DDS_VTopics_Base_NDDS_TS
+  dynamicflags = NDDS_USER_DLL_EXPORT
+
+  verbatim(gnuace, macros) {
+    override no_hidden_visibility = 1
+  }
 
   Source_Files {
+    VTopics_Base.cxx
+    VTopics_BasePlugin.cxx
+    VTopics_BaseSupport.cxx
+  }
+
+  Header_Files {
+    VTopics_Base.h
+    VTopics_BasePlugin.h
+    VTopics_BaseSupport.h
+  }
+
+  Inline_Files {
+  }
+}
+
+project(DDS_VTopics_Base_stub) : ccm_stub {
+  after += DDS_VTopics_Base_idl_gen
+  libout = ../lib
+  libpaths += ../lib
+  sharedname = DDS_VTopics_Base_stub
+  dynamicflags = VTOPICS_BASE_STUB_BUILD_DLL
+
+  IDL_Files {
+  }
+
+  Source_Files {
+    VTopics_BaseC.cpp
+  }
+
+  Header_Files {
+    VTopics_BaseC.h
+    VTopics_Base_stub_export.h
+  }
+
+  Inline_Files {
+    VTopics_BaseC.inl
   }
 }
 
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc
index 3cb46e8ebb7..71b02413764 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_VTopics_Base -l .. -o ../lib -u DDS VTS_Array_Connector"
 
-project(DDS_VTS_ARRAY_Connector_idl_gen) : connectoridldefaults, dds4ccm {
+project(DDS_VTS_ARRAY_Connector_idl_gen) : connectoridldefaults {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=VTS_ARRAY_CONNECTOR_STUB_Export \
@@ -10,8 +10,8 @@ project(DDS_VTS_ARRAY_Connector_idl_gen) : connectoridldefaults, dds4ccm {
               -Wb,skel_export_include=VTS_Array_Connector_svnt_export.h \
               -Wb,svnt_export_macro=VTS_ARRAY_CONNECTOR_SVNT_Export \
               -Wb,svnt_export_include=VTS_Array_Connector_svnt_export.h \
-              -Wb,conn_export_macro=VTS_ARRAY_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=VTS_Array_Connector_conn_export.h \
+              -Wb,exec_export_macro=VTS_ARRAY_CONNECTOR_EXEC_Export \
+              -Wb,exec_export_include=VTS_Array_Connector_exec_export.h \
               -I ..
 
   IDL_Files {
@@ -19,7 +19,7 @@ project(DDS_VTS_ARRAY_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   }
 }
 
-project(DDS_VTS_ARRAY_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_VTS_ARRAY_Connector_lem_gen) : ciaoidldefaults {
   custom_only = 1
   after += DDS_VTS_ARRAY_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=VTS_ARRAY_CONNECTOR_LEM_STUB_Export \
@@ -85,24 +85,24 @@ project(DDS_VTS_Array_Connector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_VTS_Array_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_VTS_ARRAY_Connector_lem_stub DDS_VTS_Array_Connector_stub DDS4CCM_lem_stub DDS_VTopics_Base_stub
+  after   += DDS_VTS_ARRAY_Connector_lem_stub DDS_VTS_Array_Connector_stub DDS4CCM_lem_stub DDS_VTopics_Base_NDDS_TS
   sharedname = DDS_VTS_Array_Connector_exec
-  libs += DDS_VTS_Array_Connector_stub DDS_VTS_ARRAY_Connector_lem_stub DDS_VTopics_Base_stub DDS4CCM_lem_stub DDS_VTopics_Base_stub
+  libs += DDS_VTS_Array_Connector_stub DDS_VTS_ARRAY_Connector_lem_stub DDS_VTopics_Base_stub DDS4CCM_lem_stub DDS_VTopics_Base_NDDS_TS
   libpaths += ../lib
   libout = ../lib
   includes += ..
-  dynamicflags   = VTS_ARRAY_CONNECTOR_CONN_BUILD_DLL
+  dynamicflags   = VTS_ARRAY_CONNECTOR_EXEC_BUILD_DLL
 
   IDL_Files {
   }
 
   Source_Files {
-    VTS_Array_Connector_conn.cpp
+    VTS_Array_Connector_exec.cpp
   }
 
   Header_Files {
-    VTS_Array_Connector_conn.h
-    VTS_Array_Connector_conn_export.h
+    VTS_Array_Connector_exec.h
+    VTS_Array_Connector_exec_export.h
   }
 
   Inline_Files {
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector_exec.cpp b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector_exec.cpp
new file mode 100644
index 00000000000..9b6dfc8c46a
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector_exec.cpp
@@ -0,0 +1,28 @@
+// -*- C++ -*-
+// $Id$
+
+#include "VTS_Array_Connector_exec.h"
+
+namespace CIAO_VTS_Array_VTS_Array_Connector_Impl
+{
+  VTS_Array_Connector_exec_i::VTS_Array_Connector_exec_i (void)
+    : DDS_Event_Connector_T<TopicArray_DDS_Traits, TopicArray_Connector_Traits> ()
+  {
+  }
+
+  VTS_Array_Connector_exec_i::~VTS_Array_Connector_exec_i (void)
+  {
+  }
+
+  extern "C" VTS_ARRAY_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_VTS_Array_VTS_Array_Connector_Impl (void)
+  {
+    ::Components::EnterpriseComponent_ptr retval =
+      ::Components::EnterpriseComponent::_nil ();
+
+    ACE_NEW_NORETURN (
+      retval,
+      VTS_Array_Connector_exec_i ()); 
+    return retval;
+  }
+}
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector_exec.h
new file mode 100644
index 00000000000..5d1491e235e
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Array/VTS_Array_Connector_exec.h
@@ -0,0 +1,61 @@
+// -*- C++ -*-
+// $Id$
+
+#ifndef VTS_ARRAY_CONNECTOR_EXEC_H_
+#define VTS_ARRAY_CONNECTOR_EXEC_H_
+
+#include /**/ "ace/pre.h"
+
+#include "VTS_Array_ConnectorEC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "VTS_Array_Connector_exec_export.h"
+#include "tao/LocalObject.h"
+
+#include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
+#include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
+
+
+#include "Base/VTopics_BaseSupport.h"
+
+namespace CIAO_VTS_Array_VTS_Array_Connector_Impl
+{
+
+  // @from use of VTopics as a parameter
+  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+    TopicArray,
+    TopicArraySeq,
+    TopicArrayTypeSupport,
+    TopicArrayDataWriter,
+    TopicArrayDataReader > TopicArray_DDS_Traits;
+
+  typedef CIAO::DDS4CCM::Connector_Traits <
+    ::CIAO_VTopics_VTS_Array_Connector_Impl::VTS_Array_Connector_Exec,
+    TopicArray_Seq,
+    ::CCM_DDS::TopicArray::CCM_Writer,
+    ::CCM_DDS::TopicArray::CCM_Updater,
+    ::CCM_DDS::TopicArray::CCM_Getter,
+    ::CCM_DDS::TopicArray::CCM_Reader,
+    ::VTopics::CCM_VTS_Array_Connector_Context,
+    ::CCM_DDS::TopicArray::Listener,
+    ::CCM_DDS::TopicArray::StateListener,
+    ::CCM_DDS::ConnectorStatusListener> TopicArray_Connector_Traits;
+
+  class VTS_ARRAY_CONNECTOR_EXEC_Export VTS_Array_Connector_exec_i :
+    public DDS_Event_Connector_T <TopicArray_DDS_Traits, TopicArray_Connector_Traits>
+  {
+  public:
+    VTS_Array_Connector_exec_i (void);
+    virtual ~VTS_Array_Connector_exec_i (void);
+  };
+
+  extern "C" VTS_ARRAY_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_VTS_Array_VTS_Array_Connector_Impl (void);
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc
index 9bb44c3f8fb..ff2f09076a5 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_VTopics_Base -l .. -o ../lib -u DDS VTS_Seq_Connector"
 
-project(DDS_VTS_SEQ_Connector_idl_gen) : connectoridldefaults, dds4ccm {
+project(DDS_VTS_SEQ_Connector_idl_gen) : connectoridldefaults {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=VTS_SEQ_CONNECTOR_STUB_Export \
@@ -10,8 +10,8 @@ project(DDS_VTS_SEQ_Connector_idl_gen) : connectoridldefaults, dds4ccm {
               -Wb,skel_export_include=VTS_Seq_Connector_svnt_export.h \
               -Wb,svnt_export_macro=VTS_SEQ_CONNECTOR_SVNT_Export \
               -Wb,svnt_export_include=VTS_Seq_Connector_svnt_export.h \
-              -Wb,conn_export_macro=VTS_SEQ_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=VTS_Seq_Connector_conn_export.h \
+              -Wb,exec_export_macro=VTS_SEQ_CONNECTOR_EXEC_Export \
+              -Wb,exec_export_include=VTS_Seq_Connector_exec_export.h \
               -I ..
 
   IDL_Files {
@@ -19,7 +19,7 @@ project(DDS_VTS_SEQ_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   }
 }
 
-project(DDS_VTS_SEQ_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_VTS_SEQ_Connector_lem_gen) : ciaoidldefaults {
   custom_only = 1
   after += DDS_VTS_SEQ_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=VTS_SEQ_CONNECTOR_LEM_STUB_Export \
@@ -85,24 +85,24 @@ project(DDS_VTS_Seq_Connector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_VTS_Seq_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_VTS_SEQ_Connector_lem_stub DDS_VTS_Seq_Connector_stub DDS4CCM_lem_stub DDS_VTopics_Base_stub
+  after   += DDS_VTS_SEQ_Connector_lem_stub DDS_VTS_Seq_Connector_stub DDS4CCM_lem_stub DDS_VTopics_Base_NDDS_TS
   sharedname = DDS_VTS_Seq_Connector_exec
-  libs += DDS_VTS_Seq_Connector_stub DDS_VTS_SEQ_Connector_lem_stub DDS_VTopics_Base_stub DDS4CCM_lem_stub DDS_VTopics_Base_stub
+  libs += DDS_VTS_Seq_Connector_stub DDS_VTS_SEQ_Connector_lem_stub DDS_VTopics_Base_stub DDS4CCM_lem_stub DDS_VTopics_Base_NDDS_TS
   libpaths += ../lib
   libout = ../lib
   includes += ..
-  dynamicflags   = VTS_SEQ_CONNECTOR_CONN_BUILD_DLL
+  dynamicflags   = VTS_SEQ_CONNECTOR_EXEC_BUILD_DLL
 
   IDL_Files {
   }
 
   Source_Files {
-    VTS_Seq_Connector_conn.cpp
+    VTS_Seq_Connector_exec.cpp
   }
 
   Header_Files {
-    VTS_Seq_Connector_conn.h
-    VTS_Seq_Connector_conn_export.h
+    VTS_Seq_Connector_exec.h
+    VTS_Seq_Connector_exec_export.h
   }
 
   Inline_Files {
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector_exec.cpp b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector_exec.cpp
new file mode 100644
index 00000000000..835dc19ea5d
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector_exec.cpp
@@ -0,0 +1,28 @@
+// -*- C++ -*-
+// $Id$
+
+#include "VTS_Seq_Connector_exec.h"
+
+namespace CIAO_VTS_Seq_VTS_Seq_Connector_Impl
+{
+  VTS_Seq_Connector_exec_i::VTS_Seq_Connector_exec_i (void)
+    : DDS_Event_Connector_T<TopicSeq_DDS_Traits, TopicSeq_Connector_Traits> ()
+  {
+  }
+
+  VTS_Seq_Connector_exec_i::~VTS_Seq_Connector_exec_i (void)
+  {
+  }
+
+  extern "C" VTS_SEQ_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_VTS_Seq_VTS_Seq_Connector_Impl (void)
+  {
+    ::Components::EnterpriseComponent_ptr retval =
+      ::Components::EnterpriseComponent::_nil ();
+
+    ACE_NEW_NORETURN (
+      retval,
+      VTS_Seq_Connector_exec_i ()); 
+    return retval;
+  }
+}
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector_exec.h
new file mode 100644
index 00000000000..d171220e360
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_Seq/VTS_Seq_Connector_exec.h
@@ -0,0 +1,61 @@
+// -*- C++ -*-
+// $Id$
+
+#ifndef VTS_SEQ_CONNECTOR_EXEC_H_
+#define VTS_SEQ_CONNECTOR_EXEC_H_
+
+#include /**/ "ace/pre.h"
+
+#include "VTS_Seq_ConnectorEC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "VTS_Seq_Connector_exec_export.h"
+#include "tao/LocalObject.h"
+
+#include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
+#include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
+
+
+#include "Base/VTopics_BaseSupport.h"
+
+namespace CIAO_VTS_Seq_VTS_Seq_Connector_Impl
+{
+
+  // @from use of VTopics as a parameter
+  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+    TopicSeq,
+    TopicSeqSeq,
+    TopicSeqTypeSupport,
+    TopicSeqDataWriter,
+    TopicSeqDataReader > TopicSeq_DDS_Traits;
+
+  typedef CIAO::DDS4CCM::Connector_Traits <
+    ::CIAO_VTopics_VTS_Seq_Connector_Impl::VTS_Seq_Connector_Exec,
+    TopicSeq_Seq,
+    ::CCM_DDS::TopicSeq::CCM_Writer,
+    ::CCM_DDS::TopicSeq::CCM_Updater,
+    ::CCM_DDS::TopicSeq::CCM_Getter,
+    ::CCM_DDS::TopicSeq::CCM_Reader,
+    ::VTopics::CCM_VTS_Seq_Connector_Context,
+    ::CCM_DDS::TopicSeq::Listener,
+    ::CCM_DDS::TopicSeq::StateListener,
+    ::CCM_DDS::ConnectorStatusListener> TopicSeq_Connector_Traits;
+
+  class VTS_SEQ_CONNECTOR_EXEC_Export VTS_Seq_Connector_exec_i :
+    public DDS_Event_Connector_T <TopicSeq_DDS_Traits, TopicSeq_Connector_Traits>
+  {
+  public:
+    VTS_Seq_Connector_exec_i (void);
+    virtual ~VTS_Seq_Connector_exec_i (void);
+  };
+
+  extern "C" VTS_SEQ_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_VTS_Seq_VTS_Seq_Connector_Impl (void);
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc
index 02693e92602..7ca8b5701e0 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_VTopics_Base -l .. -o ../lib -u DDS VTS_String_Connector"
 
-project(DDS_VTS_STRING_Connector_idl_gen) : connectoridldefaults, dds4ccm {
+project(DDS_VTS_STRING_Connector_idl_gen) : connectoridldefaults {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=VTS_STRING_CONNECTOR_STUB_Export \
@@ -10,8 +10,8 @@ project(DDS_VTS_STRING_Connector_idl_gen) : connectoridldefaults, dds4ccm {
               -Wb,skel_export_include=VTS_String_Connector_svnt_export.h \
               -Wb,svnt_export_macro=VTS_STRING_CONNECTOR_SVNT_Export \
               -Wb,svnt_export_include=VTS_String_Connector_svnt_export.h \
-              -Wb,conn_export_macro=VTS_STRING_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=VTS_String_Connector_conn_export.h \
+              -Wb,exec_export_macro=VTS_STRING_CONNECTOR_EXEC_Export \
+              -Wb,exec_export_include=VTS_String_Connector_exec_export.h \
               -I ..
 
   IDL_Files {
@@ -19,7 +19,7 @@ project(DDS_VTS_STRING_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   }
 }
 
-project(DDS_VTS_STRING_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_VTS_STRING_Connector_lem_gen) : ciaoidldefaults {
   custom_only = 1
   after += DDS_VTS_STRING_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=VTS_STRING_CONNECTOR_LEM_STUB_Export \
@@ -85,24 +85,24 @@ project(DDS_VTS_String_Connector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_VTS_String_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_VTS_STRING_Connector_lem_stub DDS_VTS_String_Connector_stub DDS4CCM_lem_stub DDS_VTopics_Base_stub
+  after   += DDS_VTS_STRING_Connector_lem_stub DDS_VTS_String_Connector_stub DDS4CCM_lem_stub DDS_VTopics_Base_NDDS_TS
   sharedname = DDS_VTS_String_Connector_exec
-  libs += DDS_VTS_String_Connector_stub DDS_VTS_STRING_Connector_lem_stub DDS_VTopics_Base_stub DDS4CCM_lem_stub DDS_VTopics_Base_stub
+  libs += DDS_VTS_String_Connector_stub DDS_VTS_STRING_Connector_lem_stub DDS_VTopics_Base_stub DDS4CCM_lem_stub DDS_VTopics_Base_NDDS_TS
   libpaths += ../lib
   libout = ../lib
   includes += ..
-  dynamicflags   = VTS_STRING_CONNECTOR_CONN_BUILD_DLL
+  dynamicflags   = VTS_STRING_CONNECTOR_EXEC_BUILD_DLL
 
   IDL_Files {
   }
 
   Source_Files {
-    VTS_String_Connector_conn.cpp
+    VTS_String_Connector_exec.cpp
   }
 
   Header_Files {
-    VTS_String_Connector_conn.h
-    VTS_String_Connector_conn_export.h
+    VTS_String_Connector_exec.h
+    VTS_String_Connector_exec_export.h
   }
 
   Inline_Files {
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector_exec.cpp b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector_exec.cpp
new file mode 100644
index 00000000000..46e2025f0e0
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector_exec.cpp
@@ -0,0 +1,28 @@
+// -*- C++ -*-
+// $Id$
+
+#include "VTS_String_Connector_exec.h"
+
+namespace CIAO_VTS_String_VTS_String_Connector_Impl
+{
+  VTS_String_Connector_exec_i::VTS_String_Connector_exec_i (void)
+    : DDS_Event_Connector_T<TopicString_DDS_Traits, TopicString_Connector_Traits> ()
+  {
+  }
+
+  VTS_String_Connector_exec_i::~VTS_String_Connector_exec_i (void)
+  {
+  }
+
+  extern "C" VTS_STRING_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_VTS_String_VTS_String_Connector_Impl (void)
+  {
+    ::Components::EnterpriseComponent_ptr retval =
+      ::Components::EnterpriseComponent::_nil ();
+
+    ACE_NEW_NORETURN (
+      retval,
+      VTS_String_Connector_exec_i ()); 
+    return retval;
+  }
+}
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector_exec.h
new file mode 100644
index 00000000000..0f1e7cdd1c8
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Conn_String/VTS_String_Connector_exec.h
@@ -0,0 +1,61 @@
+// -*- C++ -*-
+// $Id$
+
+#ifndef VTS_STRING_CONNECTOR_EXEC_H_
+#define VTS_STRING_CONNECTOR_EXEC_H_
+
+#include /**/ "ace/pre.h"
+
+#include "VTS_String_ConnectorEC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "VTS_String_Connector_exec_export.h"
+#include "tao/LocalObject.h"
+
+#include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
+#include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
+
+
+#include "Base/VTopics_BaseSupport.h"
+
+namespace CIAO_VTS_String_VTS_String_Connector_Impl
+{
+
+  // @from use of VTopics as a parameter
+  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+    TopicString,
+    TopicStringSeq,
+    TopicStringTypeSupport,
+    TopicStringDataWriter,
+    TopicStringDataReader > TopicString_DDS_Traits;
+
+  typedef CIAO::DDS4CCM::Connector_Traits <
+    ::CIAO_VTopics_VTS_String_Connector_Impl::VTS_String_Connector_Exec,
+    TopicString_Seq,
+    ::CCM_DDS::TopicString::CCM_Writer,
+    ::CCM_DDS::TopicString::CCM_Updater,
+    ::CCM_DDS::TopicString::CCM_Getter,
+    ::CCM_DDS::TopicString::CCM_Reader,
+    ::VTopics::CCM_VTS_String_Connector_Context,
+    ::CCM_DDS::TopicString::Listener,
+    ::CCM_DDS::TopicString::StateListener,
+    ::CCM_DDS::ConnectorStatusListener> TopicString_Connector_Traits;
+
+  class VTS_STRING_CONNECTOR_EXEC_Export VTS_String_Connector_exec_i :
+    public DDS_Event_Connector_T <TopicString_DDS_Traits, TopicString_Connector_Traits>
+  {
+  public:
+    VTS_String_Connector_exec_i (void);
+    virtual ~VTS_String_Connector_exec_i (void);
+  };
+
+  extern "C" VTS_STRING_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_VTS_String_VTS_String_Connector_Impl (void);
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc
index e8baf8482f8..8781c65edfb 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector.mpc
@@ -1,7 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_VTopics_Base -l .. -o ../lib -u DDS VTopics_Connector"
 
-project(DDS_VTopics_Connector_idl_gen) : connectoridldefaults, dds4ccm {
+project(DDS_VTopics_Connector_idl_gen) : connectoridldefaults {
   after += DDS4CCM_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=VTOPICS_CONNECTOR_STUB_Export \
@@ -10,8 +10,8 @@ project(DDS_VTopics_Connector_idl_gen) : connectoridldefaults, dds4ccm {
               -Wb,skel_export_include=VTopics_Connector_svnt_export.h \
               -Wb,svnt_export_macro=VTOPICS_CONNECTOR_SVNT_Export \
               -Wb,svnt_export_include=VTopics_Connector_svnt_export.h \
-              -Wb,conn_export_macro=VTOPICS_CONNECTOR_CONN_Export \
-              -Wb,conn_export_include=VTopics_Connector_conn_export.h \
+              -Wb,exec_export_macro=VTOPICS_CONNECTOR_EXEC_Export \
+              -Wb,exec_export_include=VTopics_Connector_exec_export.h \
               -I ..
 
   IDL_Files {
@@ -19,7 +19,7 @@ project(DDS_VTopics_Connector_idl_gen) : connectoridldefaults, dds4ccm {
   }
 }
 
-project(DDS_VTopics_Connector_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_VTopics_Connector_lem_gen) : ciaoidldefaults {
   custom_only = 1
   after += DDS_VTopics_Connector_idl_gen
   idlflags += -Wb,stub_export_macro=VTOPICS_CONNECTOR_LEM_STUB_Export \
@@ -85,24 +85,24 @@ project(DDS_VTopics_Connector_stub) : ccm_stub, dds4ccm_base {
 }
 
 project(DDS_VTopics_Connector_exec) : ciao_executor, dds4ccm_impl {
-  after   += DDS_VTopics_Connector_lem_stub DDS_VTopics_Connector_stub DDS4CCM_lem_stub DDS_VTopics_Base_stub
+  after   += DDS_VTopics_Connector_lem_stub DDS_VTopics_Connector_stub DDS4CCM_lem_stub DDS_VTopics_Base_NDDS_TS
   sharedname = DDS_VTopics_Connector_exec
-  libs += DDS_VTopics_Connector_stub DDS_VTopics_Connector_lem_stub DDS_VTopics_Base_stub DDS4CCM_lem_stub DDS_VTopics_Base_stub
+  libs += DDS_VTopics_Connector_stub DDS_VTopics_Connector_lem_stub DDS_VTopics_Base_stub DDS4CCM_lem_stub DDS_VTopics_Base_NDDS_TS
   libpaths += ../lib
   libout = ../lib
   includes += ..
-  dynamicflags   = VTOPICS_CONNECTOR_CONN_BUILD_DLL
+  dynamicflags   = VTOPICS_CONNECTOR_EXEC_BUILD_DLL
 
   IDL_Files {
   }
 
   Source_Files {
-    VTopics_Connector_conn.cpp
+    VTopics_Connector_exec.cpp
   }
 
   Header_Files {
-    VTopics_Connector_conn.h
-    VTopics_Connector_conn_export.h
+    VTopics_Connector_exec.h
+    VTopics_Connector_exec_export.h
   }
 
   Inline_Files {
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector_exec.cpp b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector_exec.cpp
new file mode 100644
index 00000000000..2905a63063c
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector_exec.cpp
@@ -0,0 +1,29 @@
+// -*- C++ -*-
+// $Id$
+
+#include "VTopics_Connector_exec.h"
+
+namespace CIAO_VTopics_VTopics_Connector_Impl
+{
+  VTopics_Connector_exec_i::VTopics_Connector_exec_i (void)
+    : DDS_Event_Connector_T<TestTopic_DDS_Traits, TestTopic_Connector_Traits> ()
+  {
+  }
+
+  VTopics_Connector_exec_i::~VTopics_Connector_exec_i (void)
+  {
+  }
+
+  extern "C" VTOPICS_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_VTopics_VTopics_Connector_Impl (void)
+  {
+    ::Components::EnterpriseComponent_ptr retval =
+      ::Components::EnterpriseComponent::_nil ();
+
+    ACE_NEW_NORETURN (
+      retval,
+      VTopics_Connector_exec_i ()); 
+    return retval;
+  }
+}
+
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector_exec.h b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector_exec.h
new file mode 100644
index 00000000000..a4aeac8fb4f
--- /dev/null
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Connector/VTopics_Connector_exec.h
@@ -0,0 +1,62 @@
+// -*- C++ -*-
+// $Id$
+
+#ifndef VTOPICS_CONNECTOR_EXEC_H_
+#define VTOPICS_CONNECTOR_EXEC_H_
+
+#include /**/ "ace/pre.h"
+
+#include "VTopics_ConnectorEC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "VTopics_Connector_exec_export.h"
+#include "tao/LocalObject.h"
+
+#include "dds4ccm/impl/ndds/DDS4CCM_Traits.h"
+#include "dds4ccm/impl/ndds/DDS_Event_Connector_T.h"
+
+
+#include "Base/VTopics_BaseSupport.h"
+
+namespace CIAO_VTopics_VTopics_Connector_Impl
+{
+
+  // @from use of VTopics as a parameter
+  typedef CIAO::DDS4CCM::RTI::Type_Traits < 
+    TestTopic,
+    TestTopicSeq,
+    TestTopicTypeSupport,
+    TestTopicDataWriter,
+    TestTopicDataReader > TestTopic_DDS_Traits;
+
+  typedef CIAO::DDS4CCM::Connector_Traits <
+    ::CIAO_VTopics_VTopics_Connector_Impl::VTopics_Connector_Exec,
+    TestTopic_Seq,
+    ::CCM_DDS::TestTopic::CCM_Writer,
+    ::CCM_DDS::TestTopic::CCM_Updater,
+    ::CCM_DDS::TestTopic::CCM_Getter,
+    ::CCM_DDS::TestTopic::CCM_Reader,
+    ::VTopics::CCM_VTopics_Connector_Context,
+    ::CCM_DDS::TestTopic::Listener,
+    ::CCM_DDS::TestTopic::StateListener,
+    ::CCM_DDS::ConnectorStatusListener> TestTopic_Connector_Traits;
+
+  class VTOPICS_CONNECTOR_EXEC_Export VTopics_Connector_exec_i :
+    public DDS_Event_Connector_T <TestTopic_DDS_Traits, TestTopic_Connector_Traits>
+  {
+  public:
+    VTopics_Connector_exec_i (void);
+    virtual ~VTopics_Connector_exec_i (void);
+  };
+
+  extern "C" VTOPICS_CONNECTOR_EXEC_Export ::Components::EnterpriseComponent_ptr
+  create_VTopics_VTopics_Connector_Impl (void);
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc
index 5d33a5a10e5..0eca38fb34d 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Receiver/VTopics_Receiver.mpc
@@ -1,8 +1,8 @@
 // $Id$
 
-project(DDS_VTopics_Receiver_idl_gen) : componentidldefaults, dds4ccm {
+project(DDS_VTopics_Receiver_idl_gen) : componentidldefaults {
   custom_only = 1
-  after += DDS_VTopics_Connector_idl_gen
+  after += DDS_VTopics_Connector_idl_gen 
   idlflags += -Wb,stub_export_macro=RECEIVER_STUB_Export \
               -Wb,stub_export_include=Receiver_stub_export.h \
               -Wb,skel_export_macro=RECEIVER_SVNT_Export \
@@ -17,7 +17,7 @@ project(DDS_VTopics_Receiver_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_VTopics_Receiver_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_VTopics_Receiver_lem_gen) : ciaoidldefaults {
   after += DDS_VTopics_Receiver_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=RECEIVER_LEM_STUB_Export \
@@ -107,7 +107,7 @@ project(DDS_VTopics_Receiver_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_VTopics_Receiver_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_VTopics_Receiver_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      +=   DDS_VTopics_Receiver_lem_stub DDS_VTopics_Base_stub DDS_VTopics_Connector_stub DDS_VTS_String_Connector_stub DDS_VTS_Array_Connector_stub DDS_VTS_Seq_Connector_stub DDS_VTopics_Connector_svnt DDS_VTS_String_Connector_svnt DDS_VTS_Array_Connector_svnt  DDS_VTS_Seq_Connector_svnt  DDS_VTopics_Receiver_exec DDS_VTopics_Connector_lem_stub DDS_VTS_String_Connector_lem_stub DDS_VTS_Array_Connector_lem_stub DDS_VTS_Seq_Connector_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
   sharedname  = Receiver_svnt
   libs       += Receiver_stub Receiver_lem_stub DDS_VTopics_Base_stub \
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc
index 2fb5e26ec21..9decdfd3a53 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/Sender/VTopics_Sender.mpc
@@ -1,8 +1,8 @@
 // $Id$
 // This file is generated with "generate_component_mpc.pl -p DDS_VTopics_Base -l ../lib -o ../lib -c controller -u DDS Sender"
 
-project(DDS_VTopics_Sender_idl_gen) : componentidldefaults, dds4ccm {
-  after += DDS_VTopics_Connector_idl_gen
+project(DDS_VTopics_Sender_idl_gen) : componentidldefaults   {
+  after += DDS_VTopics_Connector_idl_gen 
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_STUB_Export \
               -Wb,stub_export_include=Sender_stub_export.h \
@@ -19,7 +19,7 @@ project(DDS_VTopics_Sender_idl_gen) : componentidldefaults, dds4ccm {
   }
 }
 
-project(DDS_VTopics_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
+project(DDS_VTopics_Sender_lem_gen) : ciaoidldefaults {
   after += DDS_VTopics_Sender_idl_gen
   custom_only = 1
   idlflags += -Wb,stub_export_macro=SENDER_LEM_STUB_Export \
@@ -31,7 +31,7 @@ project(DDS_VTopics_Sender_lem_gen) : ciaoidldefaults, dds4ccm {
   }
 }
 
-project(DDS_VTopics_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
+project(DDS_VTopics_Sender_lem_stub) : ccm_svnt, dds4ccm_base   {
   after += DDS_VTopics_Sender_lem_gen DDS_VTopics_Sender_stub DDS_VTopics_Base_stub
   libs  += DDS_VTopics_Base_stub Sender_stub
   libpaths += ../lib
@@ -57,7 +57,7 @@ project(DDS_VTopics_Sender_lem_stub) : ccm_svnt, dds4ccm_base {
   }
 }
 
-project(DDS_VTopics_Sender_stub) : ccm_stub, dds4ccm_base {
+project(DDS_VTopics_Sender_stub) : ccm_stub, dds4ccm_base   {
   after += DDS_VTopics_Sender_idl_gen DDS_VTopics_Base_stub DDS_VTopics_Connector_stub  DDS_VTS_String_Connector_stub DDS_VTS_Array_Connector_stub DDS_VTS_Seq_Connector_stub
   libs  += DDS_VTopics_Base_stub DDS_VTopics_Connector_stub  DDS_VTS_String_Connector_stub DDS_VTS_Array_Connector_stub DDS_VTS_Seq_Connector_stub
   includes += ..
@@ -83,7 +83,7 @@ project(DDS_VTopics_Sender_stub) : ccm_stub, dds4ccm_base {
   }
 }
 
-project(DDS_VTopics_Sender_exec) : ciao_executor, dds4ccm_base {
+project(DDS_VTopics_Sender_exec) : ciao_executor, dds4ccm_base   {
   after   += DDS_VTopics_Sender_lem_stub DDS_VTopics_Sender_stub DDS_VTopics_Connector_lem_stub  DDS_VTS_String_Connector_lem_stub DDS_VTS_Array_Connector_lem_stub DDS_VTS_Seq_Connector_lem_stub DDS_VTopics_Connector_stub  DDS_VTS_String_Connector_stub DDS_VTS_Array_Connector_stub DDS_VTS_Seq_Connector_stub DDS4CCM_lem_stub
   sharedname = Sender_exec
   libs += Sender_stub Sender_lem_stub DDS_VTopics_Base_stub DDS_VTopics_Connector_lem_stub DDS_VTopics_Connector_stub DDS_VTS_String_Connector_stub DDS_VTS_Array_Connector_stub DDS_VTS_Seq_Connector_stub DDS4CCM_lem_stub
@@ -109,7 +109,7 @@ project(DDS_VTopics_Sender_exec) : ciao_executor, dds4ccm_base {
 }
 
 
-project(DDS_VTopics_Sender_svnt) : ciao_servant, dds4ccm_base {
+project(DDS_VTopics_Sender_svnt) : ciao_servant, dds4ccm_base, nddslib {
   after      += DDS_VTopics_Base_stub  DDS_VTopics_Sender_lem_stub DDS4CCM_lem_stub \
                 DDS4CCM_skel DDS_VTopics_Connector_stub DDS_VTS_String_Connector_stub DDS_VTS_Array_Connector_stub DDS_VTS_Seq_Connector_stub \
                 DDS_VTopics_Connector_svnt DDS_VTS_String_Connector_svnt DDS_VTS_Array_Connector_svnt DDS_VTS_Seq_Connector_svnt \
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/Plan.cdp b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/Plan.cdp
index 1296410de1d..f4f20d7f3a2 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/Plan.cdp
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/Plan.cdp
@@ -123,7 +123,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_VTopics_VTS_String_Connector_Impl</string>
+          <string>create_VTS_String_VTS_String_Connector_Impl</string>
         </value>
       </value>
     </execParameter>
@@ -175,7 +175,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_VTopics_VTS_Array_Connector_Impl</string>
+          <string>create_VTS_Array_VTS_Array_Connector_Impl</string>
         </value>
       </value>
     </execParameter>
@@ -227,7 +227,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_VTopics_VTS_Seq_Connector_Impl</string>
+          <string>create_VTS_Seq_VTS_Seq_Connector_Impl</string>
         </value>
       </value>
     </execParameter>
diff --git a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl
index 6065a5cc28b..2767b0eff24 100644
--- a/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl
+++ b/CIAO/connectors/dds4ccm/tests/VariousTopicsState/descriptors/run_test.pl
@@ -100,8 +100,6 @@ sub kill_open_processes {
     if ($ns_running == 1) {
         $NS->Kill (); $NS->TimedWait (1);
     }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
 }
 
 sub run_node_daemons {
@@ -218,8 +216,8 @@ for ($i = 0; $i < $nr_daemon; ++$i) {
     }
 }
 
-print "Sleeping 10 seconds to allow task to complete\n";
-sleep (10);
+print "Sleeping 30 seconds to allow task to complete\n";
+sleep (30);
 
 # Invoke executor - stop the application -.
 print "Invoking executor - stop the application -\n";
diff --git a/CIAO/docs/OMG-CCM-Tutorial.ppt b/CIAO/docs/OMG-CCM-Tutorial.ppt
index 869991cedc0..369ad2df1f8 100644
--- a/CIAO/docs/OMG-CCM-Tutorial.ppt
+++ b/CIAO/docs/OMG-CCM-Tutorial.ppt
diff --git a/CIAO/examples/BasicSP/BMClosedED/BMClosedED.idl b/CIAO/examples/BasicSP/BMClosedED/BMClosedED.idl
index cf020aeab1a..541dd06495d 100644
--- a/CIAO/examples/BasicSP/BMClosedED/BMClosedED.idl
+++ b/CIAO/examples/BasicSP/BMClosedED/BMClosedED.idl
@@ -8,16 +8,16 @@
 module BasicSP
 {
   component BMClosedED
-  {
-    provides ReadData dataout;
-    uses ReadData datain;
-    publishes DataAvailable out_avail;
-    consumes  DataAvailable in_avail;
-  };
+    {
+      provides  ReadData dataout;
+      uses      ReadData datain;
+      publishes DataAvailable out_avail;
+      consumes  DataAvailable in_avail;
+    };
 
   home BMClosedEDHome manages BMClosedED
-  {
-  };
+    {
+    };
 };
 
 #endif /* BMCLOSEDED_IDL */
diff --git a/CIAO/examples/BasicSP/descriptors/run_test.pl b/CIAO/examples/BasicSP/descriptors/run_test.pl
index 8f071eff54d..e64c797cdd4 100755
--- a/CIAO/examples/BasicSP/descriptors/run_test.pl
+++ b/CIAO/examples/BasicSP/descriptors/run_test.pl
@@ -108,8 +108,6 @@ sub kill_open_processes {
         $NS->Kill ();
         $NS->TimedWait (1);
     }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
 }
 
 sub run_node_daemons {
diff --git a/CIAO/examples/DevGuideExamples/Messenger/StaticDAnCE/run_test.pl b/CIAO/examples/DevGuideExamples/Messenger/StaticDAnCE/run_test.pl
index 6b0e99a9697..1fea712778e 100755
--- a/CIAO/examples/DevGuideExamples/Messenger/StaticDAnCE/run_test.pl
+++ b/CIAO/examples/DevGuideExamples/Messenger/StaticDAnCE/run_test.pl
@@ -108,7 +108,4 @@ $EM->Kill();
 $tg->DeleteFile ($embase);
 $tg->DeleteFile ($plior);
 
-# in case shutdown did not perform as expected
-$tg->KillAll ('ciao_componentserver');
-
 exit 0;
diff --git a/CIAO/examples/DevGuideExamples/Messenger/descriptors/run_test.pl b/CIAO/examples/DevGuideExamples/Messenger/descriptors/run_test.pl
index 6b0e99a9697..1fea712778e 100755
--- a/CIAO/examples/DevGuideExamples/Messenger/descriptors/run_test.pl
+++ b/CIAO/examples/DevGuideExamples/Messenger/descriptors/run_test.pl
@@ -108,7 +108,4 @@ $EM->Kill();
 $tg->DeleteFile ($embase);
 $tg->DeleteFile ($plior);
 
-# in case shutdown did not perform as expected
-$tg->KillAll ('ciao_componentserver');
-
 exit 0;
diff --git a/CIAO/examples/Hello/Receiver/Receiver_exec.cpp b/CIAO/examples/Hello/Receiver/Receiver_exec.cpp
index e80379cf6a8..f78651ae0eb 100644
--- a/CIAO/examples/Hello/Receiver/Receiver_exec.cpp
+++ b/CIAO/examples/Hello/Receiver/Receiver_exec.cpp
@@ -1,60 +1,34 @@
 // $Id$
 
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.7.6
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- *       http://doc.ece.uci.edu/
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.cs.wustl.edu/~schmidt/TAO.html
- **/
-
-// TAO_IDL - Generated from
-// .\be\be_codegen.cpp:1278
-
 #include "Receiver_exec.h"
 #include "ace/OS_NS_unistd.h"
 
 namespace CIAO_Hello_Receiver_Impl
 {
-  //============================================================
-  // Component Executor Implementation Class: Receiver_exec_i
-  //============================================================
-  
-  Receiver_exec_i::Receiver_exec_i (void)
+  Receiver_exec_i::Receiver_exec_i ()
     : iterations_ (10)
   {
   }
-  
-  Receiver_exec_i::~Receiver_exec_i (void)
+
+  Receiver_exec_i::~Receiver_exec_i ()
+  {
+  }
+
+  void
+  Receiver_exec_i::iterations (CORBA::Short iterations)
   {
+    this->iterations_ = iterations;
+  }
+
+  CORBA::Short
+  Receiver_exec_i::iterations ()
+  {
+    return this->iterations_;
   }
-  
-  // Supported operations and attributes.
-  
-  // Component attributes and port operations.
-  
+
   void
-  Receiver_exec_i::push_click_in (
-    ::Hello::TimeOut * ev)
+  Receiver_exec_i::push_click_in (::Hello::TimeOut * ev)
   {
-    /* Your code here. */
     ACE_DEBUG ((LM_DEBUG,
           ACE_TEXT ("Receiver - Informed by the Sender with message [%C]\n"),
           ev->data ()));
@@ -71,128 +45,81 @@ namespace CIAO_Hello_Receiver_Impl
         ACE_OS::sleep (tv);
       }
   }
-  
-  ::CORBA::Short
-  Receiver_exec_i::iterations (void)
-  {
-    /* Your code here. */
-    return this->iterations_;
-  }
-  
-  void
-  Receiver_exec_i::iterations (
-    ::CORBA::Short iterations)
-  {
-    /* Your code here. */
-    this->iterations_ = iterations;
-  }
-  
-  // Operations from Components::SessionComponent.
-  
+
+  // Operations from Components::SessionComponen
   void
-  Receiver_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
+  Receiver_exec_i::set_session_context (::Components::SessionContext_ptr ctx)
   {
     ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::set_session_context\n"));
 
     this->context_ =
       ::Hello::CCM_Receiver_Context::_narrow (ctx);
-    
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
+
+    if (CORBA::is_nil (this->context_.in ()))
+    {
+      throw ::CORBA::INTERNAL ();
+    }
   }
-  
+
   void
-  Receiver_exec_i::configuration_complete (void)
+  Receiver_exec_i::configuration_complete ()
   {
-    /* Your code here. */
     ACE_DEBUG ((LM_DEBUG,
                 "Receiver_exec_i::configuration_complete\n"));
   }
-  
+
   void
-  Receiver_exec_i::ccm_activate (void)
+  Receiver_exec_i::ccm_activate ()
   {
-    /* Your code here. */
     ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_activate\n"));
   }
-  
+
   void
-  Receiver_exec_i::ccm_passivate (void)
+  Receiver_exec_i::ccm_passivate ()
   {
-    /* Your code here. */
     ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_passivate\n"));
   }
-  
+
   void
-  Receiver_exec_i::ccm_remove (void)
+  Receiver_exec_i::ccm_remove ()
   {
-    /* Your code here. */
     ACE_DEBUG ((LM_DEBUG, "Receiver_exec_i::ccm_remove\n"));
   }
-  
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Hello_Receiver_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-    
-    ACE_NEW_NORETURN (
-      retval,
-      Receiver_exec_i);
-    
-    return retval;
-  }
-}
 
-namespace CIAO_Hello_Receiver_Impl
-{
-  //============================================================
-  // Home Executor Implementation Class: ReceiverHome_exec_i
-  //============================================================
-  
-  ReceiverHome_exec_i::ReceiverHome_exec_i (void)
+
+  ReceiverHome_exec_i::ReceiverHome_exec_i ()
   {
   }
-  
-  ReceiverHome_exec_i::~ReceiverHome_exec_i (void)
+
+  ReceiverHome_exec_i::~ReceiverHome_exec_i ()
   {
   }
-  
-  // All operations and attributes.
-  
-  // Factory operations.
-  
-  // Finder operations.
-  
-  // Implicit operations.
-  
+
   ::Components::EnterpriseComponent_ptr
-  ReceiverHome_exec_i::create (void)
+  ReceiverHome_exec_i::create ()
   {
     ::Components::EnterpriseComponent_ptr retval =
       ::Components::EnterpriseComponent::_nil ();
-    
+
     ACE_NEW_THROW_EX (
       retval,
       Receiver_exec_i,
       ::CORBA::NO_MEMORY ());
-    
+
     return retval;
   }
-  
+
   extern "C" RECEIVER_EXEC_Export ::Components::HomeExecutorBase_ptr
   create_Hello_ReceiverHome_Impl (void)
   {
     ::Components::HomeExecutorBase_ptr retval =
       ::Components::HomeExecutorBase::_nil ();
-    
-    ACE_NEW_NORETURN (
+
+    ACE_NEW_RETURN (
       retval,
-      ReceiverHome_exec_i);
-    
+      ReceiverHome_exec_i,
+      ::Components::HomeExecutorBase::_nil ());
+
     return retval;
   }
 }
diff --git a/CIAO/examples/Hello/Receiver/Receiver_exec.h b/CIAO/examples/Hello/Receiver/Receiver_exec.h
index afe69e2f35c..0d64ea1c537 100644
--- a/CIAO/examples/Hello/Receiver/Receiver_exec.h
+++ b/CIAO/examples/Hello/Receiver/Receiver_exec.h
@@ -1,37 +1,9 @@
-// -*- C++ -*-
 // $Id$
 
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.7.6
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- *       http://doc.ece.uci.edu/
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.cs.wustl.edu/~schmidt/TAO.html
- **/
-
-// TAO_IDL - Generated from
-// .\be\be_codegen.cpp:1217
-
-#ifndef CIAO_RECEIVER_EXEC_H_
-#define CIAO_RECEIVER_EXEC_H_
+#ifndef CIAO_RECEIVER_EXEC_H
+#define CIAO_RECEIVER_EXEC_H
 
+#include /**/ "ace/pre.h"
 
 #include "ReceiverEC.h"
 
@@ -39,98 +11,87 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include /**/ "Receiver_exec_export.h"
+#include "Receiver_exec_export.h"
 #include "tao/LocalObject.h"
 
-
 namespace CIAO_Hello_Receiver_Impl
 {
+  /**
+   * @class Receiver_exec_i
+   *
+   * Receiver executor implementation class.
+   */
   class RECEIVER_EXEC_Export Receiver_exec_i
     : public virtual Receiver_Exec,
       public virtual ::CORBA::LocalObject
   {
+
   public:
-    Receiver_exec_i (void);
-    virtual ~Receiver_exec_i (void);
-    
-    //@{
-    /** Supported operations and attributes. */
-    
-    //@}
-    
-    //@{
-    /** Component attributes and port operations. */
-    
-    
-    virtual void
-    push_click_in (
-      ::Hello::TimeOut * ev);
-    
-    // TAO_IDL - Generated from
-    // c:\middleware\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:42
-    
-    virtual ::CORBA::Short
-    iterations (void);
-    
-    // TAO_IDL - Generated from
-    // c:\middleware\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:42
-    
-    virtual void
-    iterations (
-      ::CORBA::Short iterations);
-    //@}
-    
-    //@{
-    /** Operations from Components::SessionComponent. */
-    
+    /// Default constructor.
+    Receiver_exec_i ();
+
+    /// Default destructor.
+    ~Receiver_exec_i ();
+
+    /// Operation to set the value of the attribute "iterations"
+    virtual void iterations (CORBA::Short iterations);
+
+    /// Operation to get the value of the attribute "iterations"
+    virtual CORBA::Short iterations ();
+
+    // Operation which will be called upon receiving the timeout event.
     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:
+    push_click_in (::Hello::TimeOut *ev);
+
+    // Operations from Components::SessionComponent
+    virtual void set_session_context (::Components::SessionContext_ptr ctx);
+
+    virtual void configuration_complete ();
+
+    virtual void ccm_activate ();
+    virtual void ccm_passivate ();
+    virtual void ccm_remove ();
+
+  protected:
+    /// Copmponent specific context
     ::Hello::CCM_Receiver_Context_var context_;
+
+  private:
     CORBA::String_var message_;
     CORBA::Short iterations_;
   };
-  
-  extern "C" RECEIVER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Hello_Receiver_Impl (void);
-}
 
-namespace CIAO_Hello_Receiver_Impl
-{
+  /**
+   * @class ReceiverHome_exec_i
+   *
+   * Receiver home executor implementation class.
+   */
   class RECEIVER_EXEC_Export ReceiverHome_exec_i
     : public virtual ReceiverHome_Exec,
       public virtual ::CORBA::LocalObject
   {
-  public:
+    public:
     ReceiverHome_exec_i (void);
-    
     virtual ~ReceiverHome_exec_i (void);
-    
-    // All operations and attributes.
-    
-    // Factory operations.
-    
-    // Finder operations.
-    
+
+    // Supported or inherited operations.
+
+    // Home operations.
+
+    // Factory and finder operations.
+
+    // Attribute operations.
+
     // Implicit operations.
-    
+
     virtual ::Components::EnterpriseComponent_ptr
-    create (void);
+    create ();
   };
-  
+
   extern "C" RECEIVER_EXEC_Export ::Components::HomeExecutorBase_ptr
   create_Hello_ReceiverHome_Impl (void);
 }
 
-#endif /* ifndef */
+#include /**/ "ace/post.h"
 
+#endif /* CIAO_RECEIVER_EXEC_H */
diff --git a/CIAO/examples/Hello/Sender/Sender_exec.cpp b/CIAO/examples/Hello/Sender/Sender_exec.cpp
index e6eae5e7f45..93842337e76 100644
--- a/CIAO/examples/Hello/Sender/Sender_exec.cpp
+++ b/CIAO/examples/Hello/Sender/Sender_exec.cpp
@@ -1,87 +1,57 @@
 // $Id$
 
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.7.6
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- *       http://doc.ece.uci.edu/
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.cs.wustl.edu/~schmidt/TAO.html
- **/
-
-// TAO_IDL - Generated from
-// .\be\be_codegen.cpp:1278
-
 #include "Sender_exec.h"
 #include "ace/OS_NS_time.h"
 
 namespace CIAO_Hello_Sender_Impl
 {
-  //============================================================
-  // Facet Executor Implementation Class: ReadMessage_exec_i
-  //============================================================
-    
-  ReadMessage_exec_i::ReadMessage_exec_i (Sender_exec_i& component)
-    : component_ (component)
+  char*
+  Message_Impl::get_message ()
   {
+    ACE_DEBUG ((LM_EMERGENCY, "Sender returning message: [%C]\n", component_.message_.in ()));
+    return CORBA::string_dup (component_.message_.in ());
   }
 
-  ReadMessage_exec_i::~ReadMessage_exec_i ()
+  Sender_exec_i::~Sender_exec_i ()
   {
   }
-  
-  // Operations from ::Hello::ReadMessage
-  
+
+  void
+  Sender_exec_i::local_message (const char * local_message)
+  {
+    message_ = CORBA::string_dup (local_message);
+  }
+
   char *
-  ReadMessage_exec_i::get_message (void)
+  Sender_exec_i::local_message ()
   {
-    /* Your code here. */
-    ACE_DEBUG ((LM_EMERGENCY, "Sender returning message: [%C]\n", component_.message_.in ()));
-    return CORBA::string_dup (component_.message_.in ());
+    return CORBA::string_dup (message_.in ());
   }
-  
-  //============================================================
-  // Component Executor Implementation Class: Sender_exec_i
-  //============================================================
-  
-  Sender_exec_i::Sender_exec_i (void)
-    : message_(CORBA::string_dup ("Default Message")),
-      color_ (::Hello::empty)
+
+  ::Hello::COLOR_SELECTION
+  Sender_exec_i::color ()
   {
+    // Your code here.
+    return this->color_;
   }
 
-  Sender_exec_i::Sender_exec_i (const char* local_message)
-    : message_(CORBA::string_dup (local_message)),
-      color_ (::Hello::empty)
+  void
+  Sender_exec_i::color (::Hello::COLOR_SELECTION color)
   {
+    this->color_ = color;
   }
-  
-  Sender_exec_i::~Sender_exec_i (void)
+
+  Hello::CCM_ReadMessage_ptr
+  Sender_exec_i::get_push_message ()
   {
+    ACE_DEBUG ((LM_EMERGENCY,
+                "Sender_exec.i::get_push_message called\n"));
+    return ( new Message_Impl (*this) );
   }
-  
-  // Supported operations and attributes.
-  
+
   void
-  Sender_exec_i::start (void)
+  Sender_exec_i::start ()
   {
-    /* Your code here. */
     Hello::TimeOut_var event = new OBV_Hello::TimeOut;
     event->data ("ACE/TAO/CIAO");
     ACE_DEBUG ((LM_EMERGENCY, "Sender initiates the process.\n"));
@@ -112,155 +82,82 @@ namespace CIAO_Hello_Sender_Impl
 
       }
   }
-  
-  // Component attributes and port operations.
-  
-  ::Hello::CCM_ReadMessage_ptr
-  Sender_exec_i::get_push_message (void)
-  {
-    /* Your code here. */
-    ACE_DEBUG ((LM_EMERGENCY,
-                "Sender_exec.i::get_push_message called\n"));
-    return ( new ReadMessage_exec_i (*this) );
-  }
-  
-  char *
-  Sender_exec_i::local_message (void)
-  {
-    /* Your code here. */
-    return CORBA::string_dup (message_.in ());
-  }
-  
-  void
-  Sender_exec_i::local_message (
-    const char * local_message)
-  {
-    /* Your code here. */
-    message_ = CORBA::string_dup (local_message);
-  }
-  
-  ::Hello::COLOR_SELECTION
-  Sender_exec_i::color (void)
-  {
-    /* Your code here. */
-    return this->color_;
-  }
-  
-  void
-  Sender_exec_i::color (
-    ::Hello::COLOR_SELECTION color)
-  {
-    /* Your code here. */
-    this->color_ = color;
-  }
-  
-  // Operations from Components::SessionComponent.
-  
+
   void
-  Sender_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
+  Sender_exec_i::set_session_context (::Components::SessionContext_ptr ctx)
   {
     ACE_DEBUG ((LM_EMERGENCY, "Sender_exec_i::set_session_context\n"));
+
     this->context_ =
       ::Hello::CCM_Sender_Context::_narrow (ctx);
-    
-    if ( ::CORBA::is_nil (this->context_.in ()))
-      {
-        throw ::CORBA::INTERNAL ();
-      }
+
+    if (CORBA::is_nil (this->context_.in ()))
+    {
+      throw ::CORBA::INTERNAL ();
+    }
   }
-  
+
   void
-  Sender_exec_i::configuration_complete (void)
+  Sender_exec_i::configuration_complete ()
   {
-    /* Your code here. */
     ACE_DEBUG ((LM_EMERGENCY,
                 "Sender_exec_i::configuration_complete\n"));
   }
-  
+
   void
-  Sender_exec_i::ccm_activate (void)
+  Sender_exec_i::ccm_activate ()
   {
-    /* Your code here. */
     ACE_DEBUG ((LM_EMERGENCY,
                 "Sender_exec_i::ccm_activate\n"));
   }
-  
+
   void
-  Sender_exec_i::ccm_passivate (void)
+  Sender_exec_i::ccm_passivate ()
   {
-    /* Your code here. */
     ACE_DEBUG ((LM_EMERGENCY, "Sender_exec_i::ccm_passivate\n"));
   }
-  
+
   void
-  Sender_exec_i::ccm_remove (void)
+  Sender_exec_i::ccm_remove ()
   {
-    /* Your code here. */
     ACE_DEBUG ((LM_EMERGENCY, "Sender_exec_i::ccm_remove\n"));
   }
-  
-  extern "C" 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;
-  }
-}
 
-namespace CIAO_Hello_Sender_Impl
-{
-  //============================================================
-  // Home Executor Implementation Class: SenderHome_exec_i
-  //============================================================
-  
-  SenderHome_exec_i::SenderHome_exec_i (void)
+  SenderHome_exec_i::SenderHome_exec_i ()
   {
   }
-  
-  SenderHome_exec_i::~SenderHome_exec_i (void)
+
+  SenderHome_exec_i::~SenderHome_exec_i ()
   {
   }
-  
-  // All operations and attributes.
-  
-  // Factory operations.
-  
-  // Finder operations.
-  
-  // Implicit operations.
-  
+
   ::Components::EnterpriseComponent_ptr
-  SenderHome_exec_i::create (void)
+  SenderHome_exec_i::create ()
   {
     ACE_DEBUG ((LM_EMERGENCY, "(%P|%t) creating SenderHome\n"));
+
     ::Components::EnterpriseComponent_ptr retval =
       ::Components::EnterpriseComponent::_nil ();
-    
+
     ACE_NEW_THROW_EX (
       retval,
       Sender_exec_i,
       ::CORBA::NO_MEMORY ());
-    
+
     return retval;
   }
-  
+
   extern "C" SENDER_EXEC_Export ::Components::HomeExecutorBase_ptr
   create_Hello_SenderHome_Impl (void)
   {
     ::Components::HomeExecutorBase_ptr retval =
       ::Components::HomeExecutorBase::_nil ();
-    
-    ACE_NEW_NORETURN (
+
+    ACE_NEW_RETURN (
       retval,
-      SenderHome_exec_i);
-    
+      SenderHome_exec_i,
+      ::Components::HomeExecutorBase::_nil ());
+
     return retval;
   }
 }
diff --git a/CIAO/examples/Hello/Sender/Sender_exec.h b/CIAO/examples/Hello/Sender/Sender_exec.h
index c47947f7ba3..e2e8a0982e3 100644
--- a/CIAO/examples/Hello/Sender/Sender_exec.h
+++ b/CIAO/examples/Hello/Sender/Sender_exec.h
@@ -1,37 +1,9 @@
-// -*- C++ -*-
 // $Id$
 
-/**
- * Code generated by the The ACE ORB (TAO) IDL Compiler v1.7.6
- * TAO and the TAO IDL Compiler have been developed by:
- *       Center for Distributed Object Computing
- *       Washington University
- *       St. Louis, MO
- *       USA
- *       http://www.cs.wustl.edu/~schmidt/doc-center.html
- * and
- *       Distributed Object Computing Laboratory
- *       University of California at Irvine
- *       Irvine, CA
- *       USA
- *       http://doc.ece.uci.edu/
- * and
- *       Institute for Software Integrated Systems
- *       Vanderbilt University
- *       Nashville, TN
- *       USA
- *       http://www.isis.vanderbilt.edu/
- *
- * Information about TAO is available at:
- *     http://www.cs.wustl.edu/~schmidt/TAO.html
- **/
-
-// TAO_IDL - Generated from
-// .\be\be_codegen.cpp:1217
-
-#ifndef CIAO_SENDER_EXEC_H_
-#define CIAO_SENDER_EXEC_H_
+#ifndef CIAO_SENDER_EXEC_H
+#define CIAO_SENDER_EXEC_H
 
+#include /**/ "ace/pre.h"
 
 #include "SenderEC.h"
 
@@ -39,146 +11,126 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include /**/ "Sender_exec_export.h"
+#include "Sender_exec_export.h"
 #include "tao/LocalObject.h"
 
-
 namespace CIAO_Hello_Sender_Impl
 {
-  class Sender_exec_i;
-
-  // TAO_IDL - Generated from
-  // c:\middleware\ace_wrappers\tao\tao_idl\be\be_visitor_component/facet_exh.cpp:58
-  
-  class SENDER_EXEC_Export ReadMessage_exec_i
-    : public virtual ::Hello::CCM_ReadMessage,
-      public virtual ::CORBA::LocalObject
-  {
-  public:
-    ReadMessage_exec_i (Sender_exec_i& component);
-
-    virtual ~ReadMessage_exec_i (void);
-    
-    // Operations and attributes from ::Hello::ReadMessage
-    
-    // TAO_IDL - Generated from
-    // c:\middleware\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:42
-    
-    virtual char *
-    get_message (void);
-
-  private:
-    Sender_exec_i& component_;
-  };
-  
+  /**
+   * @class Sender_exec_i
+   *
+   * Sender executor implementation class.
+   */
   class SENDER_EXEC_Export Sender_exec_i
     : public virtual Sender_Exec,
       public virtual ::CORBA::LocalObject
   {
+
   public:
-    Sender_exec_i (void);
-    Sender_exec_i (const char* local_message);
-    virtual ~Sender_exec_i (void);
-    
-    //@{
-    /** Supported operations and attributes. */
-    
-    
-    // TAO_IDL - Generated from
-    // c:\middleware\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:42
-    
-    virtual void
-    start (void);
-    //@}
-    
-    //@{
-    /** Component attributes and port operations. */
-    
-    
+    /// Default constructor.
+    Sender_exec_i ()
+      : message_(CORBA::string_dup ("Default Message")),
+        color_ (::Hello::empty)
+    {
+    }
+
+    /// Secondary construction.
+    Sender_exec_i (const char* local_message)
+      : message_ (CORBA::string_dup (local_message)),
+        color_ (::Hello::empty)
+    {
+    }
+
+    /// Default destructor.
+    virtual ~Sender_exec_i ();
+
+    /// Operation to set the value of the attribute "local_message"
+    virtual void local_message (const char * local_message);
+
+    /// Operation to get the value of the attribute "local_message"
+    virtual char * local_message ();
+
+    /* Operations for obtaining the interface reference. */
+    /* This method will be used in the assembly face so the
+     * ObjRef of this read_message facet will be sent to the
+     * client side(receptacle).
+     */
+    // Note: You can specify the return type as ::Hello::CCM_message *
     virtual ::Hello::CCM_ReadMessage_ptr
-    get_push_message (void);
-    
-    // TAO_IDL - Generated from
-    // c:\middleware\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:42
-    
-    virtual char *
-    local_message (void);
-    
-    // TAO_IDL - Generated from
-    // c:\middleware\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:42
-    
-    virtual void
-    local_message (
-      const char * local_message);
-    
-    // TAO_IDL - Generated from
-    // c:\middleware\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:42
-    
+    get_push_message ();
+
     virtual ::Hello::COLOR_SELECTION
-    color (void);
-    
-    // TAO_IDL - Generated from
-    // c:\middleware\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:42
-    
-    virtual void
-    color (
-      ::Hello::COLOR_SELECTION color);
-    //@}
-    
-    //@{
-    /** Operations from Components::SessionComponent. */
-    
+    color ();
+
     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:
+    color (::Hello::COLOR_SELECTION);
+
+    // Operation inside of the trigger interface.
+    virtual void start ();
+
+    // Operations from Components::SessionComponent
+    virtual void set_session_context (::Components::SessionContext_ptr ctx);
+
+    virtual void configuration_complete ();
+
+    virtual void ccm_activate ();
+
+    virtual void ccm_passivate ();
+
+    virtual void ccm_remove ();
+
+  protected:
+    /// Copmponent specific context
     ::Hello::CCM_Sender_Context_var context_;
+
+  private:
     CORBA::String_var message_;
+
     CORBA::Boolean log_time_;
+
     ::Hello::COLOR_SELECTION color_;
 
-    friend class ReadMessage_exec_i;
+    friend class Message_Impl;
   };
-  
-  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Hello_Sender_Impl (void);
-}
 
-namespace CIAO_Hello_Sender_Impl
-{
+  class Message_Impl : public virtual Hello::CCM_ReadMessage,
+                       public virtual ::CORBA::LocalObject
+  {
+  public:
+    Message_Impl (Sender_exec_i& component)
+        : component_ (component)
+    {
+    }
+
+    virtual char *get_message ();
+
+  private:
+    Sender_exec_i& component_;
+  };
+
+  /**
+   * @class SenderHome_exec_i
+   *
+   * Sender home executor implementation class.
+   */
   class SENDER_EXEC_Export SenderHome_exec_i
     : public virtual SenderHome_Exec,
       public virtual ::CORBA::LocalObject
   {
-  public:
+    public:
     SenderHome_exec_i (void);
-    
     virtual ~SenderHome_exec_i (void);
-    
-    // All operations and attributes.
-    
-    // Factory operations.
-    
-    // Finder operations.
-    
-    // Implicit operations.
-    
-    virtual ::Components::EnterpriseComponent_ptr
-    create (void);
+
+    virtual ::Components::EnterpriseComponent_ptr create ();
   };
-  
+
+  extern "C" SENDER_EXEC_Export ::Components::EnterpriseComponent_ptr
+    create_Hello_Sender_Impl (void);
+
   extern "C" SENDER_EXEC_Export ::Components::HomeExecutorBase_ptr
   create_Hello_SenderHome_Impl (void);
 }
 
-#endif /* ifndef */
+#include /**/ "ace/post.h"
 
+#endif /* CIAO_SENDER_EXEC_H */
diff --git a/CIAO/examples/Hello/descriptors/NodeMap.dat b/CIAO/examples/Hello/descriptors/NodeMap.dat
deleted file mode 100755
index 16cb0459657..00000000000
--- a/CIAO/examples/Hello/descriptors/NodeMap.dat
+++ /dev/null
@@ -1 +0,0 @@
-NodeOne      corbaloc:iiop:localhost:60001/NodeOne.NodeManager
diff --git a/CIAO/examples/Hello/descriptors/PlanLocality_DifferentProcesses.cdp b/CIAO/examples/Hello/descriptors/PlanLocality_DifferentProcesses.cdp
deleted file mode 100755
index 490c63a4bcc..00000000000
--- a/CIAO/examples/Hello/descriptors/PlanLocality_DifferentProcesses.cdp
+++ /dev/null
@@ -1,244 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<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>C5CA23E2-2004-11DF-8000-000C2916C803</UUID>
-
-  <implementation xmi:id="_5FFE7D8E-2003-11DF-B472-000C2916C803">
-    <name>PICML_default_xme_file.ComponentImplementations.Hello_ReceiverImpl.Hello_ReceiverImpl</name>
-    <source/>
-    <artifact xmi:idref="_5FFE7D8E-2003-11DF-B474-000C2916C803"/>
-    <artifact xmi:idref="_5FFE7D8E-2003-11DF-B475-000C2916C803"/>
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PICML_default_xme_file.ImplementationArtifacts.Hello_ReceiverArtifacts.Hello_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>PICML_default_xme_file.ImplementationArtifacts.Hello_ReceiverArtifacts.Hello_Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="_5FFE7D8E-2003-11DF-B473-000C2916C803">
-    <name>PICML_default_xme_file.ComponentImplementations.Hello_SenderImpl.Hello_SenderImpl</name>
-    <source/>
-    <artifact xmi:idref="_5FFE7D8E-2003-11DF-B476-000C2916C803"/>
-    <artifact xmi:idref="_5FFE7D8E-2003-11DF-B477-000C2916C803"/>
-    <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>PICML_default_xme_file.ImplementationArtifacts.Hello_SenderArtifacts.Hello_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>PICML_default_xme_file.ImplementationArtifacts.Hello_SenderArtifacts.Hello_Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="_A7F51814-2003-11DF-8000-000C2916C803">
-    <name>PICML_default_xme_file.ComponentImplementations.NewComponentImplementationContainer.ComponentAssembly.Receiver</name>
-    <node>NodeOne</node>
-    <source/>
-    <implementation xmi:idref="_5FFE7D8E-2003-11DF-B472-000C2916C803"/>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hello_ReceiverImpl.ior</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="_AC04995C-2003-11DF-8000-000C2916C803">
-    <name>PICML_default_xme_file.ComponentImplementations.NewComponentImplementationContainer.ComponentAssembly.Sender</name>
-    <node>NodeOne</node>
-    <source/>
-    <implementation xmi:idref="_5FFE7D8E-2003-11DF-B473-000C2916C803"/>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender.ior</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>local_message</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>hello, world!</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>color</name>
-      <value>
-        <type>
-          <kind>tk_enum</kind>
-          <enum>
-            <name>COLOR_SELECTION</name>
-            <typeId>IDL:Hello/COLOR_SELECTION:1.0</typeId>
-            <member>empty</member>
-            <member>white</member>
-            <member>red</member>
-            <member>yellow</member>
-          </enum>
-        </type>
-        <value>
-          <enum>yellow</enum>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>PICML_default_xme_file.ComponentImplementations.NewComponentImplementationContainer.ComponentAssembly.Receiver:read_message::PICML_default_xme_file.ComponentImplementations.NewComponentImplementationContainer.ComponentAssembly.Sender:push_message</name>
-    <internalEndpoint>
-      <portName>read_message</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="_A7F51814-2003-11DF-8000-000C2916C803"/>
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_message</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="_AC04995C-2003-11DF-8000-000C2916C803"/>
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>PICML_default_xme_file.ComponentImplementations.NewComponentImplementationContainer.ComponentAssembly.Sender:click_out::PICML_default_xme_file.ComponentImplementations.NewComponentImplementationContainer.ComponentAssembly.Receiver:click_in</name>
-    <internalEndpoint>
-      <portName>click_out</portName>
-      <provider>false</provider>
-      <kind>EventPublisher</kind>
-      <instance xmi:idref="_AC04995C-2003-11DF-8000-000C2916C803"/>
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>click_in</portName>
-      <provider>true</provider>
-      <kind>EventConsumer</kind>
-      <instance xmi:idref="_A7F51814-2003-11DF-8000-000C2916C803"/>
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="_5FFE7D8E-2003-11DF-B474-000C2916C803">
-    <name>PICML_default_xme_file.ImplementationArtifacts.Hello_ReceiverArtifacts.Hello_Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Hello_Receiver_svnt</location>
-  </artifact>
-
-  <artifact xmi:id="_5FFE7D8E-2003-11DF-B475-000C2916C803">
-    <name>PICML_default_xme_file.ImplementationArtifacts.Hello_ReceiverArtifacts.Hello_Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Hello_Receiver_exec</location>
-  </artifact>
-
-  <artifact xmi:id="_5FFE7D8E-2003-11DF-B476-000C2916C803">
-    <name>PICML_default_xme_file.ImplementationArtifacts.Hello_SenderArtifacts.Hello_Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Hello_Sender_svnt</location>
-  </artifact>
-
-  <artifact xmi:id="_5FFE7D8E-2003-11DF-B477-000C2916C803">
-    <name>PICML_default_xme_file.ImplementationArtifacts.Hello_SenderArtifacts.Hello_Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Hello_Sender_exec</location>
-  </artifact>
-
-  <localityConstraint>
-    <constraint>SameProcess</constraint>
-    <constrainedInstance xmi:idref="_AC04995C-2003-11DF-8000-000C2916C803"/>
-  </localityConstraint>
-
-  <localityConstraint>
-    <constraint>SameProcess</constraint>
-    <constrainedInstance xmi:idref="_A7F51814-2003-11DF-8000-000C2916C803"/>
-  </localityConstraint>
-
-</Deployment:DeploymentPlan>
diff --git a/CIAO/examples/Hello/descriptors/PlanLocality_SameProcess.cdp b/CIAO/examples/Hello/descriptors/PlanLocality_SameProcess.cdp
deleted file mode 100755
index b7759626348..00000000000
--- a/CIAO/examples/Hello/descriptors/PlanLocality_SameProcess.cdp
+++ /dev/null
@@ -1,240 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<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>CCA28448-2004-11DF-8000-000C2916C803</UUID>
-
-  <implementation xmi:id="_5FFE7D8E-2003-11DF-B472-000C2916C803">
-    <name>PICML_default_xme_file.ComponentImplementations.Hello_ReceiverImpl.Hello_ReceiverImpl</name>
-    <source/>
-    <artifact xmi:idref="_5FFE7D8E-2003-11DF-B474-000C2916C803"/>
-    <artifact xmi:idref="_5FFE7D8E-2003-11DF-B475-000C2916C803"/>
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_Receiver_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PICML_default_xme_file.ImplementationArtifacts.Hello_ReceiverArtifacts.Hello_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>PICML_default_xme_file.ImplementationArtifacts.Hello_ReceiverArtifacts.Hello_Receiver_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <implementation xmi:id="_5FFE7D8E-2003-11DF-B473-000C2916C803">
-    <name>PICML_default_xme_file.ComponentImplementations.Hello_SenderImpl.Hello_SenderImpl</name>
-    <source/>
-    <artifact xmi:idref="_5FFE7D8E-2003-11DF-B476-000C2916C803"/>
-    <artifact xmi:idref="_5FFE7D8E-2003-11DF-B477-000C2916C803"/>
-    <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>PICML_default_xme_file.ImplementationArtifacts.Hello_SenderArtifacts.Hello_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>PICML_default_xme_file.ImplementationArtifacts.Hello_SenderArtifacts.Hello_Sender_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="_A7F51814-2003-11DF-8000-000C2916C803">
-    <name>PICML_default_xme_file.ComponentImplementations.NewComponentImplementationContainer.ComponentAssembly.Receiver</name>
-    <node>NodeOne</node>
-    <source/>
-    <implementation xmi:idref="_5FFE7D8E-2003-11DF-B472-000C2916C803"/>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Hello_ReceiverImpl.ior</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="_AC04995C-2003-11DF-8000-000C2916C803">
-    <name>PICML_default_xme_file.ComponentImplementations.NewComponentImplementationContainer.ComponentAssembly.Sender</name>
-    <node>NodeOne</node>
-    <source/>
-    <implementation xmi:idref="_5FFE7D8E-2003-11DF-B473-000C2916C803"/>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender.ior</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>local_message</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>hello, world!</string>
-        </value>
-      </value>
-    </configProperty>
-    <configProperty>
-      <name>color</name>
-      <value>
-        <type>
-          <kind>tk_enum</kind>
-          <enum>
-            <name>COLOR_SELECTION</name>
-            <typeId>IDL:Hello/COLOR_SELECTION:1.0</typeId>
-            <member>empty</member>
-            <member>white</member>
-            <member>red</member>
-            <member>yellow</member>
-          </enum>
-        </type>
-        <value>
-          <enum>yellow</enum>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>PICML_default_xme_file.ComponentImplementations.NewComponentImplementationContainer.ComponentAssembly.Receiver:read_message::PICML_default_xme_file.ComponentImplementations.NewComponentImplementationContainer.ComponentAssembly.Sender:push_message</name>
-    <internalEndpoint>
-      <portName>read_message</portName>
-      <provider>false</provider>
-      <kind>SimplexReceptacle</kind>
-      <instance xmi:idref="_A7F51814-2003-11DF-8000-000C2916C803"/>
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>push_message</portName>
-      <provider>true</provider>
-      <kind>Facet</kind>
-      <instance xmi:idref="_AC04995C-2003-11DF-8000-000C2916C803"/>
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>PICML_default_xme_file.ComponentImplementations.NewComponentImplementationContainer.ComponentAssembly.Sender:click_out::PICML_default_xme_file.ComponentImplementations.NewComponentImplementationContainer.ComponentAssembly.Receiver:click_in</name>
-    <internalEndpoint>
-      <portName>click_out</portName>
-      <provider>false</provider>
-      <kind>EventPublisher</kind>
-      <instance xmi:idref="_AC04995C-2003-11DF-8000-000C2916C803"/>
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>click_in</portName>
-      <provider>true</provider>
-      <kind>EventConsumer</kind>
-      <instance xmi:idref="_A7F51814-2003-11DF-8000-000C2916C803"/>
-    </internalEndpoint>
-  </connection>
-
-  <artifact xmi:id="_5FFE7D8E-2003-11DF-B474-000C2916C803">
-    <name>PICML_default_xme_file.ImplementationArtifacts.Hello_ReceiverArtifacts.Hello_Receiver_svnt</name>
-    <source/>
-    <node/>
-    <location>Hello_Receiver_svnt</location>
-  </artifact>
-
-  <artifact xmi:id="_5FFE7D8E-2003-11DF-B475-000C2916C803">
-    <name>PICML_default_xme_file.ImplementationArtifacts.Hello_ReceiverArtifacts.Hello_Receiver_exec</name>
-    <source/>
-    <node/>
-    <location>Hello_Receiver_exec</location>
-  </artifact>
-
-  <artifact xmi:id="_5FFE7D8E-2003-11DF-B476-000C2916C803">
-    <name>PICML_default_xme_file.ImplementationArtifacts.Hello_SenderArtifacts.Hello_Sender_svnt</name>
-    <source/>
-    <node/>
-    <location>Hello_Sender_svnt</location>
-  </artifact>
-
-  <artifact xmi:id="_5FFE7D8E-2003-11DF-B477-000C2916C803">
-    <name>PICML_default_xme_file.ImplementationArtifacts.Hello_SenderArtifacts.Hello_Sender_exec</name>
-    <source/>
-    <node/>
-    <location>Hello_Sender_exec</location>
-  </artifact>
-
-  <localityConstraint>
-    <constraint>SameProcess</constraint>
-    <constrainedInstance xmi:idref="_A7F51814-2003-11DF-8000-000C2916C803"/>
-    <constrainedInstance xmi:idref="_AC04995C-2003-11DF-8000-000C2916C803"/>
-  </localityConstraint>
-
-</Deployment:DeploymentPlan>
diff --git a/CIAO/examples/Hello/descriptors/run_test.pl b/CIAO/examples/Hello/descriptors/run_test.pl
index b039e2b056f..be24cb081f9 100755
--- a/CIAO/examples/Hello/descriptors/run_test.pl
+++ b/CIAO/examples/Hello/descriptors/run_test.pl
@@ -107,8 +107,6 @@ sub kill_open_processes {
         $NS->Kill ();
         $NS->TimedWait (1);
     }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
 }
 
 sub run_node_daemons {
diff --git a/CIAO/examples/Hello/descriptors/run_test_PlanLocality_DifferentProcesses.pl b/CIAO/examples/Hello/descriptors/run_test_PlanLocality_DifferentProcesses.pl
deleted file mode 100755
index aee24442fc6..00000000000
--- a/CIAO/examples/Hello/descriptors/run_test_PlanLocality_DifferentProcesses.pl
+++ /dev/null
@@ -1,200 +0,0 @@
-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'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-
-$daemons = 1;
-@ports = ( 60001 );
-@iorbases = ( "NodeApp1.ior" );
-@iorfiles = 0;
-@nodenames = ( "NodeOne" );
-
-$status = 0;
-$dat_file = "NodeMap.dat";
-$cdp_file = "PlanLocality_DifferentProcesses.cdp";
-
-$controller_exec = "$CIAO_ROOT/examples/Hello/Sender/starter";
-
-# ior files other than daemon
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$ENV{"DANCE_TRACE_ENABLE"} = 0;
-$ENV{"CIAO_TRACE_ENABLE"} = 0;
-
-sub create_targets {
-    #   daemon
-    for ($i = 0; $i < $daemons; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for deamon $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_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $daemons; ++$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 < $daemons; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $daemons; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemons {
-    for ($i = 0; $i < $daemons; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemons ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill ();
-        $EM->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
-}
-
-
-sub run_node_daemons {
-    for ($i = 0; $i < $daemons; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30";
-
-        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 node daemons.
-print "Invoking node daemons\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemons\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 --node-map $dat_file");
-$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;
-}
-
-$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");
-$E->SpawnWaitKill (2*$tg_executor->ProcessStartWaitInterval ());
-
-for ($i = 0; $i < $$daemons; ++$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 "Invoking the controller ($controller_exec -k file://Sender.ior)\n";
-$CTRL = $tg_executor->CreateProcess ("$controller_exec", "-k file://Sender.ior");
-$result = $CTRL->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($result != 0) {
-    print STDERR "ERROR: The controller returned $result\n";
-    $status = 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 -q\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -q");
-$E->SpawnWaitKill ($tg_executor->ProcessStopWaitInterval ());
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/examples/Hello/descriptors/run_test_PlanLocality_SameProcess.pl b/CIAO/examples/Hello/descriptors/run_test_PlanLocality_SameProcess.pl
deleted file mode 100755
index 38652fafbcb..00000000000
--- a/CIAO/examples/Hello/descriptors/run_test_PlanLocality_SameProcess.pl
+++ /dev/null
@@ -1,200 +0,0 @@
-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'}";
-$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
-
-$daemons_running = 0;
-$em_running = 0;
-
-$daemons = 1;
-@ports = ( 60001);
-@iorbases = ( "NodeApp1.ior" );
-@iorfiles = 0;
-@nodenames = ( "NodeOne" );
-
-$status = 0;
-$dat_file = "NodeMap.dat";
-$cdp_file = "PlanLocality_SameProcess.cdp";
-
-$controller_exec = "$CIAO_ROOT/examples/Hello/Sender/starter";
-
-# ior files other than daemon
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$ENV{"DANCE_TRACE_ENABLE"} = 0;
-$ENV{"CIAO_TRACE_ENABLE"} = 0;
-
-sub create_targets {
-    #   daemon
-    for ($i = 0; $i < $daemons; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for deamon $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_emfile = $tg_exe_man->LocalFile ($ior_embase);
-    for ($i = 0; $i < $daemons; ++$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 < $daemons; ++$i) {
-        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
-    }
-    $tg_exe_man->DeleteFile ($ior_embase);
-    for ($i = 0; $i < $daemons; ++$i) {
-        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
-    }
-}
-
-sub kill_node_daemons {
-    for ($i = 0; $i < $daemons; ++$i) {
-        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
-    }
-}
-
-sub kill_open_processes {
-    if ($daemons_running == 1) {
-        kill_node_daemons ();
-    }
-
-    if ($em_running == 1) {
-        $EM->Kill ();
-        $EM->TimedWait (1);
-    }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
-}
-
-
-sub run_node_daemons {
-    for ($i = 0; $i < $daemons; ++$i) {
-        $iorbase = $iorbases[$i];
-        $iorfile = $iorfiles[$i];
-        $port = $ports[$i];
-        $nodename = $nodenames[$i];
-        $iiop = "iiop://localhost:$port";
-        $node_app = "$CIAO_ROOT/bin/ciao_componentserver";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30";
-
-        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 node daemons.
-print "Invoking node daemons\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-    print STDERR "ERROR: Unable to execute the node daemons\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 --node-map $dat_file");
-$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;
-}
-
-$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");
-$E->SpawnWaitKill (2*$tg_executor->ProcessStartWaitInterval ());
-
-for ($i = 0; $i < $$daemons; ++$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 "Invoking the controller ($controller_exec -k file://Sender.ior)\n";
-$CTRL = $tg_executor->CreateProcess ("$controller_exec", "-k file://Sender.ior");
-$result = $CTRL->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
-
-if ($result != 0) {
-    print STDERR "ERROR: The controller returned $result\n";
-    $status = 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 -q\n";
-
-$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                        "-k file://$ior_emfile -x $cdp_file -q");
-$E->SpawnWaitKill ($tg_executor->ProcessStopWaitInterval ());
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/examples/Hello/descriptors/run_test_alias.pl b/CIAO/examples/Hello/descriptors/run_test_alias.pl
index c746f4d80b0..99ba23c1068 100755
--- a/CIAO/examples/Hello/descriptors/run_test_alias.pl
+++ b/CIAO/examples/Hello/descriptors/run_test_alias.pl
@@ -107,8 +107,6 @@ sub kill_open_processes {
         $NS->Kill ();
         $NS->TimedWait (1);
     }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
 }
 
 sub run_node_daemons {
diff --git a/CIAO/examples/Hello/descriptors/run_test_without_ns.pl b/CIAO/examples/Hello/descriptors/run_test_without_ns.pl
index 9428f0be8a0..5c8c934a169 100755
--- a/CIAO/examples/Hello/descriptors/run_test_without_ns.pl
+++ b/CIAO/examples/Hello/descriptors/run_test_without_ns.pl
@@ -91,8 +91,6 @@ sub kill_open_processes {
         $EM->Kill ();
         $EM->TimedWait (1);
     }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
 }
 
 
diff --git a/CIAO/examples/Null_Component/Null_Component.idl b/CIAO/examples/Null_Component/Null_Component.idl
index 860be1694e5..55d0b2bcc99 100644
--- a/CIAO/examples/Null_Component/Null_Component.idl
+++ b/CIAO/examples/Null_Component/Null_Component.idl
@@ -1,7 +1,7 @@
 /**
  * @file Null_Component.idl
  *
- * @author Abdul Sowayan <sowayan@gmail.com>
+ * @author Abdul Sowayan <abdullah.sowayan@lmco.com>
  *
  * $Id$
  */
diff --git a/CIAO/examples/Null_Component/Null_Interface.idl b/CIAO/examples/Null_Component/Null_Interface.idl
index fa67b9b3a10..cd92867c118 100644
--- a/CIAO/examples/Null_Component/Null_Interface.idl
+++ b/CIAO/examples/Null_Component/Null_Interface.idl
@@ -1,7 +1,7 @@
 /**
  * @file Null_Interface.idl
  *
- * @author Abdul Sowayan <sowayan@gmail.com>
+ * @author Abdul Sowayan <abdullah.sowayan@lmco.com>
  *
  * $Id$
  */
diff --git a/CIAO/examples/Null_Component/descriptors/NodeMap.dat b/CIAO/examples/Null_Component/descriptors/NodeMap.dat
index 56c6058252e..51d8967c561 100644
--- a/CIAO/examples/Null_Component/descriptors/NodeMap.dat
+++ b/CIAO/examples/Null_Component/descriptors/NodeMap.dat
@@ -1 +1 @@
-NodeOne corbaloc:iiop:localhost:60001/NodeOne.NodeManager
+NodeOne corbaloc:iiop:localhost:10000/NodeManager
\ No newline at end of file
diff --git a/CIAO/examples/Null_Component/descriptors/Null_PlanLocality_DifferentProcesses.cdp b/CIAO/examples/Null_Component/descriptors/Null_PlanLocality_DifferentProcesses.cdp
deleted file mode 100755
index c6d36a934d8..00000000000
--- a/CIAO/examples/Null_Component/descriptors/Null_PlanLocality_DifferentProcesses.cdp
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<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>BFD86926-1FF5-11DF-8000-000C2916C803</UUID>
-
-  <implementation xmi:id="_1E394022-1FF5-11DF-B471-000C2916C803">
-    <name>PICML_default_xme_file.ComponentImplementations.Null_ComponentImpl.Null_ComponentImpl</name>
-    <source/>
-    <artifact xmi:idref="_1E394022-1FF5-11DF-B472-000C2916C803"/>
-    <artifact xmi:idref="_1E394022-1FF5-11DF-B473-000C2916C803"/>
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Null_Component_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PICML_default_xme_file.ImplementationArtifacts.Null_ComponentArtifacts.Null_Component_exec</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Null_Component_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PICML_default_xme_file.ImplementationArtifacts.Null_ComponentArtifacts.Null_Component_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="_8C8C50BE-1FF5-11DF-8000-000C2916C803">
-    <name>PICML_default_xme_file.ComponentImplementations.NewComponentImplementationContainer.ComponentAssembly.Null_Component2</name>
-    <node>NodeOne</node>
-    <source/>
-    <implementation xmi:idref="_1E394022-1FF5-11DF-B471-000C2916C803"/>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Null_ComponentImpl.ior</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="_90F40908-1FF5-11DF-8000-000C2916C803">
-    <name>PICML_default_xme_file.ComponentImplementations.NewComponentImplementationContainer.ComponentAssembly.Null_Component1</name>
-    <node>NodeOne</node>
-    <source/>
-    <implementation xmi:idref="_1E394022-1FF5-11DF-B471-000C2916C803"/>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Null_ComponentImpl.ior</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <artifact xmi:id="_1E394022-1FF5-11DF-B472-000C2916C803">
-    <name>PICML_default_xme_file.ImplementationArtifacts.Null_ComponentArtifacts.Null_Component_svnt</name>
-    <source/>
-    <node/>
-    <location>Null_Component_svnt</location>
-  </artifact>
-
-  <artifact xmi:id="_1E394022-1FF5-11DF-B473-000C2916C803">
-    <name>PICML_default_xme_file.ImplementationArtifacts.Null_ComponentArtifacts.Null_Component_exec</name>
-    <source/>
-    <node/>
-    <location>Null_Component_exec</location>
-  </artifact>
-
-  <localityConstraint>
-    <constraint>SameProcess</constraint>
-    <constrainedInstance xmi:idref="_90F40908-1FF5-11DF-8000-000C2916C803"/>
-  </localityConstraint>
-
-  <localityConstraint>
-    <constraint>SameProcess</constraint>
-    <constrainedInstance xmi:idref="_8C8C50BE-1FF5-11DF-8000-000C2916C803"/>
-  </localityConstraint>
-
-</Deployment:DeploymentPlan>
diff --git a/CIAO/examples/Null_Component/descriptors/Null_PlanLocality_SameProcess.cdp b/CIAO/examples/Null_Component/descriptors/Null_PlanLocality_SameProcess.cdp
deleted file mode 100755
index adf21eb76c8..00000000000
--- a/CIAO/examples/Null_Component/descriptors/Null_PlanLocality_SameProcess.cdp
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<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>BFD86926-1FF5-11DF-8000-000C2916C803</UUID>
-
-  <implementation xmi:id="_1E394022-1FF5-11DF-B471-000C2916C803">
-    <name>PICML_default_xme_file.ComponentImplementations.Null_ComponentImpl.Null_ComponentImpl</name>
-    <source/>
-    <artifact xmi:idref="_1E394022-1FF5-11DF-B472-000C2916C803"/>
-    <artifact xmi:idref="_1E394022-1FF5-11DF-B473-000C2916C803"/>
-    <execParameter>
-      <name>component factory</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Null_Component_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PICML_default_xme_file.ImplementationArtifacts.Null_ComponentArtifacts.Null_Component_exec</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Null_Component_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-    <execParameter>
-      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>PICML_default_xme_file.ImplementationArtifacts.Null_ComponentArtifacts.Null_Component_svnt</string>
-        </value>
-      </value>
-    </execParameter>
-  </implementation>
-
-  <instance xmi:id="_8C8C50BE-1FF5-11DF-8000-000C2916C803">
-    <name>PICML_default_xme_file.ComponentImplementations.NewComponentImplementationContainer.ComponentAssembly.Null_Component2</name>
-    <node>NodeOne</node>
-    <source/>
-    <implementation xmi:idref="_1E394022-1FF5-11DF-B471-000C2916C803"/>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Null_ComponentImpl.ior</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance xmi:id="_90F40908-1FF5-11DF-8000-000C2916C803">
-    <name>PICML_default_xme_file.ComponentImplementations.NewComponentImplementationContainer.ComponentAssembly.Null_Component1</name>
-    <node>NodeOne</node>
-    <source/>
-    <implementation xmi:idref="_1E394022-1FF5-11DF-B471-000C2916C803"/>
-    <configProperty>
-      <name>edu.vanderbilt.dre.DAnCE.InstanceIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Null_ComponentImpl.ior</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <artifact xmi:id="_1E394022-1FF5-11DF-B472-000C2916C803">
-    <name>PICML_default_xme_file.ImplementationArtifacts.Null_ComponentArtifacts.Null_Component_svnt</name>
-    <source/>
-    <node/>
-    <location>Null_Component_svnt</location>
-  </artifact>
-
-  <artifact xmi:id="_1E394022-1FF5-11DF-B473-000C2916C803">
-    <name>PICML_default_xme_file.ImplementationArtifacts.Null_ComponentArtifacts.Null_Component_exec</name>
-    <source/>
-    <node/>
-    <location>Null_Component_exec</location>
-  </artifact>
-
-  <localityConstraint>
-    <constraint>SameProcess</constraint>
-    <constrainedInstance xmi:idref="_90F40908-1FF5-11DF-8000-000C2916C803"/>
-    <constrainedInstance xmi:idref="_8C8C50BE-1FF5-11DF-8000-000C2916C803"/>
-  </localityConstraint>
-
-</Deployment:DeploymentPlan>
diff --git a/CIAO/examples/Null_Component/descriptors/run_test.pl b/CIAO/examples/Null_Component/descriptors/run_test.pl
index 4dbec45bc99..944dff4a533 100755
--- a/CIAO/examples/Null_Component/descriptors/run_test.pl
+++ b/CIAO/examples/Null_Component/descriptors/run_test.pl
@@ -101,9 +101,6 @@ sub kill_open_processes {
     if ($ns_running == 1) {
         $NS->Kill (); $NS->TimedWait (1);
     }
-
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
 }
 
 
diff --git a/CIAO/examples/Null_Component/descriptors/run_test_without_ns.pl b/CIAO/examples/Null_Component/descriptors/run_test_without_ns.pl
deleted file mode 100755
index 8c7f52d70eb..00000000000
--- a/CIAO/examples/Null_Component/descriptors/run_test_without_ns.pl
+++ /dev/null
@@ -1,196 +0,0 @@
-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 = 1;
-@ports = ( 60001 );
-@iorbases = ( "NodeApp1.ior" );
-@iorfiles = 0;
-@nodenames = ( "NodeOne" );
-
-$dat_file = "NodeMap.dat";
-
-# ior files other than daemon
-$ior_embase = "EM.ior";
-$ior_emfile = 0;
-
-#  Processes
-$E = 0;
-$EM = 0;
-$NS = 0;
-@DEAMONS = 0;
-
-# targets
-@tg_daemons = 0;
-$tg_exe_man = 0;
-$tg_executor = 0;
-
-$status = 0;
-
-$ENV{"DANCE_TRACE_ENABLE"} = 0;
-$ENV{"CIAO_TRACE_ENABLE"} = 0;
-
-sub create_targets {
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for deamon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('..');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('..');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('..');
-}
-
-sub init_ior_files {
-    $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_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);
-    }
-
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
-}
-
-
-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 = "$CIAO_ROOT/bin/ciao_componentserver";
-
-        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
-        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30";
-
-        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 "Starting test for deployment $file\n";
-
-    # Invoke node daemon.
-    print "Invoking node daemon\n";
-    $status = run_node_daemons ();
-
-    if ($status != 0) {
-        print STDERR "ERROR: Unable to execute the node daemons\n";
-        kill_open_processes ();
-        exit 1;
-    }
-
-    $daemons_running = 1;
-
-    # Invoke execution manager.
-    print "Invoking execution manager\n";
-    $EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile  --node-map $dat_file");
-    $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;
-    }
-
-    $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");
-    $E->SpawnWaitKill (2*$tg_executor->ProcessStartWaitInterval ());
-
-    # Invoke executor - stop the application -.
-    print "Invoking executor - stop the application -\n";
-    $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                            "-k file://$ior_emfile -x $file -q");
-    $E->SpawnWaitKill ($tg_executor->ProcessStopWaitInterval ());
-
-    print "Executor returned.\n";
-
-    delete_ior_files ();
-    kill_open_processes ();
-}
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/examples/Null_Component_Glfa/Null_Component.idl b/CIAO/examples/Null_Component_Glfa/Null_Component.idl
deleted file mode 100644
index ffe48e9e91a..00000000000
--- a/CIAO/examples/Null_Component_Glfa/Null_Component.idl
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * @file Null_Component.idl
- *
- * @author Abdul Sowayan <sowayan@gmail.com>
- *
- * $Id$
- */
-
-#ifndef NULL_COMPONENT_IDL
-#define NULL_COMPONENT_IDL
-
-#include <Components.idl>
-#include "Null_Interface.idl"
-
-/**
- * @class Null_Component
- *
- * This component is intentionally left blank. Its purpose
- * is to measure the footprint of a component in CIAO.
- */
-component Null_Component
-{
-  provides Null_Interface null_facet;
-};
-
-/**
- * @class Null_Component_Home
- *
- * @brief home for Null_Component
- */
-home Null_ComponentHome manages Null_Component
-{
-};
-
-#endif /* NULL_COMPONENT_IDL */
-
diff --git a/CIAO/examples/Null_Component_Glfa/Null_Component.mpc b/CIAO/examples/Null_Component_Glfa/Null_Component.mpc
deleted file mode 100644
index 636a4cec468..00000000000
--- a/CIAO/examples/Null_Component_Glfa/Null_Component.mpc
+++ /dev/null
@@ -1,112 +0,0 @@
-// $Id$
-// This file is generated with "generate_component_mpc.pl -p Null_Interface Null_Component"
-
-project(Null_Component_Glfa_idl_gen) : componentidldefaults {
-  custom_only = 1
-  idlflags += -Glfa
-  idlflags += -Wb,stub_export_macro=NULL_COMPONENT_STUB_Export \
-              -Wb,stub_export_include=Null_Component_stub_export.h \
-              -Wb,skel_export_macro=NULL_COMPONENT_SVNT_Export \
-              -Wb,skel_export_include=Null_Component_svnt_export.h \
-              -Wb,exec_export_macro=NULL_COMPONENT_EXEC_Export \
-              -Wb,exec_export_include=Null_Component_exec_export.h \
-              -Wb,svnt_export_macro=NULL_COMPONENT_SVNT_Export \
-              -Wb,svnt_export_include=Null_Component_svnt_export.h
-
-  IDL_Files {
-    Null_Component.idl
-  }
-}
-
-project(Null_Component_Glfa_lem_gen) : ciaoidldefaults {
-  custom_only = 1
-  after += Null_Component_Glfa_idl_gen
-  idlflags += -Wb,export_macro=NULL_COMPONENT_EXEC_Export \
-              -Wb,export_include=Null_Component_exec_export.h \
-              -SS
-
-  IDL_Files {
-    Null_ComponentE.idl
-  }
-}
-
-project(Null_Component_Glfa_stub) : ccm_stub {
-  after += Null_Component_Glfa_idl_gen Null_Interface_Glfa_stub
-  libs  += Null_Interface_stub
-
-  sharedname = Null_Component_stub
-  dynamicflags   = NULL_COMPONENT_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Null_ComponentC.cpp
-  }
-
-  Header_Files {
-    Null_ComponentC.h
-    Null_Component_stub_export.h
-  }
-
-  Inline_Files {
-    Null_ComponentC.inl
-  }
-}
-
-project(Null_Component_Glfa_exec) : ciao_executor {
-  after   += Null_Component_Glfa_lem_gen Null_Component_Glfa_stub
-  sharedname = Null_Component_exec
-  libs += Null_Component_stub Null_Interface_stub
-
-  dynamicflags   = NULL_COMPONENT_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Null_ComponentEC.cpp
-    Null_Component_exec.cpp
-  }
-
-  Header_Files {
-    Null_ComponentEC.h
-    Null_Component_exec.h
-    Null_Component_exec_export.h
-  }
-
-  Inline_Files {
-    Null_ComponentEC.inl
-  }
-}
-
-project(Null_Component_Glfa_svnt) : ciao_servant {
-  after      += Null_Interface_Glfa_skel Null_Component_Glfa_exec
-  sharedname  = Null_Component_svnt
-  libs       += Null_Component_exec \
-                Null_Component_stub \
-                Null_Interface_skel \
-                Null_Interface_stub
-
-  dynamicflags = NULL_COMPONENT_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Null_ComponentS.cpp
-    Null_Component_svnt.cpp
-  }
-
-  Header_Files {
-    Null_ComponentS.h
-    Null_Component_svnt.h
-    Null_Component_svnt_export.h
-  }
-
-  Inline_Files {
-    Null_ComponentS.inl
-  }
-}
-
-
diff --git a/CIAO/examples/Null_Component_Glfa/Null_Component_exec.cpp b/CIAO/examples/Null_Component_Glfa/Null_Component_exec.cpp
deleted file mode 100644
index d9eff1f8476..00000000000
--- a/CIAO/examples/Null_Component_Glfa/Null_Component_exec.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-// $Id$
-
-#include "Null_Component_exec.h"
-
-namespace CIAO_Null_Component_Impl
-{
-  //==================================================================
-  // Facet Executor Implementation Class:   Null_Interface_exec_i
-  //==================================================================
-
-  Null_Interface_exec_i::Null_Interface_exec_i (void)
-  {
-  }
-
-  Null_Interface_exec_i::~Null_Interface_exec_i (void)
-  {
-  }
-
-  // Operations from ::Null_Interface
-
-  void
-  Null_Interface_exec_i::null_operation ()
-  {
-    // Your code here.
-  }
-
-  //==================================================================
-  // Component Executor Implementation Class:   Null_Component_exec_i
-  //==================================================================
-
-  Null_Component_exec_i::Null_Component_exec_i (void)
-  {
-  }
-
-  Null_Component_exec_i::~Null_Component_exec_i (void)
-  {
-  }
-
-  // Supported or inherited operations.
-
-  // Attribute operations.
-
-  // Port operations.
-
-  ::CCM_Null_Interface_ptr
-  Null_Component_exec_i::get_null_facet ()
-  {
-    // Your code here.
-    return ::CCM_Null_Interface::_nil ();
-  }
-
-  // Operations from Components::SessionComponent
-
-  void
-  Null_Component_exec_i::set_session_context (
-    ::Components::SessionContext_ptr ctx)
-  {
-    this->context_ =
-      ::CCM_Null_Component_Context::_narrow (ctx);
-
-    if (CORBA::is_nil (this->context_.in ()))
-    {
-      throw ::CORBA::INTERNAL ();
-    }
-  }
-
-  void
-  Null_Component_exec_i::configuration_complete ()
-  {
-    // Your code here.
-  }
-
-  void
-  Null_Component_exec_i::ccm_activate ()
-  {
-    // Your code here.
-  }
-
-  void
-  Null_Component_exec_i::ccm_passivate ()
-  {
-    // Your code here.
-  }
-
-  void
-  Null_Component_exec_i::ccm_remove ()
-  {
-    // Your code here.
-  }
-
-  extern "C" NULL_COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Null_Component_Impl (void)
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_RETURN (
-      retval,
-      Null_Component_exec_i,
-      ::Components::EnterpriseComponent::_nil ());
-
-    return retval;
-  }
-
-  //==================================================================
-  // Home Executor Implementation Class:   Null_ComponentHome_exec_i
-  //==================================================================
-
-  Null_ComponentHome_exec_i::Null_ComponentHome_exec_i (void)
-  {
-  }
-
-  Null_ComponentHome_exec_i::~Null_ComponentHome_exec_i (void)
-  {
-  }
-
-  // Supported or inherited operations.
-
-  // Home operations.
-
-  // Factory and finder operations.
-
-  // Attribute operations.
-
-  // Implicit operations.
-
-  ::Components::EnterpriseComponent_ptr
-  Null_ComponentHome_exec_i::create ()
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-      ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_THROW_EX (
-      retval,
-      Null_Component_exec_i,
-      ::CORBA::NO_MEMORY ());
-
-    return retval;
-  }
-
-  extern "C" NULL_COMPONENT_EXEC_Export ::Components::HomeExecutorBase_ptr
-  create_Null_ComponentHome_Impl (void)
-  {
-    ::Components::HomeExecutorBase_ptr retval =
-      ::Components::HomeExecutorBase::_nil ();
-
-    ACE_NEW_RETURN (
-      retval,
-      Null_ComponentHome_exec_i,
-      ::Components::HomeExecutorBase::_nil ());
-
-    return retval;
-  }
-}
-
diff --git a/CIAO/examples/Null_Component_Glfa/Null_Component_exec.h b/CIAO/examples/Null_Component_Glfa/Null_Component_exec.h
deleted file mode 100644
index 277e7b28e69..00000000000
--- a/CIAO/examples/Null_Component_Glfa/Null_Component_exec.h
+++ /dev/null
@@ -1,100 +0,0 @@
-// $Id$
-
-#ifndef CIAO_NULL_COMPONENT_EXEC_H
-#define CIAO_NULL_COMPONENT_EXEC_H
-
-#include /**/ "ace/pre.h"
-
-#include "Null_ComponentEC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "Null_Component_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO_Null_Component_Impl
-{
-  class NULL_COMPONENT_EXEC_Export Null_Interface_exec_i
-    : public virtual ::CCM_Null_Interface,
-      public virtual ::CORBA::LocalObject
-  {
-    public:
-    Null_Interface_exec_i (void);
-    virtual ~Null_Interface_exec_i (void);
-
-    // Operations from ::Null_Interface
-
-    virtual void
-    null_operation ();
-  };
-
-  class NULL_COMPONENT_EXEC_Export Null_Component_exec_i
-    : public virtual Null_Component_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-    public:
-    Null_Component_exec_i (void);
-    virtual ~Null_Component_exec_i (void);
-
-    // Supported or inherited operations.
-
-    // Attribute operations.
-
-    // Port operations.
-
-    virtual ::CCM_Null_Interface_ptr
-    get_null_facet ();
-
-    // Operations from Components::SessionComponent
-
-    virtual void
-    set_session_context (
-      ::Components::SessionContext_ptr ctx);
-
-    virtual void configuration_complete ();
-
-    virtual void ccm_activate ();
-
-    virtual void ccm_passivate ();
-
-    virtual void ccm_remove ();
-
-    private:
-    ::CCM_Null_Component_Context_var context_;
-  };
-
-  extern "C" NULL_COMPONENT_EXEC_Export ::Components::EnterpriseComponent_ptr
-  create_Null_Component_Impl (void);
-
-  class NULL_COMPONENT_EXEC_Export Null_ComponentHome_exec_i
-    : public virtual Null_ComponentHome_Exec,
-      public virtual ::CORBA::LocalObject
-  {
-    public:
-    Null_ComponentHome_exec_i (void);
-    virtual ~Null_ComponentHome_exec_i (void);
-
-    // Supported or inherited operations.
-
-    // Home operations.
-
-    // Factory and finder operations.
-
-    // Attribute operations.
-
-    // Implicit operations.
-
-    virtual ::Components::EnterpriseComponent_ptr
-    create ();
-  };
-
-  extern "C" NULL_COMPONENT_EXEC_Export ::Components::HomeExecutorBase_ptr
-  create_Null_ComponentHome_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* CIAO_NULL_COMPONENT_EXEC_H */
-
diff --git a/CIAO/examples/Null_Component_Glfa/Null_Interface.idl b/CIAO/examples/Null_Component_Glfa/Null_Interface.idl
deleted file mode 100644
index 1d1ae6f27c2..00000000000
--- a/CIAO/examples/Null_Component_Glfa/Null_Interface.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * @file Null_Interface.idl
- *
- * @author Abdul Sowayan <sowayan@gmail.com>
- *
- * $Id$
- */
-
-#ifndef NULL_INTERFACE_IDL
-#define NULL_INTERFACE_IDL
-
-/**
- * @interface Null_Interface
- *
- * @brief
- */
-interface Null_Interface
-{
-  void null_operation();
-};
-
-#endif /* NULL_INTERFACE_IDL */
-
diff --git a/CIAO/examples/Null_Component_Glfa/Null_Interface.mpc b/CIAO/examples/Null_Component_Glfa/Null_Interface.mpc
deleted file mode 100644
index eba4706c3d4..00000000000
--- a/CIAO/examples/Null_Component_Glfa/Null_Interface.mpc
+++ /dev/null
@@ -1,68 +0,0 @@
-// $Id$
-// This file is generated with "generate_component_mpc.pl -n Null_Interface"
-
-project(Null_Interface_Glfa_idl_gen) : componentidldefaults {
-  custom_only = 1
-  idlflags -= -Glem -Gxhex
-
-  idlflags += -Wb,stub_export_macro=NULL_INTERFACE_STUB_Export \
-              -Wb,stub_export_include=Null_Interface_stub_export.h \
-              -Wb,skel_export_macro=NULL_INTERFACE_SKEL_Export \
-              -Wb,skel_export_include=Null_Interface_skel_export.h
-
-  IDL_Files {
-    Null_Interface.idl
-  }
-}
-
-project(Null_Interface_Glfa_stub) : ccm_stub {
-  after += Null_Interface_Glfa_idl_gen
-  libs  +=
-
-  sharedname = Null_Interface_stub
-  dynamicflags   = NULL_INTERFACE_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Null_InterfaceC.cpp
-  }
-
-  Header_Files {
-    Null_InterfaceC.h
-    Null_Interface_stub_export.h
-  }
-
-  Inline_Files {
-    Null_InterfaceC.inl
-  }
-}
-
-
-project(Null_Interface_Glfa_skel) : ciao_executor {
-  after      += Null_Interface_Glfa_stub
-  sharedname  = Null_Interface_skel
-  libs       += Null_Interface_stub
-
-
-  dynamicflags = NULL_INTERFACE_SKEL_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Null_InterfaceS.cpp
-  }
-
-  Header_Files {
-    Null_InterfaceS.h
-    Null_Interface_skel_export.h
-  }
-
-  Inline_Files {
-    Null_InterfaceS.inl
-  }
-}
-
-
diff --git a/CIAO/examples/Null_Component_Glfa/descriptors/NodeMap.dat b/CIAO/examples/Null_Component_Glfa/descriptors/NodeMap.dat
deleted file mode 100644
index c9e08ab3058..00000000000
--- a/CIAO/examples/Null_Component_Glfa/descriptors/NodeMap.dat
+++ /dev/null
@@ -1 +0,0 @@
-NodeOne corbaloc:iiop:localhost:10000/NodeOne.NodeManager
diff --git a/CIAO/examples/Null_Component_Glfa/descriptors/Null_Homed.cdp b/CIAO/examples/Null_Component_Glfa/descriptors/Null_Homed.cdp
deleted file mode 100644
index 2332e2d346e..00000000000
--- a/CIAO/examples/Null_Component_Glfa/descriptors/Null_Homed.cdp
+++ /dev/null
@@ -1,109 +0,0 @@
-<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">
-  <label>Null_Homed</label>
-  <UUID>Null_Homed</UUID>
-<implementation xmi:id="Null_ComponentHomeImplementation">
-  <name>Null_ComponentHomeImplementation</name>
-  <source/>
-  <artifact xmi:idref="Null_Component_ExecArtifact" />
-  <artifact xmi:idref="Null_Component_SvntArtifact" />
-  <execParameter>
-    <!-- entrypoint as exec parameter (see 10.6.1) -->
-    <name>home factory</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>create_Null_ComponentHome_Impl</string>
-      </value>
-    </value>
-  </execParameter>
-  <execParameter>
-    <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>create_Null_ComponentHome_Servant</string>
-      </value>
-    </value>
-  </execParameter>
-  <execParameter>
-    <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>Null_Component_svnt</string>
-      </value>
-    </value>
-  </execParameter>
-  <execParameter>
-    <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>Null_Component_exec</string>
-      </value>
-    </value>
-  </execParameter>
-</implementation>
-<implementation xmi:id="Null_ComponentComponentImplementation">
-  <name>Null_ComponentComponentImplementation</name>
-  <source/>
-  <artifact xmi:idref="Null_Component_ExecArtifact" />
-  <artifact xmi:idref="Null_Component_SvntArtifact" />
-  <artifact xmi:idref="Null_Component_StubArtifact" />
-</implementation>    
-  <instance xmi:id="Null_ComponentHomeInstance">
-  <name>Null_ComponentHome</name>
-  <node>NodeOne</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Null_ComponentHomeImplementation" />
-</instance>
-  <instance xmi:id="Null_ComponentComponentInstance">
-  <name>Null_ComponentComponent</name>
-  <node>NodeOne</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Null_ComponentComponentImplementation" />
-  <configProperty>
-    <name>edu.vanderbilt.dre.DAnCE.ExplicitHome</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>Null_ComponentHome</string>
-      </value>
-    </value>
-  </configProperty>
-</instance>
-  <artifact xmi:id="Null_Component_ExecArtifact">
-  <name>Null_Component_exec</name>
-  <source/>
-  <node/>
-  <location>Null_Component_exec</location>
-</artifact>
-<artifact xmi:id="Null_Component_SvntArtifact">
-  <name>Null_Component_svnt</name>
-  <source/>
-  <node/>
-  <location>Null_Component_svnt</location>
-</artifact>
-<artifact xmi:id="Null_Component_StubArtifact">
-  <name>Null_Component_stub</name>
-  <source/>
-  <node/>
-  <location>Null_Component_stub</location>
-</artifact>  
-</Deployment:DeploymentPlan>
\ No newline at end of file
diff --git a/CIAO/examples/Null_Component_Glfa/descriptors/Null_Unhomed.cdp b/CIAO/examples/Null_Component_Glfa/descriptors/Null_Unhomed.cdp
deleted file mode 100644
index c259d000b9e..00000000000
--- a/CIAO/examples/Null_Component_Glfa/descriptors/Null_Unhomed.cdp
+++ /dev/null
@@ -1,85 +0,0 @@
-<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">
-  <label>Null_Homed</label>
-  <UUID>Null_Homed</UUID>
-
-<implementation xmi:id="Null_ComponentComponentImplementation">
-  <name>Null_ComponentComponentImplementation</name>
-  <source/>
-  <artifact xmi:idref="Null_Component_ExecArtifact" />
-  <artifact xmi:idref="Null_Component_SvntArtifact" />
-  <execParameter>
-    <!-- entrypoint as exec parameter (see 10.6.1) -->
-    <name>component factory</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>create_Null_Component_Impl</string>
-      </value>
-    </value>
-  </execParameter>
-  <execParameter>
-    <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>create_Null_Component_Servant</string>
-      </value>
-    </value>
-  </execParameter>
-  <execParameter>
-    <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>Null_Component_svnt</string>
-      </value>
-    </value>
-  </execParameter>
-  <execParameter>
-    <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>Null_Component_exec</string>
-      </value>
-    </value>
-  </execParameter>
-</implementation>
-<instance xmi:id="Null_ComponentComponentInstance">
-  <name>Null_ComponentComponent</name>
-  <node>NodeOne</node>
-  <!-- hostname -->
-  <source/>
-  <implementation xmi:idref="Null_ComponentComponentImplementation" />
-</instance>
-  <artifact xmi:id="Null_Component_ExecArtifact">
-  <name>Null_Component_exec</name>
-  <source/>
-  <node/>
-  <location>Null_Component_exec</location>
-</artifact>
-<artifact xmi:id="Null_Component_SvntArtifact">
-  <name>Null_Component_svnt</name>
-  <source/>
-  <node/>
-  <location>Null_Component_svnt</location>
-</artifact>
-<artifact xmi:id="Null_Component_StubArtifact">
-  <name>Null_Component_stub</name>
-  <source/>
-  <node/>
-  <location>Null_Component_stub</location>
-</artifact>  
-</Deployment:DeploymentPlan>
\ No newline at end of file
diff --git a/CIAO/examples/Null_Component_Glfa/descriptors/run_test.pl b/CIAO/examples/Null_Component_Glfa/descriptors/run_test.pl
deleted file mode 100755
index 4dbec45bc99..00000000000
--- a/CIAO/examples/Null_Component_Glfa/descriptors/run_test.pl
+++ /dev/null
@@ -1,222 +0,0 @@
-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 = 1;
-@ports = ( 60001 );
-@iorbases = ( "NodeApp1.ior" );
-@iorfiles = 0;
-@nodenames = ( "NodeOne" );
-
-# 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;
-
-$ENV{"DANCE_TRACE_ENABLE"} = 0;
-$ENV{"CIAO_TRACE_ENABLE"} = 0;
-
-sub create_targets {
-    #   naming service
-    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
-    $tg_naming->AddLibPath ('..');
-    #   daemon
-    for ($i = 0; $i < $nr_daemon; ++$i) {
-        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for deamon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('..');
-    }
-    #   execution manager
-    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
-    $tg_exe_man->AddLibPath ('..');
-    #   executor (plan_launcher)
-    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
-    $tg_executor->AddLibPath ('..');
-}
-
-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 ('ciao_componentserver');
-}
-
-
-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 = "$CIAO_ROOT/bin/ciao_componentserver";
-
-        $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 --instance-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 "Starting test for deployment $file\n";
-
-    print STDERR "Starting Naming Service\n";
-
-    $NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", "-m 0 -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
-    $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;
-    }
-
-    $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 daemons\n";
-        kill_open_processes ();
-        exit 1;
-    }
-
-    $daemons_running = 1;
-
-    # Invoke execution manager.
-    print "Invoking execution manager\n";
-    $EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
-                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
-    $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;
-    }
-
-    $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");
-    $E->SpawnWaitKill (2*$tg_executor->ProcessStartWaitInterval ());
-
-    # Invoke executor - stop the application -.
-    print "Invoking executor - stop the application -\n";
-    $E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
-                            "-k file://$ior_emfile -x $file -q");
-    $E->SpawnWaitKill ($tg_executor->ProcessStopWaitInterval ());
-
-    print "Executor returned.\n";
-
-    delete_ior_files ();
-    kill_open_processes ();
-}
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/CIAO/tests/Bug_2130_Regression/descriptors/run_test.pl b/CIAO/tests/Bug_2130_Regression/descriptors/run_test.pl
index f5ba8f6b033..1b41f61bcea 100755
--- a/CIAO/tests/Bug_2130_Regression/descriptors/run_test.pl
+++ b/CIAO/tests/Bug_2130_Regression/descriptors/run_test.pl
@@ -88,8 +88,6 @@ sub kill_open_processes {
     if ($em_running == 1) {
         $EM->Kill (); $EM->TimedWait (1);
     }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
 }
 
 sub run_node_daemons {
diff --git a/CIAO/tests/Bug_3769_Regression/descriptors/run_test.pl b/CIAO/tests/Bug_3769_Regression/descriptors/run_test.pl
index 936165ab7b8..d6e69f00739 100644
--- a/CIAO/tests/Bug_3769_Regression/descriptors/run_test.pl
+++ b/CIAO/tests/Bug_3769_Regression/descriptors/run_test.pl
@@ -103,8 +103,6 @@ sub kill_open_processes {
     if ($ns_running == 1) {
         $NS->Kill (); $NS->TimedWait (1);
     }
-    # in case shutdown did not perform as expected
-    $tg_executor->KillAll ('ciao_componentserver');
 }
 
 sub run_node_daemons {
diff --git a/CIAO/tests/Bug_3832_Regression/run_test.pl b/CIAO/tests/Bug_3832_Regression/run_test.pl
deleted file mode 100755
index 087bf3ca8b9..00000000000
--- a/CIAO/tests/Bug_3832_Regression/run_test.pl
+++ /dev/null
@@ -1,59 +0,0 @@
-
-# $Id$
-
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-     & eval 'exec perl -S $0 $argv:q'
-     if 0;
-
-# -*- perl -*-
-
-use lib "$ENV{ACE_ROOT}/bin";
-use PerlACE::TestTarget;
-
-$status =0;
-
-my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
-
-# Generated code file names
-my $TestCaseC_i = "test.log";
-
-$server_TestCaseC_i = $server->LocalFile($TestCaseC_i);
-$server->DeleteFile($TestCaseC_i);
-
-$ENV {'CIAO_LOG_LEVEL'} = 10;
-$ENV {'CIAO_LOG_FILE'} = 'test.log';
-
-$SV = $server->CreateProcess ("../../bin/ciao_componentserver", "");
-
-$SV->Spawn ();
-
-if ($server->WaitForFileTimed ($TestCaseC_i,
-                               $server->ProcessStartWaitInterval()) == -1) {
-    print STDERR "ERROR: cannot find file <$server_TestCaseC_i\n";
-    $SV->Kill (); $SV->TimedWait (1);
-    exit 1;
-}
-
-$server_status = $SV->Kill ($server->ProcessStopWaitInterval());
-
-# Test for the presence of LM_ERROR
-$found = 0 ;
-open (I_FILE, "$server_TestCaseC_i") ;
-while( <I_FILE> ){
-   chomp ;
-   if( $_ =~ /LM_ERROR/ ){
-       $found = 1 ;
-       last ;
-   }
-}
-
-if( $found != 1 ){
-  print STDERR "ERROR: No logging found\n";
-  $status = 1 ;
-} else {
-  print STDERR "Found logging\n";
-}
-
-$server->DeleteFile($TestCaseC_i);
-
-exit $status;
diff --git a/CIAO/tests/IDL_Test/Double_Inherited_Component/Inherited_components.mpc b/CIAO/tests/IDL_Test/Double_Inherited_Component/Inherited_components.mpc
index 577994143a8..34803606813 100644
--- a/CIAO/tests/IDL_Test/Double_Inherited_Component/Inherited_components.mpc
+++ b/CIAO/tests/IDL_Test/Double_Inherited_Component/Inherited_components.mpc
@@ -28,7 +28,7 @@ project(Inherited_Components_lem_gen) : ciaoidldefaults {
   }
 }
 
-project(Inherited_Components_lem_stub) : ccm_svnt {
+project(Inherited_Components_lem_stub) : ccm_svnt, dds4ccm_base   {
   after += Inherited_Components_lem_gen Inherited_Components_stub
   libs  += ComponentC_stub
   sharedname = ComponentC_lem_stub
@@ -51,7 +51,7 @@ project(Inherited_Components_lem_stub) : ccm_svnt {
   }
 }
 
-project(Inherited_Components_stub) : ccm_stub {
+project(Inherited_Components_stub) : ccm_stub, dds4ccm_base   {
   after += Inherited_Components_idl_gen
   libs  +=
   sharedname = ComponentC_stub
@@ -74,7 +74,7 @@ project(Inherited_Components_stub) : ccm_stub {
   }
 }
 
-project(Inherited_Components_exec) : ciao_executor {
+project(Inherited_Components_exec) : ciao_executor, dds4ccm_base   {
   after   += Inherited_Components_lem_stub Inherited_Components_stub
   sharedname = ComponentC_exec
   libs += ComponentC_stub ComponentC_lem_stub
@@ -97,10 +97,11 @@ project(Inherited_Components_exec) : ciao_executor {
 }
 
 
-project(Inherited_Components_svnt) : ciao_servant {
-  after      += Inherited_Components_lem_stub
+project(Inherited_Components_svnt) : ciao_servant, dds4ccm_base, nddslib {
+  after      += Inherited_Components_lem_stub DDS4CCM_lem_stub DDS4CCM_skel
   sharedname  = ComponentC_svnt
-  libs       += ComponentC_stub ComponentC_lem_stub
+  libs       += ComponentC_stub ComponentC_lem_stub  \
+                DDS4CCM_lem_stub DDS4CCM_skel
   dynamicflags = INHERITED_COMPONENTS_SVNT_BUILD_DLL
 
   IDL_Files {
diff --git a/CIAO/tests/IDL_Test/Double_Inherited_Component/run_test.pl b/CIAO/tests/IDL_Test/Double_Inherited_Component/run_test.pl
index 28076d91e85..b6b21308dec 100755
--- a/CIAO/tests/IDL_Test/Double_Inherited_Component/run_test.pl
+++ b/CIAO/tests/IDL_Test/Double_Inherited_Component/run_test.pl
@@ -101,9 +101,6 @@ sub kill_open_processes {
     if ($ns_running == 1) {
         $NS->Kill (); $NS->TimedWait (1);
     }
-    
-    # in case the planlauncher wasn't able to shut everything down as supposed
-    $tg_executor->KillAll ('ciao_componentserver');
 }
 
 sub run_node_daemons {
diff --git a/CIAO/tests/IDL_Test/IDL3_Plus/KitchenSink.idl b/CIAO/tests/IDL_Test/IDL3_Plus/KitchenSink.idl
index 7fe1f478774..2207efedb4e 100644
--- a/CIAO/tests/IDL_Test/IDL3_Plus/KitchenSink.idl
+++ b/CIAO/tests/IDL_Test/IDL3_Plus/KitchenSink.idl
@@ -21,8 +21,6 @@ module mod
 interface iface
 {
   exception iface_excep {};
-
-  void iface_op (in string inarg);
 };
 
 typedef sequence<iface> ifaceSeq;
@@ -31,18 +29,6 @@ eventtype ev
 {
 };
 
-/*
-Jeff, this gives a redefinition of BarConsumer
-module orange
-{
-  module apple
-  {
-    eventtype Bar;
-    eventtype Bar;
-  };
-};
-*/
-
 module GlobalTyped<typename A, typename B>
 {
   typedef short x;
@@ -62,19 +48,6 @@ module A
     {
     };
 
-    union Nested_Union switch (y)
-    {
-      case 2: string strmem;
-      case 0: T Tmem;
-    };
-
-    enum Nested_Enum
-    {
-      ZERO,
-      ONE,
-      TWO
-    };
-
     // A regular module may be nested inside a template module,
     // but another template module may not.
     module GoodNested
@@ -155,8 +128,6 @@ module V
   };
 };
 
-module B::second_B<iface, ifaceSeq> second_B_Inst;
-
 module Ast<typename T,
            eventtype E,
            exception S,
@@ -166,26 +137,15 @@ module Ast<typename T,
 {
   interface Foo : T
   {
-    attribute T Foo_Attr getraises (S);
+    attribute T Foo_Attr;
 
-    void Foo_Op (inout long inoutarg,
-                 in T inarg,
-                 out T outarg,
-                 in TSeq seq_inarg)
-      raises (S);
+    void Foo_Op (in TSeq inarg) raises (S);
   };
 
   alias second<T, S> second_ref;
 
   valuetype VT_T : V supports T
   {
-    private T T_member;
-
-    factory make_VT_T ();
-
-    factory create_VT_T (in T T_arg,
-                         in string str_arg)
-      raises (S);
   };
 
   porttype PT_T
@@ -196,8 +156,8 @@ module Ast<typename T,
 
   component Comp_T
   {
-    uses multiple T Comp_T_Recep; 
-    mirrorport PT_T Comp_T_Mirror_Port; 
+    uses multiple T Comp_T_Recep;
+    mirrorport PT_T Comp_T_Mirror_Port;
     provides T Comp_T_Facet;
     emits E Comp_T_Emit;
 
@@ -227,13 +187,11 @@ module Ast<typename T,
 
   const unsigned long Ast_Const = M;
   const unsigned long LC = 7;
-
   typedef sequence<T, M> AnotherTSeq;
 
   struct boo
   {
     T T_field;
-    Foo Foo_field;
   };
 
   typedef T T_array[M][Ast_Const][LC];
@@ -247,20 +205,3 @@ module Ast<iface,
            101>
   Ast_Inst;
 
-module M 
-{
-  module N <typename T>
-  {
-    interface A {
-      void do_something (in T arg);
-    };
-  };
-};
-
-/*
-Support for native is there, but this results in non compiling code
-native NAT;
-module M {
-  module N <NAT> N_NAT;
-};
-*/
diff --git a/CIAO/tests/IDL_Test/IDL3_Plus/KitchenSink.mpc b/CIAO/tests/IDL_Test/IDL3_Plus/KitchenSink.mpc
index 71b31c21cad..0b69a7ac2d6 100644
--- a/CIAO/tests/IDL_Test/IDL3_Plus/KitchenSink.mpc
+++ b/CIAO/tests/IDL_Test/IDL3_Plus/KitchenSink.mpc
@@ -1,6 +1,7 @@
 // $Id$
 
 project(KitchenSink_idl_gen) : componentidldefaults {
+  requires += dummy_label
   custom_only = 1
   idlflags += -Gex \
               -Wb,stub_export_macro=KITCHENSINK_STUB_Export \
@@ -18,6 +19,7 @@ project(KitchenSink_idl_gen) : componentidldefaults {
 }
 
 project(KitchenSink_lem_gen) : ciaoidldefaults {
+  requires += dummy_label
   after += KitchenSink_idl_gen
   custom_only = 1
   idlflags += -Wb,export_macro=KITCHENSINK_EXEC_Export \
@@ -30,6 +32,7 @@ project(KitchenSink_lem_gen) : ciaoidldefaults {
 }
 
 project(KitchenSink_stub) : ccm_stub {
+  requires += dummy_label
   after += KitchenSink_idl_gen
 
   sharedname = KitchenSink_stub
@@ -53,6 +56,7 @@ project(KitchenSink_stub) : ccm_stub {
 }
 
 project(KitchenSink_exec) : ciao_executor {
+  requires += dummy_label
   after   += KitchenSink_lem_gen KitchenSink_stub
   sharedname = KitchenSink_exec
   libs += KitchenSink_stub
@@ -79,6 +83,7 @@ project(KitchenSink_exec) : ciao_executor {
 }
 
 project(KitchenSink_svnt) : ciao_servant {
+  requires += dummy_label
   after      += KitchenSink_exec
   sharedname  = KitchenSink_svnt
   libs       += KitchenSink_exec \
diff --git a/CIAO/tests/IDL_Test/Two_Templ_Args/TwoTemplArgs.idl b/CIAO/tests/IDL_Test/Two_Templ_Args/TwoTemplArgs.idl
deleted file mode 100644
index 66fae8261b9..00000000000
--- a/CIAO/tests/IDL_Test/Two_Templ_Args/TwoTemplArgs.idl
+++ /dev/null
@@ -1,42 +0,0 @@
-// $Id$
-
-#ifndef MY_TEST_IDL
-#define MY_TEST_IDL
-
-#include <Components.idl>
-
-module Test
-{
-   struct Foo
-   {
-      double myDouble;
-      string myStr;
-   };
-};
-
-exception ExceptType {};
-
-module TemplTest<typename T, exception S>
-{
-   interface Bar
-   {
-      // having 2 or more args of the same template param type
-      // causes an "illegal redefinition" error
-      T myTestOperation(in T inParam, out T outParam) raises(S);
-   };
-
-   struct TemplStruct
-   {
-      T myTemplField;
-   };
-};
-
-module TemplTest<Test::Foo, ExceptType> TemplatedInst;
-
-component Baz
-{
-   provides  TemplatedInst::Bar         myBar;
-   attribute TemplatedInst::TemplStruct myTemplStruct;
-};
-
-#endif
diff --git a/CIAO/tests/IDL_Test/Two_Templ_Args/TwoTemplArgs.mpc b/CIAO/tests/IDL_Test/Two_Templ_Args/TwoTemplArgs.mpc
deleted file mode 100644
index 2625489830a..00000000000
--- a/CIAO/tests/IDL_Test/Two_Templ_Args/TwoTemplArgs.mpc
+++ /dev/null
@@ -1,106 +0,0 @@
-// $Id$
-
-project(TwoTemplArgs_idl_gen) : componentidldefaults {
-  custom_only = 1
-  idlflags += -Gex \
-              -Wb,stub_export_macro=TWOTEMPLARGS_STUB_Export \
-              -Wb,stub_export_include=TwoTemplArgs_stub_export.h \
-              -Wb,skel_export_macro=TWOTEMPLARGS_SVNT_Export \
-              -Wb,skel_export_include=TwoTemplArgs_svnt_export.h \
-              -Wb,svnt_export_macro=TWOTEMPLARGS_SVNT_Export \
-              -Wb,svnt_export_include=TwoTemplArgs_svnt_export.h \
-              -Wb,exec_export_macro=TWOTEMPLARGS_EXEC_Export \
-              -Wb,exec_export_include=TwoTemplArgs_exec_export.h
-
-  IDL_Files {
-    TwoTemplArgs.idl
-  }
-}
-
-project(TwoTemplArgs_lem_gen) : ciaoidldefaults {
-  after += TwoTemplArgs_idl_gen
-  custom_only = 1
-  idlflags += -Wb,export_macro=TWOTEMPLARGS_EXEC_Export \
-              -Wb,export_include=TwoTemplArgs_exec_export.h \
-              -SS
-
-  IDL_Files {
-    TwoTemplArgsE.idl
-  }
-}
-
-project(TwoTemplArgs_stub) : ccm_stub {
-  after += TwoTemplArgs_idl_gen
-
-  sharedname = TwoTemplArgs_stub
-  dynamicflags   = TWOTEMPLARGS_STUB_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TwoTemplArgsC.cpp
-  }
-
-  Header_Files {
-    TwoTemplArgsC.h
-    TwoTemplArgs_stub_export.h
-  }
-
-  Inline_Files {
-    TwoTemplArgsC.inl
-  }
-}
-
-project(TwoTemplArgs_exec) : ciao_executor {
-  after   += TwoTemplArgs_lem_gen TwoTemplArgs_stub
-  sharedname = TwoTemplArgs_exec
-  libs += TwoTemplArgs_stub
-
-  dynamicflags   = TWOTEMPLARGS_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TwoTemplArgsEC.cpp
-    TwoTemplArgs_exec.cpp
-  }
-
-  Header_Files {
-    TwoTemplArgsEC.h
-    TwoTemplArgs_exec.h
-    TwoTemplArgs_exec_export.h
-  }
-
-  Inline_Files {
-    TwoTemplArgsEC.inl
-  }
-}
-
-project(TwoTemplArgs_svnt) : ciao_servant {
-  after      += TwoTemplArgs_exec
-  sharedname  = TwoTemplArgs_svnt
-  libs       += TwoTemplArgs_exec \
-                TwoTemplArgs_stub
-
-  dynamicflags = TWOTEMPLARGS_SVNT_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    TwoTemplArgsS.cpp
-    TwoTemplArgs_svnt.cpp
-  }
-
-  Header_Files {
-    TwoTemplArgsS.h
-    TwoTemplArgs_svnt.h
-    TwoTemplArgs_svnt_export.h
-  }
-
-  Inline_Files {
-    TwoTemplArgsS.inl
-  }
-}
diff --git a/CIAO/tools/IDL3_to_IDL2/basic_visitor.cpp b/CIAO/tools/IDL3_to_IDL2/basic_visitor.cpp
index fddb464b442..7cd2f41c5f7 100644
--- a/CIAO/tools/IDL3_to_IDL2/basic_visitor.cpp
+++ b/CIAO/tools/IDL3_to_IDL2/basic_visitor.cpp
@@ -334,6 +334,11 @@ basic_visitor::visit_consumes (AST_Consumes *)
 int
 basic_visitor::visit_factory  (AST_Factory *node)
 {
+  if (node->imported ())
+    {
+      return 0;
+    }
+
   *os << be_nl;
 
   *os << "factory "
@@ -831,12 +836,6 @@ basic_visitor::visit_native (AST_Native *node)
   return 0;
 }
 
-int
-basic_visitor::visit_param_holder (AST_Param_Holder *)
-{
-  return 0;
-}
-
 //========================================================
 
 void
diff --git a/CIAO/tools/IDL3_to_IDL2/basic_visitor.h b/CIAO/tools/IDL3_to_IDL2/basic_visitor.h
index a8d0be526c0..47a3fe9b0d5 100644
--- a/CIAO/tools/IDL3_to_IDL2/basic_visitor.h
+++ b/CIAO/tools/IDL3_to_IDL2/basic_visitor.h
@@ -92,7 +92,6 @@ public:
   virtual int visit_typedef (AST_Typedef *node);
   virtual int visit_root (AST_Root *node) = 0;
   virtual int visit_native (AST_Native *node);
-  virtual int visit_param_holder (AST_Param_Holder *node);
   
 protected:
   void check_prefix (AST_Decl *d);
diff --git a/CIAO/tools/IDL3_to_IDL2/checking_visitor.cpp b/CIAO/tools/IDL3_to_IDL2/checking_visitor.cpp
index f8381842509..a97cb03204e 100644
--- a/CIAO/tools/IDL3_to_IDL2/checking_visitor.cpp
+++ b/CIAO/tools/IDL3_to_IDL2/checking_visitor.cpp
@@ -157,6 +157,12 @@ checking_visitor::visit_template_module_ref (AST_Template_Module_Ref *)
 }
 
 int
+checking_visitor::visit_param_holder (AST_Param_Holder *)
+{
+  return 0;
+}
+
+int
 checking_visitor::visit_porttype (AST_PortType *)
 {
   return 0;
@@ -242,12 +248,6 @@ checking_visitor::visit_factory (AST_Factory *)
 }
 
 int
-checking_visitor::visit_finder (AST_Finder *)
-{
-  return 0;
-}
-
-int
 checking_visitor::visit_structure (AST_Structure *)
 {
   return 0;
@@ -400,12 +400,6 @@ checking_visitor::visit_typedef (AST_Typedef *)
   return 0;
 }
 
-int
-checking_visitor::visit_param_holder (AST_Param_Holder *)
-{
-  return 0;
-}
-
 bool
 checking_visitor::is_idl3 (void) const
 {
diff --git a/CIAO/tools/IDL3_to_IDL2/checking_visitor.h b/CIAO/tools/IDL3_to_IDL2/checking_visitor.h
index e2372efb61a..b55499cac7f 100644
--- a/CIAO/tools/IDL3_to_IDL2/checking_visitor.h
+++ b/CIAO/tools/IDL3_to_IDL2/checking_visitor.h
@@ -76,7 +76,6 @@ public:
   virtual int visit_eventtype_fwd (AST_EventTypeFwd *node);
   virtual int visit_home (AST_Home *node);
   virtual int visit_factory (AST_Factory *node);
-  virtual int visit_finder (AST_Finder *node);
   virtual int visit_structure (AST_Structure *node);
   virtual int visit_structure_fwd (AST_StructureFwd *node);
   virtual int visit_exception (AST_Exception *node);
diff --git a/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp b/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp
index 5cafe1e1467..843cee92f42 100644
--- a/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp
+++ b/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.cpp
@@ -6,7 +6,6 @@
 #include "be_sunsoft.h"
 #include "be_extern.h"
 
-#include "ast_component.h"
 #include "ast_component_fwd.h"
 #include "ast_provides.h"
 #include "ast_uses.h"
@@ -16,18 +15,15 @@
 #include "ast_eventtype.h"
 #include "ast_eventtype_fwd.h"
 #include "ast_home.h"
-#include "ast_finder.h"
 #include "ast_operation.h"
 #include "ast_root.h"
-
 #include "utl_exceptlist.h"
 #include "utl_identifier.h"
 #include "global_extern.h"
 #include "nr_extern.h"
 
 idl3_to_idl2_visitor::idl3_to_idl2_visitor (void)
-  : basic_visitor (),
-    home_ (0)
+  : basic_visitor ()
 {
 }
 
@@ -440,8 +436,6 @@ idl3_to_idl2_visitor::visit_home (AST_Home *node)
     {
       return 0;
     }
-    
-  this->home_ = node;
 
   ACE_CString explicit_name = node->original_local_name ()->get_string ();
   explicit_name += "Explicit";
@@ -486,6 +480,9 @@ idl3_to_idl2_visitor::visit_home (AST_Home *node)
   // Reset the home's decls to be defined in the explicit home interface.
   this->tranfer_scope_elements (node, xplicit);
 
+  this->gen_factories (node, xplicit);
+  this->gen_finders (node, xplicit);
+
   *os << be_uidt_nl
       << "};" << be_nl << be_nl;
 
@@ -559,45 +556,6 @@ idl3_to_idl2_visitor::visit_home (AST_Home *node)
 }
 
 int
-idl3_to_idl2_visitor::visit_factory (AST_Factory *node)
-{
-  Identifier *id = node->original_local_name ();
-  
-  *os << be_nl << be_nl;
-  
-  if (this->home_ == 0)
-    {
-      *os << "factory ";
-    }
-  else
-    {
-      AST_Component *c = this->home_->managed_component ();
-      
-      *os << IdentifierHelper::orig_sn (c->name ()).c_str ()
-          << " ";
-    }
-    
-  *os << IdentifierHelper::try_escape (id).c_str ()
-      << " (";
-      
-  this->gen_params (node, node->argument_count ());
-  
-  *os << ")";
-  
-  this->gen_exception_list (node->exceptions ());
-  
-  *os << ";";
-          
-  return 0;
-}
-
-int
-idl3_to_idl2_visitor::visit_finder (AST_Finder *node)
-{
-  return this->visit_factory (node);
-}
-
-int
 idl3_to_idl2_visitor::visit_root (AST_Root *node)
 {
   int status = be_global->outfile_init (this->os,
@@ -728,3 +686,80 @@ idl3_to_idl2_visitor::tranfer_scope_elements (AST_Home *src,
         }
     }
 }
+
+void
+idl3_to_idl2_visitor::gen_factories (AST_Home *node,
+                                     AST_Interface &)
+{
+  AST_Operation **item = 0;
+
+  for (ACE_Unbounded_Queue_Iterator<AST_Operation *> i (node->factories ());
+       ! i.done ();
+       i.advance ())
+    {
+      i.next (item);
+
+      *os << be_nl << be_nl
+          << IdentifierHelper::orig_sn (node->managed_component ()->name ()).c_str ()
+          << " "
+          << IdentifierHelper::try_escape ((*item)->original_local_name ()).c_str ()
+          << " (";
+
+      this->gen_params (*item, (*item)->argument_count ());
+
+      *os << ")";
+
+      UTL_ExceptList *exceps = (*item)->exceptions ();
+
+      if (exceps != 0 && exceps->length () > 0)
+        {
+          this->gen_exception_list (exceps, "", false);
+        }
+      else
+        {
+          *os << be_idt_nl
+              << "raises (";
+        }
+
+      *os << "Components::CreateFailure);" << be_uidt;
+    }
+}
+
+void
+idl3_to_idl2_visitor::gen_finders (AST_Home *node,
+                                   AST_Interface &)
+{
+  AST_Operation **item = 0;
+
+  for (ACE_Unbounded_Queue_Iterator<AST_Operation *> i (node->finders ());
+       ! i.done ();
+       i.advance ())
+    {
+      i.next (item);
+
+      *os << be_nl << be_nl
+          << IdentifierHelper::orig_sn (node->managed_component ()->name ()).c_str ()
+          << " "
+          << IdentifierHelper::try_escape( (*item)->original_local_name ()).c_str ()
+          << " (";
+
+      this->gen_params (*item, (*item)->argument_count ());
+
+      *os << ")";
+
+      UTL_ExceptList *exceps = (*item)->exceptions ();
+
+      if (exceps != 0 && exceps->length () > 0)
+        {
+          this->gen_exception_list (exceps, "", false);
+        }
+      else
+        {
+          *os << be_idt_nl
+              << "raises (";
+        }
+
+      *os << "Components::FinderFailure);" << be_uidt;
+    }
+}
+
diff --git a/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h b/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h
index 48ee65811db..caad8c7b20b 100644
--- a/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h
+++ b/CIAO/tools/IDL3_to_IDL2/idl3_to_idl2_visitor.h
@@ -59,8 +59,6 @@ public:
   virtual int visit_eventtype (AST_EventType *node);
   virtual int visit_eventtype_fwd (AST_EventTypeFwd *node);
   virtual int visit_home (AST_Home *node);
-  virtual int visit_factory (AST_Factory *node);
-  virtual int visit_finder (AST_Finder *node);
   virtual int visit_root (AST_Root *node);
   virtual int visit_param_holder(AST_Param_Holder *node);
   
@@ -70,9 +68,8 @@ private:
                                       const char *suffix,
                                       AST_Decl *parent);
   void tranfer_scope_elements (AST_Home *src, AST_Interface &dst);
-  
-private:
-  AST_Home *home_;
+  void gen_factories (AST_Home *node, AST_Interface &xplicit);
+  void gen_finders (AST_Home *node, AST_Interface &xplicit);
 };
 
 #endif /* TAO_IDL3_TO_IDL2_VISITOR_H */
diff --git a/CIAO/tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp b/CIAO/tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp
index add0c7f1322..af51f1dfd17 100644
--- a/CIAO/tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp
+++ b/CIAO/tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp
@@ -274,7 +274,8 @@ namespace CIAO
     }
 
     int
-    idl3_to_xmi_visitor::visit_template_module (AST_Template_Module *)
+    idl3_to_xmi_visitor::visit_template_module (
+      AST_Template_Module *)
     {
       return 0;
     }
@@ -287,19 +288,15 @@ namespace CIAO
     }
 
     int
-    idl3_to_xmi_visitor::visit_template_module_ref (AST_Template_Module_Ref *)
+    idl3_to_xmi_visitor::visit_template_module_ref(
+      AST_Template_Module_Ref *)
     {
       return 0;
     }
 
     int
-    idl3_to_xmi_visitor::visit_param_holder (AST_Param_Holder *)
-    {
-      return 0;
-    }
-
-    int
-    idl3_to_xmi_visitor::visit_finder (AST_Finder *)
+    idl3_to_xmi_visitor::visit_param_holder(
+      AST_Param_Holder *)
     {
       return 0;
     }
@@ -772,9 +769,7 @@ namespace CIAO
                 ACE_TEXT_CHAR_TO_TCHAR (node->repoID ()),
                 ACE_TEXT_CHAR_TO_TCHAR (node->base_home ()->repoID ())));
             }
-/*
- * @@@ (JP) This code will be moved to the appropriate visit_* methods
- *
+
           if (node->factories ().size () != 0)
             {
               ES_Guard noe_guard (LITERALS[OWNEDELEMENT_TAG], this);
@@ -791,7 +786,7 @@ namespace CIAO
             {
               throw Error ("home finders not supported", node);
             }
-*/
+
           this->add_managed_component (
             ACE_TEXT_CHAR_TO_TCHAR (node->repoID ()),
             ACE_TEXT_CHAR_TO_TCHAR (node->managed_component ()->repoID ()));
diff --git a/CIAO/tools/IDL3_to_XMI/IDL3_to_XMI_visitor.h b/CIAO/tools/IDL3_to_XMI/IDL3_to_XMI_visitor.h
index d376f8ace89..824fbde8f91 100644
--- a/CIAO/tools/IDL3_to_XMI/IDL3_to_XMI_visitor.h
+++ b/CIAO/tools/IDL3_to_XMI/IDL3_to_XMI_visitor.h
@@ -107,8 +107,7 @@ namespace CIAO
       virtual int visit_typedef (AST_Typedef *node);
       virtual int visit_root (AST_Root *node);
       virtual int visit_native (AST_Native *node);
-      virtual int visit_finder (AST_Finder *node);
-      
+
       struct Error
       {
         Error (const ACE_CString &diag, AST_Decl *node = 0)
diff --git a/CIAO/tools/IDL3_to_XMI/IR_Simulator_visitor.cpp b/CIAO/tools/IDL3_to_XMI/IR_Simulator_visitor.cpp
index 3d977ddc73b..b7a98d879b7 100644
--- a/CIAO/tools/IDL3_to_XMI/IR_Simulator_visitor.cpp
+++ b/CIAO/tools/IDL3_to_XMI/IR_Simulator_visitor.cpp
@@ -19,7 +19,7 @@
 #include "ast_eventtype.h"
 #include "ast_eventtype_fwd.h"
 #include "ast_exception.h"
-#include "ast_finder.h"
+#include "ast_factory.h"
 #include "ast_field.h"
 #include "ast_home.h"
 #include "ast_operation.h"
@@ -30,7 +30,6 @@
 #include "ast_template_module.h"
 #include "ast_template_module_inst.h"
 #include "ast_template_module_ref.h"
-#include "ast_param_holder.h"
 #include "ast_typedef.h"
 #include "ast_union.h"
 #include "ast_union_branch.h"
@@ -189,54 +188,30 @@ namespace CIAO
     }
 
     int
-    ir_simulator_visitor::visit_template_module (AST_Template_Module *node)
+    ir_simulator_visitor::visit_template_module (
+      AST_Template_Module *)
     {
-      XMI_TRACE ("template module");
-
-      throw Error ("Template modules not supported", node);
-
       return 0;
     }
 
     int
     ir_simulator_visitor::visit_template_module_inst (
-      AST_Template_Module_Inst *node)
+      AST_Template_Module_Inst *)
     {
-      XMI_TRACE ("template module instance");
-
-      throw Error ("Template modules not supported", node);
-
       return 0;
     }
 
     int
-    ir_simulator_visitor::visit_template_module_ref (
-      AST_Template_Module_Ref *node)
+    ir_simulator_visitor::visit_template_module_ref(
+      AST_Template_Module_Ref *)
     {
-      XMI_TRACE ("template module reference");
-
-      throw Error ("Template modules not supported", node);
-
       return 0;
     }
 
     int
-    ir_simulator_visitor::visit_param_holder (AST_Param_Holder *node)
+    ir_simulator_visitor::visit_param_holder(
+      AST_Param_Holder *)
     {
-      XMI_TRACE ("param holder");
-
-      throw Error ("Param holders not supported", node);
-
-      return 0;
-    }
-
-    int
-    ir_simulator_visitor::visit_finder (AST_Finder *node)
-    {
-      XMI_TRACE ("finder");
-
-      throw Error ("Finders not supported", node);
-
       return 0;
     }
 
@@ -650,6 +625,20 @@ namespace CIAO
               node->primary_key ()->ast_accept (this);
             }
 
+          for (size_t i = 0; i < node->factories ().size (); ++i)
+            {
+              AST_Operation **op = 0;
+              node->factories ().get (op, i);
+              (*op)->ast_accept (this);
+            }
+
+          for (size_t i = 0; i < node->finders ().size (); ++i)
+            {
+              AST_Operation **op = 0;
+              node->finders ().get (op, i);
+              (*op)->ast_accept (this);
+            }
+
           this->visit_scope (node);
         }
       catch (Error &err)
diff --git a/CIAO/tools/IDL3_to_XMI/IR_Simulator_visitor.h b/CIAO/tools/IDL3_to_XMI/IR_Simulator_visitor.h
index 8a35bd8d71f..dd75d9e4f54 100644
--- a/CIAO/tools/IDL3_to_XMI/IR_Simulator_visitor.h
+++ b/CIAO/tools/IDL3_to_XMI/IR_Simulator_visitor.h
@@ -62,8 +62,7 @@ namespace CIAO
       virtual int visit_template_module (AST_Template_Module *node);
       virtual int visit_template_module_inst (AST_Template_Module_Inst *node);
       virtual int visit_template_module_ref (AST_Template_Module_Ref *node);
-      virtual int visit_param_holder (AST_Param_Holder *node);
-      virtual int visit_finder (AST_Finder *node);
+      virtual int visit_param_holder(AST_Param_Holder *node);
       virtual int visit_interface (AST_Interface *node);
       virtual int visit_interface_fwd (AST_InterfaceFwd *node);
       virtual int visit_valuebox (AST_ValueBox *node);
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 2edd4c4b675..a03e4f7b257 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,1569 +1,6 @@
-Wed Feb 24 16:53:55 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/util/utl_scope.cpp:
-        
-          Fixed bug introduced by consolidation of fe_add_*
-          methods for exceptions.
-          
-        * TAO_IDL/be/be_codegen.cpp:
-        
-          Fixed compile error on MacOSX due to inappropriate
-          C++-style cast.
-
-Wed Feb 24 16:29:51 UTC 2010  Vladimir Zykov  <vladimir.zykov@prismtech.com>
-
-        * tests/Bug_3826_Regression/svc.conf:
-        * tests/Bug_3826_Regression/run_test.pl:
-        * tao/TAO_Internal.cpp:
-          Extended the fix for bug#3826 and adjusted the test. Initial fix
-          was not complete. If there is a svc.conf which is processed by
-          ACE unconditionally then it's processed in a global gestalt even
-          if -ORBGestalt LOCAL is provided. Current change must fix this
-          behaviour.
-
-Tue Feb 23 18:55:21 UTC 2010  Yan Dai  <dai_y@ociweb.com>
-
-        * bin/tao_orb_tests.lst:
-
-          Added Bug_3812_Regression as not fixed test.
-
-        * tests/Bug_3812_Regression/Bug_3812_Regression.cpp:
-        * tests/Bug_3812_Regression/mock_transport.h:
-
-          Fixed fuzz errors.
-
-Tue Feb 23 10:35:39 UTC 2010  Vladimir Zykov  <vladimir.zykov@prismtech.com>
-
-        * tao/TAO_Internal.cpp:
-          Changed a code layout for return values in forward declarations
-          according to TAO code conventions. Thanks to Johnny Willemsen
-          <jwillemsen at remedy dot nl> for pointing this out.
-
-Tue Feb 23 09:46:57 UTC 2010  Vladimir Zykov  <vladimir.zykov@prismtech.com>
-
-        * tests/Bug_3827_Regression/test.cpp:
-        * tests/Bug_3827_Regression/Message.idl:
-        * tests/Bug_3827_Regression/run_test.pl:
-        * tests/Bug_3827_Regression/README:
-        * tests/Bug_3827_Regression/Bug_3827_Regression.mpc:
-        * tao/ORB_Core.cpp:
-        * tao/ORB.cpp:
-        * tao/ORB_Core.h:
-          Added a test for bug#3827 and fixed it. Now access or changes to
-          valuetype_adapter_ in ORB_Core is protected by a lock.
-
-        * tests/Bug_3826_Regression/orb_svc.conf:
-        * tests/Bug_3826_Regression/server.cpp:
-        * tests/Bug_3826_Regression/README:
-        * tests/Bug_3826_Regression/Bug_3826_Regression.mpc:
-        * tests/Bug_3826_Regression/run_test.pl:
-        * tao/TAO_Internal.cpp:
-          Added a test for bug#3826 and fixed it. If the first ORB in created
-          with -ORBGestalt LOCAL it will have a local configuration and this
-          configuration will not leak into any ORBs created afterwards.
-
-        * bin/tao_orb_tests.lst:
-          Scheduled tests for bug#3826 and bug#3827 to run in the nightly
-          builds.
-
-Mon Feb 22 23:04:23 UTC 2010  Yan Dai  <dai_y@ociweb.com>
-
-
-        * tests/Bug_3812_Regression/Bug_3812_Regression.cpp:
-        * tests/Bug_3812_Regression/Makefile.am:
-        * tests/Bug_3812_Regression/mock_ps.h:
-        * tests/Bug_3812_Regression/mock_tdi.h:
-        * tests/Bug_3812_Regression/mock_transport.h:
-        * tests/Bug_3812_Regression/run_test.pl:
-
-          Added a regression test for bugzilla #3812.
-
-Mon Feb 22 21:20:15 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_codegen.cpp:
-        * TAO_IDL/be_include/be_codegen.h:
-
-          Added random 6-character string to #ifdef guard generation,
-          to prevent hiding when IDL files have the same name (but
-          are in different directories, the #ifdef guard uses only
-          the local filename).
-
-        * TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp:
-        * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp:
-
-          Added logic to check for inheritance from DDS_State or
-          DDS_Event connectors, to generate inheritance in the
-          connector impl from the correct Base connector template.
-
-Mon Feb 22 13:47:47 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/fe/idl.ll:
-        * TAO_IDL/fe/lex.yy.cpp:
-          Updated rti typesupport to ndds typesupport, everywhere we talk
-          about ndds
-
-Fri Feb 19 15:16:49 UTC 2010  jeff Parsons  <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp:
-        * TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp:
-
-          Removed unused variable 'dt_name'.
-
-        * TAO_IDL/fe/fe_component_header.cpp:
-        * TAO_IDL/fe/fe_extern.cpp:
-        * TAO_IDL/fe/fe_home_header.cpp:
-        * TAO_IDL/fe/fe_init.cpp:
-        * TAO_IDL/fe/fe_interface_header.cpp:
-        * TAO_IDL/fe/fe_obv_header.cpp:
-        * TAO_IDL/fe/idl.ll:
-        * TAO_IDL/fe/idl.yy:
-        * TAO_IDL/fe/lex.yy.cpp:
-        * TAO_IDL/fe/y.tab.cpp:
-        * TAO_IDL/include/idl_global.h:
-        * TAO_IDL/include/utl_tmpl/UTL_Scope_T.cpp:
-        * TAO_IDL/util/utl_global.cpp:
-        * TAO_IDL/util/utl_scope.cpp:
-        * TAO_IDL/ast/ast_attribute.cpp:
-        * TAO_IDL/ast/ast_check.cpp:
-
-          Reordered #includes to eliminate a circular dependency
-          introduced by the addition of the template source file
-          UTL_Scope_T.cpp.
-
-Fri Feb 19 12:54:47 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp:
-        * TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp:
-
-          Generate an additional boolean that is used to indicate
-          whether we have a fixed or non fixed type
-
-Fri Feb 19 08:53:47 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/be/be_codegen.cpp:
-
-          Always generate the state connector header, this needs more tweaks
-          in the near future
-
-Thu Feb 18 22:53:29 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/include/ast_root.h:
-        * TAO_IDL/include/ast_valuebox.h:
-        * TAO_IDL/include/ast_module.h:
-        * TAO_IDL/include/ast_union_label.h:
-        * TAO_IDL/include/ast_union.h:
-        * TAO_IDL/include/ast_interface_fwd.h:
-        * TAO_IDL/include/ast_structure.h:
-        * TAO_IDL/include/ast_component_fwd.h:
-        * TAO_IDL/include/utl_tmpl/UTL_Scope_T.cpp:
-        * TAO_IDL/include/ast_string.h:
-        * TAO_IDL/include/ast_decl.h:
-        * TAO_IDL/include/ast_factory.h:
-        * TAO_IDL/include/ast_valuetype.h:
-        * TAO_IDL/include/ast_argument.h:
-        * TAO_IDL/include/ast_eventtype.h:
-        * TAO_IDL/include/ast_native.h:
-        * TAO_IDL/include/ast_union_fwd.h:
-        * TAO_IDL/include/ast_home.h:
-        * TAO_IDL/include/ast_structure_fwd.h:
-        * TAO_IDL/include/ast_enum_val.h:
-        * TAO_IDL/include/ast_sequence.h:
-        * TAO_IDL/include/ast_valuetype_fwd.h:
-        * TAO_IDL/include/ast_eventtype_fwd.h:
-        * TAO_IDL/include/ast_exception.h:
-        * TAO_IDL/include/ast_attribute.h:
-        * TAO_IDL/include/ast_enum.h:
-        * TAO_IDL/include/ast_union_branch.h:
-        * TAO_IDL/include/ast_type.h:
-        * TAO_IDL/include/ast_field.h:
-        * TAO_IDL/include/ast_constant.h:
-        * TAO_IDL/include/ast_interface.h:
-        * TAO_IDL/include/ast_operation.h:
-        * TAO_IDL/include/ast_component.h:
-        * TAO_IDL/include/ast_concrete_type.h:
-        * TAO_IDL/include/ast_predefined_type.h:
-        * TAO_IDL/include/ast_array.h:
-        * TAO_IDL/be/be_union.cpp:
-        * TAO_IDL/be/be_interface_fwd.cpp:
-        * TAO_IDL/be/be_attribute.cpp:
-        * TAO_IDL/be/be_factory.cpp:
-        * TAO_IDL/be/be_valuetype.cpp:
-        * TAO_IDL/be/be_union_fwd.cpp:
-        * TAO_IDL/be/be_union_branch.cpp:
-        * TAO_IDL/be/be_valuetype_fwd.cpp:
-        * TAO_IDL/be/be_type.cpp:
-        * TAO_IDL/be/be_home.cpp:
-        * TAO_IDL/be/be_enum_val.cpp:
-        * TAO_IDL/be/be_mirror_port.cpp:
-        * TAO_IDL/be/be_valuebox.cpp:
-        * TAO_IDL/be/be_component.cpp:
-        * TAO_IDL/be/be_decl.cpp:
-        * TAO_IDL/be/be_util.cpp:
-        * TAO_IDL/be/be_eventtype_fwd.cpp:
-        * TAO_IDL/be/be_expression.cpp:
-        * TAO_IDL/be/be_typedef.cpp:
-        * TAO_IDL/be/be_structure.cpp:
-        * TAO_IDL/be/be_component_fwd.cpp:
-        * TAO_IDL/be/be_operation_strategy.cpp:
-        * TAO_IDL/be/be_interface_strategy.cpp:
-        * TAO_IDL/be/be_field.cpp:
-        * TAO_IDL/be/be_module.cpp:
-        * TAO_IDL/be/be_structure_fwd.cpp:
-        * TAO_IDL/be/be_predefined_type.cpp:
-        * TAO_IDL/be/be_argument.cpp:
-        * TAO_IDL/be/be_constant.cpp:
-        * TAO_IDL/be/be_exception.cpp:
-        * TAO_IDL/be/be_extended_port.cpp:
-        * TAO_IDL/be/be_sequence.cpp:
-        * TAO_IDL/be/be_eventtype.cpp:
-        * TAO_IDL/be/be_root.cpp:
-        * TAO_IDL/be/be_interface.cpp:
-        * TAO_IDL/be/be_operation.cpp:
-        * TAO_IDL/be/be_enum.cpp:
-        * TAO_IDL/be/be_string.cpp:
-        * TAO_IDL/be/be_array.cpp:
-        * TAO_IDL/be/be_template_module.cpp:
-        * TAO_IDL/be/be_native.cpp:
-        * TAO_IDL/be/be_porttype.cpp:
-        * TAO_IDL/be/be_union_label.cpp:
-        * TAO_IDL/ast/ast_home.cpp:
-        * TAO_IDL/ast/ast_union_fwd.cpp:
-        * TAO_IDL/ast/ast_constant.cpp:
-        * TAO_IDL/ast/ast_structure_fwd.cpp:
-        * TAO_IDL/ast/ast_operation.cpp:
-        * TAO_IDL/ast/ast_interface.cpp:
-        * TAO_IDL/ast/ast_component.cpp:
-        * TAO_IDL/ast/ast_concrete_type.cpp:
-        * TAO_IDL/ast/ast_predefined_type.cpp:
-        * TAO_IDL/ast/ast_enum_val.cpp:
-        * TAO_IDL/ast/ast_sequence.cpp:
-        * TAO_IDL/ast/ast_valuetype_fwd.cpp:
-        * TAO_IDL/ast/ast_array.cpp:
-        * TAO_IDL/ast/ast_eventtype_fwd.cpp:
-        * TAO_IDL/ast/ast_root.cpp:
-        * TAO_IDL/ast/ast_valuebox.cpp:
-        * TAO_IDL/ast/ast_module.cpp:
-        * TAO_IDL/ast/ast_union_label.cpp:
-        * TAO_IDL/ast/ast_union.cpp:
-        * TAO_IDL/ast/ast_exception.cpp:
-        * TAO_IDL/ast/ast_interface_fwd.cpp:
-        * TAO_IDL/ast/ast_structure.cpp:
-        * TAO_IDL/ast/ast_component_fwd.cpp:
-        * TAO_IDL/ast/ast_attribute.cpp:
-        * TAO_IDL/ast/ast_enum.cpp:
-        * TAO_IDL/ast/ast_union_branch.cpp:
-        * TAO_IDL/ast/ast_string.cpp:
-        * TAO_IDL/ast/ast_decl.cpp:
-        * TAO_IDL/ast/ast_factory.cpp:
-        * TAO_IDL/ast/ast_valuetype.cpp:
-        * TAO_IDL/ast/ast_type.cpp:
-        * TAO_IDL/ast/ast_argument.cpp:
-        * TAO_IDL/ast/ast_field.cpp:
-        * TAO_IDL/ast/ast_eventtype.cpp:
-        * TAO_IDL/ast/ast_native.cpp:
-        * TAO_IDL/be_include/be_field.h:
-        * TAO_IDL/be_include/be_interface.h:
-        * TAO_IDL/be_include/be_operation.h:
-        * TAO_IDL/be_include/be_component.h:
-        * TAO_IDL/be_include/be_enum.h:
-        * TAO_IDL/be_include/be_union_branch.h:
-        * TAO_IDL/be_include/be_type.h:
-        * TAO_IDL/be_include/be_union.h:
-        * TAO_IDL/be_include/be_interface_fwd.h:
-        * TAO_IDL/be_include/be_component_fwd.h:
-        * TAO_IDL/be_include/be_root.h:
-        * TAO_IDL/be_include/be_eventtype.h:
-        * TAO_IDL/be_include/be_valuebox.h:
-        * TAO_IDL/be_include/be_union_fwd.h:
-        * TAO_IDL/be_include/be_predefined_type.h:
-        * TAO_IDL/be_include/be_argument.h:
-        * TAO_IDL/be_include/be_union_label.h:
-        * TAO_IDL/be_include/be_home.h:
-        * TAO_IDL/be_include/be_exception.h:
-        * TAO_IDL/be_include/be_attribute.h:
-        * TAO_IDL/be_include/be_factory.h:
-        * TAO_IDL/be_include/be_module.h:
-        * TAO_IDL/be_include/be_string.h:
-        * TAO_IDL/be_include/be_array.h:
-        * TAO_IDL/be_include/be_native.h:
-        * TAO_IDL/be_include/be_constant.h:
-        * TAO_IDL/be_include/be_structure.h:
-        * TAO_IDL/be_include/be_typedef.h:
-        * TAO_IDL/be_include/be_valuetype.h:
-        * TAO_IDL/be_include/be_structure_fwd.h:
-        * TAO_IDL/be_include/be_decl.h:
-        * TAO_IDL/be_include/be_valuetype_fwd.h:
-        * TAO_IDL/be_include/be_eventtype_fwd.h:
-        * TAO_IDL/be_include/be_enum_val.h:
-        * TAO_IDL/be_include/be_sequence.h:
-
-          Removed unused constructors.
-
-        * TAO_IDL/util/utl_scope.cpp:
-        * TAO_IDL/include/utl_scope.h:
-
-          - Moved static methods inside class UTL_Scope
-            and removed related static variables.
-
-          - Re-implemented is_global_name() to
-            eliminate memory leaks and heap allocations.
-
-Thu Feb 18 20:36:04 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/include/utl_tmpl/UTL_Scope_T.cpp:
-
-          New file, containing bodies of some newly
-          added template methods to class UTL_Scope.
-
-        * TAO_IDL/fe/lex.yy.cpp:
-        * TAO_IDL/fe/idl.ll:
-
-          Cosmetic changes.
-
-        * TAO_IDL/include/ast_root.h:
-        * TAO_IDL/include/ast_module.h:
-        * TAO_IDL/include/ast_valuebox.h:
-        * TAO_IDL/include/ast_union.h:
-        * TAO_IDL/include/ast_param_holder.h:
-        * TAO_IDL/include/ast_structure.h:
-        * TAO_IDL/include/ast_interface_fwd.h:
-        * TAO_IDL/include/ast_component_fwd.h:
-        * TAO_IDL/include/ast_string.h:
-        * TAO_IDL/include/ast_decl.h:
-        * TAO_IDL/include/ast_factory.h:
-        * TAO_IDL/include/ast_template_module_ref.h:
-        * TAO_IDL/include/ast_valuetype.h:
-        * TAO_IDL/include/ast_mirror_port.h:
-        * TAO_IDL/include/ast_argument.h:
-        * TAO_IDL/include/ast_eventtype.h:
-        * TAO_IDL/include/ast_native.h:
-        * TAO_IDL/include/ast_home.h:
-        * TAO_IDL/include/ast_union_fwd.h:
-        * TAO_IDL/include/ast_connector.h:
-        * TAO_IDL/include/ast_provides.h:
-        * TAO_IDL/include/ast_structure_fwd.h:
-        * TAO_IDL/include/ast_enum_val.h:
-        * TAO_IDL/include/ast_finder.h:
-        * TAO_IDL/include/ast_sequence.h:
-        * TAO_IDL/include/ast_valuetype_fwd.h:
-        * TAO_IDL/include/ast_template_module.h:
-        * TAO_IDL/include/ast_eventtype_fwd.h:
-        * TAO_IDL/include/ast_exception.h:
-        * TAO_IDL/include/ast_typedef.h:
-        * TAO_IDL/include/ast_attribute.h:
-        * TAO_IDL/include/ast_extended_port.h:
-        * TAO_IDL/include/ast_enum.h:
-        * TAO_IDL/include/ast_union_branch.h:
-        * TAO_IDL/include/ast_template_module_inst.
-        * TAO_IDL/include/ast_uses.h:
-        * TAO_IDL/include/ast_field.h:
-        * TAO_IDL/include/utl_scope.h:
-        * TAO_IDL/include/ast_porttype.h:
-        * TAO_IDL/include/ast_constant.h:
-        * TAO_IDL/include/ast_consumes.h:
-        * TAO_IDL/include/ast_publishes.h:
-        * TAO_IDL/include/ast_interface.h:
-        * TAO_IDL/include/ast_operation.h:
-        * TAO_IDL/include/ast_component.h:
-        * TAO_IDL/include/ast_predefined_type.h:
-        * TAO_IDL/include/ast_array.h:
-        * TAO_IDL/include/ast_emits.h:
-        * TAO_IDL/be/be_visitor_union/union.cpp:
-        * TAO_IDL/be/be_root.cpp:
-        * TAO_IDL/ast/ast_home.cpp:
-        * TAO_IDL/ast/ast_union_fwd.cpp:
-        * TAO_IDL/ast/ast_constant.cpp:
-        * TAO_IDL/ast/ast_connector.cpp:
-        * TAO_IDL/ast/ast_provides.cpp:
-        * TAO_IDL/ast/ast_consumes.cpp:
-        * TAO_IDL/ast/ast_publishes.cpp:
-        * TAO_IDL/ast/ast_structure_fwd.cpp:
-        * TAO_IDL/ast/ast_operation.cpp:
-        * TAO_IDL/ast/ast_interface.cpp:
-        * TAO_IDL/ast/ast_component.cpp:
-        * TAO_IDL/ast/ast_enum_val.cpp:
-        * TAO_IDL/ast/ast_predefined_type.cpp:
-        * TAO_IDL/ast/ast_finder.cpp:
-        * TAO_IDL/ast/ast_sequence.cpp:
-        * TAO_IDL/ast/ast_array.cpp:
-        * TAO_IDL/ast/ast_valuetype_fwd.cpp:
-        * TAO_IDL/ast/ast_template_module.cpp:
-        * TAO_IDL/ast/ast_emits.cpp:
-        * TAO_IDL/ast/ast_root.cpp:
-        * TAO_IDL/ast/ast_eventtype_fwd.cpp:
-        * TAO_IDL/ast/ast_redef.cpp:
-        * TAO_IDL/ast/ast_module.cpp:
-        * TAO_IDL/ast/ast_valuebox.cpp:
-        * TAO_IDL/ast/ast_union.cpp:
-        * TAO_IDL/ast/ast_param_holder.cpp:
-        * TAO_IDL/ast/ast_exception.cpp:
-        * TAO_IDL/ast/ast_typedef.cpp:
-        * TAO_IDL/ast/ast_interface_fwd.cpp:
-        * TAO_IDL/ast/ast_structure.cpp:
-        * TAO_IDL/ast/ast_component_fwd.cpp:
-        * TAO_IDL/ast/ast_attribute.cpp:
-        * TAO_IDL/ast/ast_enum.cpp:
-        * TAO_IDL/ast/ast_extended_port.cpp:
-        * TAO_IDL/ast/ast_union_branch.cpp:
-        * TAO_IDL/ast/ast_string.cpp:
-        * TAO_IDL/ast/ast_factory.cpp:
-        * TAO_IDL/ast/ast_template_module_ref.cpp:
-        * TAO_IDL/ast/ast_template_module_inst.cpp:
-        * TAO_IDL/ast/ast_valuetype.cpp:
-        * TAO_IDL/ast/ast_mirror_port.cpp:
-        * TAO_IDL/ast/ast_uses.cpp:
-        * TAO_IDL/ast/ast_argument.cpp:
-        * TAO_IDL/ast/ast_field.cpp:
-        * TAO_IDL/ast/ast_eventtype.cpp:
-        * TAO_IDL/ast/ast_native.cpp:
-        * TAO_IDL/ast/ast_porttype.cpp:
-        * TAO_IDL/be_include/be_root.h:
-        * TAO_IDL/util/utl_scope.cpp:
-
-          - Consolidated common code from all fe_add_*
-            methods into class UTL_Scope. All these
-            methods had large bodies, and most were
-            duplicated over several AST_* classes.
-            To encapsulate the forward declaration and
-            redefinition properties of AST_Interface
-            and it forward-declarable subtypes
-            AST_ValueType, AST_EventType, and
-            AST_Component), some template methods were
-            added to UTL_Scope.
-
-          - Static constants were added to each AST_*
-            class to associated it with its corresponding
-            NodeType enum value, as an aid to template
-            programming.
-
-          - Typedefs were added to forward_declarable
-            types to associate eachtype with its
-            AST_*Fwd counterpart, as an aid to template
-            programming.
-
-Thu Feb 18 14:46:16 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp(gen_connector_traits):
-
-          Fixed bug in code generation of the context class name
-          when it appears as one of the template arguments in the
-          connector traits typedef.
-
-Wed Feb 17 15:13:40 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp(gen_dds_traits):
-
-          Removed unused parameter.
-
-Tue Feb 16 21:10:35 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp:
-        * TAO_IDL/be/be_visitor_typecode.cpp:
-        * TAO_IDL/be/be_visitor_component/any_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_component/any_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_component/cdr_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_component/cdr_op_cs.cpp:
-        * TAO_IDL/be_include/be_visitor_typecode/objref_typecode.h:
-        * TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h:
-        * TAO_IDL/be_include/be_visitor_component/cdr_op_cs.h:
-        * TAO_IDL/be_include/be_visitor_component/any_op_ch.h:
-        * TAO_IDL/be_include/be_visitor_component/any_op_cs.h:
-        * TAO_IDL/be_include/be_visitor_component/cdr_op_ch.h:
-
-          More missing pieces of connector support.
-
-Tue Feb 16 20:22:15 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_provides.cpp:
-        * TAO_IDL/be/be_visitor_interface/base_proxy_impl_ch.cpp:
-        * TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_interface/remote_proxy_impl_ch.cpp:
-        * TAO_IDL/be/be_codegen.cpp:
-        * TAO_IDL/be/be_visitor_component/facet_exs.cpp:
-        * TAO_IDL/be/be_visitor_component/servant_svh.cpp:
-        * TAO_IDL/be/be_visitor_component/context_svh.cpp:
-        * TAO_IDL/be/be_visitor_component/component_ch.cpp:
-        * TAO_IDL/be/be_visitor_component/servant_svs.cpp:
-        * TAO_IDL/be/be_visitor_component/executor_exs.cpp:
-        * TAO_IDL/be/be_visitor_component/context_svs.cpp:
-        * TAO_IDL/be/be_visitor_component/component_exs.cpp:
-        * TAO_IDL/be/be_visitor_component/component_svh.cpp:
-        * TAO_IDL/be/be_visitor_component/component_svs.cpp:
-        * TAO_IDL/be/be_produce.cpp:
-        * TAO_IDL/be/be_sequence.cpp:
-        * TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp:
-        * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp:
-        * TAO_IDL/be/be_visitor_connector/connector_dds_ex_base.cpp:
-        * TAO_IDL/be/be_interface.cpp:
-        * TAO_IDL/be/be_scope.cpp:
-        * TAO_IDL/ast/ast_visitor_reifying.cpp:
-
-          - Filled in several small missing pieces of connector
-            support
-
-          - Removed the check for the presence of components or
-            connectors that was restricting the AST passes that
-            generated servant, executor, or connector impl files.
-            As with skeleton files and the presence of interfaces,
-            we will just generate empty files even if the relevant
-            IDL construct is not seen
-
-          - Reversed the order of generation of include files in
-            the connector implementation header file, so that the
-            list of lem stub header files (generated from the list
-            of #pragam ciao lem that is seen in the compilation
-            unit) comes before the include of DDS_Event_Connector_T.h,
-            since the latter contains C++ template declarations,
-            and thus also the associated source file
-
-Tue Feb 16 14:22:12 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/narrow/narrow.cpp:
-
-          Added missing case to cast a connector to a scope.
-
-Tue Feb 16 09:16:47 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * MPC/modules/IDLHelper.pm:
-          Handle connector export file
-
-Mon Feb 15 22:35:26 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_visitor_component/component_ih.cpp:
-        * TAO_IDL/be/be_visitor_component/component_is.cpp:
-        * TAO_IDL/be_include/be_visitor_component/component_is.h:
-        * TAO_IDL/be_include/be_visitor_component/component_ih.h:
-
-          Removed these visitors, they are not applicable to
-          components since their servants aren't hand-written.
-
-        * TAO_IDL/be/be_visitor_connector/connector_dds_ex_base.cpp:
-        * TAO_IDL/be_include/be_visitor_connector/connector_dds_ex_base.h:
-
-          Added base class visitor for class be_visitor_connector_dds_exh
-          and class be_visitor_connector_dds_exs, to capture common
-          code.
-
-        * TAO_IDL/be/be_visitor_arg_traits.cpp:
-        * TAO_IDL/be/be_visitor_component.cpp:
-        * TAO_IDL/be/be_codegen.cpp:
-        * TAO_IDL/be/be_visitor_connector.cpp:
-        * TAO_IDL/be/be_visitor_component/context_ex_idl.cpp:
-        * TAO_IDL/be/be_visitor_component/component_ch.cpp:
-        * TAO_IDL/be/be_visitor_component/facet_svs.cpp:
-        * TAO_IDL/be/be_visitor_component/component_ci.cpp:
-        * TAO_IDL/be/be_visitor_component/executor_ex_idl.cpp:
-        * TAO_IDL/be/be_visitor_component/component_ex_idl.cpp:
-        * TAO_IDL/be/be_visitor_component/component_cs.cpp:
-        * TAO_IDL/be/be_visitor_component/component_sh.cpp:
-        * TAO_IDL/be/be_visitor_component/component_si.cpp:
-        * TAO_IDL/be/be_visitor_component/servant_svh.cpp:
-        * TAO_IDL/be/be_visitor_component/context_svh.cpp:
-        * TAO_IDL/be/be_visitor_component/component_ss.cpp:
-        * TAO_IDL/be/be_visitor_component/servant_svs.cpp:
-        * TAO_IDL/be/be_visitor_component/context_svs.cpp:
-        * TAO_IDL/be/be_visitor_component/component_svh.cpp:
-        * TAO_IDL/be/be_visitor_component/component_svs.cpp:
-        * TAO_IDL/be/be_visitor_module/module.cpp:
-        * TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp:
-        * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp:
-        * TAO_IDL/be/be_visitor_ccm_pre_proc.cpp:
-        * TAO_IDL/be/be_visitor_traits.cpp:
-        * TAO_IDL/ast/ast_module.cpp:
-        * TAO_IDL/be_include/be_visitor_connector.h:
-        * TAO_IDL/be_include/be_visitor_ccm_pre_proc.h:
-        * TAO_IDL/be_include/be_visitor_component/component_sh.h:
-        * TAO_IDL/be_include/be_visitor_component/component_si.h:
-        * TAO_IDL/be_include/be_visitor_component/servant_svh.h:
-        * TAO_IDL/be_include/be_visitor_component/context_svh.h:
-        * TAO_IDL/be_include/be_visitor_component/facet_ex_idl.h:
-        * TAO_IDL/be_include/be_visitor_component/component_ss.h:
-        * TAO_IDL/be_include/be_visitor_component/servant_svs.h:
-        * TAO_IDL/be_include/be_visitor_component/context_svs.h:
-        * TAO_IDL/be_include/be_visitor_component/component_svh.h:
-        * TAO_IDL/be_include/be_visitor_component/component_svs.h:
-        * TAO_IDL/be_include/be_visitor_component/facet_svh.h:
-        * TAO_IDL/be_include/be_visitor_component/context_ex_idl.h:
-        * TAO_IDL/be_include/be_visitor_component/component_ch.h:
-        * TAO_IDL/be_include/be_visitor_component/facet_svs.h:
-        * TAO_IDL/be_include/be_visitor_component/component_ci.h:
-        * TAO_IDL/be_include/be_visitor_component/executor_ex_idl.h:
-        * TAO_IDL/be_include/be_visitor_component/component_ex_idl.h:
-        * TAO_IDL/be_include/be_visitor_component/component_cs.h:
-        * TAO_IDL/be_include/be_visitor_arg_traits.h:
-        * TAO_IDL/be_include/be_visitor_connector/connector_dds_exs.h:
-        * TAO_IDL/be_include/be_visitor_connector/connector_dds_exh.h:
-        * TAO_IDL/be_include/be_visitor_traits.h:
-        * TAO_IDL/be_include/be_visitor_component.h:
-
-          Added visit_connector() methods to all visitors where the
-          code generation for connectors is the same as that for
-          components. The visit_connector() methods simply call
-          visit_component().
-
-Mon Feb 15 16:32:24 UTC 2010  Jeff Parsons  <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/fe/idl.yy:
-        * TAO_IDL/fe/y.tab.cpp:
-
-          - Changed connector grammar to allow an empty body
-          - Removed unused varables
-          - Added missing AST visitor creation
-
-Mon Feb 15 12:08:47 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * catior/README
-        * catior/README.catior
-        * nslist/README
-        * nslist/README.nslist
-          Renamed to have the postfix to make packaging and installation easier
-
-Mon Feb 15 09:35:47 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/FoxResource/FoxResource_Loader.h:
-          User has to specify the full fox path now, some distributions now ship fox-1.6 and
-          fox-1.4 as directory names
-
-Mon Feb 15 09:17:47 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * m4/tao.m4:
-          Moved to ACE, seems the latest autoconf tools only support one m4
-          directory
-
-        * configure.ac:
-        * Makefile.am:
-        * Release:
-          Updated for move above
-
-Sun Feb 14 15:57:47 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_codegen.cpp:
-
-          Changed include generation for executor IDL files to
-          always generate include of CCM_Container.idl, regardless
-          of whether it is pulled in indirectly or not. An optimizing
-          check may be added at a later date.
-
-Fri Feb 12 22:08:24 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/include/idl_global.h:
-        * TAO_IDL/be/be_visitor_root.cpp:
-        * TAO_IDL/be/be_codegen.cpp:
-        * TAO_IDL/be/be_visitor_root/root.cpp:
-        * TAO_IDL/be/be_visitor_component/component_exh.cpp:
-        * TAO_IDL/be/be_visitor_module.cpp:
-        * TAO_IDL/be/be_visitor_module/module.cpp:
-        * TAO_IDL/be/be_produce.cpp:
-        * TAO_IDL/be_include/be_visitor_root/root.h:
-        * TAO_IDL/be_include/be_visitor_module/module.h:
-        * TAO_IDL/fe/lex.yy.cpp:
-        * TAO_IDL/fe/idl.ll:
-        * TAO_IDL/util/utl_global.cpp:
-
-          - Added pragma indicating RTI DDS TypeSupport
-            header file to include in the connector implementation
-            header file.
-
-          - Added generation of client stub header file
-            inclusion in connector implementation header file.
-
-          - Cosmetic changes to be_codegen.cpp
-
-          - Added boilerplate for the spawning of the connector
-            implementation visitors.
-
-Thu Feb 11 19:12:11 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/be/be_codegen.cpp:
-          Don't generate any E.idl includes with -Glfa. -Glfa means:
-          . Generated E.idl won't depend on any other E.idl
-          . Any required CCM_ local interface for facets, etc will be
-            generated locally.
-
-Thu Feb 11 18:51:11 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/be/be_codegen.cpp
-        * TAO_IDL/be/be_global.cpp
-        * TAO_IDL/be/be_visitor_component/context_svh.cpp
-        * TAO_IDL/be/be_visitor_component/context_svs.cpp
-        * TAO_IDL/be/be_visitor_component/servant_svs.cpp
-        * TAO_IDL/be/be_visitor_component_scope.cpp
-        * TAO_IDL/be/be_visitor_home/home_svh.cpp
-        * TAO_IDL/be/be_visitor_home/home_svs.cpp
-        * TAO_IDL/be/be_visitor_operation/operation_svs.cpp
-        * TAO_IDL/be/be_visitor_root/root.cpp
-        * TAO_IDL/be_include/be_global.h
-        * TAO_IDL/be_include/be_scope.h
-        * TAO_IDL/be_include/be_visitor_component/context_svs.h
-        * TAO_IDL/be_include/be_visitor_component_scope.h
-        * TAO_IDL/be_include/be_visitor_home/home_svs.h
-        * TAO_IDL/be_include/be_visitor_operation/operation_svs.h
-        * TAO_IDL/util/utl_err.cpp
-          Removed swapping container support
-
-Thu Feb 11 17:04:59 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/fe/lex.yy.cpp:
-        * TAO_IDL/fe/idl.ll:
-        * TAO_IDL/tao_idl_fe.mpc:
-
-          Changes to restore mods that Johnny Willemsen made to
-          lex.yy.cpp without corresponding changes to idl.ll and
-          tao_idl_fe.mpc. These changes are in
-
-          Mon Feb  8 06:58:43 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-Wed Feb 10 22:16:15 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/include/idl_global.h:
-
-          Fixed typo in comment.
-
-        * TAO_IDL/be/be_codegen.cpp:
-
-          Added code generation for included files in
-          the connector implementation.
-
-        * TAO_IDL/fe/y.tab.cpp:
-        * TAO_IDL/fe/idl.yy:
-
-          Fixed incorrect comment.
-
-        * TAO_IDL/fe/lex.yy.cpp:
-        * TAO_IDL/fe/idl.ll:
-
-          Restored code that was added to the cpp file only and
-          got zapped in the last regeneration.
-
-Wed Feb 10 22:02:06 UTC 2010  Yan Dai  <dai_y@ociweb.com>
-
-        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp:
-
-          Added support for ORBKeepalive in SSL mode.
-
-Wed Feb 10 16:34:24 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_visitor_xplicit_pre_proc.cpp:
-        * TAO_IDL/be_include/be_visitor_xplicit_pre_proc.h:
-
-          In the recreation of the home scope in the corresponding
-          explicit interface, added support for eventtypes, which
-          cannot be declared inside a home, but can be referenced.
-
-Wed Feb 10 10:52:00 UTC 2010  Simon Massey  <sma at prismtech dot com>
-
-        * examples/mfc/server.cpp:
-
-          Fixed a long standing typo in mod that was committed by
-          ChangeLogTag: Mon Mar  5 07:59:00 2001  Michael Kircher  <Michael.Kircher@mchp.siemens.de>
-          He was adding ACE_TRY_ENV and ACE_TRY_CHECKS to the existing code,
-          but put in an ACE_TRY_CHECK where an ACE_TRY_ENV was supposed to
-          go. This has never been touched since and has missed the grand
-          purge of this old excaption code as it didn't conform to the normal
-          useage patterns. If TAO is built with #define ACE_LACKS_DEPRECATED_MACROS
-          this caused this example to not build due to this missuse.
-
-Wed Feb 10 10:43:11 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/IDL_Test/IDL_Test.mpc:
-          Don't compile the 3821 RTI DDS generated files, they don't compile
-          at this moment.
-
-Tue Feb  9 22:55:11 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_visitor_root/root_cnh.cpp:
-        * TAO_IDL/be/be_visitor_root/root_cns.cpp:
-        * TAO_IDL/be_include/be_visitor_root/root_cnh.h:
-        * TAO_IDL/be_include/be_visitor_root/root_cns.h:
-
-          New visitors that create the files and streams
-          for the connector header and source implementation
-          generation.
-
-        * TAO_IDL/include/idl_global.h:
-        * TAO_IDL/be/be_visitor_root.cpp:
-        * TAO_IDL/be/be_codegen.cpp:
-        * TAO_IDL/be/be_visitor_root/root.cpp:
-        * TAO_IDL/be/be_visitor_component/component.cpp:
-        * TAO_IDL/be/be_visitor_module/module.cpp:
-        * TAO_IDL/be/be_global.cpp:
-        * TAO_IDL/be/be_visitor_attribute/attribute.cpp:
-        * TAO_IDL/be/be_produce.cpp:
-        * TAO_IDL/ast/ast_connector.cpp:
-        * TAO_IDL/be_include/be_visitor_root/root_exs.h:
-        * TAO_IDL/be_include/be_visitor_root/root_exh.h:
-        * TAO_IDL/be_include/be_codegen.h:
-        * TAO_IDL/be_include/be_helper.h:
-        * TAO_IDL/be_include/be_visitor_root.h:
-        * TAO_IDL/be_include/be_global.h:
-        * TAO_IDL/util/utl_global.cpp:
-
-          Added beginning support for code generation for
-          connectors.
-
-        * docs/compiler.html:
-
-          Updated IDL compiler docs with info about connector
-          code generation support.
-
-Tue Feb  9 18:12:00 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/astast_visitor_reifying.cpp:
-
-          Added support for IDL native constructs.
-
-        * TAO_IDL/be/be_visitor_native/native_ch.cpp:
-
-          Cosmetic changes.
-
-Tue Feb  9 09:39:10 UTC 2010  Vladimir Zykov  <vladimir.zykov@prismtech.com>
-
-        * TAO_IDL/be/be_helper.cpp:
-          Fixed generation of constants for case labels in switch statement
-          for unions with char discriminator.
-
-Mon Feb  8 23:23:48 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/include/ast_union.h:
-        * TAO_IDL/be/be_union.cpp:
-        * TAO_IDL/be/be_visitor_xplicit_pre_proc.cpp:
-        * TAO_IDL/ast/ast_visitor_reifying.cpp:
-        * TAO_IDL/be_include/be_union.h:
-        * TAO_IDL/be_include/be_visitor_xplicit_pre_proc.h:
-
-          Added support for all legal home-scope declarations
-          in the generation of implied IDL for the explicit
-          home interface.
-
-Mon Feb  8 17:16:31 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_visitor_xplicit_pre_proc.cpp:
-        * TAO_IDL/be_include/be_visitor_xplicit_pre_proc.h:
-
-          In transfer of scope contents from IDL home to the
-          implied IDL explicit interface, added support for
-          typedefs. This change fixes a build problem in
-          CIAO_ROOT/tests/IDL3/Lookup. Support for other
-          constructs legal for declaration inside a home is
-          pending.
-
-Mon Feb  8 14:48:43 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/be/be_visitor_component/component_ch.cpp:
-        * TAO_IDL/be/be_visitor_root/root.cpp:
-        * TAO_IDL/be/be_visitor_traits.cpp:
-          Layout changes for the generated code
-
-Mon Feb  8 13:52:43 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/be/be_helper.cpp:
-          Removed link to website which doesn't seem to exist anymore
-
-Mon Feb  8 11:57:33 UTC 2010  Vladimir Zykov  <vladimir.zykov@prismtech.com>
-
-        * tests/IDL_Test/IDL_Test.mpc:
-          Added Bug_3821_Regression.idl to MPC.
-
-Mon Feb  8 10:58:21 UTC 2010  Vladimir Zykov  <vladimir.zykov@prismtech.com>
-
-        * tests/Bug_3821_Regression/test.cpp:
-        * tests/Bug_3821_Regression/test.idl:
-        * tests/Bug_3821_Regression/Bug_3821_Regression.mpc:
-        * tests/Bug_3821_Regression/run_test.pl:
-        * tests/Bug_3821_Regression/README:
-        * tests/IDL_Test/Bug_3821_Regression.idl:
-        * bin/tao_orb_tests.lst:
-          Added a test for bug#3821 and scheduled it for run. Added the same
-          IDL file to IDL_Test, it can be useful for testing tao_idl's
-          behavior on unions.
-
-        * TAO_IDL/be/be_union.cpp:
-        * TAO_IDL/be/be_visitor_union/discriminant_ci.cpp:
-        * TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_union/serializer_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_union/union_cs.cpp:
-        * TAO_IDL/ast/ast_union.cpp:
-        * TAO_IDL/be_include/be_union.h:
-          Fixed a bug#3821. In particular it changes how tao_idl generates
-          code for enum discriminated unions. Fixed other minor bugs.
-
-Mon Feb  8 10:35:30 UTC 2010  Martin Corino  <mcorino@remedy.nl>
-
-        * orbsvcs/orbsvcs/Trader/Constraint_l.cpp:
-        * orbsvcs/tests/Concurrency/lex.CC_command.cpp:
-        * performance-tests/POA/Demux/demux_test_server.cpp:
-        * tests/Exposed_Policies/RT_Properties.cpp:
-
-          Fixed new GCC 4.4.x warning about ignoring return values of
-          function marked by the new warn_unused_result attribute.
-
-Mon Feb  8 06:58:43 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/fe/lex.yy.cpp:
-          Fixed Windows CE compile error
-
-Sat Feb  6 13:50:43 UTC 2010  Martin Corino  <mcorino@remedy.nl>
-
-        * tao/GIOP_Message_State.cpp:
-          Fixed strict aliasing warning.
-
-Fri Feb  5 19:20:42 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_visitor_home/home_svs.cpp:
-        * TAO_IDL/be/be_visitor_home/home_svh.cpp:
-        * TAO_IDL/be/be_visitor_xplicit_pre_proc.cpp:
-        * TAO_IDL/be_include/be_visitor_ccm_pre_proc.h:
-        * TAO_IDL/be_include/be_visitor_xplicit_pre_proc.h:
-
-          Fixed bug introduced by the recent change in handling of
-          home factories and finders, where the return type of an
-          inherited factory or finder was the type of the component
-          managed by the derived home, instead of the managed component
-          of the base home, as it should be.
-
-Thu Feb  4 14:13:32 UTC 2010  Vladimir Zykov  <vladimir.zykov@prismtech.com>
-
-        * TAO_IDL/be/be_visitor_union/discriminant_ci.cpp:
-          Changed code to generate octal numbers where they are meant instead
-          of decimals. Removed code for wchars since wchar discriminant is
-          not allowed in unions.
-
-        * TAO_IDL/be/be_global.cpp:
-          Fixed a memory leak in tao_idl.
-
-        * TAO_IDL/ast/ast_module.cpp:
-          Fixed bug#3819. Multiple forward declarations of valuetypes,
-          eventtypes, and components don't crash tao_idl now.
-
-Thu Feb  4 13:56:43 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/Makefile.am:
-          Regenerated
-
-Thu Feb  4 09:25:43 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        Merged revision 88756-88826 from idl3_plus_backend2 to svn head.
-
-        * orbsvcs/IFR_Service/ifr_adding_visitor.h:
-        * orbsvcs/IFR_Service/ifr_adding_visitor.cpp:
-
-          Change IFR loader backend correspondingly with the
-          change above to home factories and finders.
-
-Thu Feb  4 09:15:43 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/*.cpp:
-          Converted to doxygen style of documentation
-
-Thu Feb  4 09:01:43 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * TAO_IDL/*.h:
-          Converted to doxygen style of documentation
-
-Thu Feb  4 08:36:43 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        Merged revision 88756-88826 from idl3_plus_backend2 to svn head.
-
-        Wed Feb  3 21:37:08 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be_include/be_visitor_xplicit_pre_proc.h:
-        * TAO_IDL/be/be_visitor_xplicit_pre_proc.cpp:
-
-          New visitor specialized to generate the contents of
-          the home explicit implied IDL interface.
-
-        * TAO_IDL/include/ast_home.h:
-        * TAO_IDL/be/be_visitor_ccm_pre_proc.cpp:
-        * TAO_IDL/ast/ast_home.cpp:
-        * TAO_IDL/be_include/be_visitor_ccm_pre_proc.h:
-        * TAO_IDL/util/utl_scope.cpp:
-
-          Completed changes to handle home factories and finders
-          as part of the home scope rather than in separate list
-          members of the home class.
-
-        Mon Feb  1 22:30:44 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_visitor_home/factory_svs.cpp:
-        * TAO_IDL/be_include/be_visitor_home/factory_svs.h:
-
-          Removed this recently-added visitor, turned out
-          to be unnecessary.
-
-        * TAO_IDL/be/be_visitor_home/home_svs.cpp:
-        * TAO_IDL/be/be_visitor_home/home_exs.cpp:
-        * TAO_IDL/be/be_visitor_home/home_svh.cpp:
-        * TAO_IDL/be/be_visitor_home/home_ex_idl.cpp:
-        * TAO_IDL/be/be_visitor_home/home_exh.cpp:
-        * TAO_IDL/be/be_visitor_operation/arglist.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_init_arglist_ch.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/arglist.cpp:
-        * TAO_IDL/be/be_decl.cpp:
-        * TAO_IDL/be/be_visitor_home.cpp:
-        * TAO_IDL/be/be_visitor_operation.cpp:
-        * TAO_IDL/be/be_scope.cpp:
-        * TAO_IDL/be/be_visitor_ccm_pre_proc.cpp:
-        * TAO_IDL/ast/ast_visitor_tmpl_module_inst.cpp:
-        * TAO_IDL/be_include/be_visitor_home/home_ex_idl.h:
-        * TAO_IDL/be_include/be_visitor_home/home_exh.h:
-        * TAO_IDL/be_include/be_visitor_home/home_svs.h:
-        * TAO_IDL/be_include/be_visitor_home/home_exs.h:
-        * TAO_IDL/be_include/be_visitor_home/home_svh.h:
-        * TAO_IDL/be_include/be_visitor_operation/arglist.h:
-        * TAO_IDL/be_include/be_visitor_ccm_pre_proc.h:
-        * TAO_IDL/be_include/be_visitor_home.h:
-
-          More work toward handling home factories and
-          finders as members of the home's scope rather
-          than as a list in the home class. In progress.
-
-        Fri Jan 29 22:03:03 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_visitor_home/factory_svs.cpp:
-        * TAO_IDL/be_include/be_visitor_home/factory_svs.h:
-
-          New visitor for homes, encapsulating the issues of
-          factory and finder code generation in the servant
-          source file.
-
-        * TAO_IDL/include/ast_valuetype.h:
-        * TAO_IDL/include/ast_home.h:
-        * TAO_IDL/include/ast_visitor_tmpl_module_inst.h:
-        * TAO_IDL/include/utl_scope.h:
-        * TAO_IDL/be/be_visitor_home/home_svs.cpp:
-        * TAO_IDL/be/be_visitor_home/home_svh.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_init_arglist_ch.cpp:
-        * TAO_IDL/be/be_visitor_home.cpp:
-        * TAO_IDL/be/be_finder.cpp:
-        * TAO_IDL/ast/ast_home.cpp:
-        * TAO_IDL/ast/ast_visitor_tmpl_module_inst.cpp:
-        * TAO_IDL/ast/ast_finder.cpp:
-        * TAO_IDL/ast/ast_redef.cpp:
-        * TAO_IDL/be_include/be_visitor_home/home_svs.h:
-        * TAO_IDL/be_include/be_visitor_home/home_svh.h:
-        * TAO_IDL/be_include/be_visitor_home.h:
-        * TAO_IDL/fe/y.tab.cpp:
-        * TAO_IDL/fe/idl.yy:
-        * TAO_IDL/util/utl_scope.cpp:
-
-          In-progress change of home factory and finder handling.
-          Instead of being stored in lists in the home node, they
-          will be members of the home scope like any other legal
-          construct for a home scope.
-
-        Fri Jan 29 18:08:41 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/include/ast_finder.h:
-        * TAO_IDL/be/be_finder.cpp:
-        * TAO_IDL/ast/ast_finder.cpp:
-        * TAO_IDL/be_include/be_finder.h:
-
-          New AST node classes, representing an IDL home
-          finder construct.
-
-        * orbsvcs/IFR_Service/ifr_visitor.h:
-        * orbsvcs/IFR_Service/ifr_visitor.cpp:
-        * orbsvcs/IFR_Service/ifr_adding_visitor.cpp:
-
-          Updated backend with no-op overrides of
-          visit_* methods added to the front end.
-
-        * TAO_IDL/include/ast_generator.h:
-        * TAO_IDL/include/ast_visitor_reifying.h:
-        * TAO_IDL/include/ast_decl.h:
-        * TAO_IDL/include/ast_factory.h:
-        * TAO_IDL/include/ast_visitor_tmpl_module_inst.h:
-        * TAO_IDL/include/ast_visitor.h:
-        * TAO_IDL/be/be_factory.cpp:
-        * TAO_IDL/be/be_visitor.cpp:
-        * TAO_IDL/be/be_generator.cpp:
-        * TAO_IDL/ast/ast_visitor_tmpl_module_inst.cpp:
-        * TAO_IDL/ast/ast_generator.cpp:
-        * TAO_IDL/ast/ast_visitor_reifying.cpp:
-        * TAO_IDL/ast/ast_factory.cpp:
-        * TAO_IDL/be_include/be_visitor.h:
-        * TAO_IDL/be_include/be_factory.h:
-        * TAO_IDL/be_include/be_generator.h:
-        * TAO_IDL/fe/y.tab.cpp:
-        * TAO_IDL/fe/idl.yy:
-        * TAO_IDL/narrow/narrow.cpp:
-
-          Other changes corresponding to the addition
-          of the new AST classes and visit_* methods
-          above.
-
-        Thu Jan 28 20:04:42 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/include/ast_decl.h:
-        * TAO_IDL/include/utl_scope.h:
-        * TAO_IDL/be/be_visitor_operation/arglist.cpp:
-        * TAO_IDL/be/be_visitor_operation/argument.cpp:
-        * TAO_IDL/be/be_sequence.cpp:
-        * TAO_IDL/ast/ast_interface.cpp:
-        * TAO_IDL/ast/ast_module.cpp:
-        * TAO_IDL/ast/ast_interface_fwd.cpp:
-        * TAO_IDL/ast/ast_decl.cpp:
-        * TAO_IDL/fe/y.tab.cpp:
-        * TAO_IDL/fe/fe_extern.cpp:
-        * TAO_IDL/fe/idl.yy:
-        * TAO_IDL/util/utl_scope.cpp:
-
-          Removal of more unnecessary code.
-
-        Thu Jan 28 18:13:19 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_union.cpp:
-        * TAO_IDL/be/be_visitor_exception/exception.cpp:
-        * TAO_IDL/be/be_visitor_exception/any_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_exception/cdr_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_exception/exception_cs.cpp:
-        * TAO_IDL/be/be_visitor_exception/exception_ctor.cpp:
-        * TAO_IDL/be/be_visitor_exception/exception_ch.cpp:
-        * TAO_IDL/be/be_visitor_exception/exception_ci.cpp:
-        * TAO_IDL/be/be_visitor_exception/any_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_exception/ctor_assign.cpp:
-        * TAO_IDL/be/be_visitor_typedef/any_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_typedef/cdr_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_typedef/typedef.cpp:
-        * TAO_IDL/be/be_visitor_typedef/serializer_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_typedef/typedef_cs.cpp:
-        * TAO_IDL/be/be_visitor_typedef/any_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp:
-        * TAO_IDL/be/be_visitor_typedef/cdr_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp:
-        * TAO_IDL/be/be_visitor_typedef/serializer_op_cs.cpp:
-        * TAO_IDL/be/be_interface_fwd.cpp:
-        * TAO_IDL/be/be_attribute.cpp:
-        * TAO_IDL/be/be_visitor_native.cpp:
-        * TAO_IDL/be/be_visitor_typecode/typecode_decl.cpp:
-        * TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp:
-        * TAO_IDL/be/be_visitor_arg_traits.cpp:
-        * TAO_IDL/be/be_valuetype.cpp:
-        * TAO_IDL/be/be_visitor_argument/invoke_cs.cpp:
-        * TAO_IDL/be/be_visitor_argument/argument.cpp:
-        * TAO_IDL/be/be_visitor_argument/arglist.cpp:
-        * TAO_IDL/be/be_visitor_argument/upcall_ss.cpp:
-        * TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp:
-        * TAO_IDL/be/be_visitor_argument/post_upcall_ss.cpp:
-        * TAO_IDL/be/be_visitor_argument/marshal_ss.cpp:
-        * TAO_IDL/be/be_visitor_argument/paramlist.cpp:
-        * TAO_IDL/be/be_visitor_home/home_ch.cpp:
-        * TAO_IDL/be/be_visitor_home/home_exs.cpp:
-        * TAO_IDL/be/be_visitor_home/home_ex_idl.cpp:
-        * TAO_IDL/be/be_visitor_home/home_exh.cpp:
-        * TAO_IDL/be/be_visitor_home/home_cs.cpp:
-        * TAO_IDL/be/be_union_fwd.cpp:
-        * TAO_IDL/be/be_visitor_interface/proxy_impls_ch.cpp:
-        * TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp:
-        * TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp:
-        * TAO_IDL/be/be_visitor_interface/amh_rh_ss.cpp:
-        * TAO_IDL/be/be_visitor_interface/base_proxy_impl_ch.cpp:
-        * TAO_IDL/be/be_visitor_interface/remote_proxy_broker_ch.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_ci.cpp:
-        * TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp:
-        * TAO_IDL/be/be_visitor_interface/amh_ch.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_ih.cpp:
-        * TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
-        * TAO_IDL/be/be_visitor_interface/remote_proxy_broker_cs.cpp:
-        * TAO_IDL/be/be_visitor_interface/base_proxy_broker_ch.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_sh.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_si.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_is.cpp:
-        * TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_interface/amh_sh.cpp:
-        * TAO_IDL/be/be_visitor_interface/any_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp:
-        * TAO_IDL/be/be_visitor_interface/amh_si.cpp:
-        * TAO_IDL/be/be_visitor_interface/ami_interface_ch.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_ss.cpp:
-        * TAO_IDL/be/be_visitor_interface/amh_ss.cpp:
-        * TAO_IDL/be/be_visitor_interface/any_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_interface/tie_sh.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_svh.cpp:
-        * TAO_IDL/be/be_visitor_interface/proxy_brokers_ch.cpp:
-        * TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp:
-        * TAO_IDL/be/be_visitor_interface/tie_ss.cpp:
-        * TAO_IDL/be/be_visitor_interface/remote_proxy_impl_ch.cpp:
-        * TAO_IDL/be/be_visitor_interface/amh_rh_sh.cpp:
-        * TAO_IDL/be/be_visitor_interface/interface_svs.cpp:
-        * TAO_IDL/be/be_visitor_operation/smart_proxy_ch.cpp:
-        * TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp:
-        * TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp:
-        * TAO_IDL/be/be_visitor_operation/remote_proxy_impl_cs.cpp:
-        * TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp:
-        * TAO_IDL/be/be_visitor_operation/arglist.cpp:
-        * TAO_IDL/be/be_visitor_operation/base_proxy_impl_ch.cpp:
-        * TAO_IDL/be/be_visitor_operation/exceptlist_cs.cpp:
-        * TAO_IDL/be/be_visitor_operation/smart_proxy_cs.cpp:
-        * TAO_IDL/be/be_visitor_operation/rettype_return_cs.cpp:
-        * TAO_IDL/be/be_visitor_operation/operation_ih.cpp:
-        * TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp:
-        * TAO_IDL/be/be_visitor_operation/operation_cs.cpp:
-        * TAO_IDL/be/be_visitor_operation/exceptlist_ss.cpp:
-        * TAO_IDL/be/be_visitor_operation/operation_sh.cpp:
-        * TAO_IDL/be/be_visitor_operation/operation_is.cpp:
-        * TAO_IDL/be/be_visitor_operation/rettype.cpp:
-        * TAO_IDL/be/be_visitor_operation/amh_sh.cpp:
-        * TAO_IDL/be/be_visitor_operation/operation.cpp:
-        * TAO_IDL/be/be_visitor_operation/operation_ss.cpp:
-        * TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_ch.cpp:
-        * TAO_IDL/be/be_visitor_operation/amh_ss.cpp:
-        * TAO_IDL/be/be_visitor_operation/tie_sh.cpp:
-        * TAO_IDL/be/be_visitor_operation/ami_ch.cpp:
-        * TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp:
-        * TAO_IDL/be/be_visitor_operation/argument.cpp:
-        * TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_cs.cpp:
-        * TAO_IDL/be/be_visitor_operation/tie_ss.cpp:
-        * TAO_IDL/be/be_visitor_operation/amh_rh_sh.cpp:
-        * TAO_IDL/be/be_visitor_operation/argument_marshal.cpp:
-        * TAO_IDL/be/be_visitor_operation/ami_cs.cpp:
-        * TAO_IDL/be/be_visitor_operation/argument_invoke.cpp:
-        * TAO_IDL/be/be_visitor_root.cpp:
-        * TAO_IDL/be/be_codegen.cpp:
-        * TAO_IDL/be/be_union_branch.cpp:
-        * TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_sequence/serializer_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_sequence/sequence_base.cpp:
-        * TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp:
-        * TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_sequence/buffer_type.cpp:
-        * TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp:
-        * TAO_IDL/be/be_visitor_union.cpp:
-        * TAO_IDL/be/be_valuetype_fwd.cpp:
-        * TAO_IDL/be/be_visitor_ami_pre_proc.cpp:
-        * TAO_IDL/be/be_visitor_interface_fwd.cpp:
-        * TAO_IDL/be/be_visitor_root/root_ci.cpp:
-        * TAO_IDL/be/be_visitor_root/root_sth.cpp:
-        * TAO_IDL/be/be_visitor_root/root_exs.cpp:
-        * TAO_IDL/be/be_visitor_root/root_ih.cpp:
-        * TAO_IDL/be/be_visitor_root/root_svh.cpp:
-        * TAO_IDL/be/be_visitor_root/cdr_op.cpp:
-        * TAO_IDL/be/be_visitor_root/serializer_op.cpp:
-        * TAO_IDL/be/be_visitor_root/root_ex_idl.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_svs.cpp:
-        * TAO_IDL/be/be_visitor_root/root_is.cpp:
-        * TAO_IDL/be/be_visitor_root/root_si.cpp:
-        * TAO_IDL/be/be_visitor_root/root.cpp:
-        * TAO_IDL/be/be_visitor_root/any_op.cpp:
-        * TAO_IDL/be/be_visitor_root/root_exh.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/any_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp:
-        * TAO_IDL/be/be_visitor_valuebox/cdr_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp:
-        * TAO_IDL/be/be_visitor_valuebox/valuebox.cpp:
-        * TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp:
-        * TAO_IDL/be/be_visitor_valuebox/cdr_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_valuebox/field_ch.cpp:
-        * TAO_IDL/be/be_visitor_enum.cpp:
-        * TAO_IDL/be/be_home.cpp:
-        * TAO_IDL/be/be_visitor_template_export.cpp:
-        * TAO_IDL/be/be_visitor_component_fwd/any_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_component_fwd/cdr_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_component_fwd/component_fwd_ch.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/field_ci.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ci.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_init_arglist_ch.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/field_cdr_cs.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/marshal_ch.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/arglist.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/ami_exception_holder_cs.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_sh.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/field_cs.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_si.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_init_ci.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/field_cdr_ch.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/obv_module.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/ami_exception_holder_ch.cpp:
-        * TAO_IDL/be/be_visitor_valuetype/field_ch.cpp:
-        * TAO_IDL/be/be_helper.cpp:
-        * TAO_IDL/be/be_valuebox.cpp:
-        * TAO_IDL/be/be_visitor_union_fwd/union_fwd_ch.cpp:
-        * TAO_IDL/be/be_visitor_valuetype_fwd.cpp:
-        * TAO_IDL/be/be_visitor_structure_fwd/structure_fwd_ch.cpp:
-        * TAO_IDL/be/be_component.cpp:
-        * TAO_IDL/be/be_visitor_exception.cpp:
-        * TAO_IDL/be/be_visitor_typedef.cpp:
-        * TAO_IDL/be/be_visitor_union_branch.cpp:
-        * TAO_IDL/be/be_visitor_typecode.cpp:
-        * TAO_IDL/be/be_visitor_argument.cpp:
-        * TAO_IDL/be/be_component_fwd.cpp:
-        * TAO_IDL/be/be_visitor_union_branch/cdr_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_union_branch/serializer_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_union_branch/public_cs.cpp:
-        * TAO_IDL/be/be_visitor_union_branch/private_ch.cpp:
-        * TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp:
-        * TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp:
-        * TAO_IDL/be/be_visitor_union_branch/public_ch.cpp:
-        * TAO_IDL/be/be_visitor_union_branch/public_constructor_cs.cpp:
-        * TAO_IDL/be/be_visitor_union_branch/public_ci.cpp:
-        * TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_union_branch/serializer_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_home.cpp:
-        * TAO_IDL/be/be_visitor_constant.cpp:
-        * TAO_IDL/be/be_visitor_amh_pre_proc.cpp:
-        * TAO_IDL/be/be_interface_strategy.cpp:
-        * TAO_IDL/be/be_operation_strategy.cpp:
-        * TAO_IDL/be/be_field.cpp:
-        * TAO_IDL/be/be_visitor_native/native_ch.cpp:
-        * TAO_IDL/be/be_module.cpp:
-        * TAO_IDL/be/be_visitor_sequence.cpp:
-        * TAO_IDL/be/be_visitor_constant/constant_cs.cpp:
-        * TAO_IDL/be/be_visitor_constant/constant_ch.cpp:
-        * TAO_IDL/be/be_structure_fwd.cpp:
-        * TAO_IDL/be/be_visitor_component/component_ch.cpp:
-        * TAO_IDL/be/be_visitor_component/component_ci.cpp:
-        * TAO_IDL/be/be_visitor_component/cdr_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_component/component_ih.cpp:
-        * TAO_IDL/be/be_visitor_component/component_cs.cpp:
-        * TAO_IDL/be/be_visitor_component/cdr_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_component/component_sh.cpp:
-        * TAO_IDL/be/be_visitor_component/component_is.cpp:
-        * TAO_IDL/be/be_visitor_component/component_si.cpp:
-        * TAO_IDL/be/be_visitor_component/any_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_component/component.cpp:
-        * TAO_IDL/be/be_visitor_component/component_ss.cpp:
-        * TAO_IDL/be/be_visitor_component/any_op_cs.cpp:
-        * TAO_IDL/be/be_predefined_type.cpp:
-        * TAO_IDL/be/be_visitor_array/array.cpp:
-        * TAO_IDL/be/be_visitor_array/any_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_array/cdr_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_array/serializer_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_array/array_cs.cpp:
-        * TAO_IDL/be/be_visitor_array/array_ci.cpp:
-        * TAO_IDL/be/be_visitor_array/any_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_array/serializer_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_component_fwd.cpp:
-        * TAO_IDL/be/be_argument.cpp:
-        * TAO_IDL/be/be_visitor_module/module_ch.cpp:
-        * TAO_IDL/be/be_visitor_module/module_sh.cpp:
-        * TAO_IDL/be/be_visitor_module/any_op.cpp:
-        * TAO_IDL/be/be_visitor_module/module.cpp:
-        * TAO_IDL/be/be_visitor_module/module_ih.cpp:
-        * TAO_IDL/be/be_visitor_module/cdr_op.cpp:
-        * TAO_IDL/be/be_visitor_module/serializer_op.cpp:
-        * TAO_IDL/be/be_visitor_decl.cpp:
-        * TAO_IDL/be/be_visitor_union/discriminant_ch.cpp:
-        * TAO_IDL/be/be_visitor_union/any_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_union/discriminant_ci.cpp:
-        * TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_union/serializer_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_union/union_ch.cpp:
-        * TAO_IDL/be/be_visitor_union/union_ci.cpp:
-        * TAO_IDL/be/be_visitor_union/union.cpp:
-        * TAO_IDL/be/be_visitor_union/discriminant_cs.cpp:
-        * TAO_IDL/be/be_visitor_union/any_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_union/serializer_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_union/union_cs.cpp:
-        * TAO_IDL/be/be_constant.cpp:
-        * TAO_IDL/be/be_visitor_valuetype.cpp:
-        * TAO_IDL/be/be_exception.cpp:
-        * TAO_IDL/be/be_visitor_structure/any_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_structure/cdr_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_structure/structure.cpp:
-        * TAO_IDL/be/be_visitor_structure/serializer_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_structure/structure_cs.cpp:
-        * TAO_IDL/be/be_visitor_structure/any_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_structure/structure_ch.cpp:
-        * TAO_IDL/be/be_visitor_structure/structure_ci.cpp:
-        * TAO_IDL/be/be_visitor_structure/serializer_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_interface_fwd/interface_fwd_ch.cpp:
-        * TAO_IDL/be/be_global.cpp:
-        * TAO_IDL/be/be_null_return_emitter.cpp:
-        * TAO_IDL/be/be_visitor_enum/enum_ch.cpp:
-        * TAO_IDL/be/be_visitor_enum/any_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_enum/cdr_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_enum/serializer_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_enum/enum_cs.cpp:
-        * TAO_IDL/be/be_visitor_enum/any_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_enum/cdr_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_enum/serializer_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_context.cpp:
-        * TAO_IDL/be/be_visitor_union_fwd.cpp:
-        * TAO_IDL/be/be_visitor_structure_fwd.cpp:
-        * TAO_IDL/be/be_visitor_field/field_ci.cpp:
-        * TAO_IDL/be/be_visitor_field/cdr_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_field/serializer_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_field/field_cs.cpp:
-        * TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_field/serializer_op_cs.cpp:
-        * TAO_IDL/be/be_visitor_field/field_ch.cpp:
-        * TAO_IDL/be/be_root.cpp:
-        * TAO_IDL/be/be_interface.cpp:
-        * TAO_IDL/be/be_enum.cpp:
-        * TAO_IDL/be/be_string.cpp:
-        * TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ch.cpp:
-        * TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ci.cpp:
-        * TAO_IDL/be/be_visitor_valuetype_fwd/valuetype_fwd_ch.cpp:
-        * TAO_IDL/be/be_array.cpp:
-        * TAO_IDL/be/be_visitor_traits.cpp:
-        * TAO_IDL/be/be_visitor_factory.cpp:
-        * TAO_IDL/be/be_native.cpp:
-        * TAO_IDL/be/be_generator.cpp:
-        * TAO_IDL/ast/ast_union_fwd.cpp:
-        * TAO_IDL/ast/ast_structure_fwd.cpp:
-        * TAO_IDL/ast/ast_concrete_type.cpp:
-        * TAO_IDL/ast/ast_predefined_type.cpp:
-        * TAO_IDL/ast/ast_enum_val.cpp:
-        * TAO_IDL/ast/ast_recursive.cpp:
-        * TAO_IDL/ast/ast_valuetype_fwd.cpp:
-        * TAO_IDL/ast/ast_root.cpp:
-        * TAO_IDL/ast/ast_eventtype_fwd.cpp:
-        * TAO_IDL/ast/ast_valuebox.cpp:
-        * TAO_IDL/ast/ast_redef.cpp:
-        * TAO_IDL/ast/ast_union_label.cpp:
-        * TAO_IDL/ast/ast_interface_fwd.cpp:
-        * TAO_IDL/ast/ast_component_fwd.cpp:
-        * TAO_IDL/ast/ast_enum.cpp:
-        * TAO_IDL/ast/ast_string.cpp:
-        * TAO_IDL/ast/ast_check.cpp:
-        * TAO_IDL/ast/ast_type.cpp:
-        * TAO_IDL/ast/ast_native.cpp:
-        * TAO_IDL/be_include/be_visitor_context.h:
-        * TAO_IDL/fe/fe_global.cpp:
-        * TAO_IDL/fe/fe_init.cpp:
-        * TAO_IDL/fe/fe_extern.cpp:
-        * TAO_IDL/fe/fe_private.cpp:
-        * TAO_IDL/driver/drv_mcpp_preproc.cpp:
-        * TAO_IDL/driver/drv_preproc.cpp:
-        * TAO_IDL/narrow/narrow.cpp:
-        * TAO_IDL/util/utl_identifier.cpp:
-        * TAO_IDL/util/utl_tmpl/utl_exprlist.cpp:
-        * TAO_IDL/util/utl_tmpl/utl_list.cpp:
-        * TAO_IDL/util/utl_tmpl/utl_namelist.cpp:
-        * TAO_IDL/util/utl_tmpl/utl_decllist.cpp:
-        * TAO_IDL/util/utl_tmpl/utl_exceptlist.cpp:
-        * TAO_IDL/util/utl_tmpl/utl_strlist.cpp:
-        * TAO_IDL/util/utl_tmpl/utl_idlist.cpp:
-        * TAO_IDL/util/utl_decllist.cpp:
-        * TAO_IDL/util/utl_strlist.cpp:
-        * TAO_IDL/util/utl_stack.cpp:
-        * TAO_IDL/util/utl_string.cpp:
-
-          Removed many unused methods from class be_visitor_context,
-          and bits of unused code from many other files.
-
-        Thu Jan 28 15:56:11 UTC 2010  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * TAO_IDL/be/be_visitor_home/home_svs.cpp:
-        * TAO_IDL/be/be_visitor_home/home_svh.cpp:
-
-          Added code generation for method overrides that appear as pure
-          virtual in the skeleton base class when the home has
-          a primary key. These methods throw CORBA::NO_IMPLEMENT,
-          since primary keys are not supported in CIAO.
-
-Wed Feb  3 15:23:16 UTC 2010  Abdul Sowayan  <sowayan@gmail.com>
-
-        * orbsvcs/tests/AVStreams/Full_Profile/run_test.pl:
-        * orbsvcs/tests/AVStreams/Pluggable/run_test.pl:
-        * orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl:
-        * orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl:
-
-          Increase sleep out time to allow these tests to pass on the
-          iPhone Simulator.
-
-Wed Feb  3 09:52:47 UTC 2010  Vladimir Zykov  <vladimir.zykov@prismtech.com>
-
-        * tests/IDL_Test/IDL_Test.mpc:
-        * tests/IDL_Test/Bug_3819_Regression.idl:
-          Added a test for bug#3819.
-
-Tue Feb  2 11:07:14 UTC 2010  Vladimir Zykov  <vladimir.zykov@prismtech.com>
-
-        * tests/Bug_1361_Regression/server.cpp:
-        * tests/Bug_1361_Regression/shutdown.cpp:
-        * tests/Bug_1361_Regression/client.cpp:
-        * tests/Bug_1361_Regression/Echo.cpp:
-        * tests/Bug_1361_Regression/Bug_1361_Regression.mpc:
-          Simplified the test. It used libTAO_Messaging without any
-          need for it.
-
-        * orbsvcs/orbsvcs/PortableGroup/PG_Property_Set_Find.h:
-        * tao/AnyTypeCode/Any_Array_Impl_T.cpp:
-        * tao/AnyTypeCode/Objref_TypeCode.cpp:
-        * tao/PortableServer/Any_SArg_Traits.h:
-        * tao/PortableServer/get_arg.h:
-        * tao/PI_Server/Policy_Creator_T.h:
-        * tao/Load_Protocol_Factory_T.h:
-        * tao/TransportCurrent/IIOP_Current_Impl.h:
-        * tao/Valuetype/Valuetype_Traits_Base_T.h:
-          Added required include.
-
-        * orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h:
-        * tao/TransportCurrent/Current_ORBInitializer.h:
-          Removed unnecessary for templates export directive.
-
-        * tao/ImR_Client/ServerObject.pidl:
-        * tao/ImR_Client/ImplRepo.pidl:
-        * tao/AnyTypeCode/BasicTypeTraits.h:
-        * tao/IORTable/IORTable.pidl:
-        * tao/Object_Key.pidl:
-        * tao/TransportCurrent/Transport_Current.h:
-        * tao/TransportCurrent/IIOP_Transport_Current.h:
-          Added inclusion guards.
-
-        * tao/AnyTypeCode/Union_TypeCode.h:
-          Added necessary forward declaration.
-
-        * tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h:
-        * tao/PortableServer/Upcall_Command.h:
-        * tao/PortableServer/Upcall_Wrapper.h:
-        * tao/Object_Reference_Traits_T.h:
-        * tao/String_Traits_T.h:
-        * tao/Value_Traits_T.h:
-        * tao/Array_Traits_T.h:
-        * tao/Utils/Servant_Var.inl:
-        * tao/Valuetype/Valuetype_Traits_T.h:
-          Changed 'ifndef ACE_LACKS_PRAGMA_ONCE' to
-          'if !defined (ACE_LACKS_PRAGMA_ONCE)'. So that ifndef is only used
-          for inclusion guards in TAO.
-
-        * tao/Transport.cpp:
-          Changed 0 to false for boolean type.
-
-        * tao/RTScheduling/ThreadAction.h:
-          Fixed code that didn't compile.
-
-Mon Feb  1 19:27:43 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/orbsvcs/Notify/QoSProperties.h
-        * orbsvcs/orbsvcs/Notify/Topology_Saver.h
-        * orbsvcs/orbsvcs/Time_Utilities.h
-        * orbsvcs/orbsvcs/Time_Utilities.inl
-          Doxygen fixes
-
 Sun Jan 31 01:04:43 CST 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
 
-        * TAO version 1.7.6 released.
+	* TAO version 1.7.6 released.
 
 Thu Jan 28 12:56:31 UTC 2010  Abdul Sowayan  <sowayan@gmail.com>
 
diff --git a/TAO/MPC/modules/IDLHelper.pm b/TAO/MPC/modules/IDLHelper.pm
index 21bec3f8ec8..29093b9b553 100644
--- a/TAO/MPC/modules/IDLHelper.pm
+++ b/TAO/MPC/modules/IDLHelper.pm
@@ -20,9 +20,6 @@ sub get_output {
   if ($flags =~ /-Gxhsv/ && $flags =~ /-Wb,svnt_export_include=(\S*)/) {
     push(@out, $1);
   }
-  if ($flags =~ /-Gxhcn/ && $flags =~ /-Wb,conn_export_include=(\S*)/) {
-    push(@out, $1);
-  }
 
   return \@out;
 }
diff --git a/TAO/Makefile.am b/TAO/Makefile.am
index 4b2f848d4d2..39058f38495 100644
--- a/TAO/Makefile.am
+++ b/TAO/Makefile.am
@@ -24,7 +24,7 @@ SUBDIRS += performance-tests interop-tests tests
 endif
 
 ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = -I ../m4
+ACLOCAL_AMFLAGS = -I m4 -I ../m4
 AUTOMAKE_OPTIONS = foreign
 
 EXTRA_DIST =  \
diff --git a/TAO/Release b/TAO/Release
index ffc4f196444..f60ab9f8d44 100644
--- a/TAO/Release
+++ b/TAO/Release
@@ -30,7 +30,7 @@ CONTROLLED_FILES = \
 	TAO/docs \
 	TAO/examples \
 	TAO/interop-tests \
-        TAO/m4 \
+	TAO/m4 \
 	TAO/orbsvcs \
 	TAO/performance-tests \
 	TAO/rules.tao.GNU \
diff --git a/TAO/TAO_IDL/Makefile.am b/TAO/TAO_IDL/Makefile.am
index b95d181d891..773c8d8ac5a 100644
--- a/TAO/TAO_IDL/Makefile.am
+++ b/TAO/TAO_IDL/Makefile.am
@@ -45,7 +45,6 @@ libTAO_IDL_FE_la_SOURCES = \
   ast/ast_extended_port.cpp \
   ast/ast_factory.cpp \
   ast/ast_field.cpp \
-  ast/ast_finder.cpp \
   ast/ast_generator.cpp \
   ast/ast_home.cpp \
   ast/ast_interface.cpp \
@@ -139,7 +138,6 @@ noinst_HEADERS = \
   include/ast_extern.h \
   include/ast_factory.h \
   include/ast_field.h \
-  include/ast_finder.h \
   include/ast_generator.h \
   include/ast_home.h \
   include/ast_interface.h \
@@ -240,7 +238,6 @@ libTAO_IDL_BE_la_SOURCES = \
   be/be_extended_port.cpp \
   be/be_factory.cpp \
   be/be_field.cpp \
-  be/be_finder.cpp \
   be/be_generator.cpp \
   be/be_global.cpp \
   be/be_helper.cpp \
@@ -325,8 +322,7 @@ libTAO_IDL_BE_la_SOURCES = \
   be/be_visitor_union_fwd.cpp \
   be/be_visitor_valuebox.cpp \
   be/be_visitor_valuetype.cpp \
-  be/be_visitor_valuetype_fwd.cpp \
-  be/be_visitor_xplicit_pre_proc.cpp
+  be/be_visitor_valuetype_fwd.cpp
 
 noinst_HEADERS += \
   be_include/TAO_IDL_BE_Export.h \
@@ -351,7 +347,6 @@ noinst_HEADERS += \
   be_include/be_extern.h \
   be_include/be_factory.h \
   be_include/be_field.h \
-  be_include/be_finder.h \
   be_include/be_generator.h \
   be_include/be_global.h \
   be_include/be_helper.h \
@@ -433,8 +428,7 @@ noinst_HEADERS += \
   be_include/be_visitor_union_fwd.h \
   be_include/be_visitor_valuebox.h \
   be_include/be_visitor_valuetype.h \
-  be_include/be_visitor_valuetype_fwd.h \
-  be_include/be_visitor_xplicit_pre_proc.h
+  be_include/be_visitor_valuetype_fwd.h
 
 ## Makefile.TAO_IDL_EXE.am
 
diff --git a/TAO/TAO_IDL/ast/ast_argument.cpp b/TAO/TAO_IDL/ast/ast_argument.cpp
index 419ff28718e..1ace9b13072 100644
--- a/TAO/TAO_IDL/ast/ast_argument.cpp
+++ b/TAO/TAO_IDL/ast/ast_argument.cpp
@@ -92,8 +92,13 @@ direction_to_string (AST_Argument::Direction d)
   return 0;
 }
 
-AST_Decl::NodeType const
-AST_Argument::NT = AST_Decl::NT_argument;
+AST_Argument::AST_Argument (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    AST_Field (),
+    pd_direction (dir_IN)
+{
+}
 
 AST_Argument::AST_Argument (Direction d,
                             AST_Type *ft,
diff --git a/TAO/TAO_IDL/ast/ast_array.cpp b/TAO/TAO_IDL/ast/ast_array.cpp
index eb624b430f2..a474333473b 100644
--- a/TAO/TAO_IDL/ast/ast_array.cpp
+++ b/TAO/TAO_IDL/ast/ast_array.cpp
@@ -80,8 +80,19 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "ace/Log_Msg.h"
 #include "ace/OS_Memory.h"
 
-AST_Decl::NodeType const
-AST_Array::NT = AST_Decl::NT_array;
+// Constructor(s) and destructor.
+
+AST_Array::AST_Array (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    AST_Type (),
+    AST_ConcreteType (),
+    pd_n_dims (0),
+    pd_dims (0),
+    pd_base_type (0),
+    owns_base_type_ (false)
+{
+}
 
 AST_Array::AST_Array (UTL_ScopedName *n,
                       ACE_CDR::ULong nd,
diff --git a/TAO/TAO_IDL/ast/ast_attribute.cpp b/TAO/TAO_IDL/ast/ast_attribute.cpp
index 0c9d5036ce6..26d770b0796 100644
--- a/TAO/TAO_IDL/ast/ast_attribute.cpp
+++ b/TAO/TAO_IDL/ast/ast_attribute.cpp
@@ -70,18 +70,25 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 // of AST_Type) and a boolean indicating whether the attribute is
 // readonly.
 
+#include "ast_attribute.h"
+#include "ast_exception.h"
+#include "ast_visitor.h"
 #include "utl_namelist.h"
 #include "utl_exceptlist.h"
 #include "utl_scope.h"
 #include "utl_err.h"
 #include "global_extern.h"
 
-#include "ast_attribute.h"
-#include "ast_exception.h"
-#include "ast_visitor.h"
-
-AST_Decl::NodeType const
-AST_Attribute::NT = AST_Decl::NT_attr;
+// Constructor(s) and destructor.
+AST_Attribute::AST_Attribute (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    AST_Field (),
+    pd_readonly (true),
+    pd_get_exceptions (0),
+    pd_set_exceptions (0)
+{
+}
 
 AST_Attribute::AST_Attribute (bool ro,
                               AST_Type *ft,
diff --git a/TAO/TAO_IDL/ast/ast_check.cpp b/TAO/TAO_IDL/ast/ast_check.cpp
index 69c88a54644..7bb53bae46e 100644
--- a/TAO/TAO_IDL/ast/ast_check.cpp
+++ b/TAO/TAO_IDL/ast/ast_check.cpp
@@ -70,7 +70,9 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "global_extern.h"
 #include "utl_err.h"
 
-#include "utl_scope.h"
+ACE_RCSID (ast,
+           ast_check,
+           "$Id$")
 
 // Static storage for remembering nodes.
 static AST_Type  **ast_fwds = 0;
diff --git a/TAO/TAO_IDL/ast/ast_component.cpp b/TAO/TAO_IDL/ast/ast_component.cpp
index f6227a232cb..18ca9aaa8a4 100644
--- a/TAO/TAO_IDL/ast/ast_component.cpp
+++ b/TAO/TAO_IDL/ast/ast_component.cpp
@@ -14,8 +14,15 @@
 #include "utl_err.h"
 #include "global_extern.h"
 
-AST_Decl::NodeType const
-AST_Component::NT = AST_Decl::NT_component;
+AST_Component::AST_Component (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    AST_Type (),
+    UTL_Scope (),
+    AST_Interface (),
+    pd_base_component (0)
+{
+}
 
 AST_Component::AST_Component (UTL_ScopedName *n,
                               AST_Component *base_component,
@@ -199,57 +206,267 @@ AST_Component::ast_accept (ast_visitor *visitor)
 AST_Provides *
 AST_Component::fe_add_provides (AST_Provides *p)
 {
-  return
-    AST_Provides::narrow_from_decl (
-      this->fe_add_ref_decl (p));
+  AST_Decl *d = 0;
+
+  // Already defined? Or already used?
+  if ((d = this->lookup_for_add (p, false)) != 0)
+    {
+      if (!can_be_redefined (d))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      p,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (this->referenced (d, p->local_name ()))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      p,
+                                      this,
+                                      d);
+          return 0;
+        }
+    }
+
+  // Add it to scope.
+  this->add_to_scope (p);
+
+  // Add it to set of locally referenced symbols.
+  this->add_to_referenced (p,
+                           false,
+                           p->local_name ());
+
+  return p;
 }
 
 AST_Uses *
 AST_Component::fe_add_uses (AST_Uses *u)
 {
-  return
-    AST_Uses::narrow_from_decl (
-      this->fe_add_ref_decl (u));
+  AST_Decl *d = 0;
+
+  // Already defined? Or already used?
+  if ((d = this->lookup_for_add (u, false)) != 0)
+    {
+      if (!can_be_redefined (d))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      u,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (this->referenced (d, u->local_name ()))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      u,
+                                      this,
+                                      d);
+          return 0;
+        }
+    }
+
+  // Add it to scope.
+  this->add_to_scope (u);
+
+  // Add it to set of locally referenced symbols.
+  this->add_to_referenced (u,
+                           false,
+                           u->local_name ());
+
+  return u;
 }
 
 AST_Publishes *
 AST_Component::fe_add_publishes (AST_Publishes *p)
 {
-  return
-    AST_Publishes::narrow_from_decl (
-      this->fe_add_ref_decl (p));
+  AST_Decl *d = 0;
+
+  // Already defined? Or already used?
+  if ((d = this->lookup_for_add (p, false)) != 0)
+    {
+      if (!can_be_redefined (d))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      p,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (this->referenced (d, p->local_name ()))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      p,
+                                      this,
+                                      d);
+          return 0;
+        }
+    }
+
+  // Add it to scope.
+  this->add_to_scope (p);
+
+  // Add it to set of locally referenced symbols.
+  this->add_to_referenced (p,
+                           false,
+                           p->local_name ());
+
+  return p;
 }
 
 AST_Emits *
 AST_Component::fe_add_emits (AST_Emits *e)
 {
-  return
-    AST_Emits::narrow_from_decl (
-      this->fe_add_ref_decl (e));
+  AST_Decl *d = 0;
+
+  // Already defined? Or already used?
+  if ((d = this->lookup_for_add (e, false)) != 0)
+    {
+      if (!can_be_redefined (d))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      e,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (this->referenced (d, e->local_name ()))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      e,
+                                      this,
+                                      d);
+          return 0;
+        }
+    }
+
+  // Add it to scope.
+  this->add_to_scope (e);
+
+  // Add it to set of locally referenced symbols.
+  this->add_to_referenced (e,
+                           false,
+                           e->local_name ());
+
+  return e;
 }
 
 AST_Consumes *
 AST_Component::fe_add_consumes (AST_Consumes *c)
 {
-  return
-    AST_Consumes::narrow_from_decl (
-      this->fe_add_ref_decl (c));
+  AST_Decl *d = 0;
+
+  // Already defined? Or already used?
+  if ((d = this->lookup_for_add (c, false)) != 0)
+    {
+      if (!can_be_redefined (d))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      c,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (this->referenced (d, c->local_name ()))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      c,
+                                      this,
+                                      d);
+          return 0;
+        }
+    }
+
+  // Add it to scope.
+  this->add_to_scope (c);
+
+  // Add it to set of locally referenced symbols.
+  this->add_to_referenced (c,
+                           false,
+                           c->local_name ());
+
+  return c;
 }
 
 AST_Extended_Port *
 AST_Component::fe_add_extended_port (AST_Extended_Port *p)
 {
-  return
-    AST_Extended_Port::narrow_from_decl (
-      this->fe_add_ref_decl (p));
+  AST_Decl *d = 0;
+
+  // Already defined? Or already used?
+  if ((d = this->lookup_for_add (p, false)) != 0)
+    {
+      if (!can_be_redefined (d))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      p,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (this->referenced (d, p->local_name ()))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      p,
+                                      this,
+                                      d);
+          return 0;
+        }
+    }
+
+  // Add it to scope.
+  this->add_to_scope (p);
+
+  // Add it to set of locally referenced symbols.
+  this->add_to_referenced (p,
+                           false,
+                           p->local_name ());
+
+  return p;
 }
 
 AST_Mirror_Port *
 AST_Component::fe_add_mirror_port (AST_Mirror_Port *p)
 {
-  return
-    AST_Mirror_Port::narrow_from_decl (
-      this->fe_add_ref_decl (p));
+  AST_Decl *d = 0;
+
+  // Already defined? Or already used?
+  if ((d = this->lookup_for_add (p, false)) != 0)
+    {
+      if (!can_be_redefined (d))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      p,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (this->referenced (d, p->local_name ()))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      p,
+                                      this,
+                                      d);
+          return 0;
+        }
+    }
+
+  // Add it to scope.
+  this->add_to_scope (p);
+
+  // Add it to set of locally referenced symbols.
+  this->add_to_referenced (p,
+                           false,
+                           p->local_name ());
+
+  return p;
 }
 
 int
diff --git a/TAO/TAO_IDL/ast/ast_component_fwd.cpp b/TAO/TAO_IDL/ast/ast_component_fwd.cpp
index 766152554f7..2d9ffcabbf9 100644
--- a/TAO/TAO_IDL/ast/ast_component_fwd.cpp
+++ b/TAO/TAO_IDL/ast/ast_component_fwd.cpp
@@ -4,8 +4,17 @@
 #include "ast_visitor.h"
 #include "utl_identifier.h"
 
-AST_Decl::NodeType const
-AST_ComponentFwd::NT = AST_Decl::NT_component_fwd;
+ACE_RCSID( ast,
+           ast_component_fwd,
+           "$Id$")
+
+AST_ComponentFwd::AST_ComponentFwd (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    AST_Type (),
+    AST_InterfaceFwd ()
+{
+}
 
 AST_ComponentFwd::AST_ComponentFwd (AST_Interface *dummy,
                                     UTL_ScopedName *n)
diff --git a/TAO/TAO_IDL/ast/ast_concrete_type.cpp b/TAO/TAO_IDL/ast/ast_concrete_type.cpp
index 5719f4ca019..804f33933da 100644
--- a/TAO/TAO_IDL/ast/ast_concrete_type.cpp
+++ b/TAO/TAO_IDL/ast/ast_concrete_type.cpp
@@ -69,6 +69,18 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 #include "ast_concrete_type.h"
 
+ACE_RCSID (ast, 
+           ast_concrete_type, 
+           "$Id$")
+
+// Constructor(s) and destructor.
+AST_ConcreteType::AST_ConcreteType (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    AST_Type ()
+{
+}
+
 AST_ConcreteType::AST_ConcreteType (AST_Decl::NodeType nt,
                                     UTL_ScopedName *n)
   : COMMON_Base (),
diff --git a/TAO/TAO_IDL/ast/ast_connector.cpp b/TAO/TAO_IDL/ast/ast_connector.cpp
index f2d6dc7a27d..32912ba23a6 100644
--- a/TAO/TAO_IDL/ast/ast_connector.cpp
+++ b/TAO/TAO_IDL/ast/ast_connector.cpp
@@ -7,9 +7,6 @@
 #include "utl_err.h"
 #include "global_extern.h"
 
-AST_Decl::NodeType const
-AST_Connector::NT = AST_Decl::NT_connector;
-
 AST_Connector::AST_Connector (
       UTL_ScopedName *n,
       AST_Connector *base_connector)
@@ -34,10 +31,6 @@ AST_Connector::AST_Connector (
                    0,
                    0)
 {
-  if (!this->imported ())
-    {
-      idl_global->connector_seen_ = true;
-    }
 }
 
 AST_Connector::~AST_Connector (void)
diff --git a/TAO/TAO_IDL/ast/ast_constant.cpp b/TAO/TAO_IDL/ast/ast_constant.cpp
index f8daab685bc..8ef4b604c41 100644
--- a/TAO/TAO_IDL/ast/ast_constant.cpp
+++ b/TAO/TAO_IDL/ast/ast_constant.cpp
@@ -122,8 +122,17 @@ AST_Constant::exprtype_to_string (AST_Expression::ExprType et)
   return 0;
 }
 
-AST_Decl::NodeType const
-AST_Constant::NT = AST_Decl::NT_const;
+// Constructor(s) and destructor.
+
+// Default constructor.
+AST_Constant::AST_Constant (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    pd_constant_value (0),
+    pd_et (AST_Expression::EV_none),
+    ifr_added_ (0)
+{
+}
 
 // Used in constructing AST_EnumVal nodes.
 AST_Constant::AST_Constant (AST_Expression::ExprType t,
diff --git a/TAO/TAO_IDL/ast/ast_consumes.cpp b/TAO/TAO_IDL/ast/ast_consumes.cpp
index 61d164760f7..2e38ad8141d 100644
--- a/TAO/TAO_IDL/ast/ast_consumes.cpp
+++ b/TAO/TAO_IDL/ast/ast_consumes.cpp
@@ -3,9 +3,6 @@
 #include "ast_consumes.h"
 #include "ast_visitor.h"
 
-AST_Decl::NodeType const
-AST_Consumes::NT = AST_Decl::NT_consumes;
-
 AST_Consumes::AST_Consumes (UTL_ScopedName *n,
                             AST_Type *consumes_type)
   : COMMON_Base (false,
diff --git a/TAO/TAO_IDL/ast/ast_decl.cpp b/TAO/TAO_IDL/ast/ast_decl.cpp
index b253094962b..6c7b8682681 100644
--- a/TAO/TAO_IDL/ast/ast_decl.cpp
+++ b/TAO/TAO_IDL/ast/ast_decl.cpp
@@ -130,6 +130,31 @@ COMMON_Base::destroy (void)
 {
 }
 
+// Constructor(s) and destructor.
+
+AST_Decl::AST_Decl (void)
+  : COMMON_Base (),
+    repoID_ (0),
+    flat_name_ (0),
+    contains_wstring_ (-1),
+    pd_imported (false),
+    pd_in_main_file (false),
+    pd_defined_in (0),
+    pd_node_type (NT_module),
+    pd_line (-1),
+    pd_local_name (0),
+    pd_original_local_name (0),
+    pd_added (false),
+    full_name_ (0),
+    prefix_ (0),
+    version_ (0),
+    anonymous_ (false),
+    typeid_set_ (false),
+    last_referenced_as_ (0),
+    prefix_scope_ (0)
+{
+}
+
 AST_Decl::AST_Decl (NodeType nt,
                     UTL_ScopedName *n,
                     bool anonymous)
@@ -147,6 +172,7 @@ AST_Decl::AST_Decl (NodeType nt,
     pd_name (0),
     pd_local_name (n == 0 ? 0 : n->last_component ()->copy ()),
     pd_original_local_name (0),
+    pd_added (false),
     full_name_ (0),
     prefix_ (0),
     version_ (0),
@@ -1171,6 +1197,18 @@ AST_Decl::set_in_main_file (bool is_it)
   this->pd_in_main_file = is_it;
 }
 
+bool
+AST_Decl::added (void)
+{
+  return this->pd_added;
+}
+
+void
+AST_Decl::set_added (bool is_it)
+{
+  this->pd_added = is_it;
+}
+
 UTL_Scope *
 AST_Decl::defined_in (void)
 {
diff --git a/TAO/TAO_IDL/ast/ast_emits.cpp b/TAO/TAO_IDL/ast/ast_emits.cpp
index 69450853908..531d7441fdc 100644
--- a/TAO/TAO_IDL/ast/ast_emits.cpp
+++ b/TAO/TAO_IDL/ast/ast_emits.cpp
@@ -3,9 +3,6 @@
 #include "ast_emits.h"
 #include "ast_visitor.h"
 
-AST_Decl::NodeType const
-AST_Emits::NT = AST_Decl::NT_emits;
-
 AST_Emits::AST_Emits (UTL_ScopedName *n,
                       AST_Type *emits_type)
   : COMMON_Base (),
diff --git a/TAO/TAO_IDL/ast/ast_enum.cpp b/TAO/TAO_IDL/ast/ast_enum.cpp
index 44d900e7304..679f2278f78 100644
--- a/TAO/TAO_IDL/ast/ast_enum.cpp
+++ b/TAO/TAO_IDL/ast/ast_enum.cpp
@@ -72,8 +72,21 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "utl_err.h"
 #include "utl_indenter.h"
 
-AST_Decl::NodeType const
-AST_Enum::NT = AST_Decl::NT_enum;
+ACE_RCSID (ast,
+           ast_enum,
+           "$Id$")
+
+AST_Enum::AST_Enum (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    AST_Type (),
+    AST_ConcreteType (),
+    UTL_Scope (),
+    pd_enum_counter (0),
+    member_count_ (-1)
+{
+  this->size_type (AST_Type::FIXED);
+}
 
 AST_Enum::AST_Enum (UTL_ScopedName *n,
                     bool local,
@@ -236,6 +249,7 @@ AST_Enum::compute_member_count (void)
   return 0;
 }
 
+// Add an AST_EnumVal node to this scope.
 AST_EnumVal *
 AST_Enum::fe_add_enum_val (AST_EnumVal *t)
 {
@@ -266,7 +280,7 @@ AST_Enum::fe_add_enum_val (AST_EnumVal *t)
     }
       
   // Already defined and cannot be redefined? Or already used?
-  if ((d = this->lookup_for_add (t)) != 0)
+  if ((d = this->lookup_for_add (t, false)) != 0)
     {
       if (!can_be_redefined (d))
         {
diff --git a/TAO/TAO_IDL/ast/ast_enum_val.cpp b/TAO/TAO_IDL/ast/ast_enum_val.cpp
index c7abab6b8e7..3fd3c7f2167 100644
--- a/TAO/TAO_IDL/ast/ast_enum_val.cpp
+++ b/TAO/TAO_IDL/ast/ast_enum_val.cpp
@@ -71,8 +71,16 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "ast_enum_val.h"
 #include "ast_visitor.h"
 
-AST_Decl::NodeType const
-AST_EnumVal::NT = AST_Decl::NT_enum_val;
+ACE_RCSID (ast,
+           ast_enum_val,
+           "$Id$")
+
+AST_EnumVal::AST_EnumVal (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    AST_Constant ()
+{
+}
 
 AST_EnumVal::AST_EnumVal (ACE_CDR::ULong v,
                           UTL_ScopedName *n)
diff --git a/TAO/TAO_IDL/ast/ast_eventtype.cpp b/TAO/TAO_IDL/ast/ast_eventtype.cpp
index 85ece04f369..5a3fce42284 100644
--- a/TAO/TAO_IDL/ast/ast_eventtype.cpp
+++ b/TAO/TAO_IDL/ast/ast_eventtype.cpp
@@ -7,8 +7,15 @@
 #include "utl_indenter.h"
 #include "global_extern.h"
 
-AST_Decl::NodeType const
-AST_EventType::NT = AST_Decl::NT_eventtype;
+AST_EventType::AST_EventType (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    AST_Type (),
+    UTL_Scope (),
+    AST_Interface (),
+    AST_ValueType ()
+{
+}
 
 AST_EventType::AST_EventType (UTL_ScopedName *n,
                               AST_Type **inherits,
diff --git a/TAO/TAO_IDL/ast/ast_eventtype_fwd.cpp b/TAO/TAO_IDL/ast/ast_eventtype_fwd.cpp
index d44e3aeba3f..0f2bd53fd17 100644
--- a/TAO/TAO_IDL/ast/ast_eventtype_fwd.cpp
+++ b/TAO/TAO_IDL/ast/ast_eventtype_fwd.cpp
@@ -5,8 +5,18 @@
 #include "ast_visitor.h"
 #include "utl_identifier.h"
 
-AST_Decl::NodeType const
-AST_EventTypeFwd::NT = AST_Decl::NT_eventtype_fwd;
+ACE_RCSID( ast,
+           ast_eventtype_fwd,
+           "$Id$")
+
+AST_EventTypeFwd::AST_EventTypeFwd (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    AST_Type (),
+    AST_InterfaceFwd (),
+    AST_ValueTypeFwd ()
+{
+}
 
 AST_EventTypeFwd::AST_EventTypeFwd (AST_Interface *dummy,
                                     UTL_ScopedName *n)
diff --git a/TAO/TAO_IDL/ast/ast_exception.cpp b/TAO/TAO_IDL/ast/ast_exception.cpp
index 685b66273e7..f322dc53962 100644
--- a/TAO/TAO_IDL/ast/ast_exception.cpp
+++ b/TAO/TAO_IDL/ast/ast_exception.cpp
@@ -80,8 +80,15 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "utl_identifier.h"
 #include "utl_indenter.h"
 
-AST_Decl::NodeType const
-AST_Exception::NT = AST_Decl::NT_except;
+AST_Exception::AST_Exception (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    AST_Type (),
+    AST_ConcreteType (),
+    UTL_Scope (),
+    AST_Structure ()
+{
+}
 
 AST_Exception::AST_Exception (UTL_ScopedName *n,
                               bool local,
@@ -160,6 +167,253 @@ AST_Exception::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list)
   return this->in_recursion_;
 }
 
+// Private operations.
+
+// Add this AST_Field node to the current scope.
+AST_Field *
+AST_Exception::fe_add_field (AST_Field *t)
+{
+  AST_Decl *d = 0;
+
+  // Already defined and cannot be redefined? Or already used?
+  if ((d = this->lookup_for_add (t, false)) != 0)
+    {
+      if (!can_be_redefined (d))
+        {
+          idl_global->err ()->error3  (UTL_Error::EIDL_REDEF,
+                                       t,
+                                       this,
+                                       d);
+          return 0;
+        }
+
+      if (referenced (d, t->local_name ()))
+        {
+          idl_global->err ()->error3  (UTL_Error::EIDL_DEF_USE,
+                                       t,
+                                       this,
+                                       d);
+          return 0;
+        }
+
+      if (t->has_ancestor (d))
+        {
+          idl_global->err ()->redefinition_in_scope (t,
+                                                     d);
+          return 0;
+        }
+    }
+
+  // Add it to scope.
+  this->add_to_scope (t);
+
+  // Add it to set of locally referenced symbols.
+  this->add_to_referenced (t,
+                           false,
+                           t->local_name ());
+
+  AST_Type *ft = t->field_type ();
+  UTL_ScopedName *mru = ft->last_referenced_as ();
+
+  if (mru != 0)
+    {
+      this->add_to_referenced (ft,
+                               false,
+                               mru->first_component ());
+    }
+
+  this->fields_.enqueue_tail (t);
+
+  return t;
+}
+
+// Add this AST_Union (manifest type declaration) to the current scope.
+AST_Union *
+AST_Exception::fe_add_union (AST_Union *t)
+{
+  AST_Decl *d = 0;
+
+  // Already defined and cannot be redefined? Or already used?
+  if ((d = this->lookup_for_add (t, false)) != 0)
+    {
+      if (!can_be_redefined (d))
+        {
+          idl_global->err ()->error3  (UTL_Error::EIDL_REDEF,
+                                       t,
+                                       this,
+                                       d);
+          return 0;
+        }
+
+      if (this->referenced (d, t->local_name ()))
+        {
+          idl_global->err ()->error3  (UTL_Error::EIDL_DEF_USE,
+                                       t,
+                                       this,
+                                       d);
+          return 0;
+        }
+
+      if (t->has_ancestor (d))
+        {
+          idl_global->err ()->redefinition_in_scope (t,
+                                                     d);
+          return 0;
+        }
+    }
+
+  // Add it to local types.
+  this->add_to_local_types (t);
+
+  // Add it to set of locally referenced symbols.
+  this->add_to_referenced (t,
+                           false,
+                           t->local_name ());
+
+  return t;
+}
+
+// Add this AST_Structure (manifest type declaration) to the current
+// scope.
+AST_Structure *
+AST_Exception::fe_add_structure (AST_Structure *t)
+{
+  AST_Decl *d = 0;
+
+  // Already defined and cannot be redefined? Or already used?
+  if ((d = this->lookup_for_add (t, false)) != 0)
+    {
+      if (!can_be_redefined (d))
+        {
+          idl_global->err ()->error2  (UTL_Error::EIDL_REDEF,
+                                       t,
+                                       this);
+          return 0;
+        }
+
+      if (this->referenced (d, t->local_name ()))
+        {
+          idl_global->err ()->error3  (UTL_Error::EIDL_DEF_USE,
+                                       t,
+                                       this,
+                                       d);
+          return 0;
+        }
+
+      if (t->has_ancestor (d))
+        {
+          idl_global->err ()->redefinition_in_scope (t,
+                                                     d);
+          return 0;
+        }
+    }
+
+  // Add it to local types.
+  this->add_to_local_types (t);
+
+  // Add it to set of locally referenced symbols.
+  this->add_to_referenced (t,
+                           false,
+                           t->local_name ());
+
+  return t;
+}
+
+// Add this AST_Enum (manifest type declaration) to the current scope.
+AST_Enum *
+AST_Exception::fe_add_enum (AST_Enum *t)
+{
+  AST_Decl *d = 0;
+
+  // Already defined and cannot be redefined? Or already used?
+  if ((d = this->lookup_for_add (t, false)) != 0)
+    {
+      if (!can_be_redefined (d))
+        {
+          idl_global->err ()->error3  (UTL_Error::EIDL_REDEF,
+                                       t,
+                                       this,
+                                       d);
+          return 0;
+        }
+
+      if (referenced (d, t->local_name ()))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (t->has_ancestor (d))
+        {
+          idl_global->err ()->redefinition_in_scope (t,
+                                                     d);
+          return 0;
+        }
+    }
+
+  // Add it to local types.
+  this->add_to_local_types (t);
+
+  // Add it to set of locally referenced symbols.
+  this->add_to_referenced (t,
+                           false,
+                           t->local_name ());
+
+  return t;
+}
+
+// Add this AST_EnumVal (enumerator declaration) to the current scope.
+// This is done to conform to the C++ scoping rules which declare
+// enumerators in the enclosing scope (in addition to declaring them
+// in the enum itself).
+AST_EnumVal *
+AST_Exception::fe_add_enum_val (AST_EnumVal *t)
+{
+  AST_Decl *d = 0;
+
+  // Already defined and cannot be redefined? Or already used?
+  if ((d = this->lookup_for_add (t, false)) != 0)
+    {
+      if (!can_be_redefined (d))
+        {
+          idl_global->err ()->error3  (UTL_Error::EIDL_REDEF,
+                                       t,
+                                       this,
+                                       d);
+          return 0;
+        }
+
+      if (referenced (d, t->local_name ()))
+        {
+          idl_global->err ()->error3  (UTL_Error::EIDL_DEF_USE,
+                                       t,
+                                       this,
+                                       d);
+          return 0;
+        }
+
+      if (t->has_ancestor (d))
+        {
+          idl_global->err ()->redefinition_in_scope (t,
+                                                     d);
+          return 0;
+        }
+    }
+
+  // Add it to scope.
+  this->add_to_scope (t);
+
+  // Add it to set of locally referenced symbols.
+  this->add_to_referenced (t,
+                           false,
+                           t->local_name ());
+
+  return t;
+}
+
 // Dump this AST_Exception node to the ostream o.
 void
 AST_Exception::dump (ACE_OSTREAM_TYPE &o)
@@ -184,5 +438,7 @@ AST_Exception::destroy (void)
   this->AST_Structure::destroy ();
 }
 
+
+
 IMPL_NARROW_FROM_DECL(AST_Exception)
 IMPL_NARROW_FROM_SCOPE(AST_Exception)
diff --git a/TAO/TAO_IDL/ast/ast_extended_port.cpp b/TAO/TAO_IDL/ast/ast_extended_port.cpp
index 633f3aecc37..f2eef3975f3 100644
--- a/TAO/TAO_IDL/ast/ast_extended_port.cpp
+++ b/TAO/TAO_IDL/ast/ast_extended_port.cpp
@@ -7,9 +7,6 @@
 #include "utl_indenter.h"
 #include "global_extern.h"
 
-AST_Decl::NodeType const
-AST_Extended_Port::NT = AST_Decl::NT_ext_port;
-
 AST_Extended_Port::AST_Extended_Port (
     UTL_ScopedName *n,
     AST_PortType *porttype_ref)
diff --git a/TAO/TAO_IDL/ast/ast_factory.cpp b/TAO/TAO_IDL/ast/ast_factory.cpp
index 347ec3470c9..b04773ea070 100644
--- a/TAO/TAO_IDL/ast/ast_factory.cpp
+++ b/TAO/TAO_IDL/ast/ast_factory.cpp
@@ -64,8 +64,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 */
 
-// AST_Factory nodes denote OBV or component home factory
-// construct declarations.
+// AST_Factory nodes denote OBV factory construct declarations
 // AST_Factory is a subclass of AST_Decl (it is not a type!)
 // and of UTL_Scope (the arguments are managed in a scope).
 
@@ -79,12 +78,20 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "utl_exceptlist.h"
 #include "utl_namelist.h"
 
-AST_Decl::NodeType const
-AST_Factory::NT = AST_Decl::NT_factory;
+AST_Factory::AST_Factory (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    UTL_Scope (),
+    pd_exceptions (0),
+    pd_n_exceptions (0),
+    argument_count_ (-1),
+    has_native_ (0)
+{
+}
 
 AST_Factory::AST_Factory (UTL_ScopedName *n)
-  : COMMON_Base (true,
-                 false), //@@ Always local, never abstract
+  : COMMON_Base (1,
+                 0), //@@ Always local, never abstract
     AST_Decl (AST_Decl::NT_factory,
               n),
     UTL_Scope (AST_Decl::NT_factory),
@@ -207,12 +214,51 @@ AST_Factory::compute_argument_attr (void)
   return 0;
 }
 
+// Add this AST_Argument node (an factory argument declaration)
+// to this scope.
 AST_Argument *
 AST_Factory::fe_add_argument (AST_Argument *t)
 {
-  return
-    AST_Argument::narrow_from_decl (
-      this->fe_add_ref_decl (t));
+  AST_Decl *d = 0;
+
+  // Already defined and cannot be redefined? Or already used?
+  if ((d = lookup_by_name_local (t->local_name(), 0)) != 0)
+    {
+      if (!can_be_redefined (d))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (this->referenced (d, t->local_name ()))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (t->has_ancestor (d))
+        {
+          idl_global->err ()->redefinition_in_scope (t,
+                                                     d);
+          return 0;
+        }
+    }
+
+  // Add it to scope.
+  this->add_to_scope (t);
+
+  // Add it to set of locally referenced symbols.
+  this->add_to_referenced (t,
+                           false,
+                           t->local_name ());
+
+  return t;
 }
 
 UTL_NameList *
@@ -277,7 +323,7 @@ AST_Factory::fe_add_exceptions (UTL_NameList *t)
   return t;
 }
 
-// Dump this AST_Factory node to the ostream o.
+// Dump this AST_Factory node (an OBV factory construct) to the ostream o.
 void
 AST_Factory::dump (ACE_OSTREAM_TYPE &o)
 {
@@ -289,7 +335,7 @@ AST_Factory::dump (ACE_OSTREAM_TYPE &o)
 
   // Iterator must be explicitly advanced inside the loop.
   for (UTL_ScopeActiveIterator i (this, IK_decls);
-       !i.is_done ();)
+       !i.is_done();)
     {
       d = i.item ();
       d->dump (o);
@@ -302,6 +348,7 @@ AST_Factory::dump (ACE_OSTREAM_TYPE &o)
     }
 
   this->dump_i (o, ")");
+
 }
 
 int
@@ -310,6 +357,7 @@ AST_Factory::ast_accept (ast_visitor *visitor)
   return visitor->visit_factory (this);
 }
 
+// Data accessors
+
 IMPL_NARROW_FROM_DECL(AST_Factory)
 IMPL_NARROW_FROM_SCOPE(AST_Factory)
-
diff --git a/TAO/TAO_IDL/ast/ast_field.cpp b/TAO/TAO_IDL/ast/ast_field.cpp
index fc20472e2d5..426feddaaf8 100644
--- a/TAO/TAO_IDL/ast/ast_field.cpp
+++ b/TAO/TAO_IDL/ast/ast_field.cpp
@@ -83,9 +83,16 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 #include "global_extern.h"
 
-AST_Decl::NodeType const
-AST_Field::NT = AST_Decl::NT_field;
+AST_Field::AST_Field (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    ref_type_ (0),
+    visibility_ (vis_NA),
+    owns_base_type_ (false)
+{
+}
 
+// To be used when constructing an AST_Field node.
 AST_Field::AST_Field (AST_Type *ft,
                       UTL_ScopedName *n,
                       Visibility vis)
diff --git a/TAO/TAO_IDL/ast/ast_finder.cpp b/TAO/TAO_IDL/ast/ast_finder.cpp
deleted file mode 100644
index 972b21f5d4b..00000000000
--- a/TAO/TAO_IDL/ast/ast_finder.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-// $Id$
-
-#include "ast_finder.h"
-#include "ast_visitor.h"
-
-#include "utl_identifier.h"
-
-AST_Decl::NodeType const
-AST_Finder::NT = AST_Decl::NT_finder;
-
-AST_Finder::AST_Finder (UTL_ScopedName *n)
-  : COMMON_Base (true,
-                 false), //@@ Always local, never abstract
-    AST_Decl (AST_Decl::NT_finder,
-              n),
-    UTL_Scope (AST_Decl::NT_finder),
-    AST_Factory (n)
-{
-}
-
-AST_Finder::~AST_Finder (void)
-{
-}
-
-void
-AST_Finder::destroy (void)
-{
-  this->AST_Factory::destroy ();
-}
-
-// Dump this AST_Factory node to the ostream o.
-void
-AST_Finder::dump (ACE_OSTREAM_TYPE &o)
-{
-  AST_Decl *d = 0;
-
-  this->dump_i (o, "finder ");
-  this->local_name ()->dump (o);
-  this->dump_i (o, "(");
-
-  // Iterator must be explicitly advanced inside the loop.
-  for (UTL_ScopeActiveIterator i (this, IK_decls);
-       !i.is_done ();)
-    {
-      d = i.item ();
-      d->dump (o);
-      i.next ();
-
-      if (!i.is_done())
-        {
-          this->dump_i (o, ", ");
-        }
-    }
-
-  this->dump_i (o, ")");
-}
-
-int
-AST_Finder::ast_accept (ast_visitor *visitor)
-{
-  return visitor->visit_finder (this);
-}
-
-IMPL_NARROW_FROM_DECL(AST_Finder)
-IMPL_NARROW_FROM_SCOPE(AST_Finder)
-
diff --git a/TAO/TAO_IDL/ast/ast_generator.cpp b/TAO/TAO_IDL/ast/ast_generator.cpp
index e61bcd69cea..358f8eee92a 100644
--- a/TAO/TAO_IDL/ast/ast_generator.cpp
+++ b/TAO/TAO_IDL/ast/ast_generator.cpp
@@ -104,7 +104,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "ast_typedef.h"
 #include "ast_native.h"
 #include "ast_factory.h"
-#include "ast_finder.h"
 
 #include "utl_identifier.h"
 
@@ -922,17 +921,6 @@ AST_Generator::create_factory (UTL_ScopedName *n)
   return retval;
 }
 
-AST_Finder *
-AST_Generator::create_finder (UTL_ScopedName *n)
-{
-  AST_Finder *retval = 0;
-  ACE_NEW_RETURN (retval,
-                  AST_Finder (n),
-                  0);
-
-  return retval;
-}
-
 AST_ValueBox *
 AST_Generator::create_valuebox (UTL_ScopedName *n,
                                 AST_Type *boxed_type)
diff --git a/TAO/TAO_IDL/ast/ast_home.cpp b/TAO/TAO_IDL/ast/ast_home.cpp
index fd3319534a0..95d39563949 100644
--- a/TAO/TAO_IDL/ast/ast_home.cpp
+++ b/TAO/TAO_IDL/ast/ast_home.cpp
@@ -5,7 +5,6 @@
 #include "ast_valuetype.h"
 #include "ast_param_holder.h"
 #include "ast_operation.h"
-#include "ast_finder.h"
 #include "ast_visitor.h"
 
 #include "utl_identifier.h"
@@ -13,8 +12,17 @@
 #include "utl_err.h"
 #include "global_extern.h"
 
-AST_Decl::NodeType const
-AST_Home::NT = AST_Decl::NT_home;
+AST_Home::AST_Home (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    AST_Type (),
+    UTL_Scope (),
+    AST_Interface (),
+    pd_base_home (0),
+    pd_managed_component (0),
+    pd_primary_key (0)
+{
+}
 
 AST_Home::AST_Home (UTL_ScopedName *n,
                     AST_Home *base_home,
@@ -158,6 +166,18 @@ AST_Home::primary_key (void) const
   return this->pd_primary_key;
 }
 
+AST_Home::INIT_LIST &
+AST_Home::factories (void)
+{
+  return this->pd_factories;
+}
+
+AST_Home::INIT_LIST &
+AST_Home::finders (void)
+{
+  return this->pd_finders;
+}
+
 void
 AST_Home::destroy (void)
 {
@@ -252,22 +272,6 @@ AST_Home::ast_accept (ast_visitor *visitor)
   return visitor->visit_home (this);
 }
 
-AST_Factory *
-AST_Home::fe_add_factory (AST_Factory *f)
-{
-  return
-    AST_Factory::narrow_from_decl (
-      this->fe_add_decl (f));
-}
-
-AST_Finder *
-AST_Home::fe_add_finder (AST_Finder *f)
-{
-  return
-    AST_Finder::narrow_from_decl (
-      this->fe_add_decl (f));
-}
-
   // Narrowing.
 
 IMPL_NARROW_FROM_DECL(AST_Home)
diff --git a/TAO/TAO_IDL/ast/ast_interface.cpp b/TAO/TAO_IDL/ast/ast_interface.cpp
index 279fda53b46..c10e3a9f53f 100644
--- a/TAO/TAO_IDL/ast/ast_interface.cpp
+++ b/TAO/TAO_IDL/ast/ast_interface.cpp
@@ -100,8 +100,21 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 #include "ace/streams.h"
 
-AST_Decl::NodeType const
-AST_Interface::NT = AST_Decl::NT_interface;
+AST_Interface::AST_Interface (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    AST_Type (),
+    UTL_Scope (),
+    pd_inherits (0),
+    pd_n_inherits (0),
+    pd_inherits_flat (0),
+    pd_n_inherits_flat (0),
+    home_equiv_ (false),
+    fwd_decl_ (0)
+{
+  this->size_type (AST_Type::VARIABLE); // Always the case.
+  this->has_constructor (true);      // Always the case.
+}
 
 AST_Interface::AST_Interface (UTL_ScopedName *n,
                               AST_Type **ih,
@@ -175,72 +188,662 @@ AST_Interface::is_defined (void)
           : this->fwd_decl_->is_defined ());
 }
 
+// Add an AST_Constant node (a constant declaration) to this scope.
 AST_Constant *
 AST_Interface::fe_add_constant (AST_Constant *t)
 {
-  return
-    AST_Constant::narrow_from_decl (
-      this->fe_add_decl (t));
+  AST_Decl *d = 0;
+
+  // Can't add to interface which was not yet defined
+  if (!this->is_defined ())
+    {
+      idl_global->err ()->error2 (UTL_Error::EIDL_DECL_NOT_DEFINED,
+                                  this,
+                                  t);
+      return 0;
+    }
+
+  // Already defined and cannot be redefined? Or already used?
+  if ((d = this->lookup_for_add (t, false)) != 0)
+    {
+      if (!can_be_redefined (d))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (this->referenced  (d, t->local_name ()))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (t->has_ancestor(d))
+        {
+          idl_global->err ()->redefinition_in_scope (t,
+                                                     d);
+          return 0;
+        }
+    }
+
+  // Add it to scope.
+   this->add_to_scope (t);
+
+  // Add it to set of locally referenced symbols.
+  this->add_to_referenced (t,
+                           false,
+                           t->local_name ());
+
+  return t;
 }
 
+// Add an AST_Exception node (an exception declaration) to this scope.
 AST_Exception *
 AST_Interface::fe_add_exception (AST_Exception *t)
 {
-  return
-    AST_Exception::narrow_from_decl (
-      this->fe_add_decl (t));
+  AST_Decl *d = 0;
+
+  // Can't add to interface which was not yet defined
+  if (!this->is_defined ())
+    {
+      idl_global->err ()->error2 (UTL_Error::EIDL_DECL_NOT_DEFINED,
+                                  this,
+                                  t);
+      return 0;
+    }
+
+  // Already defined and cannot be redefined? Or already used?
+  if ((d = this->lookup_for_add (t, false)) != 0)
+    {
+      if (!can_be_redefined (d))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (this->referenced (d, t->local_name ()))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (t->has_ancestor (d))
+        {
+          idl_global->err ()->redefinition_in_scope (t,
+                                                     d);
+          return 0;
+        }
+    }
+
+  // Add it to scope.
+  this->add_to_scope (t);
+
+  // Add it to set of locally referenced symbols.
+  this->add_to_referenced (t,
+                           false,
+                           t->local_name ());
+
+  return t;
 }
 
+// Add an AST_Attribute node (an attribute declaration) to this scope.
 AST_Attribute *
 AST_Interface::fe_add_attribute (AST_Attribute *t)
 {
-  return
-    AST_Attribute::narrow_from_decl (
-      this->fe_add_decl (t));
+  AST_Decl *d = 0;
+
+  // Can't add to interface which was not yet defined.
+   if (!this->is_defined ())
+    {
+      idl_global->err ()->error2 (UTL_Error::EIDL_DECL_NOT_DEFINED,
+                                  this,
+                                  t);
+      return 0;
+    }
+  /*
+   * Already defined and cannot be redefined? Or already used?
+   */
+  if ((d = this->lookup_for_add (t, false)) != 0)
+    {
+      if (!can_be_redefined (d))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (referenced (d, t->local_name ()))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (t->has_ancestor(d))
+        {
+          idl_global->err ()->redefinition_in_scope (t,
+                                                     d);
+          return 0;
+        }
+    }
+
+  // Add it to scope.
+  this->add_to_scope (t);
+
+  // Add it to set of locally referenced symbols.
+  this->add_to_referenced (t,
+                           false,
+                           t->local_name ());
+
+  return t;
+}
+
+// Add this AST_Field node (a field declaration) to this scope
+// (only for valuetypes).
+AST_Field *
+AST_Interface::fe_add_field (AST_Field *t)
+{
+  AST_Decl *d = 0;
+
+  // Already defined and cannot be redefined? Or already used?
+  if ((d = this->lookup_for_add (t, false)) != 0)
+    {
+      if (!can_be_redefined (d))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (this->referenced (d, t->local_name ()))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (t->has_ancestor (d))
+        {
+          idl_global->err ()->redefinition_in_scope (t,
+                                                     d);
+          return 0;
+        }
+    }
+
+  // Add it to scope.
+  this->add_to_scope (t);
+
+  // Add it to set of locally referenced symbols.
+  this->add_to_referenced (t,
+                           false,
+                           t->local_name ());
+
+  AST_Type *ft = t->field_type ();
+  UTL_ScopedName *mru = ft->last_referenced_as ();
+
+  if (mru != 0)
+    {
+      this->add_to_referenced (ft,
+                               false,
+                               mru->first_component ());
+    }
+
+  return t;
 }
 
+// Add an AST_Operation node (an operation declaration) to this scope.
 AST_Operation *
 AST_Interface::fe_add_operation (AST_Operation *t)
 {
-  return
-    AST_Operation::narrow_from_decl (
-      this->fe_add_decl (t));
+  AST_Decl *d = 0;
+
+  // Can't add to interface which was not yet defined.
+  if (!this->is_defined ())
+    {
+      idl_global->err ()->error2 (UTL_Error::EIDL_DECL_NOT_DEFINED,
+                                  this,
+                                  t);
+      return 0;
+    }
+
+  // Already defined and cannot be redefined? Or already used?
+  if ((d = this->lookup_for_add (t, false)) != 0)
+    {
+      if (!can_be_redefined (d))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (this->referenced (d, t->local_name ()))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (t->has_ancestor (d))
+        {
+          idl_global->err ()->redefinition_in_scope (t,
+                                                     d);
+          return 0;
+        }
+    }
+  else if ((d = this->look_in_inherited (t->name (), false)) != 0)
+    {
+      if (d->node_type () == AST_Decl::NT_op)
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+    }
+
+  // Add it to scope.
+  this->add_to_scope (t);
+
+  // Add it to set of locally referenced symbols.
+  this->add_to_referenced (t,
+                           false,
+                           t->local_name ());
+
+  return t;
 }
 
+// Add an AST_Structure (a struct declaration) to this scope.
 AST_Structure *
 AST_Interface::fe_add_structure (AST_Structure *t)
 {
-  return this->fe_add_full_struct_type (t);
+  AST_Decl *predef = 0;
+  AST_StructureFwd *fwd = 0;
+
+  if ((predef = this->lookup_for_add (t, false)) != 0)
+    {
+      // Treat fwd declared interfaces specially
+      if (predef->node_type () == AST_Decl::NT_struct_fwd)
+        {
+          fwd = AST_StructureFwd::narrow_from_decl (predef);
+
+          if (fwd == 0)
+            {
+              return 0;
+            }
+
+          // Forward declared and not defined yet.
+          if (!fwd->is_defined ())
+            {
+              if (fwd->defined_in () == this)
+                {
+                  fwd->set_full_definition (t);
+                }
+              else
+                {
+                  idl_global->err ()->error3 (UTL_Error::EIDL_SCOPE_CONFLICT,
+                                              fwd,
+                                              t,
+                                              this);
+
+                  return 0;
+                }
+            }
+          // OK, not illegal redef of forward declaration. Now check whether.
+          // it has been referenced already.
+          else if (this->referenced (predef, t->local_name ()))
+            {
+              idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                          t,
+                                          this,
+                                          predef);
+
+              return 0;
+            }
+        }
+      else if (!can_be_redefined (predef))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      t,
+                                      this,
+                                      predef);
+
+          return 0;
+        }
+      else if (referenced (predef, t->local_name ()) && !t->is_defined ())
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      t,
+                                      this,
+                                      predef);
+
+          return 0;
+        }
+    }
+
+  // Add it to scope.
+  this->add_to_scope (t);
+
+  // Add it to set of locally referenced symbols.
+  this->add_to_referenced (t,
+                           false,
+                           t->local_name ());
+
+  return t;
 }
 
+// Add this AST_StructureFwd node (a forward declaration of an IDL
+// struct) to this scope.
 AST_StructureFwd *
 AST_Interface::fe_add_structure_fwd (AST_StructureFwd *t)
 {
-  return this->fe_add_fwd_struct_type (t);
+  AST_Decl *d = 0;
+
+  // Already defined and cannot be redefined? Or already used?
+  if ((d = this->lookup_for_add (t, false)) != 0)
+    {
+      AST_Decl::NodeType nt = d->node_type ();
+
+      // There used to be another check here ANDed with the one below:
+      // d->defined_in () == this. But lookup_for_add() calls only
+      // lookup_by_name_local(), which does not bump up the scope.
+      if (nt == AST_Decl::NT_struct_fwd)
+        {
+          // It's legal to forward declare something more than once,
+          // but we need only one entry in the scope for lookup.
+          AST_StructureFwd *fd = AST_StructureFwd::narrow_from_decl (d);
+          t->destroy ();
+          delete t;
+          t = 0;
+          return fd;
+        }
+      else if (nt == AST_Decl::NT_struct)
+        {
+          AST_Structure *s = AST_Structure::narrow_from_decl (d);
+          t->set_full_definition (s);
+
+          if (t->added () == 0)
+            {
+              t->set_added (1);
+              this->add_to_scope (t);
+
+              // Must check later that all struct and union forward declarations
+              // are defined in the same IDL file.
+              AST_record_fwd_decl (t);
+            }
+
+          return t;
+        }
+      else
+        {
+          if (!can_be_redefined (d))
+            {
+              idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                          t,
+                                          this,
+                                          d);
+              return 0;
+            }
+
+          if (this->referenced (d, t->local_name ()))
+            {
+              idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                          t,
+                                          this,
+                                          d);
+              return 0;
+            }
+        }
+    }
+
+  // Add it to scope
+  this->add_to_scope (t);
+
+  // Add it to set of locally referenced symbols
+  this->add_to_referenced (t,
+                           false,
+                           t->local_name ());
+
+  // Must check later that all struct and union forward declarations
+  // are defined in the same IDL file.
+  AST_record_fwd_decl (t);
+  return t;
 }
 
+// Add an AST_Enum node (an enum declaration) to this scope.
 AST_Enum *
 AST_Interface::fe_add_enum (AST_Enum *t)
 {
-  return
-    AST_Enum::narrow_from_decl (
-      this->fe_add_decl (t));
+  AST_Decl *d = 0;
+
+  // Can't add to interface which was not yet defined.
+  if (!this->is_defined ())
+    {
+      idl_global->err ()->error2 (UTL_Error::EIDL_DECL_NOT_DEFINED,
+                                  this,
+                                  t);
+      return 0;
+    }
+
+  // Already defined and cannot be redefined? Or already used?
+  if ((d = this->lookup_for_add (t, false)) != 0)
+    {
+      if (!can_be_redefined (d))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (this->referenced (d, t->local_name ()))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (t->has_ancestor (d))
+        {
+          idl_global->err ()->redefinition_in_scope (t,
+                                                     d);
+          return 0;
+        }
+    }
+
+  // Add it to scope.
+  this->add_to_scope (t);
+
+  // Add it to set of locally referenced symbols.
+  this->add_to_referenced (t,
+                           false,
+                           t->local_name ());
+
+  return t;
 }
 
+// Add an AST_Union (a union declaration) to this scope.
 AST_Union *
 AST_Interface::fe_add_union (AST_Union *t)
 {
-  return
-    AST_Union::narrow_from_decl (
-      this->fe_add_full_struct_type (t));
+  AST_Decl *predef = 0;
+  AST_UnionFwd *fwd = 0;
+
+  if ((predef = this->lookup_for_add (t, false)) != 0)
+    {
+      // Treat fwd declared interfaces specially
+      if (predef->node_type () == AST_Decl::NT_union_fwd)
+        {
+          fwd = AST_UnionFwd::narrow_from_decl (predef);
+
+          if (fwd == 0)
+            {
+              return 0;
+            }
+
+          // Forward declared and not defined yet.
+          if (!fwd->is_defined ())
+            {
+              if (fwd->defined_in () == this)
+                {
+                  fwd->set_full_definition (t);
+                }
+              else
+                {
+                  idl_global->err ()->error3 (UTL_Error::EIDL_SCOPE_CONFLICT,
+                                              fwd,
+                                              t,
+                                              this);
+
+                  return 0;
+                }
+            }
+          // OK, not illegal redef of forward declaration. Now check whether.
+          // it has been referenced already.
+          else if (this->referenced (predef, t->local_name ()))
+            {
+              idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                          t,
+                                          this,
+                                          predef);
+
+              return 0;
+            }
+        }
+      else if (!can_be_redefined (predef))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      t,
+                                      this,
+                                      predef);
+
+          return 0;
+        }
+      else if (referenced (predef, t->local_name ()) && !t->is_defined ())
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      t,
+                                      this,
+                                      predef);
+
+          return 0;
+        }
+    }
+
+  // Add it to scope.
+  this->add_to_scope (t);
+
+  // Add it to set of locally referenced symbols.
+  this->add_to_referenced (t,
+                           false,
+                           t->local_name ());
+
+  return t;
 }
 
+// Add this AST_UnionFwd node (a forward declaration of an IDL
+// union) to this scope.
 AST_UnionFwd *
 AST_Interface::fe_add_union_fwd (AST_UnionFwd *t)
 {
-  return
-    AST_UnionFwd::narrow_from_decl (
-      this->fe_add_fwd_struct_type (t));
+  AST_Decl *d = 0;
+
+  // Already defined and cannot be redefined? Or already used?
+  if ((d = this->lookup_for_add (t, false)) != 0)
+    {
+      AST_Decl::NodeType nt = d->node_type ();
+
+      // There used to be another check here ANDed with the one below:
+      // d->defined_in () == this. But lookup_for_add() calls only
+      // lookup_by_name_local(), which does not bump up the scope.
+      if (nt == AST_Decl::NT_union_fwd)
+        {
+          // It's legal to forward declare something more than once,
+          // but we need only one entry in the scope for lookup.
+          AST_UnionFwd *fd = AST_UnionFwd::narrow_from_decl (d);
+          t->destroy ();
+          delete t;
+          t = 0;
+          return fd;
+        }
+      else if (nt == AST_Decl::NT_union)
+        {
+          AST_Union *s = AST_Union::narrow_from_decl (d);
+          t->set_full_definition (s);
+
+          if (t->added () == 0)
+            {
+              t->set_added (1);
+              this->add_to_scope (t);
+
+              // Must check later that all struct and union forward declarations
+              // are defined in the same IDL file.
+              AST_record_fwd_decl (t);
+            }
+
+          return t;
+        }
+      else
+        {
+          if (!can_be_redefined (d))
+            {
+              idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                          t,
+                                          this,
+                                          d);
+              return 0;
+            }
+
+          if (this->referenced (d, t->local_name ()))
+            {
+              idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                          t,
+                                          this,
+                                          d);
+              return 0;
+            }
+        }
+    }
+
+  // Add it to scope
+  this->add_to_scope (t);
+
+  // Add it to set of locally referenced symbols
+  this->add_to_referenced (t,
+                           false,
+                           t->local_name ());
+
+  // Must check later that all struct and union forward declarations
+  // are defined in the same IDL file.
+  AST_record_fwd_decl (t);
+  return t;
 }
 
 // Add an AST_EnumVal node (an enumerator) to this scope.
@@ -250,26 +853,177 @@ AST_Interface::fe_add_union_fwd (AST_UnionFwd *t)
 AST_EnumVal *
 AST_Interface::fe_add_enum_val (AST_EnumVal *t)
 {
-  return
-    AST_EnumVal::narrow_from_decl (
-      this->fe_add_decl (t));
+  AST_Decl *d = 0;
+
+  // Can't add to interface which was not yet defined.
+  if (!this->is_defined ())
+    {
+      idl_global->err ()->error2 (UTL_Error::EIDL_DECL_NOT_DEFINED,
+                                  this,
+                                  t);
+      return 0;
+    }
+
+  // Already defined and cannot be redefined? Or already used?
+  if ((d = this->lookup_for_add (t, false)) != 0)
+    {
+      if (!can_be_redefined (d))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (this->referenced (d, t->local_name ()))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (t->has_ancestor (d))
+        {
+          idl_global->err ()->redefinition_in_scope (t,
+                                                     d);
+          return 0;
+        }
+    }
+
+  // Add it to scope.
+  this->add_to_scope (t);
+
+  // Add it to set of locally referenced symbols.
+  this->add_to_referenced (t,
+                           false,
+                           t->local_name ());
+
+  return t;
 }
 
 // Add an AST_Typedef (a typedef) to the current scope.
 AST_Typedef *
 AST_Interface::fe_add_typedef (AST_Typedef *t)
 {
-  return
-    AST_Typedef::narrow_from_decl (
-      this->fe_add_ref_decl (t));
+  AST_Decl *d = 0;
+
+  // Can't add to interface which was not yet defined.
+  if (!this->is_defined ())
+    {
+      idl_global->err ()->error2 (UTL_Error::EIDL_DECL_NOT_DEFINED,
+                                  this,
+                                  t);
+      return 0;
+    }
+
+  // Already defined and cannot be redefined? Or already used?
+  if ((d = this->lookup_for_add (t, false)) != 0)
+    {
+      if (!can_be_redefined (d))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (this->referenced (d, t->local_name ()))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (t->has_ancestor (d))
+        {
+          idl_global->err ()->redefinition_in_scope (t,
+                                                     d);
+          return 0;
+        }
+    }
+
+  // Add it to scope.
+  this->add_to_scope (t);
+
+  // Add it to set of locally referenced symbols.
+  this->add_to_referenced (t,
+                           false,
+                           t->local_name ());
+
+  AST_Type *bt = t->base_type ();
+  UTL_ScopedName *mru = bt->last_referenced_as ();
+
+  if (mru != 0)
+    {
+      this->add_to_referenced (
+          bt,
+          false,
+          mru->first_component ()
+        );
+    }
+
+  return t;
 }
 
+// Add an AST_Native (a native declaration) to this scope.
 AST_Native *
 AST_Interface::fe_add_native (AST_Native *t)
 {
-  return
-    AST_Native::narrow_from_decl (
-      this->fe_add_decl (t));
+  AST_Decl *d = 0;
+
+  // Can't add to interface which was not yet defined.
+  if (!this->is_defined ())
+    {
+      idl_global->err ()->error2 (UTL_Error::EIDL_DECL_NOT_DEFINED,
+                                  this,
+                                  t);
+      return 0;
+    }
+
+  // Already defined and cannot be redefined? Or already used?
+  if ((d = this->lookup_for_add (t, false)) != 0)
+    {
+      if (!can_be_redefined (d))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (this->referenced (d, t->local_name ()))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (t->has_ancestor (d))
+        {
+          idl_global->err ()->redefinition_in_scope (t,
+                                                     d);
+          return 0;
+        }
+    }
+
+  // Add it to scope.
+  this->add_to_scope (t);
+
+  // Add it to set of locally referenced symbols.
+  this->add_to_referenced (t,
+                           false,
+                           t->local_name ());
+
+  return t;
 }
 
 // Dump this AST_Interface node to the ostream o.
@@ -369,6 +1123,20 @@ AST_Interface::fwd_redefinition_helper (AST_Interface *&i,
           scope = parent->defined_in ();
         }
 
+      // (JP) This could give a bogus error, since typeprefix can
+      // appear any time after the corresponding declaration.
+      // The right way to do this is with a separate traversal
+      // after the entire AST is built.
+      /*
+      if (ACE_OS::strcmp (i->prefix (), d->prefix ()) != 0)
+        {
+          idl_global->err ()->error1 (UTL_Error::EIDL_PREFIX_CONFLICT,
+                                      i);
+
+          return;
+        }
+      */
+
       fd = AST_Interface::narrow_from_decl (d);
 
       // Successful?
@@ -414,14 +1182,7 @@ AST_Interface::fwd_redefinition_helper (AST_Interface *&i,
                 }
 
               fd->redefine (i);
-              
-              AST_InterfaceFwd *fwd = fd->fwd_decl ();
-              
-              if (fwd != 0)
-                {
-                  fwd->set_as_defined ();
-                }
-              
+
               // Use full definition node.
               i->destroy ();
               delete i;
@@ -883,7 +1644,8 @@ AST_Interface::look_in_inherited (UTL_ScopedName *e,
 }
 
 AST_Decl *
-AST_Interface::lookup_for_add (AST_Decl *d)
+AST_Interface::lookup_for_add (AST_Decl *d,
+                               bool /* treat_as_ref */)
 {
   if (d == 0)
     {
diff --git a/TAO/TAO_IDL/ast/ast_interface_fwd.cpp b/TAO/TAO_IDL/ast/ast_interface_fwd.cpp
index 558f1bf4c90..ad89b09e9c9 100644
--- a/TAO/TAO_IDL/ast/ast_interface_fwd.cpp
+++ b/TAO/TAO_IDL/ast/ast_interface_fwd.cpp
@@ -75,8 +75,18 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "ast_visitor.h"
 #include "utl_identifier.h"
 
-AST_Decl::NodeType const
-AST_InterfaceFwd::NT = AST_Decl::NT_interface_fwd;
+ACE_RCSID( ast,
+           ast_interface_fwd,
+           "$Id$")
+
+AST_InterfaceFwd::AST_InterfaceFwd (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    AST_Type (),
+    pd_full_definition (0),
+    is_defined_ (false)
+{
+}
 
 AST_InterfaceFwd::AST_InterfaceFwd (AST_Interface *dummy,
                                     UTL_ScopedName *n)
@@ -239,7 +249,7 @@ AST_InterfaceFwd::is_defined (void)
               // is a sufficient way to tell if our full
               // definition has already gone through the
               // add_to_scope process.
-              if (0 != fwd && fwd->is_defined ())
+              if (0 != fwd && fwd->full_definition ()->added ())
                 {
                   this->is_defined_ = true;
                 }
diff --git a/TAO/TAO_IDL/ast/ast_mirror_port.cpp b/TAO/TAO_IDL/ast/ast_mirror_port.cpp
index fa5aa5f2922..ce79e976135 100644
--- a/TAO/TAO_IDL/ast/ast_mirror_port.cpp
+++ b/TAO/TAO_IDL/ast/ast_mirror_port.cpp
@@ -8,9 +8,6 @@
 #include "utl_indenter.h"
 #include "global_extern.h"
 
-AST_Decl::NodeType const
-AST_Mirror_Port::NT = AST_Decl::NT_mirror_port;
-
 AST_Mirror_Port::AST_Mirror_Port (
     UTL_ScopedName *n,
     AST_PortType *porttype_ref)
diff --git a/TAO/TAO_IDL/ast/ast_module.cpp b/TAO/TAO_IDL/ast/ast_module.cpp
index 43cbdd0fc45..2df82d58e21 100644
--- a/TAO/TAO_IDL/ast/ast_module.cpp
+++ b/TAO/TAO_IDL/ast/ast_module.cpp
@@ -101,8 +101,12 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "global_extern.h"
 #include "nr_extern.h"
 
-AST_Decl::NodeType const
-AST_Module::NT = AST_Decl::NT_module;
+AST_Module::AST_Module (void)
+ : AST_Decl (),
+   UTL_Scope (),
+   pd_has_nested_valuetype (0)
+{
+}
 
 AST_Module::AST_Module (UTL_ScopedName *n)
  : AST_Decl (AST_Decl::NT_module,
@@ -116,14 +120,55 @@ AST_Module::~AST_Module (void)
 {
 }
 
+// Add this AST_PredefinedType node (a predefined type declaration) to
+// this scope.
+
 AST_PredefinedType *
 AST_Module::fe_add_predefined_type (AST_PredefinedType *t)
 {
-  return
-    AST_PredefinedType::narrow_from_decl (
-      this->fe_add_decl (t));
+  AST_Decl *d = 0;
+
+  // Already defined and cannot be redefined? Or already used?
+  if ((d = this->lookup_for_add (t, false)) != 0)
+    {
+      if (!can_be_redefined (d))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (this->referenced (d, t->local_name ()))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (t->has_ancestor (d))
+        {
+          idl_global->err()->redefinition_in_scope (t,
+                                                    d);
+          return 0;
+        }
+    }
+
+  // Add it to scope.
+  this->add_to_scope (t);
+
+  // Add it to set of locally referenced symbols.
+  this->add_to_referenced (t,
+                           false,
+                           t->local_name ());
+
+  return t;
 }
 
+// Add this AST_Module node (a module declaration) to this scope.
 AST_Module *
 AST_Module::fe_add_module (AST_Module *t)
 {
@@ -150,7 +195,7 @@ AST_Module::fe_add_module (AST_Module *t)
     }
 
   // Already defined and cannot be redefined? Or already used?
-  if ((d = this->lookup_for_add (t)) != 0)
+  if ((d = this->lookup_for_add (t, false)) != 0)
     {
       if (!can_be_redefined (d))
         {
@@ -187,6 +232,23 @@ AST_Module::fe_add_module (AST_Module *t)
             {
               d->prefix (const_cast<char *> (this_prefix));
             }
+          // (JP) This could give a bogus error, since typeprefix can
+          // appear any time after the corresponding declaration.
+          // The right way to do this is with a separate traversal
+          // after the entire AST is built.
+          /*
+          else
+            {
+              if (ACE_OS::strcmp (this_prefix, prev_prefix) != 0)
+                {
+                  idl_global->err ()->error2 (UTL_Error::EIDL_PREFIX_CONFLICT,
+                                              this,
+                                              d);
+
+                  return 0;
+                }
+            }
+          */
         }
     }
 
@@ -206,179 +268,1552 @@ AST_Module::fe_add_module (AST_Module *t)
 }
 
 AST_Template_Module_Inst *
-AST_Module::fe_add_template_module_inst (AST_Template_Module_Inst *t)
+AST_Module::fe_add_template_module_inst (AST_Template_Module_Inst *m)
 {
-  return
-    AST_Template_Module_Inst::narrow_from_decl (
-      this->fe_add_ref_decl (t));
+  AST_Decl *d = 0;
+
+  // Already defined and cannot be redefined? Or already used?
+  if ((d = this->lookup_for_add (m, false)) != 0)
+    {
+      if (!can_be_redefined (d))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      m,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (this->referenced (d, m->local_name ()))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      m,
+                                      this,
+                                      d);
+          return 0;
+        }
+    }
+
+  // Add it to scope.
+  this->add_to_scope (m);
+
+  // Add it to set of locally referenced symbols.
+  this->add_to_referenced (m,
+                           false,
+                           m->local_name ());
+
+  AST_Type *ft = m->field_type ();
+  UTL_ScopedName *mru = ft->last_referenced_as ();
+
+  if (mru != 0)
+    {
+      this->add_to_referenced (ft,
+                               false,
+                               mru->first_component ());
+    }
+
+  return m;
 }
 
+// Add this AST_Interface node (an interface declaration) to this scope.
 AST_Interface *
 AST_Module::fe_add_interface (AST_Interface *t)
 {
-  return
-    this->fe_add_full_intf_decl<AST_Interface> (t);
+  if (t->redef_clash ())
+    {
+      return 0;
+    }
+
+  AST_Decl *predef = 0;
+  AST_Interface *fwd = 0;
+
+  // Already defined?
+  if ((predef = this->lookup_for_add (t, false)) != 0)
+    {
+      // Treat fwd declared interfaces specially
+      if (predef->node_type () == AST_Decl::NT_interface)
+        {
+          fwd = AST_Interface::narrow_from_decl (predef);
+
+          if (fwd == 0)
+            {
+              return 0;
+            }
+
+          // Forward declared and not defined yet.
+          if (!fwd->is_defined ())
+            {
+              if (fwd->defined_in () != this)
+                {
+                  idl_global->err ()->error3 (UTL_Error::EIDL_SCOPE_CONFLICT,
+                                              fwd,
+                                              t,
+                                              this);
+
+                  return 0;
+                }
+            }
+          // OK, not illegal redef of forward declaration. Now check whether.
+          // it has been referenced already.
+          else if (this->referenced (predef, t->local_name ()))
+            {
+              idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                          t,
+                                          this,
+                                          predef);
+
+              return 0;
+            }
+
+        }
+      else if (!can_be_redefined (predef))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      t,
+                                      this,
+                                      predef);
+
+          return 0;
+        }
+      else if (referenced (predef, t->local_name ()) && !t->is_defined ())
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      t,
+                                      this,
+                                      predef);
+
+          return 0;
+        }
+      else if (t->has_ancestor (predef))
+        {
+          idl_global->err ()->redefinition_in_scope (t,
+                                                     predef);
+
+          return 0;
+        }
+    }
+
+  // Add it to scope
+  this->add_to_scope (t);
+
+  // We do this for interfaces, valuetypes and components in 
+  // a different place than we do for structs and unions,
+  // since fwd declared structs and unions must be defined in
+  // the same translation unit.
+  AST_InterfaceFwd *fd = t->fwd_decl ();
+
+  if (0 != fd)
+    {
+      fd->set_as_defined ();
+    }
+
+  // Add it to set of locally referenced symbols
+  this->add_to_referenced (t,
+                           false,
+                           t->local_name ());
+  return t;
 }
 
+
+// Add this AST_ValueBox node (a value type declaration) to this scope.
 AST_ValueBox *
 AST_Module::fe_add_valuebox (AST_ValueBox *t)
 {
-  return
-    AST_ValueBox::narrow_from_decl (
-      this->fe_add_decl (t));
+  AST_Decl *predef = 0;
+
+  // Already defined and cannot be redefined? Or already used?
+  if ((predef = this->lookup_for_add (t, false)) != 0)
+    {
+      if (!can_be_redefined (predef))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      t,
+                                      this,
+                                      predef);
+
+          return 0;
+        }
+      else if (referenced (predef, t->local_name ()))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      t,
+                                      this,
+                                      predef);
+
+          return 0;
+        }
+      else if (t->has_ancestor (predef))
+        {
+          idl_global->err ()->redefinition_in_scope (t,
+                                                     predef);
+
+          return 0;
+        }
+    }
+
+  // Add it to scope
+  this->add_to_scope (t);
+
+  // Add it to set of locally referenced symbols
+  this->add_to_referenced (t,
+                           false,
+                           t->local_name ());
+  return t;
 }
 
+
+// Add this AST_ValueType node (a value type declaration) to this scope.
 AST_ValueType *
 AST_Module::fe_add_valuetype (AST_ValueType *t)
 {
-  return
-    this->fe_add_full_intf_decl<AST_ValueType> (t);
+  if (t->redef_clash ())
+    {
+      return 0;
+    }
+
+  AST_Decl *predef = 0;
+  AST_ValueType *fwd = 0;
+
+  // Already defined?
+  if ((predef = this->lookup_for_add (t, false)) != 0)
+    {
+      // Treat fwd declared interfaces specially
+      if (predef->node_type () == AST_Decl::NT_valuetype)
+        {
+          fwd = AST_ValueType::narrow_from_decl (predef);
+
+          if (fwd == 0)
+            {
+              return 0;
+            }
+
+          // Forward declared and not defined yet.
+          if (!fwd->is_defined ())
+            {
+              if (fwd->defined_in () != this)
+                {
+                  idl_global->err ()->error3 (UTL_Error::EIDL_SCOPE_CONFLICT,
+                                              fwd,
+                                              t,
+                                              this);
+
+                  return 0;
+                }
+            }
+          // OK, not illegal redef of forward declaration. Now check whether.
+          // it has been referenced already.
+          else if (this->referenced (predef, t->local_name ()))
+            {
+              idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                          t,
+                                          this,
+                                          predef);
+
+              return 0;
+            }
+        }
+      else if (!can_be_redefined (predef))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      t,
+                                      this,
+                                      predef);
+
+          return 0;
+        }
+      else if (referenced (predef, t->local_name ()) && !t->is_defined ())
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      t,
+                                      this,
+                                      predef);
+
+          return 0;
+        }
+      else if (t->has_ancestor (predef))
+        {
+          idl_global->err ()->redefinition_in_scope (t,
+                                                     predef);
+
+          return 0;
+        }
+    }
+
+  // Add it to scope
+  this->add_to_scope (t);
+
+  // We do this for interfaces, valuetypes and components in 
+  // a different place than we do for structs and unions,
+  // since fwd declared structs and unions must be defined in
+  // the same translation unit.
+  AST_InterfaceFwd *fd = t->fwd_decl ();
+  
+  if (0 != fd)
+    {
+      fd->set_as_defined ();
+    }
+
+  // Add it to set of locally referenced symbols
+  this->add_to_referenced (t,
+                           false,
+                           t->local_name ());
+  return t;
 }
 
+// Add this AST_EventType node (an event type declaration) to this scope.
 AST_EventType *
 AST_Module::fe_add_eventtype (AST_EventType *t)
 {
-  return
-    this->fe_add_full_intf_decl<AST_EventType> (t);
+  if (t->redef_clash ())
+    {
+      return 0;
+    }
+
+  AST_Decl *predef = 0;
+  AST_EventType *fwd = 0;
+
+  // Already defined?
+  if ((predef = this->lookup_for_add (t, false)) != 0)
+    {
+      // Treat fwd declared interfaces specially
+      if (predef->node_type () == AST_Decl::NT_eventtype)
+        {
+          fwd = AST_EventType::narrow_from_decl (predef);
+
+          if (fwd == 0)
+            {
+              return 0;
+            }
+
+          // Forward declared and not defined yet.
+          if (!fwd->is_defined ())
+            {
+              if (fwd->defined_in () != this)
+                {
+                  idl_global->err ()->error3 (UTL_Error::EIDL_SCOPE_CONFLICT,
+                                              fwd,
+                                              t,
+                                              this);
+
+                  return 0;
+                }
+            }
+          // OK, not illegal redef of forward declaration. Now check whether.
+          // it has been referenced already.
+          else if (this->referenced (predef, t->local_name ()))
+            {
+              idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                          t,
+                                          this,
+                                          predef);
+
+              return 0;
+            }
+        }
+      else if (!can_be_redefined (predef))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      t,
+                                      this,
+                                      predef);
+
+          return 0;
+        }
+      else if (referenced (predef, t->local_name ()) && !t->is_defined ())
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      t,
+                                      this,
+                                      predef);
+
+          return 0;
+        }
+      else if (t->has_ancestor (predef))
+        {
+          idl_global->err ()->redefinition_in_scope (t,
+                                                     predef);
+
+          return 0;
+        }
+    }
+
+  // Add it to scope
+  this->add_to_scope (t);
+
+  // Add it to set of locally referenced symbols
+  this->add_to_referenced (t,
+                           false,
+                           t->local_name ());
+  return t;
 }
 
+// Add this AST_Component node (a value type declaration) to this scope.
 AST_Component *
 AST_Module::fe_add_component (AST_Component *t)
 {
-  return
-    this->fe_add_full_intf_decl<AST_Component> (t);
+  if (t->redef_clash ())
+    {
+      return 0;
+    }
+
+  AST_Decl *predef = 0;
+  AST_Component *fwd = 0;
+
+  // Already defined?
+  if ((predef = this->lookup_for_add (t, false)) != 0)
+    {
+      // Treat fwd declared interfaces specially
+      if (predef->node_type () == AST_Decl::NT_component)
+        {
+          fwd = AST_Component::narrow_from_decl (predef);
+
+          if (fwd == 0)
+            {
+              return 0;
+            }
+
+          // Forward declared and not defined yet.
+          if (!fwd->is_defined ())
+            {
+              if (fwd->defined_in () != this)
+                {
+                  idl_global->err ()->error3 (UTL_Error::EIDL_SCOPE_CONFLICT,
+                                              fwd,
+                                              t,
+                                              this);
+
+                  return 0;
+                }
+            }
+          // OK, not illegal redef of forward declaration. Now check whether.
+          // it has been referenced already.
+          else if (this->referenced (predef, t->local_name ()))
+            {
+              idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                          t,
+                                          this,
+                                          predef);
+
+              return 0;
+            }
+        }
+      else if (!can_be_redefined (predef))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      t,
+                                      this,
+                                      predef);
+
+          return 0;
+        }
+      else if (referenced (predef, t->local_name ()) && !t->is_defined ())
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      t,
+                                      this,
+                                      predef);
+
+          return 0;
+        }
+      else if (t->has_ancestor (predef))
+        {
+          idl_global->err ()->redefinition_in_scope (t,
+                                                     predef);
+
+          return 0;
+        }
+    }
+
+  // Add it to scope
+  this->add_to_scope (t);
+  
+  // We do this for interfaces, valuetypes and components in 
+  // a different place than we do for structs and unions,
+  // since fwd declared structs and unions must be defined in
+  // the same translation unit.
+  AST_InterfaceFwd *fd = t->fwd_decl ();
+  
+  if (0 != fd)
+    {
+      fd->set_as_defined ();
+    }
+
+  // Add it to set of locally referenced symbols
+  this->add_to_referenced (t,
+                           false,
+                           t->local_name ());
+  return t;
 }
 
 AST_Connector *
 AST_Module::fe_add_connector (AST_Connector *t)
 {
-  return
-    AST_Connector::narrow_from_decl (
-      this->fe_add_decl (t));
+  AST_Decl *d = 0;
+
+  // Already defined and cannot be redefined? Or already used?
+  if ((d = this->lookup_for_add (t, false)) != 0)
+    {
+      if (!can_be_redefined (d))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (this->referenced (d, t->local_name ()))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (t->has_ancestor (d))
+        {
+          idl_global->err ()->redefinition_in_scope (t,
+                                                     d);
+          return 0;
+        }
+    }
+
+  // Add it to local types.
+  this->add_to_local_types (t);
+
+  // Add it to set of locally referenced symbols.
+  this->add_to_referenced (t,
+                           false,
+                           t->local_name ());
+
+  return t;
 }
 
+// Add this AST_Home node (a value type declaration) to this scope.
 AST_Home *
 AST_Module::fe_add_home (AST_Home *t)
 {
-  return
-    AST_Home::narrow_from_decl (
-      this->fe_add_decl (t));
+  AST_Decl *d = 0;
+
+  // Already defined and cannot be redefined? Or already used?
+  if ((d = this->lookup_for_add (t, false)) != 0)
+    {
+      if (!can_be_redefined (d))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (this->referenced  (d, t->local_name ()))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (t->has_ancestor (d))
+        {
+          idl_global->err ()->redefinition_in_scope (t,
+                                                     d);
+          return 0;
+        }
+    }
+
+  // Add it to scope.
+  this->add_to_scope (t);
+
+  // The home's local name is not added to the referenced list, since
+  // the name will later be mangled to allow a creation of an
+  // equivalent interface with the original name.
+
+  return t;
 }
 
+// Add this AST_InterfaceFwd node (a forward declaration of an IDL
+// interface) to this scope.
 AST_InterfaceFwd *
-AST_Module::fe_add_interface_fwd (AST_InterfaceFwd *t)
+AST_Module::fe_add_interface_fwd (AST_InterfaceFwd *i)
 {
-  return
-    this->fe_add_fwd_intf_decl<AST_Interface> (t);
+  AST_Decl *d = 0;
+
+  // Already defined and cannot be redefined? Or already used?
+  if ((d = this->lookup_for_add (i, false)) != 0)
+    {
+      AST_Decl::NodeType nt = d->node_type ();
+/*
+      if (nt == AST_Decl::NT_interface_fwd)
+        {
+          AST_InterfaceFwd *ifwd = AST_InterfaceFwd::narrow_from_decl (d);
+          i->set_full_definition (ifwd->full_definition ());
+        }
+*/
+      // There used to be another check here ANDed with the one below:
+      // d->defined_in () == this. But lookup_for_add calls only
+      // lookup_by_name_local(), which does not bump up the scope,
+      // and look_in_previous() for modules. If look_in_previous()
+      // finds something, the scopes will NOT be the same pointer
+      // value, but the result is what we want.
+      if (nt == AST_Decl::NT_interface)
+        {
+          AST_Interface *itf = AST_Interface::narrow_from_decl (d);
+
+          if (itf == 0)
+            {
+              return 0;
+            }
+
+          if (i->added () == 0)
+            {
+              i->set_added (true);
+              this->add_to_scope (i);
+            }
+            
+          // If the lookup found the full_definition member of another
+          // interface_fwd, don't reset this full_definition. Otherwise
+          // reset the member and set is_defined_ on i so it itf won't
+          // get destroyed twice.  
+          if (itf->is_defined ())
+            {
+              if (!i->is_defined ())
+                {
+                  AST_Interface *prev_fd = i->full_definition ();
+                  prev_fd->destroy ();
+                  // No need to delete prev_fd, the call to 
+                  // set_full_definition() below will do it.
+                }
+                
+              i->set_full_definition (itf);
+              i->set_as_defined ();
+            }
+            
+          return i;
+        }
+
+      if (!can_be_redefined (d)) {
+
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      i,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      // No need to call referenced() for forward declared interafces,
+      // they can be redeclared after referencing.
+
+      if (i->has_ancestor (d))
+        {
+          idl_global->err ()->redefinition_in_scope  (i,
+                                                      d);
+          return 0;
+        }
+    }
+
+  // Add it to scope
+  this->add_to_scope (i);
+
+  // Add it to set of locally referenced symbols
+  this->add_to_referenced (i,
+                           false,
+                           i->local_name ());
+
+  return i;
 }
 
+// Add this AST_ValueTypeFwd node (a forward declaration of an IDL
+// value type) to this scope.
 AST_ValueTypeFwd *
-AST_Module::fe_add_valuetype_fwd (AST_ValueTypeFwd *t)
+AST_Module::fe_add_valuetype_fwd (AST_ValueTypeFwd *v)
 {
-  return
-    this->fe_add_fwd_intf_decl<AST_ValueType> (t);
+  AST_Decl *d = 0;
+
+  // Already defined and cannot be redefined? Or already used?
+  if ((d = this->lookup_for_add (v, false)) != 0)
+    {
+      AST_Decl::NodeType nt = d->node_type ();
+
+      if (nt == AST_Decl::NT_valuetype_fwd)
+        {
+          AST_ValueTypeFwd *vfwd = AST_ValueTypeFwd::narrow_from_decl (d);
+          v->set_full_definition (vfwd->full_definition ());
+        }
+
+      // There used to be another check here ANDed with the one below:
+      // d->defined_in () == this. But lookup_for_add calls only
+      // lookup_by_name_local(), which does not bump up the scope,
+      // and look_in_previous() for modules. If look_in_previous()
+      // finds something, the scopes will NOT be the same pointer
+      // value, but the result is what we want.
+      if (nt == AST_Decl::NT_valuetype)
+        {
+          AST_ValueType *vtf = AST_ValueType::narrow_from_decl (d);
+
+          if (vtf == 0)
+            {
+              return 0;
+            }
+
+          if (v->added () == 0)
+            {
+              v->set_added (1);
+              this->add_to_scope (v);
+            }
+
+          // @@ Redefinition of forward. Type check not implemented.
+          v->set_full_definition (vtf);   // @@ Memory leak.
+          return v;
+        }
+
+      if (!can_be_redefined (d)) {
+
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      v,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (this->referenced (d, v->local_name ()))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      v,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (v->has_ancestor (d))
+        {
+          idl_global->err ()->redefinition_in_scope  (v,
+                                                      d);
+          return 0;
+        }
+    }
+
+  // Add it to scope
+  this->add_to_scope (v);
+
+  // Add it to set of locally referenced symbols
+  this->add_to_referenced (v,
+                           false,
+                           v->local_name ());
+
+  return v;
 }
 
+// Add this AST_EventTypeFwd node (a forward declaration of an IDL
+// event type) to this scope.
 AST_EventTypeFwd *
-AST_Module::fe_add_eventtype_fwd (AST_EventTypeFwd *t)
+AST_Module::fe_add_eventtype_fwd (AST_EventTypeFwd *v)
 {
-  return
-    this->fe_add_fwd_intf_decl<AST_EventType> (t);
+  AST_Decl *d = 0;
+
+  // Already defined and cannot be redefined? Or already used?
+  if ((d = this->lookup_for_add (v, false)) != 0)
+    {
+      AST_Decl::NodeType nt = d->node_type ();
+
+      if (nt == AST_Decl::NT_eventtype_fwd)
+        {
+          AST_EventTypeFwd *efwd = AST_EventTypeFwd::narrow_from_decl (d);
+          v->set_full_definition (efwd->full_definition ());
+        }
+
+      // There used to be another check here ANDed with the one below:
+      // d->defined_in () == this. But lookup_for_add calls only
+      // lookup_by_name_local(), which does not bump up the scope,
+      // and look_in_previous() for modules. If look_in_previous()
+      // finds something, the scopes will NOT be the same pointer
+      // value, but the result is what we want.
+      if (nt == AST_Decl::NT_eventtype)
+        {
+          AST_EventType *vtf = AST_EventType::narrow_from_decl (d);
+
+          if (vtf == 0)
+            {
+              return 0;
+            }
+
+          if (v->added () == 0)
+            {
+              v->set_added (1);
+              this->add_to_scope (v);
+            }
+
+          // @@ Redefinition of forward. Type check not implemented.
+          v->set_full_definition (vtf);   // @@ Memory leak.
+          return v;
+        }
+
+      if (!can_be_redefined (d)) {
+
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      v,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (this->referenced (d, v->local_name ()))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      v,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (v->has_ancestor (d))
+        {
+          idl_global->err ()->redefinition_in_scope  (v,
+                                                      d);
+          return 0;
+        }
+    }
+
+  // Add it to scope
+  this->add_to_scope (v);
+
+  // Add it to set of locally referenced symbols
+  this->add_to_referenced (v,
+                           false,
+                           v->local_name ());
+
+  return v;
 }
 
+// Add this AST_ComponentFwd node (a forward declaration of an IDL
+// value type) to this scope.
 AST_ComponentFwd *
-AST_Module::fe_add_component_fwd (AST_ComponentFwd *t)
+AST_Module::fe_add_component_fwd (AST_ComponentFwd *c)
 {
-  return
-    this->fe_add_fwd_intf_decl<AST_Component> (t);
+  AST_Decl *d = 0;
+
+  // Already defined and cannot be redefined? Or already used?
+  if ((d = this->lookup_for_add (c, false)) != 0)
+    {
+      AST_Decl::NodeType nt = d->node_type ();
+
+      if (nt == AST_Decl::NT_component_fwd)
+        {
+          AST_ComponentFwd *cfwd = AST_ComponentFwd::narrow_from_decl (d);
+          c->set_full_definition (cfwd->full_definition ());
+        }
+
+      // There used to be another check here ANDed with the one below:
+      // d->defined_in () == this. But lookup_for_add calls only
+      // lookup_by_name_local(), which does not bump up the scope,
+      // and look_in_previous() for modules. If look_in_previous()
+      // finds something, the scopes will NOT be the same pointer
+      // value, but the result is what we want.
+      if (nt == AST_Decl::NT_component)
+        {
+          AST_Component *cf = AST_Component::narrow_from_decl (d);
+
+          if (cf == 0)
+            {
+              return 0;
+            }
+
+          if (c->added () == 0)
+            {
+              c->set_added (1);
+              this->add_to_scope (c);
+            }
+
+          // @@ Redefinition of forward. Type check not implemented.
+          c->set_full_definition (cf);   // @@ Memory leak.
+          return c;
+        }
+
+      if (!can_be_redefined (d)) {
+
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      c,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (this->referenced (d, c->local_name ()))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      c,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (c->has_ancestor (d))
+        {
+          idl_global->err ()->redefinition_in_scope  (c,
+                                                      d);
+          return 0;
+        }
+    }
+
+  // Add it to scope
+  this->add_to_scope (c);
+
+  // Add it to set of locally referenced symbols
+  this->add_to_referenced (c,
+                           false,
+                           c->local_name ());
+
+  return c;
 }
 
+// Add this AST_Constant node (a constant declaration) to this scope.
 AST_Constant *
 AST_Module::fe_add_constant (AST_Constant *t)
 {
-  return
-    AST_Constant::narrow_from_decl (
-      this->fe_add_decl (t));
+  AST_Decl *d = 0;
+
+  // Already defined and cannot be redefined? Or already used?
+  if ((d = this->lookup_for_add (t, false)) != 0)
+    {
+      if (!can_be_redefined (d))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (this->referenced (d, t->local_name ()))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (t->has_ancestor (d))
+        {
+          idl_global->err ()->redefinition_in_scope (t,
+                                                     d);
+          return 0;
+        }
+    }
+
+  // Add it to scope.
+  this->add_to_scope (t);
+
+  // Add it to set of locally referenced symbols.
+  this->add_to_referenced (t,
+                           false,
+                           t->local_name ());
+
+  return t;
 }
 
+// Add this AST_Exception node (an exception declaration) to this scope
 AST_Exception *
 AST_Module::fe_add_exception (AST_Exception *t)
 {
-  return
-    AST_Exception::narrow_from_decl (
-      this->fe_add_decl (t));
+  AST_Decl *d = 0;
+
+  // Already defined and cannot be redefined? Or already used?
+  if ((d = this->lookup_for_add (t, false)) != 0)
+    {
+      if (!can_be_redefined (d))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (this->referenced  (d, t->local_name ()))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (t->has_ancestor (d))
+        {
+          idl_global->err ()->redefinition_in_scope (t,
+                                                     d);
+          return 0;
+        }
+    }
+
+  // Add it to scope.
+  this->add_to_scope (t);
+
+  // Add it to set of locally referenced symbols.
+  this->add_to_referenced (t,
+                           false,
+                           t->local_name ());
+
+  return t;
 }
 
+// Add this AST_Union node (a union declaration) to this scope
 AST_Union *
 AST_Module::fe_add_union (AST_Union *t)
 {
-  return
-    AST_Union::narrow_from_decl (
-      this->fe_add_full_struct_type (t));
+  AST_UnionFwd *fwd = 0;
+  AST_Decl *predef = this->lookup_for_add (t, false);
+
+  if (predef != 0)
+    {
+      // Treat fwd declared interfaces specially
+      if (predef->node_type () == AST_Decl::NT_union_fwd)
+        {
+          fwd = AST_UnionFwd::narrow_from_decl (predef);
+
+          if (fwd == 0)
+            {
+              return 0;
+            }
+
+          // Forward declared and not defined yet.
+          if (!fwd->is_defined ())
+            {
+              UTL_Scope *s = fwd->defined_in ();
+              UTL_ScopedName *sn = ScopeAsDecl (s)->name ();
+
+              if (fwd->defined_in () == this
+                  || sn->compare (this->name ()) == 0)
+                {
+                  fwd->set_full_definition (t);
+                }
+              else
+                {
+                  idl_global->err ()->error3 (UTL_Error::EIDL_SCOPE_CONFLICT,
+                                              fwd,
+                                              t,
+                                              this);
+
+                  return 0;
+                }
+            }
+          // OK, not illegal redef of forward declaration. Now check whether.
+          // it has been referenced already.
+          else if (this->referenced (predef, t->local_name ()))
+            {
+              idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                          t,
+                                          this,
+                                          predef);
+
+              return 0;
+            }
+        }
+      else if (!can_be_redefined (predef))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      t,
+                                      this,
+                                      predef);
+
+          return 0;
+        }
+      else if (referenced (predef, t->local_name ()) && !t->is_defined ())
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      t,
+                                      this,
+                                      predef);
+
+          return 0;
+        }
+    }
+
+  // Add it to scope.
+  this->add_to_scope (t);
+
+  // Add it to set of locally referenced symbols.
+  this->add_to_referenced (t,
+                           false,
+                           t->local_name ());
+
+  return t;
 }
 
+// Add this AST_UnionFwd node (a forward declaration of an IDL
+// union) to this scope.
 AST_UnionFwd *
 AST_Module::fe_add_union_fwd (AST_UnionFwd *t)
 {
-  return
-    AST_UnionFwd::narrow_from_decl (
-      this->fe_add_fwd_struct_type (t));
+  AST_Decl *d = 0;
+
+  // Already defined and cannot be redefined? Or already used?
+  if ((d = this->lookup_for_add (t, false)) != 0)
+    {
+      AST_Decl::NodeType nt = d->node_type ();
+
+      if (nt == AST_Decl::NT_union_fwd)
+        {
+          AST_UnionFwd *ufwd = AST_UnionFwd::narrow_from_decl (d);
+          t->set_full_definition (ufwd->full_definition ());
+        }
+
+      // There used to be another check here ANDed with the one below:
+      // d->defined_in () == this. But lookup_for_add calls only
+      // lookup_by_name_local(), which does not bump up the scope,
+      // and look_in_previous() for modules. If look_in_previous()
+      // finds something, the scopes will NOT be the same pointer
+      // value, but the result is what we want.
+      if (nt == AST_Decl::NT_union)
+        {
+          AST_Union *s = AST_Union::narrow_from_decl (d);
+          t->set_full_definition (s);
+
+          if (t->added () == 0)
+            {
+              t->set_added (1);
+              this->add_to_scope (t);
+
+              // Must check later that all struct and union forward declarations
+              // are defined in the same IDL file.
+              AST_record_fwd_decl (t);
+            }
+
+          return t;
+        }
+      else
+        {
+          if (!can_be_redefined (d))
+            {
+              idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                          t,
+                                          this,
+                                          d);
+              return 0;
+            }
+
+          if (this->referenced (d, t->local_name ()))
+            {
+              idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                          t,
+                                          this,
+                                          d);
+              return 0;
+            }
+        }
+    }
+
+  // Add it to scope
+  this->add_to_scope (t);
+
+  // Add it to set of locally referenced symbols
+  this->add_to_referenced (t,
+                           false,
+                           t->local_name ());
+
+  // Must check later that all struct and union forward declarations
+  // are defined in the same IDL file.
+  AST_record_fwd_decl (t);
+  return t;
 }
 
+// Add this AST_Structure node (a struct declaration) to this scope.
 AST_Structure *
 AST_Module::fe_add_structure (AST_Structure *t)
 {
-  return this->fe_add_full_struct_type (t);
+  AST_Decl *predef = 0;
+  AST_StructureFwd *fwd = 0;
+
+  if ((predef = this->lookup_for_add (t, false)) != 0)
+    {
+      // Treat fwd declared interfaces specially
+      if (predef->node_type () == AST_Decl::NT_struct_fwd)
+        {
+          fwd = AST_StructureFwd::narrow_from_decl (predef);
+
+          if (fwd == 0)
+            {
+              return 0;
+            }
+
+          // Forward declared and not defined yet.
+          if (!fwd->is_defined ())
+            {
+              UTL_Scope *s = fwd->defined_in ();
+              UTL_ScopedName *sn = ScopeAsDecl (s)->name ();
+
+              if (fwd->defined_in () == this
+                  || sn->compare (this->name ()) == 0)
+                {
+                  fwd->set_full_definition (t);
+                }
+              else
+                {
+                  idl_global->err ()->error3 (UTL_Error::EIDL_SCOPE_CONFLICT,
+                                              fwd,
+                                              t,
+                                              this);
+
+                  return 0;
+                }
+            }
+          // OK, not illegal redef of forward declaration. Now check whether.
+          // it has been referenced already.
+          else if (this->referenced (predef, t->local_name ()))
+            {
+              idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                          t,
+                                          this,
+                                          predef);
+
+              return 0;
+            }
+        }
+      else if (!can_be_redefined (predef))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      t,
+                                      this,
+                                      predef);
+
+          return 0;
+        }
+      else if (referenced (predef, t->local_name ()) && !t->is_defined ())
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      t,
+                                      this,
+                                      predef);
+
+          return 0;
+        }
+    }
+
+  // Add it to scope.
+  this->add_to_scope (t);
+
+  // Add it to set of locally referenced symbols.
+  this->add_to_referenced (t,
+                           false,
+                           t->local_name ());
+
+  return t;
 }
 
+// Add this AST_StructureFwd node (a forward declaration of an IDL
+// struct) to this scope.
 AST_StructureFwd *
 AST_Module::fe_add_structure_fwd (AST_StructureFwd *t)
 {
-  return this->fe_add_fwd_struct_type (t);
+  AST_Decl *d = 0;
+
+  // Already defined and cannot be redefined? Or already used?
+  if ((d = this->lookup_for_add (t, false)) != 0)
+    {
+      AST_Decl::NodeType nt = d->node_type ();
+
+      if (nt == AST_Decl::NT_struct_fwd)
+        {
+          AST_StructureFwd *sfwd = AST_StructureFwd::narrow_from_decl (d);
+          t->set_full_definition (sfwd->full_definition ());
+        }
+
+      // There used to be another check here ANDed with the one below:
+      // d->defined_in () == this. But lookup_for_add calls only
+      // lookup_by_name_local(), which does not bump up the scope,
+      // and look_in_previous() for modules. If look_in_previous()
+      // finds something, the scopes will NOT be the same pointer
+      // value, but the result is what we want.
+      if (nt == AST_Decl::NT_struct)
+        {
+          AST_Structure *s = AST_Structure::narrow_from_decl (d);
+          t->set_full_definition (s);
+
+          if (t->added () == 0)
+            {
+              t->set_added (1);
+              this->add_to_scope (t);
+
+              // Must check later that all struct and union forward declarations
+              // are defined in the same IDL file.
+              AST_record_fwd_decl (t);
+            }
+
+          return t;
+        }
+      else
+        {
+          if (!can_be_redefined (d))
+            {
+              idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                          t,
+                                          this,
+                                          d);
+              return 0;
+            }
+
+          if (this->referenced (d, t->local_name ()))
+            {
+              idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                          t,
+                                          this,
+                                          d);
+              return 0;
+            }
+        }
+    }
+
+  // Add it to scope
+  this->add_to_scope (t);
+
+  // Add it to set of locally referenced symbols
+  this->add_to_referenced (t,
+                           false,
+                           t->local_name ());
+
+  // Must check later that all struct and union forward declarations
+  // are defined in the same IDL file.
+  AST_record_fwd_decl (t);
+  return t;
 }
 
+// Add this AST_Enum node (an enum declaration) to this scope.
 AST_Enum *
 AST_Module::fe_add_enum (AST_Enum *t)
 {
-  return
-    AST_Enum::narrow_from_decl (
-      this->fe_add_decl (t));
+  AST_Decl *d = 0;
+
+  // Already defined and cannot be redefined? Or already used?
+  if ((d = this->lookup_for_add (t, false)) != 0)
+    {
+      if (!can_be_redefined (d))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (this->referenced (d, t->local_name ()))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (t->has_ancestor(d))
+        {
+          idl_global->err ()->redefinition_in_scope (t,
+                                                     d);
+          return 0;
+        }
+    }
+
+  // Add it to scope.
+  this->add_to_scope (t);
+
+  // Add it to set of locally referenced symbols.
+  this->add_to_referenced (t,
+                           false,
+                           t->local_name ());
+
+  return t;
 }
 
-// Add an AST_EnumVal node (an enumerator) to this scope.
+// Add this AST_EnumVal node (an enumerator declaration) to this scope
 // This is done to conform to the C++ scoping rules which declare
 // enumerators in the enclosing scope (in addition to declaring them
 // in the enum itself).
 AST_EnumVal *
 AST_Module::fe_add_enum_val (AST_EnumVal *t)
 {
-  return
-    AST_EnumVal::narrow_from_decl (
-      this->fe_add_decl (t));
+  AST_Decl *d = 0;
+
+  // Already defined and cannot be redefined? Or already used?
+  if ((d = this->lookup_for_add(t, false)) != 0)
+    {
+      if (!can_be_redefined (d))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (this->referenced (d, t->local_name ()))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (t->has_ancestor (d))
+        {
+          idl_global->err ()->redefinition_in_scope (t,
+                                                     d);
+          return 0;
+        }
+    }
+
+  // Add it to scope.
+  this->add_to_scope (t);
+
+  // Add it to set of locally referenced symbols.
+  this->add_to_referenced (t,
+                           false,
+                           t->local_name ());
+
+  return t;
 }
 
+// Add this AST_Typedef node (a typedef) to this scope.
 AST_Typedef *
 AST_Module::fe_add_typedef (AST_Typedef *t)
 {
-  return
-    AST_Typedef::narrow_from_decl (
-      this->fe_add_ref_decl (t));
+  AST_Decl *d = 0;
+
+  // Already defined and cannot be redefined? Or already used?
+  if ((d = this->lookup_for_add (t, false)) != 0)
+    {
+      if (!can_be_redefined (d))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (this->referenced (d, t->local_name ()))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (t->has_ancestor (d))
+        {
+          idl_global->err ()->redefinition_in_scope (t,
+                                                     d);
+          return 0;
+        }
+    }
+
+  // Add it to scope.
+  this->add_to_scope (t);
+
+  // Add it to set of locally referenced symbols.
+  this->add_to_referenced (t,
+                           false,
+                           t->local_name ());
+
+  AST_Type *bt = t->base_type ();
+  UTL_ScopedName *mru = bt->last_referenced_as ();
+
+  if (mru != 0)
+    {
+      this->add_to_referenced (bt,
+                               false,
+                               mru->first_component ());
+    }
+
+  return t;
 }
 
+// Add an AST_Native (a native declaration) to this scope.
 AST_Native *
 AST_Module::fe_add_native (AST_Native *t)
 {
-  return
-    AST_Native::narrow_from_decl (
-      this->fe_add_decl (t));
+  AST_Decl *d = 0;
+
+  // Already defined and cannot be redefined? Or already used?
+  if ((d = this->lookup_for_add (t, false)) != 0)
+    {
+      if (!can_be_redefined (d))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (this->referenced (d, t->local_name ()))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (t->has_ancestor (d))
+        {
+          idl_global->err ()->redefinition_in_scope (t,
+                                                     d);
+          return 0;
+        }
+    }
+
+  // Add it to scope.
+  this->add_to_scope (t);
+
+  // Add it to set of locally referenced symbols.
+  this->add_to_referenced (t,
+                           false,
+                           t->local_name ());
+
+  return t;
 }
 
 AST_PortType *
-AST_Module::fe_add_porttype (AST_PortType *t)
+AST_Module::fe_add_porttype (AST_PortType *pt)
 {
-  return
-    AST_PortType::narrow_from_decl (
-      this->fe_add_decl (t));
+  AST_Decl *d = 0;
+
+  // Already defined? Or already used?
+  if ((d = this->lookup_for_add (pt, false)) != 0)
+    {
+      if (!can_be_redefined (d))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      pt,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (this->referenced (d, pt->local_name ()))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      pt,
+                                      this,
+                                      d);
+          return 0;
+        }
+    }
+
+  // Add it to scope.
+  this->add_to_scope (pt);
+
+  // Add it to set of locally referenced symbols.
+  this->add_to_referenced (pt,
+                           false,
+                           pt->local_name ());
+
+  return pt;
 }
 
 // Dump this AST_Module node to the ostream o.
diff --git a/TAO/TAO_IDL/ast/ast_native.cpp b/TAO/TAO_IDL/ast/ast_native.cpp
index a2d555b72d2..cd672a2960c 100644
--- a/TAO/TAO_IDL/ast/ast_native.cpp
+++ b/TAO/TAO_IDL/ast/ast_native.cpp
@@ -3,8 +3,20 @@
 #include "ast_native.h"
 #include "ast_visitor.h"
 
-AST_Decl::NodeType const
-AST_Native::NT = AST_Decl::NT_native;
+ACE_RCSID (ast,
+           ast_native,
+           "$Id$")
+
+AST_Native::AST_Native (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    AST_Type (),
+    AST_ConcreteType (),
+    UTL_Scope (),
+    AST_Structure (),
+    AST_Exception ()
+{
+}
 
 AST_Native::AST_Native (UTL_ScopedName *n)
   : COMMON_Base (),
diff --git a/TAO/TAO_IDL/ast/ast_operation.cpp b/TAO/TAO_IDL/ast/ast_operation.cpp
index 818aa3f2241..bbcc676a0e1 100644
--- a/TAO/TAO_IDL/ast/ast_operation.cpp
+++ b/TAO/TAO_IDL/ast/ast_operation.cpp
@@ -91,8 +91,18 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 #include "global_extern.h"
 
-AST_Decl::NodeType const
-AST_Operation::NT = AST_Decl::NT_op;
+AST_Operation::AST_Operation (void)
+  : COMMON_Base (),
+    AST_Decl(),
+    UTL_Scope(),
+    pd_return_type (0),
+    pd_flags (OP_noflags),
+    pd_context (0),
+    pd_exceptions (0),
+    argument_count_ (-1),
+    has_native_ (0)
+{
+}
 
 AST_Operation::AST_Operation (AST_Type *rt,
                               Flags fl,
@@ -427,12 +437,80 @@ AST_Operation::fe_add_exceptions (UTL_NameList *t)
   return 0;
 }
 
+// Add this AST_Argument node (an operation argument declaration)
+// to this scope.
 AST_Argument *
 AST_Operation::fe_add_argument (AST_Argument *t)
 {
-  return
-    AST_Argument::narrow_from_decl (
-      this->fe_add_decl (t));
+  AST_Decl *d = 0;
+
+  // Already defined and cannot be redefined? Or already used?
+  if ((d = lookup_by_name_local (t->local_name(), 0)) != 0)
+    {
+      if (!can_be_redefined (d))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (this->referenced (d, t->local_name ()))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (t->has_ancestor (d))
+        {
+          idl_global->err ()->redefinition_in_scope (t,
+                                                     d);
+          return 0;
+        }
+    }
+
+  // Cannot add OUT or INOUT argument to oneway operation.
+  if ((t->direction () == AST_Argument::dir_OUT
+       || t->direction() == AST_Argument::dir_INOUT)
+      && pd_flags == OP_oneway)
+    {
+      idl_global->err ()->error2 (UTL_Error::EIDL_ONEWAY_CONFLICT,
+                                  t,
+                                  this);
+      return 0;
+    }
+
+  AST_Type *arg_type = t->field_type ();
+
+  // This error is not caught in y.tab.cpp so we check for it here.
+  if (arg_type->node_type () == AST_Decl::NT_array
+      && arg_type->anonymous () == true)
+    {
+      idl_global->err ()->syntax_error (idl_global->parse_state ());
+    }
+
+  // Add it to scope.
+  this->add_to_scope (t);
+
+  // Add it to set of locally referenced symbols.
+  this->add_to_referenced (t,
+                           false,
+                           t->local_name ());
+
+  UTL_ScopedName *mru = arg_type->last_referenced_as ();
+
+  if (mru != 0)
+    {
+      this->add_to_referenced (arg_type,
+                               false,
+                               mru->first_component ());
+    }
+
+  return t;
 }
 
 // Dump this AST_Operation node (an operation) to the ostream o.
@@ -546,5 +624,7 @@ AST_Operation::exceptions (void)
   return this->pd_exceptions;
 }
 
+
+
 IMPL_NARROW_FROM_DECL(AST_Operation)
 IMPL_NARROW_FROM_SCOPE(AST_Operation)
diff --git a/TAO/TAO_IDL/ast/ast_param_holder.cpp b/TAO/TAO_IDL/ast/ast_param_holder.cpp
index 380f4cad97a..0dab66761b9 100644
--- a/TAO/TAO_IDL/ast/ast_param_holder.cpp
+++ b/TAO/TAO_IDL/ast/ast_param_holder.cpp
@@ -5,9 +5,6 @@
 
 #include "utl_identifier.h"
 
-AST_Decl::NodeType const
-AST_Param_Holder::NT = AST_Decl::NT_param_holder;
-
 AST_Param_Holder::AST_Param_Holder (UTL_ScopedName *parameter_name,
                                     FE_Utils::T_Param_Info *info)
   : COMMON_Base (false,
diff --git a/TAO/TAO_IDL/ast/ast_porttype.cpp b/TAO/TAO_IDL/ast/ast_porttype.cpp
index 7927246c404..b43347908eb 100644
--- a/TAO/TAO_IDL/ast/ast_porttype.cpp
+++ b/TAO/TAO_IDL/ast/ast_porttype.cpp
@@ -12,9 +12,6 @@
 #include "utl_indenter.h"
 #include "global_extern.h"
 
-AST_Decl::NodeType const
-AST_PortType::NT = AST_Decl::NT_porttype;
-
 AST_PortType::AST_PortType (UTL_ScopedName *n)
   : COMMON_Base (false,
                  false),
@@ -51,42 +48,191 @@ AST_PortType::ast_accept (ast_visitor *visitor)
 AST_Provides *
 AST_PortType::fe_add_provides (AST_Provides *p)
 {
-  return
-    AST_Provides::narrow_from_decl (
-      this->fe_add_ref_decl (p));
+  AST_Decl *d = 0;
+
+  // Already defined? Or already used?
+  if ((d = this->lookup_for_add (p, false)) != 0)
+    {
+      if (!can_be_redefined (d))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      p,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (this->referenced (d, p->local_name ()))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      p,
+                                      this,
+                                      d);
+          return 0;
+        }
+    }
+
+  // Add it to scope.
+  this->add_to_scope (p);
+
+  // Add it to set of locally referenced symbols.
+  this->add_to_referenced (p,
+                           false,
+                           p->local_name ());
+
+  return p;
 }
 
 AST_Uses *
 AST_PortType::fe_add_uses (AST_Uses *u)
 {
-  return
-    AST_Uses::narrow_from_decl (
-      this->fe_add_ref_decl (u));
+  AST_Decl *d = 0;
+
+  // Already defined? Or already used?
+  if ((d = this->lookup_for_add (u, false)) != 0)
+    {
+      if (!can_be_redefined (d))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      u,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (this->referenced (d, u->local_name ()))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      u,
+                                      this,
+                                      d);
+          return 0;
+        }
+    }
+
+  // Add it to scope.
+  this->add_to_scope (u);
+
+  // Add it to set of locally referenced symbols.
+  this->add_to_referenced (u,
+                           false,
+                           u->local_name ());
+
+  return u;
 }
 
 AST_Publishes *
 AST_PortType::fe_add_publishes (AST_Publishes *p)
 {
-  return
-    AST_Publishes::narrow_from_decl (
-      this->fe_add_ref_decl (p));
+  AST_Decl *d = 0;
+
+  // Already defined? Or already used?
+  if ((d = this->lookup_for_add (p, false)) != 0)
+    {
+      if (!can_be_redefined (d))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      p,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (this->referenced (d, p->local_name ()))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      p,
+                                      this,
+                                      d);
+          return 0;
+        }
+    }
+
+  // Add it to scope.
+  this->add_to_scope (p);
+
+  // Add it to set of locally referenced symbols.
+  this->add_to_referenced (p,
+                           false,
+                           p->local_name ());
+
+  return p;
 }
 
 AST_Emits *
 AST_PortType::fe_add_emits (AST_Emits *e)
 {
-  return
-    AST_Emits::narrow_from_decl (
-      this->fe_add_ref_decl (e));
+  AST_Decl *d = 0;
+
+  // Already defined? Or already used?
+  if ((d = this->lookup_for_add (e, false)) != 0)
+    {
+      if (!can_be_redefined (d))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      e,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (this->referenced (d, e->local_name ()))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      e,
+                                      this,
+                                      d);
+          return 0;
+        }
+    }
+
+  // Add it to scope.
+  this->add_to_scope (e);
+
+  // Add it to set of locally referenced symbols.
+  this->add_to_referenced (e,
+                           false,
+                           e->local_name ());
+
   return e;
 }
 
 AST_Consumes *
 AST_PortType::fe_add_consumes (AST_Consumes *c)
 {
-  return
-    AST_Consumes::narrow_from_decl (
-      this->fe_add_ref_decl (c));
+  AST_Decl *d = 0;
+
+  // Already defined? Or already used?
+  if ((d = this->lookup_for_add (c, false)) != 0)
+    {
+      if (!can_be_redefined (d))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      c,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (this->referenced (d, c->local_name ()))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      c,
+                                      this,
+                                      d);
+          return 0;
+        }
+    }
+
+  // Add it to scope.
+  this->add_to_scope (c);
+
+  // Add it to set of locally referenced symbols.
+  this->add_to_referenced (c,
+                           false,
+                           c->local_name ());
+
+  return c;
 }
 
 IMPL_NARROW_FROM_DECL (AST_PortType)
diff --git a/TAO/TAO_IDL/ast/ast_predefined_type.cpp b/TAO/TAO_IDL/ast/ast_predefined_type.cpp
index 0fda4201ff7..1fef7398594 100644
--- a/TAO/TAO_IDL/ast/ast_predefined_type.cpp
+++ b/TAO/TAO_IDL/ast/ast_predefined_type.cpp
@@ -78,8 +78,18 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_stdio.h"
 
-AST_Decl::NodeType const
-AST_PredefinedType::NT = AST_Decl::NT_pre_defined;
+ACE_RCSID (ast,
+           ast_predefined_type,
+           "$Id$")
+
+AST_PredefinedType::AST_PredefinedType (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    AST_Type (),
+    AST_ConcreteType (),
+    pd_pt (PT_long)
+{
+}
 
 AST_PredefinedType::AST_PredefinedType (PredefinedType t,
                                         UTL_ScopedName *n)
diff --git a/TAO/TAO_IDL/ast/ast_provides.cpp b/TAO/TAO_IDL/ast/ast_provides.cpp
index ffbc936c59e..cc1798a1265 100644
--- a/TAO/TAO_IDL/ast/ast_provides.cpp
+++ b/TAO/TAO_IDL/ast/ast_provides.cpp
@@ -4,9 +4,6 @@
 #include "ast_interface.h"
 #include "ast_visitor.h"
 
-AST_Decl::NodeType const
-AST_Provides::NT = AST_Decl::NT_provides;
-
 AST_Provides::AST_Provides (UTL_ScopedName *n,
                             AST_Type *provides_type)
   : COMMON_Base (),
diff --git a/TAO/TAO_IDL/ast/ast_publishes.cpp b/TAO/TAO_IDL/ast/ast_publishes.cpp
index 76817a7373d..b20f81b0956 100644
--- a/TAO/TAO_IDL/ast/ast_publishes.cpp
+++ b/TAO/TAO_IDL/ast/ast_publishes.cpp
@@ -3,9 +3,6 @@
 #include "ast_publishes.h"
 #include "ast_visitor.h"
 
-AST_Decl::NodeType const
-AST_Publishes::NT = AST_Decl::NT_publishes;
-
 AST_Publishes::AST_Publishes (UTL_ScopedName *n,
                               AST_Type *publishes_type)
   : COMMON_Base (),
diff --git a/TAO/TAO_IDL/ast/ast_recursive.cpp b/TAO/TAO_IDL/ast/ast_recursive.cpp
index daa002e4e74..1603b184a0b 100644
--- a/TAO/TAO_IDL/ast/ast_recursive.cpp
+++ b/TAO/TAO_IDL/ast/ast_recursive.cpp
@@ -84,6 +84,10 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "global_extern.h"
 #include "nr_extern.h"
 
+ACE_RCSID (ast,
+           ast_recursive,
+           "$Id$")
+
 bool
 AST_illegal_interface_recursion (AST_Decl *t)
 {
diff --git a/TAO/TAO_IDL/ast/ast_redef.cpp b/TAO/TAO_IDL/ast/ast_redef.cpp
index 3b8109e3a5c..fd3cf9b449c 100644
--- a/TAO/TAO_IDL/ast/ast_redef.cpp
+++ b/TAO/TAO_IDL/ast/ast_redef.cpp
@@ -66,6 +66,10 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 #include "ast_decl.h"
 
+ACE_RCSID (ast,
+           ast_redef,
+           "$Id$")
+
 // Return TRUE if the node d represents an IDL construct whose name
 // can be redefined.
 bool
@@ -82,11 +86,39 @@ can_be_redefined (AST_Decl *d)
     case AST_Decl::NT_component_fwd:
     case AST_Decl::NT_eventtype:
     case AST_Decl::NT_eventtype_fwd:
+    case AST_Decl::NT_porttype:
+    case AST_Decl::NT_home:
+    case AST_Decl::NT_const:
+    case AST_Decl::NT_except:
+    case AST_Decl::NT_argument:
+    case AST_Decl::NT_enum_val:
+    case AST_Decl::NT_string:
+    case AST_Decl::NT_wstring:
+    case AST_Decl::NT_array:
+    case AST_Decl::NT_sequence:
     case AST_Decl::NT_union:
     case AST_Decl::NT_union_fwd:
     case AST_Decl::NT_struct:
     case AST_Decl::NT_struct_fwd:
+    case AST_Decl::NT_enum:
+    case AST_Decl::NT_typedef:
+    case AST_Decl::NT_valuebox:
+    case AST_Decl::NT_connector:
       return true;
+
+    case AST_Decl::NT_union_branch:
+    case AST_Decl::NT_field:
+    case AST_Decl::NT_attr:
+    case AST_Decl::NT_op:
+    case AST_Decl::NT_pre_defined:
+    case AST_Decl::NT_factory:
+    case AST_Decl::NT_provides:
+    case AST_Decl::NT_uses:
+    case AST_Decl::NT_publishes:
+    case AST_Decl::NT_emits:
+    case AST_Decl::NT_consumes:
+    case AST_Decl::NT_ext_port:
+    case AST_Decl::NT_mirror_port:
     default:
       return false;
     }
diff --git a/TAO/TAO_IDL/ast/ast_root.cpp b/TAO/TAO_IDL/ast/ast_root.cpp
index fc5694bd000..81d6d3ab3a9 100644
--- a/TAO/TAO_IDL/ast/ast_root.cpp
+++ b/TAO/TAO_IDL/ast/ast_root.cpp
@@ -78,8 +78,17 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "ace/OS_NS_string.h"
 #include "ace/OS_Memory.h"
 
-AST_Decl::NodeType const
-AST_Root::NT = AST_Decl::NT_root;
+ACE_RCSID (ast,
+           ast_root,
+           "$Id$")
+
+AST_Root::AST_Root (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    UTL_Scope (),
+    AST_Module ()
+{
+}
 
 AST_Root::AST_Root (UTL_ScopedName *n)
   : COMMON_Base (),
@@ -125,6 +134,18 @@ AST_Root::fe_add_sequence (AST_Sequence *t)
       return 0;
     }
 
+  Identifier *id = 0;
+  ACE_NEW_RETURN (id,
+                  Identifier ("local type"),
+                  0);
+
+  UTL_ScopedName *sn = 0;
+  ACE_NEW_RETURN (sn,
+                  UTL_ScopedName (id,
+                                  0),
+                  0);
+
+  t->set_name (sn);
   this->add_to_local_types (t);
   return t;
 }
@@ -138,6 +159,18 @@ AST_Root::fe_add_string (AST_String *t)
       return 0;
     }
 
+  Identifier *id = 0;
+  ACE_NEW_RETURN (id,
+                  Identifier ("local type"),
+                  0);
+
+  UTL_ScopedName *sn = 0;
+  ACE_NEW_RETURN (sn,
+                  UTL_ScopedName (id,
+                                  0),
+                  0);
+
+  t->set_name (sn);
   this->add_to_local_types (t);
   return t;
 }
@@ -151,6 +184,18 @@ AST_Root::fe_add_array (AST_Array *t)
       return 0;
     }
 
+  Identifier *id = 0;
+  ACE_NEW_RETURN (id,
+                  Identifier ("local type"),
+                  0);
+
+  UTL_ScopedName *sn = 0;
+  ACE_NEW_RETURN (sn,
+                  UTL_ScopedName (id,
+                                  0),
+                  0);
+
+  t->set_name (sn);
   this->add_to_local_types (t);
   return t;
 }
@@ -224,5 +269,7 @@ AST_Root::fini (void)
   this->AST_Decl::destroy ();
 }
 
+
+
 IMPL_NARROW_FROM_DECL(AST_Root)
 IMPL_NARROW_FROM_SCOPE(AST_Root)
diff --git a/TAO/TAO_IDL/ast/ast_sequence.cpp b/TAO/TAO_IDL/ast/ast_sequence.cpp
index 1827823d37a..ac1ed44f65e 100644
--- a/TAO/TAO_IDL/ast/ast_sequence.cpp
+++ b/TAO/TAO_IDL/ast/ast_sequence.cpp
@@ -86,8 +86,18 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "ace/OS_Memory.h"
 #include "ace/OS_NS_string.h"
 
-AST_Decl::NodeType const
-AST_Sequence::NT = AST_Decl::NT_sequence;
+AST_Sequence::AST_Sequence (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    AST_Type (),
+    AST_ConcreteType (),
+    pd_max_size (0),
+    pd_base_type (0),
+    owns_base_type_ (false)
+{
+  // A sequence data type is always VARIABLE.
+  this->size_type (AST_Type::VARIABLE);
+}
 
 AST_Sequence::AST_Sequence (AST_Expression *ms,
                             AST_Type *bt,
@@ -282,4 +292,6 @@ AST_Sequence::destroy (void)
   this->AST_ConcreteType::destroy ();
 }
 
+
+
 IMPL_NARROW_FROM_DECL(AST_Sequence)
diff --git a/TAO/TAO_IDL/ast/ast_string.cpp b/TAO/TAO_IDL/ast/ast_string.cpp
index 80e261ada79..3284cefeabf 100644
--- a/TAO/TAO_IDL/ast/ast_string.cpp
+++ b/TAO/TAO_IDL/ast/ast_string.cpp
@@ -78,9 +78,21 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "idl_defines.h"
 #include "global_extern.h"
 
-// Note we are overlooking the wstring case here.
-AST_Decl::NodeType const
-AST_String::NT = AST_Decl::NT_string;
+ACE_RCSID (ast,
+           ast_string,
+           "$Id$")
+
+AST_String::AST_String (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    AST_Type (),
+    AST_ConcreteType (),
+    pd_max_size (0),
+    pd_width (sizeof (char))
+{
+  // Always the case.
+  this->size_type (AST_Type::VARIABLE);
+}
 
 AST_String::AST_String (AST_Decl::NodeType nt,
                         UTL_ScopedName *n,
diff --git a/TAO/TAO_IDL/ast/ast_structure.cpp b/TAO/TAO_IDL/ast/ast_structure.cpp
index f46245c7ac8..42af00b2451 100644
--- a/TAO/TAO_IDL/ast/ast_structure.cpp
+++ b/TAO/TAO_IDL/ast/ast_structure.cpp
@@ -80,6 +80,18 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "utl_err.h"
 #include "utl_indenter.h"
 
+AST_Structure::AST_Structure (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    AST_Type (),
+    AST_ConcreteType (),
+    UTL_Scope (),
+    member_count_ (-1),
+    local_struct_ (-1),
+    fwd_decl_ (0)
+{
+}
+
 AST_Structure::AST_Structure (UTL_ScopedName *n,
                               bool local,
                               bool abstract)
@@ -184,6 +196,7 @@ AST_Structure::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list)
   return this->in_recursion_;
 }
 
+// Return the member count.
 int
 AST_Structure::member_count (void)
 {
@@ -310,40 +323,202 @@ AST_Structure::fwd_decl (AST_StructureFwd *node)
   this->fwd_decl_ = node;
 }
 
-ACE_Unbounded_Queue<AST_Field *> &
-AST_Structure::fields (void)
-{
-  return this->fields_;
-}
-
 // Private operations.
 
+// Add this AST_Field node (a field declaration) to this scope.
 AST_Field *
 AST_Structure::fe_add_field (AST_Field *t)
 {
-  return this->fe_add_ref_decl (t);
+  AST_Decl *d = 0;
+
+  // Already defined and cannot be redefined? Or already used?
+  if ((d = this->lookup_for_add (t, false)) != 0)
+    {
+      if (!can_be_redefined (d))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (this->referenced (d, t->local_name ()))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (t->has_ancestor (d))
+        {
+          idl_global->err ()->redefinition_in_scope (t,
+                                                     d);
+          return 0;
+        }
+    }
+
+  // Add it to scope.
+  this->add_to_scope (t);
+
+  // Add it to set of locally referenced symbols.
+  this->add_to_referenced (t,
+                           false,
+                           t->local_name ());
+
+  AST_Type *ft = t->field_type ();
+  UTL_ScopedName *mru = ft->last_referenced_as ();
+
+  if (mru != 0)
+    {
+      this->add_to_referenced (ft,
+                               false,
+                               mru->first_component ());
+    }
+
+  this->fields_.enqueue_tail (t);
+
+  return t;
 }
 
+// Add an AST_Structure node (a manifest struct type) to this scope.
 AST_Structure *
 AST_Structure::fe_add_structure (AST_Structure *t)
 {
-  return this->fe_add_full_struct_type (t);
+  AST_Decl *d = 0;
+
+  // Already defined and cannot be redefined? Or already used?
+  if ((d = this->lookup_for_add (t, false)) != 0)
+    {
+      if (!can_be_redefined (d))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (this->referenced (d, t->local_name ()))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (t->has_ancestor (d))
+        {
+          idl_global->err ()->redefinition_in_scope (t,
+                                                     d);
+          return 0;
+        }
+    }
+
+  // Add it to local types.
+  this->add_to_local_types (t);
+
+  // Add it to set of locally referenced symbols.
+  this->add_to_referenced (t,
+                           false,
+                           t->local_name ());
+
+  return t;
 }
 
+// Add an AST_Union node (a manifest union type) to this scope.
 AST_Union *
 AST_Structure::fe_add_union (AST_Union *t)
 {
-  return
-    AST_Union::narrow_from_decl (
-      this->fe_add_full_struct_type (t));
+  AST_Decl *d = 0;
+
+  // Already defined and cannot be redefined? Or already used?
+  if ((d = this->lookup_for_add (t, false)) != 0)
+    {
+      if (!can_be_redefined (d))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (this->referenced (d, t->local_name ()))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (t->has_ancestor (d))
+        {
+          idl_global->err ()->redefinition_in_scope (t,
+                                                     d);
+          return 0;
+        }
+    }
+
+  // Add it to local types.
+  this->add_to_local_types (t);
+
+  // Add it to set of locally referenced symbols.
+  this->add_to_referenced (t,
+                           false,
+                           t->local_name ());
+
+  return t;
 }
 
+// Add this AST_Enum node (a manifest enum declaration) to this scope.
 AST_Enum *
 AST_Structure::fe_add_enum (AST_Enum *t)
 {
-  return
-    AST_Enum::narrow_from_decl (
-      this->fe_add_decl (t));
+  AST_Decl *d = 0;
+
+  // Already defined and cannot be redefined? Or already used?
+  if ((d = this->lookup_for_add (t, false)) != 0)
+    {
+      if (!can_be_redefined (d))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (this->referenced (d, t->local_name ()))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (t->has_ancestor (d))
+        {
+          idl_global->err ()->redefinition_in_scope (t,
+                                                     d);
+          return 0;
+        }
+    }
+
+  // Add it to local types.
+  this->add_to_local_types (t);
+
+  // Add it to set of locally referenced symbols.
+  this->add_to_referenced (t,
+                           false,
+                           t->local_name ());
+
+  return t;
 }
 
 // Add this AST_EnumVal node (an enumerator declaration) to this scope.
@@ -353,9 +528,46 @@ AST_Structure::fe_add_enum (AST_Enum *t)
 AST_EnumVal *
 AST_Structure::fe_add_enum_val (AST_EnumVal *t)
 {
-  return
-    AST_EnumVal::narrow_from_decl (
-      this->fe_add_decl (t));
+  AST_Decl *d = 0;
+
+  // Already defined and cannot be redefined? Or already used?
+  if ((d = this->lookup_for_add (t, false)) != 0)
+    {
+      if (!can_be_redefined (d))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (this->referenced (d, t->local_name ()))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (t->has_ancestor (d))
+        {
+          idl_global->err ()->redefinition_in_scope (t,
+                                                     d);
+          return 0;
+        }
+    }
+
+  // Add it to scope.
+  this->add_to_scope (t);
+
+  // Add it to set of locally referenced symbols.
+  this->add_to_referenced (t,
+                           false,
+                           t->local_name ());
+
+  return t;
 }
 
 // Compute total number of members.
@@ -569,6 +781,8 @@ AST_Structure::destroy (void)
   this->UTL_Scope::destroy ();
 }
 
+
+
 IMPL_NARROW_FROM_DECL(AST_Structure)
 IMPL_NARROW_FROM_SCOPE(AST_Structure)
 
diff --git a/TAO/TAO_IDL/ast/ast_structure_fwd.cpp b/TAO/TAO_IDL/ast/ast_structure_fwd.cpp
index 3a28f0ffe2e..cd0da2b72ea 100644
--- a/TAO/TAO_IDL/ast/ast_structure_fwd.cpp
+++ b/TAO/TAO_IDL/ast/ast_structure_fwd.cpp
@@ -10,8 +10,18 @@
 #include "ast_visitor.h"
 #include "utl_identifier.h"
 
-AST_Decl::NodeType const
-AST_StructureFwd::NT = AST_Decl::NT_struct_fwd;
+ACE_RCSID( ast,
+           ast_structure_fwd,
+           "$Id$")
+
+AST_StructureFwd::AST_StructureFwd (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    AST_Type (),
+    pd_full_definition (0),
+    is_defined_ (false)
+{
+}
 
 AST_StructureFwd::AST_StructureFwd (AST_Structure *full_defn,
                                     UTL_ScopedName *n)
diff --git a/TAO/TAO_IDL/ast/ast_template_module.cpp b/TAO/TAO_IDL/ast/ast_template_module.cpp
index 6b6d3dfbba4..8f141b319df 100644
--- a/TAO/TAO_IDL/ast/ast_template_module.cpp
+++ b/TAO/TAO_IDL/ast/ast_template_module.cpp
@@ -13,9 +13,6 @@
 #include "global_extern.h"
 #include "nr_extern.h"
 
-AST_Decl::NodeType const
-AST_Template_Module::NT = AST_Decl::NT_module;
-
 AST_Template_Module::AST_Template_Module (
       UTL_ScopedName *n,
       FE_Utils::T_PARAMLIST_INFO *template_params)
@@ -153,9 +150,49 @@ AST_Template_Module_Ref *
 AST_Template_Module::fe_add_template_module_ref (
   AST_Template_Module_Ref *m)
 {
-  return
-    AST_Template_Module_Ref::narrow_from_decl (
-      this->fe_add_ref_decl (m));
+  AST_Decl *d = 0;
+
+  // Already defined and cannot be redefined? Or already used?
+  if ((d = this->lookup_for_add (m, false)) != 0)
+    {
+      if (!can_be_redefined (d))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      m,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (this->referenced (d, m->local_name ()))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      m,
+                                      this,
+                                      d);
+          return 0;
+        }
+    }
+
+  // Add it to scope.
+  this->add_to_scope (m);
+
+  // Add it to set of locally referenced symbols.
+  this->add_to_referenced (m,
+                           false,
+                           m->local_name ());
+
+  AST_Type *ft = m->field_type ();
+  UTL_ScopedName *mru = ft->last_referenced_as ();
+
+  if (mru != 0)
+    {
+      this->add_to_referenced (ft,
+                               false,
+                               mru->first_component ());
+    }
+
+  return m;
 }
 
 void
diff --git a/TAO/TAO_IDL/ast/ast_template_module_inst.cpp b/TAO/TAO_IDL/ast/ast_template_module_inst.cpp
index e51d39128f9..a535ebb074d 100644
--- a/TAO/TAO_IDL/ast/ast_template_module_inst.cpp
+++ b/TAO/TAO_IDL/ast/ast_template_module_inst.cpp
@@ -4,9 +4,6 @@
 #include "ast_template_module.h"
 #include "ast_visitor.h"
 
-AST_Decl::NodeType const
-AST_Template_Module_Inst::NT = AST_Decl::NT_module;
-
 AST_Template_Module_Inst::AST_Template_Module_Inst (
       UTL_ScopedName *n,
       AST_Template_Module *ref,
diff --git a/TAO/TAO_IDL/ast/ast_template_module_ref.cpp b/TAO/TAO_IDL/ast/ast_template_module_ref.cpp
index 645a9433442..358107c45a2 100644
--- a/TAO/TAO_IDL/ast/ast_template_module_ref.cpp
+++ b/TAO/TAO_IDL/ast/ast_template_module_ref.cpp
@@ -6,9 +6,6 @@
 
 #include "utl_strlist.h"
 
-AST_Decl::NodeType const
-AST_Template_Module_Ref::NT = AST_Decl::NT_module;
-
 AST_Template_Module_Ref::AST_Template_Module_Ref (
       UTL_ScopedName *n,
       AST_Template_Module *ref,
diff --git a/TAO/TAO_IDL/ast/ast_type.cpp b/TAO/TAO_IDL/ast/ast_type.cpp
index d576b9e413d..b4cb660d48f 100644
--- a/TAO/TAO_IDL/ast/ast_type.cpp
+++ b/TAO/TAO_IDL/ast/ast_type.cpp
@@ -78,6 +78,23 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_Memory.h"
 
+ACE_RCSID (ast,
+           ast_type,
+           "$Id$")
+
+AST_Type::AST_Type (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    ifr_added_ (0),
+    ifr_fwd_added_ (0),
+    size_type_ (AST_Type::SIZE_UNKNOWN),
+    has_constructor_ (0),
+    nested_type_name_ (0),
+    in_recursion_ (-1),
+    recursing_in_legal_pk_ (false)
+{
+}
+
 AST_Type::AST_Type (AST_Decl::NodeType nt,
                     UTL_ScopedName *n)
   : COMMON_Base (),
diff --git a/TAO/TAO_IDL/ast/ast_typedef.cpp b/TAO/TAO_IDL/ast/ast_typedef.cpp
index 3940069da80..e8ae551d50e 100644
--- a/TAO/TAO_IDL/ast/ast_typedef.cpp
+++ b/TAO/TAO_IDL/ast/ast_typedef.cpp
@@ -76,9 +76,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 #include "ace/Log_Msg.h"
 
-AST_Decl::NodeType const
-AST_Typedef::NT = AST_Decl::NT_typedef;
-
 AST_Typedef::AST_Typedef (AST_Type *bt,
                           UTL_ScopedName *n,
                           bool local,
diff --git a/TAO/TAO_IDL/ast/ast_union.cpp b/TAO/TAO_IDL/ast/ast_union.cpp
index 45dd72b8eb6..41a9867d99d 100644
--- a/TAO/TAO_IDL/ast/ast_union.cpp
+++ b/TAO/TAO_IDL/ast/ast_union.cpp
@@ -90,6 +90,17 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 // FUZZ: disable check_for_streams_include
 #include "ace/streams.h"
 
+AST_Union::AST_Union (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    AST_Type (),
+    AST_ConcreteType (),
+    UTL_Scope (),
+    AST_Structure (),
+    default_index_ (-2)
+{
+}
+
 AST_Union::AST_Union (AST_ConcreteType *dt,
                       UTL_ScopedName *n,
                       bool local,
@@ -556,7 +567,7 @@ AST_Union::compute_default_value (void)
     {
     case AST_Expression::EV_short:
     case AST_Expression::EV_ushort:
-      if (total_case_members > ACE_UINT16_MAX)
+      if (total_case_members == ACE_UINT16_MAX + 1)
         {
           this->default_value_.computed_ = 0;
         }
@@ -564,10 +575,6 @@ AST_Union::compute_default_value (void)
       break;
     case AST_Expression::EV_long:
     case AST_Expression::EV_ulong:
-    case AST_Expression::EV_enum:
-      // Enums in CORBA are always 32bits in size, so unless
-      // there are that many enum labels in the set, it is
-      // incomplete (reguardless as to the actual member_count).
       if (total_case_members > ACE_UINT32_MAX)
         {
           this->default_value_.computed_ = 0;
@@ -586,7 +593,7 @@ AST_Union::compute_default_value (void)
 
       break;
     case AST_Expression::EV_char:
-      if (total_case_members > ACE_OCTET_MAX)
+      if (total_case_members == ACE_OCTET_MAX + 1)
         {
           this->default_value_.computed_ = 0;
         }
@@ -606,6 +613,38 @@ AST_Union::compute_default_value (void)
         }
 
       break;
+    case AST_Expression::EV_enum:
+      // Has to be enum.
+      {
+        AST_Decl *d = AST_Decl::narrow_from_decl (this->disc_type ());
+
+        if (d->node_type () == AST_Decl::NT_typedef)
+          {
+            AST_Typedef *bt = AST_Typedef::narrow_from_decl (d);
+            d = bt->primitive_base_type ();
+          }
+
+        AST_Enum *en = AST_Enum::narrow_from_decl (d);
+
+        if (en != 0)
+          {
+            if (total_case_members == (ACE_UINT64) en->member_count ())
+              {
+                this->default_value_.computed_ = 0;
+              }
+          }
+        else
+          {
+            // Error.
+            this->default_value_.computed_ = -1;
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               ACE_TEXT ("(%N:%l) AST_Union::")
+                               ACE_TEXT ("compute_default_value ")
+                               ACE_TEXT ("- disc type not an ENUM\n")),
+                              -1);
+          }
+      }
+      break;
     default:
       // Error.
       this->default_value_.computed_ = -1;
@@ -906,34 +945,228 @@ AST_Union::compute_default_index (void)
 
 // Redefinition of inherited virtual operations
 
+// Add this AST_UnionBranch node (a node representing one branch in a
+// union declaration) to this scope
 AST_UnionBranch *
 AST_Union::fe_add_union_branch (AST_UnionBranch *t)
 {
-  return
-    AST_UnionBranch::narrow_from_decl (
-      this->fe_add_ref_decl (t));
+  AST_Decl *d = 0;
+
+  // If this is a malformed branch, don't do anything with it.
+  if (t == 0 || t->label() == 0)
+    {
+      return 0;
+    }
+
+  // If branch with that label already exists, complain.
+  if (lookup_branch (t) != 0)
+    {
+      idl_global->err ()->error2 (UTL_Error::EIDL_MULTIPLE_BRANCH,
+                                  this,
+                                  t);
+      return 0;
+    }
+
+  // If branch with same field name exists, complain.
+  if ((d = this->lookup_for_add (t, false)) != 0)
+    {
+      if (!can_be_redefined (d))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (this->referenced (d, t->local_name ()))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (t->has_ancestor (d))
+        {
+          idl_global->err ()->redefinition_in_scope (t,
+                                                     d);
+          return 0;
+        }
+    }
+
+  // Add it to scope.
+  this->add_to_scope (t);
+
+  // If we have an enum discriminator, add the label names to
+  // the name_referenced list before we add the union branch,
+  // so a branch name clash with a label name will be caught.
+  if (this->pd_udisc_type == AST_Expression::EV_enum)
+    {
+      t->add_labels (this);
+    }
+  else
+    {
+      t->coerce_labels (this);
+    }
+
+  // Add it to set of locally referenced symbols.
+  this->add_to_referenced (t,
+                           false,
+                           t->local_name ());
+
+  AST_Type *ft = t->field_type ();
+  UTL_ScopedName *mru = ft->last_referenced_as ();
+
+  if (mru != 0)
+    {
+      this->add_to_referenced (ft,
+                               false,
+                               mru->first_component ());
+    }
+
+  this->fields_.enqueue_tail (t);
+
+  return t;
 }
 
+// Add this AST_Union (manifest union type) to this scope.
 AST_Union *
 AST_Union::fe_add_union (AST_Union *t)
 {
-  return
-    AST_Union::narrow_from_decl (
-      this->fe_add_full_struct_type (t));
+  AST_Decl *d = 0;
+
+  // Already defined and cannot be redefined? Or already used?
+  if ((d = this->lookup_for_add (t, false)) != 0)
+    {
+      if (!can_be_redefined (d))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (this->referenced (d, t->local_name ()))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (t->has_ancestor (d))
+        {
+          idl_global->err ()->redefinition_in_scope (t,
+                                                     d);
+          return 0;
+        }
+    }
+
+  // Add it to local types.
+  this->add_to_local_types (t);
+
+  // Add it to set of locally referenced symbols.
+  this->add_to_referenced (t,
+                           false,
+                           t->local_name ());
+
+  return t;
 }
 
+// Add this AST_Structure node (manifest struct type) to this scope.
 AST_Structure *
 AST_Union::fe_add_structure (AST_Structure *t)
 {
-  return this->fe_add_full_struct_type (t);
+  AST_Decl *d = 0;
+
+  // Already defined and cannot be redefined? Or already used?
+  if ((d = this->lookup_for_add (t, false)) != 0)
+    {
+      if (!can_be_redefined (d))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (this->referenced (d, t->local_name ()))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (t->has_ancestor (d))
+        {
+          idl_global->err ()->redefinition_in_scope (t,
+                                                     d);
+          return 0;
+        }
+    }
+
+  // Add it to local types.
+  this->add_to_local_types (t);
+
+  // Add it to set of locally referenced symbols.
+  this->add_to_referenced (t,
+                           false,
+                           t->local_name ());
+
+  return t;
 }
 
+// Add this AST_Enum node (manifest enum type) to this scope.
 AST_Enum *
 AST_Union::fe_add_enum (AST_Enum *t)
 {
-  return
-    AST_Enum::narrow_from_decl (
-      this->fe_add_decl (t));
+  AST_Decl *d = 0;
+
+  // Already defined and cannot be redefined? Or already used?
+  if ((d = this->lookup_for_add (t, false)) != 0)
+    {
+      if (!can_be_redefined (d))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (this->referenced (d, t->local_name ()))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (t->has_ancestor (d))
+        {
+          idl_global->err ()->redefinition_in_scope (t,
+                                                     d);
+          return 0;
+        }
+    }
+
+  // Add it to local types.
+  this->add_to_local_types (t);
+
+  // Add it to set of locally referenced symbols.
+  this->add_to_referenced (t,
+                           false,
+                           t->local_name ());
+
+  return t;
 }
 
 // Add this AST_EnumVal node (enumerator declaration) to this scope.
@@ -943,9 +1176,46 @@ AST_Union::fe_add_enum (AST_Enum *t)
 AST_EnumVal *
 AST_Union::fe_add_enum_val (AST_EnumVal *t)
 {
-  return
-    AST_EnumVal::narrow_from_decl (
-      this->fe_add_decl (t));
+  AST_Decl *d = 0;
+
+  // Already defined and cannot be redefined? Or already used?
+  if ((d = this->lookup_for_add (t, false)) != 0)
+    {
+      if (!can_be_redefined (d))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (this->referenced (d, t->local_name ()))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      t,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (t->has_ancestor (d))
+        {
+          idl_global->err ()->redefinition_in_scope (t,
+                                                     d);
+          return 0;
+        }
+    }
+
+  // Add it to scope.
+  this->add_to_scope (t);
+
+  // Add it to set of locally referenced symbols.
+  this->add_to_referenced (t,
+                           false,
+                           t->local_name ());
+
+  return t;
 }
 
 // Dump this AST_Union node to the ostream o.
@@ -1020,5 +1290,7 @@ AST_Union::udisc_type (void)
   return this->pd_udisc_type;
 }
 
+
+
 IMPL_NARROW_FROM_DECL(AST_Union)
 IMPL_NARROW_FROM_SCOPE(AST_Union)
diff --git a/TAO/TAO_IDL/ast/ast_union_branch.cpp b/TAO/TAO_IDL/ast/ast_union_branch.cpp
index 75bd44ffec1..5203c4a023e 100644
--- a/TAO/TAO_IDL/ast/ast_union_branch.cpp
+++ b/TAO/TAO_IDL/ast/ast_union_branch.cpp
@@ -77,8 +77,13 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "ast_visitor.h"
 #include "utl_labellist.h"
 
-AST_Decl::NodeType const
-AST_UnionBranch::NT = AST_Decl::NT_union_branch;
+AST_UnionBranch::AST_UnionBranch (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    AST_Field (),
+    pd_ll (0)
+{
+}
 
 AST_UnionBranch::AST_UnionBranch (UTL_LabelList *ll,
                                   AST_Type *ft,
@@ -228,4 +233,6 @@ AST_UnionBranch::coerce_labels (AST_Union *u)
     }
 }
 
+
+
 IMPL_NARROW_FROM_DECL(AST_UnionBranch)
diff --git a/TAO/TAO_IDL/ast/ast_union_fwd.cpp b/TAO/TAO_IDL/ast/ast_union_fwd.cpp
index 7cd63dcf00c..effe3279ce2 100644
--- a/TAO/TAO_IDL/ast/ast_union_fwd.cpp
+++ b/TAO/TAO_IDL/ast/ast_union_fwd.cpp
@@ -10,8 +10,17 @@
 #include "ast_visitor.h"
 #include "utl_identifier.h"
 
-AST_Decl::NodeType const
-AST_UnionFwd::NT = AST_Decl::NT_union_fwd;
+ACE_RCSID (ast, 
+           ast_union_fwd, 
+           "$Id$")
+
+AST_UnionFwd::AST_UnionFwd (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    AST_Type (),
+    AST_StructureFwd ()
+{
+}
 
 AST_UnionFwd::AST_UnionFwd (AST_Union *dummy,
                             UTL_ScopedName *n)
diff --git a/TAO/TAO_IDL/ast/ast_union_label.cpp b/TAO/TAO_IDL/ast/ast_union_label.cpp
index 96ea4d01fc8..37a2e337020 100644
--- a/TAO/TAO_IDL/ast/ast_union_label.cpp
+++ b/TAO/TAO_IDL/ast/ast_union_label.cpp
@@ -76,6 +76,16 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 // FUZZ: disable check_for_streams_include
 #include "ace/streams.h"
 
+ACE_RCSID (ast, 
+           ast_union_label, 
+           "$Id$")
+
+AST_UnionLabel::AST_UnionLabel (void)
+  : pd_label_kind (UL_default),
+          pd_label_val (0)
+{
+}
+
 AST_UnionLabel::AST_UnionLabel (UnionLabel lk,
                                 AST_Expression *lv)
   : pd_label_kind (lk),
diff --git a/TAO/TAO_IDL/ast/ast_uses.cpp b/TAO/TAO_IDL/ast/ast_uses.cpp
index 647271ec313..fdd66a0bbca 100644
--- a/TAO/TAO_IDL/ast/ast_uses.cpp
+++ b/TAO/TAO_IDL/ast/ast_uses.cpp
@@ -4,9 +4,6 @@
 #include "ast_interface.h"
 #include "ast_visitor.h"
 
-AST_Decl::NodeType const
-AST_Uses::NT = AST_Decl::NT_uses;
-
 AST_Uses::AST_Uses (UTL_ScopedName *n,
                     AST_Type *uses_type,
                     bool is_multiple)
diff --git a/TAO/TAO_IDL/ast/ast_valuebox.cpp b/TAO/TAO_IDL/ast/ast_valuebox.cpp
index 832f6cf478c..a28b5ae29f4 100644
--- a/TAO/TAO_IDL/ast/ast_valuebox.cpp
+++ b/TAO/TAO_IDL/ast/ast_valuebox.cpp
@@ -4,8 +4,17 @@
 #include "ast_visitor.h"
 #include "utl_identifier.h"
 
-AST_Decl::NodeType const
-AST_ValueBox::NT = AST_Decl::NT_valuebox;
+ACE_RCSID (ast, 
+           ast_valuebox, 
+           "ast_valuebox.cpp,v 1.0  Exp")
+
+AST_ValueBox::AST_ValueBox (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    AST_Type (),
+    AST_ConcreteType () 
+{
+}
 
 AST_ValueBox::AST_ValueBox (UTL_ScopedName *n,
                             AST_Type       *boxed_type)
@@ -52,6 +61,8 @@ AST_ValueBox::destroy (void)
   this->AST_ConcreteType::destroy ();
 }
 
+
+
 IMPL_NARROW_FROM_DECL(AST_ValueBox)
 
 
diff --git a/TAO/TAO_IDL/ast/ast_valuetype.cpp b/TAO/TAO_IDL/ast/ast_valuetype.cpp
index 7eb4add3277..3aad0bc9935 100644
--- a/TAO/TAO_IDL/ast/ast_valuetype.cpp
+++ b/TAO/TAO_IDL/ast/ast_valuetype.cpp
@@ -19,8 +19,20 @@
 
 #include "ace/streams.h"
 
-AST_Decl::NodeType const
-AST_ValueType::NT = AST_Decl::NT_valuetype;
+AST_ValueType::AST_ValueType (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    AST_Type (),
+    UTL_Scope (),
+    AST_Interface (),
+    pd_supports (0),
+    pd_n_supports (0),
+    pd_inherits_concrete (0),
+    pd_supports_concrete (0),
+    pd_truncatable (false),
+    pd_custom (false)
+{
+}
 
 AST_ValueType::AST_ValueType (UTL_ScopedName *n,
                               AST_Type **inherits,
@@ -438,18 +450,58 @@ AST_ValueType::ast_accept (ast_visitor *visitor)
   return visitor->visit_valuetype (this);
 }
 
-AST_Field *
-AST_ValueType::fe_add_field (AST_Field *t)
-{
-  return this->fe_add_ref_decl (t);
-}
-
 AST_Factory *
 AST_ValueType::fe_add_factory (AST_Factory *f)
 {
-  return
-    AST_Factory::narrow_from_decl (
-      this->fe_add_decl (f));
+  AST_Decl *d = 0;
+
+  // Can't add to interface which was not yet defined.
+  if (!this->is_defined ())
+    {
+      idl_global->err ()->error2 (UTL_Error::EIDL_DECL_NOT_DEFINED,
+                                  this,
+                                  f);
+      return 0;
+    }
+
+  // Already defined and cannot be redefined? Or already used?
+  if ((d = this->lookup_for_add (f, false)) != 0)
+    {
+      if (!can_be_redefined (d))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
+                                      f,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (this->referenced (d, f->local_name ()))
+        {
+          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
+                                      f,
+                                      this,
+                                      d);
+          return 0;
+        }
+
+      if (f->has_ancestor (d))
+        {
+          idl_global->err ()->redefinition_in_scope (f,
+                                                     d);
+          return 0;
+        }
+    }
+
+  // Add it to scope.
+  this->add_to_scope (f);
+
+  // Add it to set of locally referenced symbols.
+  this->add_to_referenced (f,
+                           false,
+                           f->local_name ());
+
+  return f;
 }
 
 bool
diff --git a/TAO/TAO_IDL/ast/ast_valuetype_fwd.cpp b/TAO/TAO_IDL/ast/ast_valuetype_fwd.cpp
index cfc3b778dcc..b4e904dd808 100644
--- a/TAO/TAO_IDL/ast/ast_valuetype_fwd.cpp
+++ b/TAO/TAO_IDL/ast/ast_valuetype_fwd.cpp
@@ -5,8 +5,17 @@
 #include "ast_visitor.h"
 #include "utl_identifier.h"
 
-AST_Decl::NodeType const
-AST_ValueTypeFwd::NT = AST_Decl::NT_valuetype_fwd;
+ACE_RCSID( ast,
+           ast_valuetype_fwd,
+           "$Id$")
+
+AST_ValueTypeFwd::AST_ValueTypeFwd (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    AST_Type (),
+    AST_InterfaceFwd ()
+{
+}
 
 AST_ValueTypeFwd::AST_ValueTypeFwd (AST_Interface *dummy,
                                     UTL_ScopedName *n)
diff --git a/TAO/TAO_IDL/ast/ast_visitor_context.cpp b/TAO/TAO_IDL/ast/ast_visitor_context.cpp
index 7c0f3866528..29b95abb1b6 100644
--- a/TAO/TAO_IDL/ast/ast_visitor_context.cpp
+++ b/TAO/TAO_IDL/ast/ast_visitor_context.cpp
@@ -1,17 +1,22 @@
-
-//=============================================================================
-/**
- *  @file    ast_visitor_context.cpp
- *
- *  $Id$
- *
- *   Maintains the context information for visitors
- *
- *
- *  @author Jeff Parsons & Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO_IDL_FE
+//
+// = FILENAME
+//    ast_visitor_context.cpp
+//
+// = DESCRIPTION
+//     Maintains the context information for visitors
+//
+// = AUTHOR
+//    Jeff Parsons & Aniruddha Gokhale
+//
+// ============================================================================
 
 #include "ast_visitor_context.h"
 
diff --git a/TAO/TAO_IDL/ast/ast_visitor_reifying.cpp b/TAO/TAO_IDL/ast/ast_visitor_reifying.cpp
index 0dc17c698b4..b97f0cca10b 100644
--- a/TAO/TAO_IDL/ast/ast_visitor_reifying.cpp
+++ b/TAO/TAO_IDL/ast/ast_visitor_reifying.cpp
@@ -13,9 +13,8 @@
 
 #include "ast_interface.h"
 #include "ast_valuetype.h"
-#include "ast_valuebox.h"
 #include "ast_eventtype.h"
-#include "ast_connector.h"
+#include "ast_component.h"
 #include "ast_home.h"
 #include "ast_exception.h"
 #include "ast_typedef.h"
@@ -26,7 +25,6 @@
 #include "ast_predefined_type.h"
 #include "ast_string.h"
 #include "ast_constant.h"
-#include "ast_native.h"
 #include "ast_param_holder.h"
 #include "ast_template_module.h"
 
@@ -82,9 +80,8 @@ ast_visitor_reifying::visit_interface_fwd (AST_InterfaceFwd *)
 }
 
 int
-ast_visitor_reifying::visit_valuebox (AST_ValueBox *node)
+ast_visitor_reifying::visit_valuebox (AST_ValueBox *)
 {
-  this->check_and_store (node);
   return 0;
 }
 
@@ -174,9 +171,8 @@ ast_visitor_reifying::visit_mirror_port (AST_Mirror_Port *)
 }
 
 int
-ast_visitor_reifying::visit_connector (AST_Connector *node)
+ast_visitor_reifying::visit_connector (AST_Connector *)
 {
-  this->check_and_store (node);
   return 0;
 }
 
@@ -194,12 +190,6 @@ ast_visitor_reifying::visit_factory (AST_Factory *)
 }
 
 int
-ast_visitor_reifying::visit_finder (AST_Finder *)
-{
-  return 0;
-}
-
-int
 ast_visitor_reifying::visit_structure (AST_Structure *node)
 {
   this->check_and_store (node);
@@ -287,9 +277,8 @@ ast_visitor_reifying::visit_root (AST_Root *)
 }
 
 int
-ast_visitor_reifying::visit_native (AST_Native *node)
+ast_visitor_reifying::visit_native (AST_Native *)
 {
-  this->check_and_store (node);
   return 0;
 }
 
@@ -402,7 +391,8 @@ ast_visitor_reifying::visit_array (AST_Array *node)
         }
     }
 
-  UTL_ScopedName sn (node->local_name (), 0);
+  UTL_ScopedName sn (node->name ()->last_component ()->copy (),
+                     0);
 
   AST_Array *arr =
     idl_global->gen ()->create_array (&sn,
@@ -414,6 +404,7 @@ ast_visitor_reifying::visit_array (AST_Array *node)
   // No need to add this new node to any scope - it's anonymous
   // and owned by the node that references it.
 
+  sn.destroy ();
   v_list->destroy ();
   delete v_list;
   v_list = 0;
@@ -490,48 +481,7 @@ ast_visitor_reifying::visit_predefined_type (AST_PredefinedType *node)
 int
 ast_visitor_reifying::visit_string (AST_String *node)
 {
-  AST_Expression *b = node->max_size ();
-  AST_Param_Holder *ph = b->param_holder ();
-
-  if (ph != 0)
-    {
-      if (this->visit_param_holder (ph) != 0)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             ACE_TEXT ("ast_visitor_reifying::")
-                             ACE_TEXT ("visit_string - ")
-                             ACE_TEXT ("visit_param_holder() ")
-                             ACE_TEXT ("failed\n")),
-                            -1);
-        }
-
-      AST_Constant *c =
-        AST_Constant::narrow_from_decl (this->reified_node_);
-
-      b = c->constant_value ();
-    }
-  else if (b->ev ()->u.ulval == 0)
-    {
-      this->reified_node_ = node;
-      return 0;
-    }
-
-  AST_Expression *bound = 0;
-  ACE_NEW_RETURN (bound,
-                  AST_Expression (b,
-                                  AST_Expression::EV_ulong),
-                  -1);
-                  
-  Identifier id ("string");
-  UTL_ScopedName sn (&id, 0);
-  
-  ACE_NEW_RETURN (this->reified_node_,
-                  AST_String (AST_Decl::NT_string,
-                              &sn,
-                              bound,
-                              node->width ()),
-                  -1);
-                  
+  this->reified_node_ = node;
   return 0;
 }
 
diff --git a/TAO/TAO_IDL/ast/ast_visitor_tmpl_module_inst.cpp b/TAO/TAO_IDL/ast/ast_visitor_tmpl_module_inst.cpp
index 9c289e0932e..f24f42f9d59 100644
--- a/TAO/TAO_IDL/ast/ast_visitor_tmpl_module_inst.cpp
+++ b/TAO/TAO_IDL/ast/ast_visitor_tmpl_module_inst.cpp
@@ -36,7 +36,7 @@
 #include "ast_union_branch.h"
 #include "ast_enum.h"
 #include "ast_enum_val.h"
-#include "ast_finder.h"
+#include "ast_factory.h"
 #include "ast_param_holder.h"
 #include "ast_expression.h"
 
@@ -58,7 +58,6 @@ ast_visitor_tmpl_module_inst::ast_visitor_tmpl_module_inst (
   : ast_visitor (),
     ctx_ (ctx),
     for_eventtype_ (false),
-    for_finder_ (false),
     ref_only_ (ref_only)
 {
 }
@@ -1138,18 +1137,8 @@ ast_visitor_tmpl_module_inst::visit_factory (AST_Factory *node)
   Identifier id (node->local_name ()->get_string ());
   UTL_ScopedName sn (&id, 0);
 
-  AST_Factory *added_factory = 0;
-  
-  if (this->for_finder_)
-    {
-      added_factory =
-        idl_global->gen ()->create_finder (&sn);
-    }
-  else
-    {
-      added_factory =
-        idl_global->gen ()->create_factory (&sn);
-    }
+  AST_Factory *added_factory =
+    idl_global->gen ()->create_factory (&sn);
 
   idl_global->scopes ().top ()->add_to_scope (added_factory);
 
@@ -1173,19 +1162,9 @@ ast_visitor_tmpl_module_inst::visit_factory (AST_Factory *node)
 
   added_factory->be_add_exceptions (reified_exceps);
 
-  // In case it was set for this call.
-  this->for_finder_ = false;
-  
   return 0;
 }
 
-int
-ast_visitor_tmpl_module_inst::visit_finder (AST_Finder *node)
-{
-  this->for_finder_ = true;
-  return this->visit_factory (node);
-}
-
 AST_Decl *
 ast_visitor_tmpl_module_inst::reify_type (AST_Decl *d)
 {
diff --git a/TAO/TAO_IDL/be/be_argument.cpp b/TAO/TAO_IDL/be/be_argument.cpp
index c18855c84f3..aa587dde2b5 100644
--- a/TAO/TAO_IDL/be/be_argument.cpp
+++ b/TAO/TAO_IDL/be/be_argument.cpp
@@ -1,18 +1,23 @@
+// $Id$
 
-//=============================================================================
-/**
- *  @file    be_argument.cpp
- *
- *  $Id$
- *
- *  Extension of class AST_Argument that provides additional means for C++
- *  mapping.
- *
- *
- *  @author Copyright 1994-1995 by Sun Microsystems
- *  @author Inc. and Aniruddha Gokhale
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_argument.cpp
+//
+// = DESCRIPTION
+//    Extension of class AST_Argument that provides additional means for C++
+//    mapping.
+//
+// = AUTHOR
+//    Copyright 1994-1995 by Sun Microsystems, Inc.
+//    and
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #include "be_argument.h"
 #include "be_type.h"
@@ -20,6 +25,19 @@
 #include "nr_extern.h"
 #include "global_extern.h"
 
+ACE_RCSID (be,
+           be_argument,
+           "$Id$")
+
+be_argument::be_argument (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    AST_Field (),
+    AST_Argument (),
+    be_decl ()
+{
+}
+
 be_argument::be_argument (AST_Argument::Direction d,
                           AST_Type *ft,
                           UTL_ScopedName *n)
diff --git a/TAO/TAO_IDL/be/be_array.cpp b/TAO/TAO_IDL/be/be_array.cpp
index 12b46af4791..7e66e1d4538 100644
--- a/TAO/TAO_IDL/be/be_array.cpp
+++ b/TAO/TAO_IDL/be/be_array.cpp
@@ -1,18 +1,23 @@
-
-//=============================================================================
-/**
- *  @file    be_array.cpp
- *
- *  $Id$
- *
- *  Extension of class AST_Array that provides additional means for C++
- *  mapping.
- *
- *
- *  @author Copyright 1994-1995 by Sun Microsystems
- *  @author Inc. and Aniruddha Gokhale
- */
-//=============================================================================
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_array.cpp
+//
+// = DESCRIPTION
+//    Extension of class AST_Array that provides additional means for C++
+//    mapping.
+//
+// = AUTHOR
+//    Copyright 1994-1995 by Sun Microsystems, Inc.
+//    and
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #include "be_array.h"
 #include "be_codegen.h"
@@ -25,6 +30,21 @@
 
 #include "ace/Log_Msg.h"
 
+ACE_RCSID (be,
+           be_array,
+           "$Id$")
+
+be_array::be_array (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    AST_Type (),
+    AST_ConcreteType (),
+    AST_Array (),
+    be_decl (),
+    be_type ()
+{
+}
+
 be_array::be_array (UTL_ScopedName *n,
                     unsigned long ndims,
                     UTL_ExprList *dims,
diff --git a/TAO/TAO_IDL/be/be_attribute.cpp b/TAO/TAO_IDL/be/be_attribute.cpp
index 3d7e228be9e..4a72062bd43 100644
--- a/TAO/TAO_IDL/be/be_attribute.cpp
+++ b/TAO/TAO_IDL/be/be_attribute.cpp
@@ -1,18 +1,23 @@
-
-//=============================================================================
-/**
- *  @file    be_attribute.cpp
- *
- *  $Id$
- *
- *  Extension of class AST_Attribute that provides additional means for C++
- *  mapping.
- *
- *
- *  @author Copyright 1994-1995 by Sun Microsystems
- *  @author Inc. and Aniruddha Gokhale
- */
-//=============================================================================
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_attribute.cpp
+//
+// = DESCRIPTION
+//    Extension of class AST_Attribute that provides additional means for C++
+//    mapping.
+//
+// = AUTHOR
+//    Copyright 1994-1995 by Sun Microsystems, Inc.
+//    and
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #include "be_attribute.h"
 #include "be_type.h"
@@ -20,6 +25,29 @@
 
 #include "global_extern.h"
 
+ACE_RCSID (be,
+           be_attribute,
+           "$Id$")
+
+be_attribute::be_attribute (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    AST_Field (),
+    AST_Attribute (),
+    be_decl (),
+    original_attribute_ (0)
+{
+  be_operation_default_strategy *bods = 0;
+
+  ACE_NEW (bods,
+           be_operation_default_strategy (0));
+  this->get_strategy_ = bods;
+
+  ACE_NEW (bods,
+           be_operation_default_strategy (0));
+  this->set_strategy_ = bods;
+}
+
 be_attribute::be_attribute (bool ro,
                             AST_Type *ft,
                             UTL_ScopedName *n,
diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp
index d81340eb063..f249cd7ba24 100644
--- a/TAO/TAO_IDL/be/be_codegen.cpp
+++ b/TAO/TAO_IDL/be/be_codegen.cpp
@@ -1,17 +1,20 @@
-
-//=============================================================================
-/**
- *  @file    be_codegen.cpp
- *
- *  $Id$
- *
- * Code generation
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_codegen.cpp
+//
+// = DESCRIPTION
+//   Code generation
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #include "be_codegen.h"
 #include "be_helper.h"
@@ -20,11 +23,11 @@
 #include "global_extern.h"
 #include "utl_string.h"
 #include "idl_defines.h"
-
 #include "ace/OS_NS_ctype.h"
-#include "ace/OS_NS_sys_time.h"
-#include "ace/OS_NS_unistd.h"
-#include "ace/Numeric_Limits.h"
+
+ACE_RCSID (be,
+           be_codegen,
+           "$Id$")
 
 TAO_CodeGen * tao_cg = 0;
 
@@ -47,8 +50,6 @@ TAO_CodeGen::TAO_CodeGen (void)
     ciao_exec_header_ (0),
     ciao_exec_source_ (0),
     ciao_exec_idl_ (0),
-    ciao_conn_header_ (0),
-    ciao_conn_source_ (0),
     curr_os_ (0),
     gperf_input_filename_ (0),
     visitor_factory_ (0)
@@ -1340,121 +1341,6 @@ TAO_CodeGen::ciao_exec_idl (void)
   return this->ciao_exec_idl_;
 }
 
-int
-TAO_CodeGen::start_ciao_conn_header (const char *fname)
-{
-  // Clean up between multiple files.
-  delete this->ciao_conn_header_;
-
-  ACE_NEW_RETURN (this->ciao_conn_header_,
-                  TAO_OutStream,
-                  -1);
-
-  int status =
-    this->ciao_conn_header_->open (fname,
-                                   TAO_OutStream::CIAO_CONN_HDR);
-
-  if (status == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("TAO_CodeGen::start_ciao_conn_header - ")
-                         ACE_TEXT ("Error opening file\n")),
-                        -1);
-    }
-
-  TAO_OutStream &os = *this->ciao_conn_header_;
-
-  os << be_nl
-     << "// TAO_IDL - Generated from" << be_nl
-     << "// " << __FILE__ << ":" << __LINE__
-     << be_nl << be_nl;
-
-  // Generate the #ident string, if any.
-  this->gen_ident_string (this->ciao_conn_header_);
-
-  // Generate the #ifndef clause.
-  this->gen_ifndef_string (fname,
-                           this->ciao_conn_header_,
-                           "CIAO_",
-                           "_H_");
-
-  if (be_global->pre_include () != 0)
-    {
-      os << "#include /**/ \""
-         << be_global->pre_include ()
-         << "\"\n";
-    }
-
-  // This will almost certainly be true, but just in case...
-  if (be_global->conn_export_include () != 0)
-    {
-      this->gen_standard_include (
-        this->ciao_conn_header_,
-        be_global->conn_export_include (),
-        true);
-    }
-
-  // Some compilers don't optimize the #ifndef header include
-  // protection, but do optimize based on #pragma once.
-  os << "\n\n#if !defined (ACE_LACKS_PRAGMA_ONCE)\n"
-     << "# pragma once\n"
-     << "#endif /* ACE_LACKS_PRAGMA_ONCE */\n";
-
-  this->gen_conn_hdr_includes ();
-
-  return 0;
-}
-
-TAO_OutStream *
-TAO_CodeGen::ciao_conn_header (void)
-{
-  return this->ciao_conn_header_;
-}
-
-int
-TAO_CodeGen::start_ciao_conn_source (const char *fname)
-{
-  // Clean up between multiple files.
-  delete this->ciao_conn_source_;
-
-  ACE_NEW_RETURN (this->ciao_conn_source_,
-                  TAO_OutStream,
-                  -1);
-
-  int status =
-    this->ciao_conn_source_->open (fname,
-                                   TAO_OutStream::CIAO_CONN_IMPL);
-
-  if (status == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("TAO_CodeGen::")
-                         ACE_TEXT ("start_ciao_conn_source - ")
-                         ACE_TEXT ("Error opening file\n")),
-                        -1);
-    }
-
-  TAO_OutStream &os = *this->ciao_conn_source_;
-
-  os << be_nl
-     << "// TAO_IDL - Generated from" << be_nl
-     << "// " << __FILE__ << ":" << __LINE__
-     << be_nl;
-
-  // Generate the #ident string, if any.
-  this->gen_ident_string (this->ciao_conn_source_);
-
-  this->gen_conn_src_includes ();
-
-  return 0;
-}
-
-TAO_OutStream *
-TAO_CodeGen::ciao_conn_source (void)
-{
-  return this->ciao_conn_source_;
-}
-
 // Set the server header stream.
 int
 TAO_CodeGen::start_implementation_header (const char *fname)
@@ -1877,29 +1763,6 @@ TAO_CodeGen::end_ciao_exec_idl (void)
   return 0;
 }
 
-int
-TAO_CodeGen::end_ciao_conn_header (void)
-{
-  if (be_global->post_include () != 0)
-    {
-      *this->ciao_conn_header_ << "\n\n#include /**/ \""
-                               << be_global->post_include ()
-                               << "\"";
-    }
-
-  *this->ciao_conn_header_ << "\n\n#endif /* ifndef */\n";
-
-  return 0;
-}
-
-int
-TAO_CodeGen::end_ciao_conn_source (void)
-{
-  *this->ciao_conn_source_ << "\n";
-
-  return 0;
-}
-
 // We use the following helper functions to pass information. This class is the
 // best place to pass such information rather than passing information through
 // global variables spread everywhere. This class is a singleton and is
@@ -2011,14 +1874,6 @@ TAO_CodeGen::gen_export_files (void)
         be_global->exec_export_macro (),
         "exec");
     }
-
-  if (be_global->gen_conn_export_hdr_file ())
-    {
-      this->gen_export_file (
-        be_global->conn_export_include (),
-        be_global->conn_export_macro (),
-        "conn");
-    }
 }
 
 void
@@ -2220,11 +2075,6 @@ TAO_CodeGen::gen_ifndef_string (const char *fname,
           macro_name[i + offset] = '_';
         }
     }
-    
-  ACE_OS::strcat (macro_name, "_XXXXXX");
-  char * const t = ACE_OS::strstr (macro_name, "XXXXXX");
-  
-  this->make_rand_extension (t);
 
   ACE_OS::strcat (macro_name, suffix);
 
@@ -2369,32 +2219,35 @@ TAO_CodeGen::gen_stub_hdr_includes (void)
 
   // Non-abstract interface or keyword 'Object'.
   this->gen_cond_file_include (
-    idl_global->non_local_iface_seen_
+      idl_global->non_local_iface_seen_
       | idl_global->local_iface_seen_
       | idl_global->base_object_seen_,
-    "tao/Object.h",
-    this->client_header_);
+      "tao/Object.h",
+      this->client_header_
+    );
 
   // This is true if we have a typecode or TCKind in the IDL file.
   // If not included here, it will appear in *C.cpp, if TCs not suppressed.
   this->gen_cond_file_include (
-    idl_global->typecode_seen_
+      idl_global->typecode_seen_
       | idl_global->any_seen_,
-    "tao/AnyTypeCode/TypeCode.h",
-    this->client_header_);
+      "tao/AnyTypeCode/TypeCode.h",
+      this->client_header_
+    );
 
   this->gen_cond_file_include (
-    idl_global->any_seen_
+      idl_global->any_seen_
       | idl_global->typecode_seen_,
-    "tao/AnyTypeCode/TypeCode_Constants.h",
-    this->client_header_);
+      "tao/AnyTypeCode/TypeCode_Constants.h",
+      this->client_header_);
 
   // This is true if we have an 'any' in the IDL file.
   // If not included here, it will appear in *C.cpp, if Anys not suppressed.
   this->gen_cond_file_include (
-    idl_global->any_seen_,
-    "tao/AnyTypeCode/Any.h",
-    this->client_header_);
+      idl_global->any_seen_,
+      "tao/AnyTypeCode/Any.h",
+      this->client_header_
+    );
 
   // Generated if (w)string member of struct/union/exception/array/valuetype
   // has been seen.
@@ -2669,30 +2522,26 @@ TAO_CodeGen::gen_skel_src_includes (void)
     {
       case BE_GlobalData::TAO_DYNAMIC_HASH:
         {
-          this->gen_standard_include (
-            this->server_skeletons_,
-            "tao/PortableServer/Operation_Table_Dynamic_Hash.h");
+          this->gen_standard_include (this->server_skeletons_,
+                                      "tao/PortableServer/Operation_Table_Dynamic_Hash.h");
         }
         break;
       case BE_GlobalData::TAO_LINEAR_SEARCH:
         {
-          this->gen_standard_include (
-            this->server_skeletons_,
-            "tao/PortableServer/Operation_Table_Linear_Search.h");
+          this->gen_standard_include (this->server_skeletons_,
+                                      "tao/PortableServer/Operation_Table_Linear_Search.h");
         }
         break;
       case BE_GlobalData::TAO_BINARY_SEARCH:
         {
-          this->gen_standard_include (
-            this->server_skeletons_,
-            "tao/PortableServer/Operation_Table_Binary_Search.h");
+          this->gen_standard_include (this->server_skeletons_,
+                                      "tao/PortableServer/Operation_Table_Binary_Search.h");
         }
         break;
       case BE_GlobalData::TAO_PERFECT_HASH:
         {
-          this->gen_standard_include (
-            this->server_skeletons_,
-            "tao/PortableServer/Operation_Table_Perfect_Hash.h");
+          this->gen_standard_include (this->server_skeletons_,
+                                      "tao/PortableServer/Operation_Table_Perfect_Hash.h");
         }
         break;
     }
@@ -3028,39 +2877,30 @@ TAO_CodeGen::gen_skel_arg_file_includes (TAO_OutStream * stream)
       stream
     );
 
-  this->gen_standard_include (
-    stream,
-    "tao/PortableServer/TypeCode_SArg_Traits.h");
-
-  this->gen_standard_include (
-    stream,
-    "tao/PortableServer/Object_SArg_Traits.h");
+  this->gen_standard_include (stream,
+                              "tao/PortableServer/TypeCode_SArg_Traits.h");
+  this->gen_standard_include (stream,
+                              "tao/PortableServer/Object_SArg_Traits.h");
 
   if (be_global->gen_thru_poa_collocation ())
     {
       // Thru-POA/skeleton argument selection function templates.
-      this->gen_cond_file_include (
-        idl_global->non_local_iface_seen_,
-        "tao/PortableServer/get_arg.h",
-        stream);
+      this->gen_cond_file_include (idl_global->non_local_iface_seen_,
+                                   "tao/PortableServer/get_arg.h",
+                                   stream);
 
       // We need the stub side argument templates when thru-POA
       // collocation is enabled for type resolution.
       // this->gen_stub_arg_file_includes (stream);
 
-      // Always needed for CORBA::Boolean
-      // handling in _is_a() skeleton
-      // code when an unconstrained (non-local)
-      // IDL interface is defined.
-      this->gen_cond_file_include (
-        idl_global->non_local_iface_seen_,
-        "tao/Special_Basic_Arguments.h",
-        stream);
-
-      // Always needed for string argument
-      // handling in _is_a() skeleton
-      // code when an unconstrained (non-local)
-      // IDL interface is defined.
+      // Always needed for CORBA::Boolean handling in _is_a() skeleton
+      // code when an unconstrained (non-local) IDL interface is defined.
+      this->gen_cond_file_include (idl_global->non_local_iface_seen_,
+                                   "tao/Special_Basic_Arguments.h",
+                                   stream);
+
+      // Always needed for string argument handling in _is_a() skeleton
+      // code when an unconstrained (non-local) IDL interface is defined.
       this->gen_cond_file_include (idl_global->non_local_iface_seen_,
                                    "tao/UB_String_Arguments.h",
                                    stream);
@@ -3082,94 +2922,140 @@ TAO_CodeGen::gen_cond_file_include (bool condition_green,
 void
 TAO_CodeGen::gen_typecode_includes (TAO_OutStream * stream)
 {
-  this->gen_standard_include (
-    stream,
-    "tao/AnyTypeCode/Null_RefCount_Policy.h");
+  this->gen_standard_include (stream,
+                              "tao/AnyTypeCode/Null_RefCount_Policy.h");
 
-  this->gen_standard_include (
-    stream,
-    "tao/AnyTypeCode/TypeCode_Constants.h");
+  this->gen_standard_include (stream,
+                              "tao/AnyTypeCode/TypeCode_Constants.h");
 
   // Just assume we're going to need alias TypeCodes since there is
   // currently no alias_seen_ or typedef_seen_ flag in idl_global.
-  this->gen_standard_include (
-    stream,
-    "tao/AnyTypeCode/Alias_TypeCode_Static.h");
+  this->gen_standard_include (stream,
+                              "tao/AnyTypeCode/Alias_TypeCode_Static.h");
 
-  this->gen_cond_file_include (
-    idl_global->enum_seen_,
-    "tao/AnyTypeCode/Enum_TypeCode_Static.h",
-    stream);
+  this->gen_cond_file_include (idl_global->enum_seen_,
+                               "tao/AnyTypeCode/Enum_TypeCode_Static.h",
+                               stream);
 
-  this->gen_cond_file_include (
-    idl_global->interface_seen_,
-    "tao/AnyTypeCode/Objref_TypeCode_Static.h",
-    stream);
+  this->gen_cond_file_include (idl_global->interface_seen_,
+                               "tao/AnyTypeCode/Objref_TypeCode_Static.h",
+                               stream);
 
-  this->gen_cond_file_include (
-    idl_global->seq_seen_ | idl_global->array_seen_,
-    "tao/AnyTypeCode/Sequence_TypeCode_Static.h",
-    stream);
+  this->gen_cond_file_include (idl_global->seq_seen_
+                               | idl_global->array_seen_,
+                               "tao/AnyTypeCode/Sequence_TypeCode_Static.h",
+                               stream);
 
-  this->gen_cond_file_include (
-    idl_global->string_seen_,
-    "tao/AnyTypeCode/String_TypeCode_Static.h",
-    stream);
+  this->gen_cond_file_include (idl_global->string_seen_,
+                               "tao/AnyTypeCode/String_TypeCode_Static.h",
+                               stream);
 
   this->gen_cond_file_include (
-      idl_global->exception_seen_ | idl_global->aggregate_seen_,
+      idl_global->exception_seen_
+      | idl_global->aggregate_seen_,
       "tao/AnyTypeCode/Struct_TypeCode_Static.h",
       stream);
 
   this->gen_cond_file_include (
-      idl_global->exception_seen_ | idl_global->aggregate_seen_,
+      idl_global->exception_seen_
+      | idl_global->aggregate_seen_,
       "tao/AnyTypeCode/TypeCode_Struct_Field.h",
       stream);
 
-  this->gen_cond_file_include (
-    idl_global->union_seen_,
-    "tao/AnyTypeCode/TypeCode_Case_T.h",
-    stream);
+  this->gen_cond_file_include (idl_global->union_seen_,
+                               "tao/AnyTypeCode/TypeCode_Case_T.h",
+                               stream);
 
-  this->gen_cond_file_include (
-    idl_global->union_seen_,
-    "tao/AnyTypeCode/Union_TypeCode_Static.h",
-    stream);
+  this->gen_cond_file_include (idl_global->union_seen_,
+                               "tao/AnyTypeCode/Union_TypeCode_Static.h",
+                               stream);
 
-  this->gen_cond_file_include (
-    idl_global->valuetype_seen_,
-    "tao/AnyTypeCode/Value_TypeCode_Static.h",
-    stream);
+  this->gen_cond_file_include (idl_global->valuetype_seen_,
+                               "tao/AnyTypeCode/Value_TypeCode_Static.h",
+                               stream);
 
-  this->gen_cond_file_include (
-    idl_global->valuetype_seen_,
-    "tao/AnyTypeCode/TypeCode_Value_Field.h",
-    stream);
+  this->gen_cond_file_include (idl_global->valuetype_seen_,
+                               "tao/AnyTypeCode/TypeCode_Value_Field.h",
+                               stream);
 
-  this->gen_cond_file_include (
-    idl_global->recursive_type_seen_,
-    "tao/AnyTypeCode/Recursive_Type_TypeCode.h",
-    stream);
+  this->gen_cond_file_include (idl_global->recursive_type_seen_,
+                               "tao/AnyTypeCode/Recursive_Type_TypeCode.h",
+                               stream);
 }
 
 void
 TAO_CodeGen::gen_svnt_hdr_includes (void)
 {
-  this->gen_standard_include (
-    this->ciao_svnt_header_,
-    "ciao/Containers/Container_BaseC.h");
+  bool has_included = false;
 
-  this->gen_standard_include (
-    this->ciao_svnt_header_,
-       "ciao/Contexts/Context_Impl_T.h");
+  if (be_global->gen_lem_force_all ())
+    {
+      size_t const nfiles = idl_global->n_included_idl_files ();
 
-  this->gen_standard_include (
-    this->ciao_svnt_header_,
-    "ciao/Servants/Servant_Impl_T.h");
+      for (size_t j = 0; j < nfiles; ++j)
+        {
+          char* idl_name = idl_global->included_idl_files ()[j];
 
-  this->gen_standard_include (
-    this->ciao_svnt_header_,
-    "ciao/Servants/Home_Servant_Impl_T.h");
+          // Make a String out of it.
+          UTL_String idl_name_str = idl_name;
+
+          // No *_svnt.h version of this one.
+          if (ACE_OS::strcmp (idl_name, "Components.idl") == 0)
+            {
+              continue;
+            }
+
+          // Get the constructed IDL file name.
+          const char* svnt_hdr =
+            BE_GlobalData::be_get_ciao_svnt_header (&idl_name_str,
+                                                    true);
+
+          idl_name_str.destroy ();
+
+          // Sanity check and then print.
+          if (svnt_hdr != 0)
+            {
+              this->gen_standard_include (
+                this->ciao_svnt_header_,
+                svnt_hdr);
+
+              has_included = true;
+            }
+          else
+            {
+              ACE_ERROR ((LM_ERROR,
+                          ACE_TEXT ("\nERROR, invalid ")
+                          ACE_TEXT ("file '%C' included"),
+                          svnt_hdr));
+            }
+        }
+    }
+
+  if (! has_included)
+    {
+      bool swapping = be_global->gen_component_swapping ();
+
+      this->gen_standard_include (
+        this->ciao_svnt_header_,
+        (swapping
+           ? "ciao/Containers/Swapping/Swapping_Container.h"
+           : "ciao/Containers/Container_BaseC.h"));
+
+      this->gen_standard_include (
+        this->ciao_svnt_header_,
+        (swapping
+           ? "cial/Contexts/Swapping/Upgradeable_Context_Impl_T.h"
+           : "ciao/Contexts/Context_Impl_T.h"));
+
+      this->gen_standard_include (this->ciao_svnt_header_,
+                                  "ciao/Servants/Servant_Impl_T.h");
+
+      this->gen_standard_include (
+        this->ciao_svnt_header_,
+        (swapping
+           ? "ciao/Servants/Swapping/Swapping_Servant_Home_Impl_T.h"
+           : "ciao/Servants/Home_Servant_Impl_T.h"));
+    }
 
   *this->ciao_svnt_header_ << be_nl;
 
@@ -3195,6 +3081,11 @@ TAO_CodeGen::gen_svnt_src_includes (void)
     this->ciao_svnt_source_,
     "ciao/Containers/CIAO_Servant_ActivatorC.h");
 
+  this->gen_cond_file_include (
+    be_global->gen_component_swapping (),
+    "ciao/Servants/Swapping/Dynamic_Component_Activator.h",
+    this->ciao_svnt_source_);
+
   this->gen_standard_include (
     this->ciao_svnt_source_,
     "ciao/Servants/Port_Activator_T.h");
@@ -3238,217 +3129,157 @@ TAO_CodeGen::gen_exec_hdr_includes (void)
   this->gen_standard_include (
     this->ciao_exec_header_,
     "tao/LocalObject.h");
-}
-
-void
-TAO_CodeGen::gen_exec_src_includes (void)
-{
-  // Generate the include statement for the exec source.
-  this->gen_standard_include (
-    this->ciao_exec_source_,
-    be_global->be_get_ciao_exec_hdr_fname (true));
-}
 
-void
-TAO_CodeGen::gen_exec_idl_includes (void)
-{
-  this->gen_standard_include (
-    this->ciao_exec_idl_,
-    "ccm/CCM_Container.idl");
+  // Placeholder until we get real-world logic in place.
+  bool dds_connector_seen = true;
 
-  if (be_global->ami4ccm_call_back ())
+  if (dds_connector_seen)
     {
-      this->gen_standard_include (
-        this->ciao_exec_idl_,
-        "connectors/ami4ccm/ami4ccm/ami4ccm.idl");
-    }
+      *this->ciao_exec_header_ << be_nl;
 
-  this->gen_standard_include (
-    this->ciao_exec_idl_,
-    idl_global->stripped_filename ()->get_string ());
+//      this->gen_standard_include (this->ciao_exec_header_,
+//                                  "dds4ccm/impl/ndds/NDDS_Traits.h");
 
-  char **path_tmp  = 0;
+//      this->gen_standard_include (this->ciao_exec_header_,
+//                                  "dds4ccm/impl/ndds/Connector_T.h");
 
-  for (ACE_Unbounded_Queue_Iterator<char *>riter (
-         idl_global->ciao_lem_file_names ());
-       riter.done () == 0;
-       riter.advance ())
-    {
-      riter.next (path_tmp);
+      size_t const nfiles = idl_global->n_included_idl_files ();
 
-      this->gen_standard_include (this->ciao_exec_idl_,
-                                  *path_tmp);
-    }
-}
+      for (size_t j = 0; j < nfiles; ++j)
+        {
+          char* idl_name = idl_global->included_idl_files ()[j];
 
-void
-TAO_CodeGen::gen_conn_hdr_includes (void)
-{
-  ACE_Unbounded_Queue<char *> &lem_file_names =
-    idl_global->ciao_lem_file_names ();
+          // Make a String out of it.
+          UTL_String idl_name_str = idl_name;
 
-  char **path_tmp  = 0;
+          // No *_svnt.h version of this one.
+          if (ACE_OS::strcmp (idl_name, "Components.idl") == 0)
+            {
+              continue;
+            }
 
-  for (ACE_Unbounded_Queue_Iterator<char *> riter (
-         lem_file_names);
-       riter.done () == 0;
-       riter.advance ())
-    {
-      riter.next (path_tmp);
-      ACE_CString lem_str (*path_tmp);
-      lem_str = lem_str.substr (0, lem_str.find (".idl"));
-      lem_str += be_global->client_hdr_ending ();
+          // Get the constructed IDL file name.
+          const char* ts_hdr =
+            BE_GlobalData::be_get_dds_typesupport_header (
+              &idl_name_str);
 
-      this->gen_standard_include (
-        this->ciao_conn_header_,
-        lem_str.c_str ());
-    }
+          idl_name_str.destroy ();
 
-  *this->ciao_conn_header_ << be_nl;
+          // Sanity check and then print.
+          if (ts_hdr != 0)
+            {
+//              this->gen_standard_include (
+//                this->ciao_exec_header_,
+//                ts_hdr);
+            }
+          else
+            {
+              ACE_ERROR ((LM_ERROR,
+                          ACE_TEXT ("\nERROR, invalid ")
+                          ACE_TEXT ("file '%C' included"),
+                          ts_hdr));
+            }
+        }
+    }
+}
 
-  // We'll probably need some kind of flag to check
-  // to tell which DDS vendor.
+void
+TAO_CodeGen::gen_exec_src_includes (void)
+{
+  // Generate the include statement for the exec header.
   this->gen_standard_include (
-    this->ciao_conn_header_,
-    "connectors/dds4ccm/impl/ndds/DDS4CCM_Traits.h");
+    this->ciao_exec_source_,
+    be_global->be_get_ciao_exec_hdr_fname (true));
+}
 
-  // Placeholder for forthcoming real-world logic.
-  bool dds_event_connector = true;
+void
+TAO_CodeGen::gen_exec_idl_includes (void)
+{
+  bool has_included = false;
 
-  if (dds_event_connector)
+  if (be_global->gen_lem_force_all ())
     {
-      this->gen_standard_include (
-        this->ciao_conn_header_,
-        "connectors/dds4ccm/impl/ndds/DDS_Event_Connector_T.h");
-    }
+      size_t const nfiles = idl_global->n_included_idl_files ();
 
-  // Placeholder for forthcoming real-world logic.
-  bool dds_state_connector = true;
+      for (size_t j = 0; j < nfiles; ++j)
+        {
+          char* idl_name = idl_global->included_idl_files ()[j];
 
-  if (dds_state_connector)
-    {
-      this->gen_standard_include (
-        this->ciao_conn_header_,
-        "connectors/dds4ccm/impl/ndds/DDS_State_Connector_T.h");
-    }
+          // Make a String out of it.
+          UTL_String idl_name_str = idl_name;
 
-  for (size_t j = 0; j < idl_global->n_included_idl_files (); ++j)
-    {
-      if (j == 0)
-        {
-          *this->ciao_conn_header_ << be_nl;
-        }
+          // No *E.idl version of this one.
+          if (ACE_OS::strcmp (idl_name, "Components.idl") == 0)
+            {
+              continue;
+            }
 
-      char * const idl_name =
-        idl_global->included_idl_files ()[j];
+          // Make sure this file was actually got included, not
+          // ignored by some #if defined compiler directive.
 
-      if (ACE_OS::strcmp (idl_name, "Components.idl") == 0)
-        {
-          continue;
-        }
+          // Get the constructed IDL file name.
+          const char* exec_idl =
+            BE_GlobalData::be_get_ciao_exec_idl (&idl_name_str,
+                                                 true);
 
-      UTL_String str (idl_name);
+          idl_name_str.destroy ();
 
-      this->gen_standard_include (
-        this->ciao_conn_header_,
-        BE_GlobalData::be_get_client_hdr (&str));
+          // Sanity check and then print.
+          if (exec_idl != 0)
+            {
+              if (! has_included)
+                {
+                  // No newline first time for better formatting.
+                  this->ciao_exec_idl_->print ("#include \"%s\"",
+                                               exec_idl);
 
-      str.destroy ();
+                  has_included = true;
+                }
+              else
+                {
+                  this->gen_standard_include (
+                    this->ciao_exec_idl_,
+                    exec_idl);
+                }
+            }
+          else
+            {
+              ACE_ERROR ((LM_ERROR,
+                          ACE_TEXT ("\nERROR, invalid ")
+                          ACE_TEXT ("file '%C' included"),
+                          exec_idl));
+            }
+        }
     }
 
-  ACE_Unbounded_Queue<char *> &rti_ts_files =
-    idl_global->ciao_rti_ts_file_names ();
-
-  if (rti_ts_files.size () > 0)
+  // Otherwise it's included indirectly.
+  if (! has_included)
     {
-      *this->ciao_conn_header_ << be_nl;
+      this->ciao_exec_idl_->print (
+        "#include \"ccm/CCM_Container.idl\"");
     }
 
-  for (ACE_Unbounded_Queue_Iterator<char *> iter (
-         rti_ts_files);
-       iter.done () == 0;
-       iter.advance ())
+  if (be_global->ami4ccm_call_back ())
     {
-      iter.next (path_tmp);
-
-      this->gen_standard_include (
-        this->ciao_conn_header_,
-        *path_tmp);
+      this->ciao_exec_idl_->print (
+        "\n#include \"connectors/ami4ccm/ami4ccm/ami4ccm.idl\"");
     }
-}
 
-void
-TAO_CodeGen::gen_conn_src_includes (void)
-{
-  // Generate the include statement for the connector exec source.
   this->gen_standard_include (
-    this->ciao_conn_source_,
-    be_global->be_get_ciao_conn_hdr_fname (true));
-}
+    this->ciao_exec_idl_,
+    idl_global->stripped_filename ()->get_string ());
 
-void
-TAO_CodeGen::make_rand_extension (char * const t)
-{
-  size_t const NUM_CHARS = ACE_OS::strlen (t);
-  
-  /// Use ACE_Time_Value::msec(ACE_UINT64&) as opposed to
-  /// ACE_Time_Value::msec(void) to avoid truncation.
-  ACE_UINT64 msec;
-
-  /// Use a const ACE_Time_Value to resolve ambiguity between
-  /// ACE_Time_Value::msec (long) and ACE_Time_Value::msec(ACE_UINT64&) const.
-  ACE_Time_Value const now = ACE_OS::gettimeofday ();
-  now.msec (msec);
-
-  /// Add the process and thread ids to ensure uniqueness. Must use
-  // C-style cast, since thr_self() returns a pointer on some platforms.
-  msec += ACE_OS::getpid ();
-  msec += (size_t) ACE_OS::thr_self ();
-
-  // ACE_thread_t may be a char* (returned by ACE_OS::thr_self()) so
-  // we need to use a C-style cast as a catch-all in order to use a
-  // static_cast<> to an integral type.
-  ACE_RANDR_TYPE seed = static_cast<ACE_RANDR_TYPE> (msec);
-
-  // We only care about UTF-8 / ASCII characters in generated
-  // filenames.  A UTF-16 or UTF-32 character could potentially cause
-  // a very large space to be searched in the below do/while() loop,
-  // greatly slowing down this mkstemp() implementation.  It is more
-  // practical to limit the search space to UTF-8 / ASCII characters
-  // (i.e. 127 characters).
-  //
-  // Note that we can't make this constant static since the compiler
-  // may not inline the return value of ACE_Numeric_Limits::max(),
-  // meaning multiple threads could potentially initialize this value
-  // in parallel.
-  float const MAX_VAL =
-    static_cast<float> (ACE_Numeric_Limits<char>::max ());
-
-  // Use high-order bits rather than low-order ones (e.g. rand() %
-  // MAX_VAL).  See Numerical Recipes in C: The Art of Scientific
-  // Computing (William  H. Press, Brian P. Flannery, Saul
-  // A. Teukolsky, William T. Vetterling; New York: Cambridge
-  // University Press, 1992 (2nd ed., p. 277).
-  //
-  // e.g.: MAX_VAL * rand() / (RAND_MAX + 1.0)
-
-  // Factor out the constant coefficient.
-  float const coefficient =
-    static_cast<float> (MAX_VAL / (RAND_MAX + 1.0f));
-
-  for (unsigned int n = 0; n < NUM_CHARS; ++n)
-    {
-      ACE_TCHAR r;
-
-      // This do/while() loop allows this alphanumeric character
-      // selection to work for EBCDIC, as well.
-      do
-        {
-          r = static_cast<ACE_TCHAR> (coefficient * ACE_OS::rand_r (seed));
-        }
-      while (!ACE_OS::ace_isalnum (r));
+  char **path_tmp  = 0;
+  for (ACE_Unbounded_Queue_Iterator<char *>riter (
+            idl_global->ciao_lem_file_names ()
+          );
+       riter.done () == 0;
+       riter.advance ())
+    {
+      riter.next (path_tmp);
 
-      t[n] = static_cast<char> (ACE_OS::ace_toupper (r));
+      // No newline first time for better formatting.
+      this->ciao_exec_idl_->print ("\n#include \"%s\"", *path_tmp);
     }
 }
 
@@ -3471,8 +3302,6 @@ TAO_CodeGen::destroy (void)
   delete this->ciao_svnt_source_;
   delete this->ciao_exec_header_;
   delete this->ciao_exec_source_;
-  delete this->ciao_conn_header_;
-  delete this->ciao_conn_source_;
   delete this->ciao_exec_idl_;
   delete this->gperf_input_stream_;
   delete [] this->gperf_input_filename_;
diff --git a/TAO/TAO_IDL/be/be_component.cpp b/TAO/TAO_IDL/be/be_component.cpp
index a3bfe952110..ac4afefeb03 100644
--- a/TAO/TAO_IDL/be/be_component.cpp
+++ b/TAO/TAO_IDL/be/be_component.cpp
@@ -1,17 +1,21 @@
+// $Id$
 
-//=============================================================================
-/**
- *  @file    be_component.cpp
- *
- *  $Id$
- *
- *  Extension of class AST_Component that provides additional means for C++
- *  mapping of an interface.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_component.cpp
+//
+// = DESCRIPTION
+//    Extension of class AST_Component that provides additional means for C++
+//    mapping of an interface.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #include "be_component.h"
 #include "be_visitor.h"
@@ -19,6 +23,26 @@
 #include "global_extern.h"
 #include "utl_err.h"
 
+ACE_RCSID (be,
+           be_component,
+           "$Id$")
+
+be_component::be_component (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    AST_Type (),
+    UTL_Scope (),
+    AST_Interface (),
+    AST_Component (),
+    be_scope (),
+    be_decl (),
+    be_type (),
+    be_interface ()
+{
+  this->size_type (AST_Type::VARIABLE);
+  this->has_constructor (true);
+}
+
 be_component::be_component (UTL_ScopedName *n,
                             AST_Component *base_component,
                             AST_Type **supports,
diff --git a/TAO/TAO_IDL/be/be_component_fwd.cpp b/TAO/TAO_IDL/be/be_component_fwd.cpp
index 3c5b12ffd8c..1121b2dc2c6 100644
--- a/TAO/TAO_IDL/be/be_component_fwd.cpp
+++ b/TAO/TAO_IDL/be/be_component_fwd.cpp
@@ -1,23 +1,43 @@
+// $Id$
 
-//=============================================================================
-/**
- *  @file    be_component_fwd.cpp
- *
- *  $Id$
- *
- *  Extension of class AST_ComponentFwd that provides additional means for C++
- *  mapping of a forward declared component.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_component_fwd.cpp
+//
+// = DESCRIPTION
+//    Extension of class AST_ComponentFwd that provides additional means for C++
+//    mapping of a forward declared component.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #include "be_component_fwd.h"
 #include "be_visitor.h"
 #include "global_extern.h"
 #include "utl_err.h"
 
+ACE_RCSID (be, 
+           be_component_fwd, 
+           "$Id$")
+
+be_component_fwd::be_component_fwd (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    AST_Type (),
+    AST_InterfaceFwd (),
+    AST_ComponentFwd (),
+    be_type (),
+    be_interface_fwd ()
+{
+  this->size_type (AST_Type::VARIABLE);
+}
+
 be_component_fwd::be_component_fwd (AST_Interface *dummy,
                                     UTL_ScopedName *n)
   : COMMON_Base (),
@@ -29,8 +49,6 @@ be_component_fwd::be_component_fwd (AST_Interface *dummy,
                       n),
     AST_ComponentFwd (dummy,
                       n),
-    be_decl (AST_Decl::NT_component_fwd,
-             n),
     be_type (AST_Decl::NT_component_fwd,
              n),
     be_interface_fwd (dummy,
diff --git a/TAO/TAO_IDL/be/be_constant.cpp b/TAO/TAO_IDL/be/be_constant.cpp
index 2ca74288d66..8d52e52f4d7 100644
--- a/TAO/TAO_IDL/be/be_constant.cpp
+++ b/TAO/TAO_IDL/be/be_constant.cpp
@@ -1,24 +1,41 @@
+// $Id$
 
-//=============================================================================
-/**
- *  @file    be_constant.cpp
- *
- *  $Id$
- *
- *  Extension of class AST_Constant that provides additional means for C++
- *  mapping.
- *
- *
- *  @author Copyright 1994-1995 by Sun Microsystems
- *  @author Inc. and Aniruddha Gokhale
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_constant.cpp
+//
+// = DESCRIPTION
+//    Extension of class AST_Constant that provides additional means for C++
+//    mapping.
+//
+// = AUTHOR
+//    Copyright 1994-1995 by Sun Microsystems, Inc.
+//    and
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #include "be_constant.h"
 #include "be_visitor.h"
 #include "utl_scope.h"
 #include "nr_extern.h"
 
+ACE_RCSID (be,
+           be_constant,
+           "$Id$")
+
+be_constant::be_constant (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    AST_Constant (),
+    be_decl ()
+{
+}
+
 be_constant::be_constant (AST_Expression::ExprType et,
                           AST_Expression *v,
                           UTL_ScopedName *n)
diff --git a/TAO/TAO_IDL/be/be_decl.cpp b/TAO/TAO_IDL/be/be_decl.cpp
index d80570b3561..df0ce31d2c7 100644
--- a/TAO/TAO_IDL/be/be_decl.cpp
+++ b/TAO/TAO_IDL/be/be_decl.cpp
@@ -1,18 +1,23 @@
-
-//=============================================================================
-/**
- *  @file    be_decl.cpp
- *
- *  $Id$
- *
- *  Extension of class AST_Decl that provides additional means for C++
- *  mapping.
- *
- *
- *  @author Copyright 1994-1995 by Sun Microsystems
- *  @author Inc. and Aniruddha Gokhale
- */
-//=============================================================================
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_decl.cpp
+//
+// = DESCRIPTION
+//    Extension of class AST_Decl that provides additional means for C++
+//    mapping.
+//
+// = AUTHOR
+//    Copyright 1994-1995 by Sun Microsystems, Inc.
+//    and
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #include "be_decl.h"
 #include "be_scope.h"
@@ -30,7 +35,6 @@
 #include "be_enum.h"
 #include "be_operation.h"
 #include "be_factory.h"
-#include "be_finder.h"
 #include "be_sequence.h"
 #include "be_visitor.h"
 
@@ -44,6 +48,62 @@
 #include "ace/Log_Msg.h"
 #include "ace/String_Base.h"
 
+// Default Constructor
+be_decl::be_decl (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    cli_hdr_gen_ (false),
+    cli_stub_gen_ (false),
+    cli_inline_gen_ (false),
+    srv_hdr_gen_ (false),
+    impl_hdr_gen_ (false),
+    srv_skel_gen_ (false),
+    impl_skel_gen_ (false),
+    srv_inline_gen_ (false),
+    tie_skel_gen_ (false),
+    cli_hdr_any_op_gen_ (false),
+    cli_stub_any_op_gen_ (false),
+    cli_hdr_cdr_op_gen_ (false),
+    cli_stub_cdr_op_gen_ (false),
+    cli_inline_cdr_op_gen_ (false),
+    cli_inline_cdr_decl_gen_ (false),
+    cli_hdr_serializer_op_gen_ (false),
+    cli_stub_serializer_op_gen_ (false),
+    cli_inline_serializer_op_gen_ (false),
+    cli_inline_serializer_decl_gen_ (false),
+    cli_traits_gen_ (false),
+    cli_arg_traits_gen_ (false),
+    srv_arg_traits_gen_ (false),
+    srv_sarg_traits_gen_ (false),
+    cli_pragma_inst_gen_ (false),
+    cli_inarg_tmpl_class_gen_ (false),
+    cli_inarg_pragma_inst_gen_ (false),
+    cli_inoutarg_tmpl_class_gen_ (false),
+    cli_inoutarg_pragma_inst_gen_ (false),
+    cli_outarg_tmpl_class_gen_ (false),
+    cli_outarg_pragma_inst_gen_ (false),
+    cli_retarg_tmpl_class_gen_ (false),
+    cli_retarg_pragma_inst_gen_ (false),
+    srv_tmpl_class_gen_ (false),
+    srv_pragma_inst_gen_ (false),
+    srv_inarg_tmpl_class_gen_ (false),
+    srv_inarg_pragma_inst_gen_ (false),
+    srv_inoutarg_tmpl_class_gen_ (false),
+    srv_inoutarg_pragma_inst_gen_ (false),
+    srv_outarg_tmpl_class_gen_ (false),
+    srv_outarg_pragma_inst_gen_ (false),
+    srv_retarg_tmpl_class_gen_ (false),
+    srv_retarg_pragma_inst_gen_ (false),
+    ccm_pre_proc_gen_ (false),
+    ex_idl_facet_gen_ (false),
+    svnt_hdr_facet_gen_ (false),
+    svnt_src_facet_gen_ (false),
+    exec_hdr_facet_gen_ (false),
+    exec_src_facet_gen_ (false)
+{
+}
+
+// Constructor
 be_decl::be_decl (AST_Decl::NodeType type,
                   UTL_ScopedName *n)
   : COMMON_Base (),
@@ -100,6 +160,7 @@ be_decl::be_decl (AST_Decl::NodeType type,
 {
 }
 
+// Destructor
 be_decl::~be_decl (void)
 {
 }
@@ -255,49 +316,47 @@ be_decl::scope (void)
 {
   be_decl *d = this;
 
-  switch (this->node_type ())
-  {
-    case AST_Decl::NT_interface_fwd:
-      // Resolve forward declared interface by looking at full_definition()
-      // field and iterating.
-      d =
-        be_interface::narrow_from_decl (
-            (be_interface_fwd::narrow_from_decl (this))->full_definition ()
-          );
-    // Fall through
-    case AST_Decl::NT_interface:
-      return be_interface::narrow_from_decl (d);
-    case AST_Decl::NT_module:
-      return be_module::narrow_from_decl (d);
-    case AST_Decl::NT_root:
-      return be_root::narrow_from_decl (d);
-    case AST_Decl::NT_except:
-      return be_exception::narrow_from_decl (d);
-    case AST_Decl::NT_union:
-      return be_union::narrow_from_decl (d);
-    case AST_Decl::NT_struct:
-      return be_structure::narrow_from_decl (d);
-    case AST_Decl::NT_enum:
-      return be_enum::narrow_from_decl (d);
-    case AST_Decl::NT_op:
-      return be_operation::narrow_from_decl (d);
-    case AST_Decl::NT_factory:
-      return be_factory::narrow_from_decl (d);
-    case AST_Decl::NT_finder:
-      return be_finder::narrow_from_decl (d);
-    case AST_Decl::NT_sequence:
-      return be_sequence::narrow_from_decl (d);
-    case AST_Decl::NT_valuetype:
-      return be_valuetype::narrow_from_decl (d);
-    case AST_Decl::NT_component:
-      return be_component::narrow_from_decl (d);
-    case AST_Decl::NT_eventtype:
-      return be_eventtype::narrow_from_decl (d);
-    case AST_Decl::NT_home:
-      return be_home::narrow_from_decl (d);
-    default:
-      return (be_scope *)0;
-  }
+   switch (this->node_type ())
+   {
+     case AST_Decl::NT_interface_fwd:
+        // Resolve forward declared interface by looking at full_definition()
+        // field and iterating.
+        d =
+          be_interface::narrow_from_decl (
+              (be_interface_fwd::narrow_from_decl (this))->full_definition ()
+            );
+     // Fall through
+     case AST_Decl::NT_interface:
+        return be_interface::narrow_from_decl (d);
+     case AST_Decl::NT_module:
+        return be_module::narrow_from_decl (d);
+     case AST_Decl::NT_root:
+        return be_root::narrow_from_decl (d);
+     case AST_Decl::NT_except:
+        return be_exception::narrow_from_decl (d);
+     case AST_Decl::NT_union:
+        return be_union::narrow_from_decl (d);
+     case AST_Decl::NT_struct:
+        return be_structure::narrow_from_decl (d);
+     case AST_Decl::NT_enum:
+        return be_enum::narrow_from_decl (d);
+     case AST_Decl::NT_op:
+        return be_operation::narrow_from_decl (d);
+     case AST_Decl::NT_factory:
+        return be_factory::narrow_from_decl (d);
+     case AST_Decl::NT_sequence:
+        return be_sequence::narrow_from_decl (d);
+     case AST_Decl::NT_valuetype:
+        return be_valuetype::narrow_from_decl (d);
+     case AST_Decl::NT_component:
+        return be_component::narrow_from_decl (d);
+     case AST_Decl::NT_eventtype:
+        return be_eventtype::narrow_from_decl (d);
+     case AST_Decl::NT_home:
+        return be_home::narrow_from_decl (d);
+     default:
+        return (be_scope *)0;
+   }
 }
 
 // Boolean methods to test if code was already generated.
diff --git a/TAO/TAO_IDL/be/be_enum.cpp b/TAO/TAO_IDL/be/be_enum.cpp
index 1bc36f1f7a1..b094f811f40 100644
--- a/TAO/TAO_IDL/be/be_enum.cpp
+++ b/TAO/TAO_IDL/be/be_enum.cpp
@@ -1,18 +1,23 @@
+// $Id$
 
-//=============================================================================
-/**
- *  @file    be_enum.cpp
- *
- *  $Id$
- *
- *  Extension of class AST_Enum that provides additional means for C++
- *  mapping.
- *
- *
- *  @author Copyright 1994-1995 by Sun Microsystems
- *  @author Inc. and Aniruddha Gokhale
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_enum.cpp
+//
+// = DESCRIPTION
+//    Extension of class AST_Enum that provides additional means for C++
+//    mapping.
+//
+// = AUTHOR
+//    Copyright 1994-1995 by Sun Microsystems, Inc.
+//    and
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #include "be_enum.h"
 #include "be_visitor.h"
@@ -20,6 +25,23 @@
 
 #include "global_extern.h"
 
+ACE_RCSID (be,
+           be_enum,
+           "$Id$")
+
+be_enum::be_enum (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    AST_Type (),
+    AST_ConcreteType (),
+    UTL_Scope (),
+    AST_Enum (),
+    be_scope (),
+    be_decl (),
+    be_type ()
+{
+}
+
 be_enum::be_enum (UTL_ScopedName *n,
                   bool local,
                   bool abstract)
diff --git a/TAO/TAO_IDL/be/be_enum_val.cpp b/TAO/TAO_IDL/be/be_enum_val.cpp
index 2459c943168..0c4ca16aeb4 100644
--- a/TAO/TAO_IDL/be/be_enum_val.cpp
+++ b/TAO/TAO_IDL/be/be_enum_val.cpp
@@ -1,22 +1,36 @@
+// $Id$
 
-//=============================================================================
-/**
- *  @file    be_enum_val.cpp
- *
- *  $Id$
- *
- *  Extension of class AST_EnumVal that provides additional means for C++
- *  mapping.
- *
- *
- *  @author Copyright 1994-1995 by Sun Microsystems
- *  @author Inc. and Aniruddha Gokhale
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_enum_val.cpp
+//
+// = DESCRIPTION
+//    Extension of class AST_EnumVal that provides additional means for C++
+//    mapping.
+//
+// = AUTHOR
+//    Copyright 1994-1995 by Sun Microsystems, Inc.
+//    and
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #include "be_enum_val.h"
 #include "be_visitor.h"
 
+be_enum_val::be_enum_val (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    AST_Constant (),
+    AST_EnumVal (),
+    be_decl ()
+{
+}
+
 be_enum_val::be_enum_val (ACE_CDR::ULong v,
                           UTL_ScopedName *n)
   : COMMON_Base (),
diff --git a/TAO/TAO_IDL/be/be_eventtype.cpp b/TAO/TAO_IDL/be/be_eventtype.cpp
index 4ddc50d516c..8fd28c68344 100644
--- a/TAO/TAO_IDL/be/be_eventtype.cpp
+++ b/TAO/TAO_IDL/be/be_eventtype.cpp
@@ -1,23 +1,45 @@
+// $Id$
 
-//=============================================================================
-/**
- *  @file    be_eventtype.cpp
- *
- *  $Id$
- *
- *  Extension of class AST_EventType and be_valuetype that provides
- *  additional means for C++ mapping of an eventtype.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_eventtype.cpp
+//
+// = DESCRIPTION
+//    Extension of class AST_EventType and be_valuetype that provides
+//    additional means for C++ mapping of an eventtype.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #include "be_eventtype.h"
 #include "be_visitor.h"
 
 #include "global_extern.h"
 
+// Default constructor.
+be_eventtype::be_eventtype (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    AST_Type (),
+    UTL_Scope (),
+    AST_Interface (),
+    be_scope (),
+    be_decl (),
+    be_type (),
+    be_interface (),
+    AST_ValueType (),
+    be_valuetype (),
+    AST_EventType ()
+{
+}
+
+// Constructor used to build the AST.
 be_eventtype::be_eventtype (UTL_ScopedName *n,
                             AST_Type **inherits,
                             long n_inherits,
diff --git a/TAO/TAO_IDL/be/be_eventtype_fwd.cpp b/TAO/TAO_IDL/be/be_eventtype_fwd.cpp
index ca8b79c2177..423048bc46b 100644
--- a/TAO/TAO_IDL/be/be_eventtype_fwd.cpp
+++ b/TAO/TAO_IDL/be/be_eventtype_fwd.cpp
@@ -1,17 +1,22 @@
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_eventtype_fwd.h
+//
+// = DESCRIPTION
+//    Extension of class be_valuetype_fwd that provides additional
+//    means for C++ mapping of an eventtype.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
-//=============================================================================
-/**
- *  @file    be_eventtype_fwd.cpp
- *
- *  $Id$
- *
- *  Extension of class be_valuetype_fwd that provides additional
- *  means for C++ mapping of an eventtype.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
 
 #include "be_eventtype_fwd.h"
 #include "be_visitor.h"
@@ -20,6 +25,20 @@
 
 #include "global_extern.h"
 
+be_eventtype_fwd::be_eventtype_fwd (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    AST_Type (),
+    AST_InterfaceFwd (),
+    be_decl (),
+    be_type (),
+    be_interface_fwd (),
+    AST_ValueTypeFwd (),
+    be_valuetype_fwd (),
+    AST_EventTypeFwd ()
+{
+}
+
 be_eventtype_fwd::be_eventtype_fwd (AST_Interface *dummy,
                                     UTL_ScopedName *n)
   : COMMON_Base (dummy->is_local (),
diff --git a/TAO/TAO_IDL/be/be_exception.cpp b/TAO/TAO_IDL/be/be_exception.cpp
index ca576b7c2e9..f1eddd37a52 100644
--- a/TAO/TAO_IDL/be/be_exception.cpp
+++ b/TAO/TAO_IDL/be/be_exception.cpp
@@ -1,24 +1,51 @@
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_exception.cpp
+//
+// = DESCRIPTION
+//    Extension of class AST_Exception that provides additional means for C++
+//    mapping of an interface.
+//
+// = AUTHOR
+//    Copyright 1994-1995 by Sun Microsystems, Inc.
+//    and
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
-//=============================================================================
-/**
- *  @file    be_exception.cpp
- *
- *  $Id$
- *
- *  Extension of class AST_Exception that provides additional means for C++
- *  mapping of an interface.
- *
- *
- *  @author Copyright 1994-1995 by Sun Microsystems
- *  @author Inc. and Aniruddha Gokhale
- */
-//=============================================================================
 
 #include "be_exception.h"
 #include "be_visitor.h"
 
 #include "global_extern.h"
 
+ACE_RCSID (be,
+           be_exception,
+           "$Id$")
+
+be_exception::be_exception (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    AST_Type (),
+    AST_ConcreteType (),
+    UTL_Scope (),
+    AST_Structure (),
+    AST_Exception (),
+    be_scope (),
+    be_decl (),
+    be_type (),
+    be_structure ()
+{
+  // Always the case.
+  this->size_type (AST_Type::VARIABLE);
+}
+
 be_exception::be_exception (UTL_ScopedName *n,
                             bool local,
                             bool abstract)
@@ -43,8 +70,7 @@ be_exception::be_exception (UTL_ScopedName *n,
              n),
     be_type (AST_Decl::NT_except,
              n),
-    be_structure (AST_Decl::NT_except,
-                  n,
+    be_structure (n,
                   local,
                   abstract)
 {
diff --git a/TAO/TAO_IDL/be/be_expression.cpp b/TAO/TAO_IDL/be/be_expression.cpp
index 2802dc46423..9fcf363283d 100644
--- a/TAO/TAO_IDL/be/be_expression.cpp
+++ b/TAO/TAO_IDL/be/be_expression.cpp
@@ -1,18 +1,23 @@
+// $Id$
 
-//=============================================================================
-/**
- *  @file    be_expression.cpp
- *
- *  $Id$
- *
- *  Extension of class AST_Expression that provides additional means for C++
- *  mapping.
- *
- *
- *  @author Copyright 1994-1995 by Sun Microsystems
- *  @author Inc. and Aniruddha Gokhale
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_expression.cpp
+//
+// = DESCRIPTION
+//    Extension of class AST_Expression that provides additional means for C++
+//    mapping.
+//
+// = AUTHOR
+//    Copyright 1994-1995 by Sun Microsystems, Inc.
+//    and
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #include "be_expression.h"
 #include "be_visitor.h"
diff --git a/TAO/TAO_IDL/be/be_extended_port.cpp b/TAO/TAO_IDL/be/be_extended_port.cpp
index 079688d40aa..d476e370713 100644
--- a/TAO/TAO_IDL/be/be_extended_port.cpp
+++ b/TAO/TAO_IDL/be/be_extended_port.cpp
@@ -17,8 +17,6 @@ be_extended_port::be_extended_port (
                n),
     AST_Extended_Port (n,
                        porttype_ref),
-    be_decl (AST_Decl::NT_ext_port,
-             n),
     be_field (porttype_ref,
               n)
 {
diff --git a/TAO/TAO_IDL/be/be_factory.cpp b/TAO/TAO_IDL/be/be_factory.cpp
index 5d3d1679097..13653d72dba 100644
--- a/TAO/TAO_IDL/be/be_factory.cpp
+++ b/TAO/TAO_IDL/be/be_factory.cpp
@@ -1,18 +1,23 @@
+// $Id$
 
-//=============================================================================
-/**
- *  @file    be_factory.cpp
- *
- *  $Id$
- *
- *  Extension of class AST_Factory that provides additional means for C++
- *  mapping.
- *
- *
- *  @author Copyright 1994-1995 by Sun Microsystems
- *  @author Inc. and Boris Kolpackov <bosk@ipmce.ru>
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_factory.cpp
+//
+// = DESCRIPTION
+//    Extension of class AST_Factory that provides additional means for C++
+//    mapping.
+//
+// = AUTHOR
+//    Copyright 1994-1995 by Sun Microsystems, Inc.
+//    and
+//    Boris Kolpackov <bosk@ipmce.ru>
+//
+// ============================================================================
 
 #include "be_factory.h"
 #include "be_visitor.h"
@@ -25,6 +30,16 @@
 
 #include "global_extern.h"
 
+be_factory::be_factory (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    UTL_Scope (),
+    AST_Factory (),
+    be_scope (),
+    be_decl ()
+{
+}
+
 be_factory::be_factory (UTL_ScopedName *n)
   : COMMON_Base (1,
                  0), //@@ Always local, never abstract
diff --git a/TAO/TAO_IDL/be/be_field.cpp b/TAO/TAO_IDL/be/be_field.cpp
index 199e6cfbb47..d19f6c3894b 100644
--- a/TAO/TAO_IDL/be/be_field.cpp
+++ b/TAO/TAO_IDL/be/be_field.cpp
@@ -1,18 +1,23 @@
+// $Id$
 
-//=============================================================================
-/**
- *  @file    be_field.cpp
- *
- *  $Id$
- *
- *  Extension of class AST_Field that provides additional means for C++
- *  mapping.
- *
- *
- *  @author Copyright 1994-1995 by Sun Microsystems
- *  @author Inc. and Aniruddha Gokhale
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_field.cpp
+//
+// = DESCRIPTION
+//    Extension of class AST_Field that provides additional means for C++
+//    mapping.
+//
+// = AUTHOR
+//    Copyright 1994-1995 by Sun Microsystems, Inc.
+//    and
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #include "be_field.h"
 #include "be_visitor.h"
@@ -20,6 +25,18 @@
 #include "global_extern.h"
 #include "ace/Log_Msg.h"
 
+ACE_RCSID (be, 
+           be_field, 
+           "$Id$")
+
+be_field::be_field (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    AST_Field (),
+    be_decl ()
+{
+}
+
 be_field::be_field (AST_Type *ft,
                     UTL_ScopedName *n,
                     Visibility vis)
diff --git a/TAO/TAO_IDL/be/be_finder.cpp b/TAO/TAO_IDL/be/be_finder.cpp
deleted file mode 100644
index b2924aa2cd4..00000000000
--- a/TAO/TAO_IDL/be/be_finder.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-
-//=============================================================================
-/**
- *  @file    be_finder.cpp
- *
- *  $Id$
- *
- *  Extension of class AST_Finder that provides additional means for C++
- *  mapping.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
-
-#include "be_finder.h"
-#include "be_visitor.h"
-
-be_finder::be_finder (UTL_ScopedName *n)
-  : COMMON_Base (1,
-                 0), //@@ Always local, never abstract
-    AST_Decl (AST_Decl::NT_finder,
-              n),
-    UTL_Scope (AST_Decl::NT_finder),
-    AST_Factory (n),
-    AST_Finder (n),
-    be_scope (AST_Decl::NT_finder),
-    be_decl (AST_Decl::NT_finder,
-             n),
-    be_factory (n)
-{
-}
-
-be_finder::~be_finder (void)
-{
-}
-
-void
-be_finder::destroy (void)
-{
-  // Call the destroy methods of our base classes.
-  this->be_factory::destroy ();
-  this->AST_Finder::destroy ();
-}
-
-int
-be_finder::accept (be_visitor *visitor)
-{
-  return visitor->visit_finder (this);
-}
-
-IMPL_NARROW_FROM_DECL (be_finder)
-IMPL_NARROW_FROM_SCOPE (be_finder)
diff --git a/TAO/TAO_IDL/be/be_generator.cpp b/TAO/TAO_IDL/be/be_generator.cpp
index 774a6926e69..9d6fb99f38d 100644
--- a/TAO/TAO_IDL/be/be_generator.cpp
+++ b/TAO/TAO_IDL/be/be_generator.cpp
@@ -114,11 +114,14 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "be_typedef.h"
 #include "be_native.h"
 #include "be_factory.h"
-#include "be_finder.h"
 #include "utl_identifier.h"
 #include "nr_extern.h"
 #include "ace/config-all.h"
 
+ACE_RCSID (be,
+           be_generator,
+           "$Id$")
+
 AST_Root *
 be_generator::create_root (UTL_ScopedName *n)
 {
@@ -927,17 +930,6 @@ be_generator::create_factory (UTL_ScopedName *n)
   return retval;
 }
 
-AST_Finder *
-be_generator::create_finder (UTL_ScopedName *n)
-{
-  be_finder *retval = 0;
-  ACE_NEW_RETURN (retval,
-                  be_finder (n),
-                  0);
-
-  return retval;
-}
-
 AST_PortType *
 be_generator::create_porttype (UTL_ScopedName *n)
 {
diff --git a/TAO/TAO_IDL/be/be_global.cpp b/TAO/TAO_IDL/be/be_global.cpp
index 76b02beebf6..3db5efc7e7f 100644
--- a/TAO/TAO_IDL/be/be_global.cpp
+++ b/TAO/TAO_IDL/be/be_global.cpp
@@ -1,17 +1,21 @@
-
-//=============================================================================
-/**
- *  @file    be_global.cpp
- *
- *  $Id$
- *
- *  Stores global data specific to the compiler back end.
- *
- *
- *  @author Jeff Parsons <parsons@cs.wustl.edu>
- */
-//=============================================================================
-
+// $Id$
+
+// ============================================================================
+//
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_global.cpp
+//
+// = DESCRIPTION
+//    Stores global data specific to the compiler back end.
+//
+// = AUTHOR
+//    Jeff Parsons <parsons@cs.wustl.edu>
+//
+// ============================================================================
 
 #include "be_global.h"
 #include "be_codegen.h"
@@ -29,6 +33,10 @@
 #include "ace/OS_NS_sys_stat.h"
 #include "ace/OS_NS_ctype.h"
 
+ACE_RCSID (be,
+           be_global,
+           "$Id$")
+
 TAO_IDL_BE_Export BE_GlobalData *be_global = 0;
 
 BE_GlobalData::BE_GlobalData (void)
@@ -43,8 +51,6 @@ BE_GlobalData::BE_GlobalData (void)
     exec_export_include_ (0),
     svnt_export_macro_ (0),
     svnt_export_include_ (0),
-    conn_export_macro_ (0),
-    conn_export_include_ (0),
     pch_include_ (0),
     pre_include_ (0),
     post_include_ (0),
@@ -75,8 +81,6 @@ BE_GlobalData::BE_GlobalData (void)
     ciao_exec_src_ending_ (ACE::strnew ("_exec.cpp")),
     ciao_exec_stub_hdr_ending_ (ACE::strnew ("EC.h")),
     ciao_exec_idl_ending_ (ACE::strnew ("E.idl")),
-    ciao_conn_hdr_ending_ (ACE::strnew ("_conn.h")),
-    ciao_conn_src_ending_ (ACE::strnew ("_conn.cpp")),
     dds_typesupport_hdr_ending_ (ACE::strnew ("Support.h")),
     output_dir_ (0),
     skel_output_dir_ (0),
@@ -126,14 +130,13 @@ BE_GlobalData::BE_GlobalData (void)
     gen_ciao_svnt_ (false),
     gen_ciao_exec_idl_ (false),
     gen_ciao_exec_impl_ (false),
-    gen_ciao_conn_impl_ (false),
+    gen_component_swapping_ (false),
     gen_ciao_static_config_ (false),
     gen_ciao_valuefactory_reg_ (true),
     gen_stub_export_hdr_file_ (false),
     gen_skel_export_hdr_file_ (false),
     gen_svnt_export_hdr_file_ (false),
     gen_exec_export_hdr_file_ (false),
-    gen_conn_export_hdr_file_ (false),
     gen_lem_force_all_ (false)
 {
 }
@@ -456,24 +459,6 @@ BE_GlobalData::be_get_ciao_exec_idl (
 }
 
 const char *
-BE_GlobalData::be_get_ciao_conn_header (UTL_String *idl_file_name,
-                                        bool base_name_only)
-{
-  return be_change_idl_file_extension (idl_file_name,
-                                       be_global->ciao_conn_header_ending (),
-                                       base_name_only);
-}
-
-const char *
-BE_GlobalData::be_get_ciao_conn_source (UTL_String *idl_file_name,
-                                        bool base_name_only)
-{
-  return be_change_idl_file_extension (idl_file_name,
-                                       be_global->ciao_conn_source_ending (),
-                                       base_name_only);
-}
-
-const char *
 BE_GlobalData::be_get_dds_typesupport_header (
   UTL_String *idl_file_name,
   bool base_name_only)
@@ -630,22 +615,6 @@ BE_GlobalData::be_get_ciao_exec_idl_fname (
       base_name_only);
 }
 
-const char *
-BE_GlobalData::be_get_ciao_conn_hdr_fname (
-  bool base_name_only)
-{
-  return be_get_ciao_conn_header (idl_global->stripped_filename (),
-                                  base_name_only);
-}
-
-const char *
-BE_GlobalData::be_get_ciao_conn_src_fname (
-  bool base_name_only)
-{
-  return be_get_ciao_conn_source (idl_global->stripped_filename (),
-                                  base_name_only);
-}
-
 const char*
 BE_GlobalData::skel_export_macro (void) const
 {
@@ -802,37 +771,6 @@ BE_GlobalData::svnt_export_include (const char *s)
 }
 
 const char*
-BE_GlobalData::conn_export_macro (void) const
-{
-  if (this->conn_export_macro_ == 0)
-    {
-      return "";
-    }
-
-  return this->conn_export_macro_;
-}
-
-void
-BE_GlobalData::conn_export_macro (const char *s)
-{
-  ACE::strdelete (this->conn_export_macro_);
-  this->conn_export_macro_ = ACE::strnew (s);
-}
-
-const char*
-BE_GlobalData::conn_export_include (void) const
-{
-  return this->conn_export_include_;
-}
-
-void
-BE_GlobalData::conn_export_include (const char *s)
-{
-  ACE::strdelete (this->conn_export_include_);
-  this->conn_export_include_ = ACE::strnew (s);
-}
-
-const char*
 BE_GlobalData::pch_include (void) const
 {
   return this->pch_include_;
@@ -1259,32 +1197,6 @@ BE_GlobalData::ciao_exec_idl_ending (void) const
 }
 
 void
-BE_GlobalData::ciao_conn_header_ending (const char* s)
-{
-  ACE::strdelete (this->ciao_conn_hdr_ending_);
-  this->ciao_conn_hdr_ending_ = ACE::strnew (s);
-}
-
-const char*
-BE_GlobalData::ciao_conn_header_ending (void) const
-{
-  return this->ciao_conn_hdr_ending_;
-}
-
-void
-BE_GlobalData::ciao_conn_source_ending (const char* s)
-{
-  ACE::strdelete (this->ciao_conn_src_ending_);
-  this->ciao_conn_src_ending_ = ACE::strnew (s);
-}
-
-const char*
-BE_GlobalData::ciao_conn_source_ending (void) const
-{
-  return this->ciao_conn_src_ending_;
-}
-
-void
 BE_GlobalData::dds_typesupport_hdr_ending (const char* s)
 {
   ACE::strdelete (this->dds_typesupport_hdr_ending_);
@@ -1646,12 +1558,6 @@ BE_GlobalData::destroy (void)
   ACE::strdelete (this->svnt_export_include_);
   this->svnt_export_include_ = 0;
 
-  ACE::strdelete (this->conn_export_macro_);
-  this->conn_export_macro_ = 0;
-
-  ACE::strdelete (this->conn_export_include_);
-  this->conn_export_include_ = 0;
-
   ACE::strdelete (this->pch_include_);
   this->pch_include_ = 0;
 
@@ -1730,15 +1636,6 @@ BE_GlobalData::destroy (void)
   ACE::strdelete (this->ciao_exec_idl_ending_);
   this->ciao_exec_idl_ending_ = 0;
 
-  ACE::strdelete (this->ciao_conn_hdr_ending_);
-  this->ciao_conn_hdr_ending_ = 0;
-
-  ACE::strdelete (this->ciao_conn_src_ending_);
-  this->ciao_conn_src_ending_ = 0;
-
-  ACE::strdelete (this->dds_typesupport_hdr_ending_);
-  this->dds_typesupport_hdr_ending_ = 0;
-
   ACE::strdelete (this->output_dir_);
   this->output_dir_ = 0;
 
@@ -2288,15 +2185,15 @@ BE_GlobalData::gen_ciao_exec_impl (bool val)
 }
 
 bool
-BE_GlobalData::gen_ciao_conn_impl (void) const
+BE_GlobalData::gen_component_swapping (void) const
 {
-  return this->gen_ciao_conn_impl_;
+  return this->gen_component_swapping_;
 }
 
 void
-BE_GlobalData::gen_ciao_conn_impl (bool val)
+BE_GlobalData::gen_component_swapping (bool val)
 {
-  this->gen_ciao_conn_impl_ = val;
+  this->gen_component_swapping_ = val;
 }
 
 bool
@@ -2372,18 +2269,6 @@ BE_GlobalData::gen_exec_export_hdr_file (bool val)
 }
 
 bool
-BE_GlobalData::gen_conn_export_hdr_file (void) const
-{
-  return this->gen_conn_export_hdr_file_;
-}
-
-void
-BE_GlobalData::gen_conn_export_hdr_file (bool val)
-{
-  this->gen_conn_export_hdr_file_ = val;
-}
-
-bool
 BE_GlobalData::gen_lem_force_all (void) const
 {
   return this->gen_lem_force_all_;
@@ -2793,20 +2678,6 @@ BE_GlobalData::parse_args (long &i, char **av)
             // Any operators into a separate set of files.
             be_global->gen_anyop_files (true);
           }
-        else if (av[i][2] == 'c' && av[i][3] == 'n')
-          {
-            // CIAO connector impl code generation.
-            be_global->gen_ciao_conn_impl (true);
-
-            break;
-          }
-        else if (av[i][2] == 'e' && av[i][3] == 'x')
-          {
-            // CIAO executor impl code generation.
-            be_global->gen_ciao_exec_impl (true);
-
-            break;
-          }
         else if (av[i][2] == 's')
           {
             if (av[i][3] == 'p')
@@ -2824,6 +2695,11 @@ BE_GlobalData::parse_args (long &i, char **av)
                 // CIAO servant code generation.
                 be_global->gen_ciao_svnt (true);
               }
+            else if (av[i][3] == 'w')
+              {
+                // CIAO swapping container code generation.
+                be_global->gen_component_swapping (true);
+              }
             else if (av[i][3] == 'c')
               {
                 // CIAO static configuration code generation.
@@ -2841,6 +2717,25 @@ BE_GlobalData::parse_args (long &i, char **av)
 
             break;
           }
+        else if (av[i][2] == 'e')
+          {
+            if (av[i][3] == 'x')
+              {
+                // CIAO executor impl code generation.
+                be_global->gen_ciao_exec_impl (true);
+              }
+            else
+              {
+                ACE_ERROR ((
+                    LM_ERROR,
+                    ACE_TEXT ("IDL: I don't understand ")
+                    ACE_TEXT ("the '%s' option\n"),
+                    av[i]
+                  ));
+              }
+
+            break;
+          }
         else if (av[i][2] == 'x')
           {
             if (av[i][3] == 'h')
@@ -2875,10 +2770,6 @@ BE_GlobalData::parse_args (long &i, char **av)
                   {
                     be_global->gen_exec_export_hdr_file (true);
                   }
-                else if (av[i][4] == 'c' && av[i][5] == 'n')
-                  {
-                    be_global->gen_conn_export_hdr_file (true);
-                  }
                 else
                   {
                     ACE_ERROR ((
@@ -3284,8 +3175,6 @@ BE_GlobalData::prep_be_arg (char *s)
   static const char exec_arg_include[]     = "exec_export_include=";
   static const char svnt_arg_macro[]       = "svnt_export_macro=";
   static const char svnt_arg_include[]     = "svnt_export_include=";
-  static const char conn_arg_macro[]       = "conn_export_macro=";
-  static const char conn_arg_include[]     = "conn_export_include=";
   static const char arg_pch_include[]      = "pch_include=";
   static const char arg_pre_include[]      = "pre_include=";
   static const char arg_post_include[]     = "post_include=";
@@ -3364,16 +3253,6 @@ BE_GlobalData::prep_be_arg (char *s)
           char* val = arg + sizeof (svnt_arg_include) - 1;
           be_global->svnt_export_include (val);
         }
-      else if (ACE_OS::strstr (arg, conn_arg_macro) == arg)
-        {
-          char* val = arg + sizeof (conn_arg_macro) - 1;
-          be_global->conn_export_macro (val);
-        }
-      else if (ACE_OS::strstr (arg, conn_arg_include) == arg)
-        {
-          char* val = arg + sizeof (conn_arg_include) - 1;
-          be_global->conn_export_include (val);
-        }
       else if (ACE_OS::strstr (arg, arg_pch_include) == arg)
         {
           char* val = arg + sizeof (arg_pch_include) - 1;
@@ -3556,18 +3435,6 @@ BE_GlobalData::usage (void) const
     ));
   ACE_DEBUG ((
       LM_DEBUG,
-      ACE_TEXT (" -Wb,conn_export_macro=<macro name>\t\tsets export macro ")
-      ACE_TEXT ("for CIAO connector impl files only, when -Gcn option ")
-      ACE_TEXT ("is used\n")
-    ));
-  ACE_DEBUG ((
-      LM_DEBUG,
-      ACE_TEXT (" -Wb,conn_export_include=<include path>\t\tsets export ")
-      ACE_TEXT ("include file for CIAO connector impl files only, when -Gcn ")
-      ACE_TEXT ("option is used\n")
-    ));
-  ACE_DEBUG ((
-      LM_DEBUG,
       ACE_TEXT (" -Wb,pch_include=<include path>\t\t\tsets include ")
       ACE_TEXT ("file for precompiled header mechanism\n")
     ));
@@ -3762,7 +3629,7 @@ BE_GlobalData::usage (void) const
     ));
   ACE_DEBUG ((
       LM_DEBUG,
-      ACE_TEXT (" -Glfa\t\t\tgenerate executor IDL for all facets ")
+      ACE_TEXT (" -Glfa\t\t\tgenerate executor IDL for all facets")
       ACE_TEXT ("(only for facet interfaces in main file by default)\n")
     ));
   ACE_DEBUG ((
@@ -3772,8 +3639,8 @@ BE_GlobalData::usage (void) const
     ));
   ACE_DEBUG ((
       LM_DEBUG,
-      ACE_TEXT (" -Gcn\t\t\tgenerate CIAO connector implementation ")
-      ACE_TEXT ("code (not generated by default)\n")
+      ACE_TEXT (" -Gsw\t\t\tgenerate CIAO code to support component ")
+      ACE_TEXT ("swapping (not generated by default)\n")
     ));
   ACE_DEBUG ((
       LM_DEBUG,
@@ -3802,11 +3669,6 @@ BE_GlobalData::usage (void) const
     ));
   ACE_DEBUG ((
       LM_DEBUG,
-      ACE_TEXT (" -Gxhcn\t\t\tgenerate export header file ")
-      ACE_TEXT ("for CIAO connector (not generated by default)\n")
-    ));
-  ACE_DEBUG ((
-      LM_DEBUG,
       ACE_TEXT (" -hc\t\t\tClient's header file name ending.")
       ACE_TEXT (" Default is C.h\n")
     ));
diff --git a/TAO/TAO_IDL/be/be_helper.cpp b/TAO/TAO_IDL/be/be_helper.cpp
index 708c791f2a4..d56d7aeb689 100644
--- a/TAO/TAO_IDL/be/be_helper.cpp
+++ b/TAO/TAO_IDL/be/be_helper.cpp
@@ -1,17 +1,23 @@
-
-//=============================================================================
-/**
- *  @file    be_helper.cpp
- *
- *  $Id$
- *
- * Provides helper classes to print generated code to the output
- *
- *
- *  @author Aniruddha Gokhale Improvements by Carlos O'Ryan
- */
-//=============================================================================
-
+// $Id$
+
+// ============================================================================
+//
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_helper.cpp
+//
+// = DESCRIPTION
+//   Provides helper classes to print generated code to the output
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+//    Improvements by Carlos O'Ryan
+//
+// ============================================================================
 
 #include "be_helper.h"
 #include "be_codegen.h"
@@ -25,6 +31,10 @@
 #include "ace/OS_NS_ctype.h"
 #include "../../tao/Version.h"
 
+ACE_RCSID (be,
+           be_helper,
+           "$Id$")
+
 static const char copyright[] =
 "// -*- C++ -*-\n"
 "// $I" "d$\n\n"
@@ -41,6 +51,7 @@ static const char copyright[] =
 " *       University of California at Irvine\n"
 " *       Irvine, CA\n"
 " *       USA\n"
+" *       http://doc.ece.uci.edu/\n"
 " * and\n"
 " *       Institute for Software Integrated Systems\n"
 " *       Vanderbilt University\n"
@@ -529,7 +540,10 @@ TAO_OutStream::print (AST_Expression *expr)
             this->TAO_OutStream::print ("'\\''");
 
           // This handles hex and octal escape sequences
-          // that would print out as weird characters.
+          // that would print out either as weird characters
+          // or as an unsigned number too large for a char.
+          else if ((unsigned char) ev->u.cval > ACE_CHAR_MAX)
+            this->TAO_OutStream::print ("%hd", ev->u.cval);
           else if (ACE_OS::ace_isprint (ev->u.cval))
             this->TAO_OutStream::print ("'%c'", ev->u.cval);
           else if (ACE_OS::ace_iscntrl (ev->u.cval))
@@ -560,10 +574,10 @@ TAO_OutStream::print (AST_Expression *expr)
                   this->TAO_OutStream::print ("'?'");
                   break;
               default:
-                this->TAO_OutStream::print ("'\\x%x'", ev->u.oval);
+                this->TAO_OutStream::print ("'\\x%x'", ev->u.cval);
               }
            else
-            this->TAO_OutStream::print ("'\\x%x'", ev->u.oval);
+            this->TAO_OutStream::print ("'\\x%x'", ev->u.cval);
           break;
         case AST_Expression::EV_wchar:
           this->TAO_OutStream::print ("L'%lc'", ev->u.wcval);
diff --git a/TAO/TAO_IDL/be/be_home.cpp b/TAO/TAO_IDL/be/be_home.cpp
index 9ead4b728d4..beb83897077 100644
--- a/TAO/TAO_IDL/be/be_home.cpp
+++ b/TAO/TAO_IDL/be/be_home.cpp
@@ -1,17 +1,21 @@
+// $Id$
 
-//=============================================================================
-/**
- *  @file    be_home.cpp
- *
- *  $Id$
- *
- *  Extension of class AST_Home that provides additional means for C++
- *  mapping of a component home.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_home.cpp
+//
+// = DESCRIPTION
+//    Extension of class AST_Home that provides additional means for C++
+//    mapping of a component home.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #include "be_home.h"
 #include "be_component.h"
@@ -20,6 +24,24 @@
 #include "global_extern.h"
 #include "utl_err.h"
 
+ACE_RCSID (be,
+           be_home,
+           "$Id$")
+
+be_home::be_home (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    AST_Type (),
+    UTL_Scope (),
+    AST_Interface (),
+    AST_Home (),
+    be_scope (),
+    be_type (),
+    be_interface ()
+{
+  this->size_type (AST_Type::VARIABLE);
+}
+
 be_home::be_home (UTL_ScopedName *n,
                   AST_Home *base_home,
                   AST_Component *managed_component,
@@ -51,8 +73,6 @@ be_home::be_home (UTL_ScopedName *n,
               supports_flat,
               n_supports_flat),
     be_scope (AST_Decl::NT_home),
-    be_decl (AST_Decl::NT_home,
-             n),
     be_type (AST_Decl::NT_home,
              n),
     be_interface (n,
diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp
index 7df1bcf5dc9..097130d2efb 100644
--- a/TAO/TAO_IDL/be/be_interface.cpp
+++ b/TAO/TAO_IDL/be/be_interface.cpp
@@ -1,19 +1,24 @@
-
-//=============================================================================
-/**
- *  @file    be_interface.cpp
- *
- *  $Id$
- *
- *  Extension of class AST_Interface that provides additional means for C++
- *  mapping of an interface.
- *
- *
- *  @author Copyright 1994-1995 by Sun Microsystems
- *  @author Inc. and Aniruddha Gokhale
- *  @author Michael Kircher
- */
-//=============================================================================
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_interface.cpp
+//
+// = DESCRIPTION
+//    Extension of class AST_Interface that provides additional means for C++
+//    mapping of an interface.
+//
+// = AUTHOR
+//    Copyright 1994-1995 by Sun Microsystems, Inc.
+//    and
+//    Aniruddha Gokhale,
+//    Michael Kircher
+//
+// ============================================================================
 
 #include "be_interface.h"
 #include "be_interface_strategy.h"
@@ -41,6 +46,32 @@
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_fcntl.h"
 
+ACE_RCSID (be,
+           be_interface,
+           "$Id$")
+
+// Default constructor.
+be_interface::be_interface (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    AST_Type (),
+    UTL_Scope (),
+    AST_Interface (),
+    be_scope (),
+    be_type (),
+    var_out_seq_decls_gen_ (0),
+    skel_count_ (0),
+    in_mult_inheritance_ (-1),
+    strategy_ (0),
+    original_interface_ (0),
+    has_mixed_parentage_ (-1),
+    session_component_child_ (-1)
+{
+  ACE_NEW (this->strategy_,
+           be_interface_default_strategy (this));
+}
+
+// Constructor used to build the AST.
 be_interface::be_interface (UTL_ScopedName *n,
                             AST_Type **ih,
                             long nih,
@@ -63,8 +94,6 @@ be_interface::be_interface (UTL_ScopedName *n,
                    local,
                    abstract),
     be_scope (AST_Decl::NT_interface),
-    be_decl (AST_Decl::NT_interface,
-             n),
     be_type (AST_Decl::NT_interface,
              n),
     var_out_seq_decls_gen_ (0),
@@ -1371,8 +1400,7 @@ be_interface::analyze_parentage (void)
   AST_Decl::NodeType nt = this->node_type ();
   bool can_be_mixed = nt == AST_Decl::NT_interface
                           || nt == AST_Decl::NT_component
-                          || nt == AST_Decl::NT_home
-                          || nt == AST_Decl::NT_connector;
+                          || nt == AST_Decl::NT_home;
 
   if (this->has_mixed_parentage_ == 1
       && can_be_mixed
@@ -1455,18 +1483,16 @@ be_interface::traverse_inheritance_graph (
                              "dequeue_head failed\n"),
                             -1);
         }
-        
-      AST_Decl::NodeType nt = intf->node_type ();
 
       // If we are doing a home, we check for a parent.
-      if (nt == AST_Decl::NT_home)
+      if (intf->node_type () == AST_Decl::NT_home)
         {
           this->enqueue_base_home_r (
             AST_Home::narrow_from_decl (intf));
         }
 
       // If we are doing a component, we check for a parent.
-      if (nt == AST_Decl::NT_component || nt == AST_Decl::NT_connector)
+      if (intf->node_type () == AST_Decl::NT_component)
         {
           if (add_ccm_object)
             {
@@ -2553,9 +2579,7 @@ be_interface::has_mixed_parentage (void)
 
   AST_Decl::NodeType nt = this->node_type ();
 
-  if (AST_Decl::NT_component == nt
-      || AST_Decl::NT_home == nt
-      || AST_Decl::NT_connector == nt)
+  if (AST_Decl::NT_component == nt || AST_Decl::NT_home == nt)
     {
       return 0;
     }
@@ -2788,9 +2812,7 @@ Facet_Op_Attr_Helper::emit (be_interface * /*derived_interface */,
                             TAO_OutStream *,
                             be_interface *base_interface)
 {
-  AST_Decl::NodeType nt = base_interface->node_type ();
-
-  if (nt == AST_Decl::NT_component || nt == AST_Decl::NT_connector)
+  if (base_interface->node_type () == AST_Decl::NT_component)
     {
       return 0;
     }
diff --git a/TAO/TAO_IDL/be/be_interface_fwd.cpp b/TAO/TAO_IDL/be/be_interface_fwd.cpp
index 9d9a2ea4f9c..0f45d384287 100644
--- a/TAO/TAO_IDL/be/be_interface_fwd.cpp
+++ b/TAO/TAO_IDL/be/be_interface_fwd.cpp
@@ -1,24 +1,45 @@
+// $Id$
 
-//=============================================================================
-/**
- *  @file    be_interface_fwd.cpp
- *
- *  $Id$
- *
- *  Extension of class AST_InterfaceFwd that provides additional means for C++
- *  mapping of an interface.
- *
- *
- *  @author Copyright 1994-1995 by Sun Microsystems
- *  @author Inc. and Aniruddha Gokhale
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_interface_fwd.cpp
+//
+// = DESCRIPTION
+//    Extension of class AST_InterfaceFwd that provides additional means for C++
+//    mapping of an interface.
+//
+// = AUTHOR
+//    Copyright 1994-1995 by Sun Microsystems, Inc.
+//    and
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #include "be_interface_fwd.h"
 #include "be_interface.h"
 #include "be_visitor.h"
 #include "ast_interface.h"
 
+ACE_RCSID (be,
+           be_interface_fwd,
+           "$Id$")
+
+be_interface_fwd::be_interface_fwd (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    AST_Type (),
+    AST_InterfaceFwd (),
+    be_decl (),
+    be_type ()
+{
+  // Always the case.
+  this->size_type (AST_Type::VARIABLE);
+}
+
 be_interface_fwd::be_interface_fwd (AST_Interface *dummy,
                                     UTL_ScopedName *n)
   : COMMON_Base (dummy->is_local (),
diff --git a/TAO/TAO_IDL/be/be_interface_strategy.cpp b/TAO/TAO_IDL/be/be_interface_strategy.cpp
index 82a1d1d639e..4d79368c580 100644
--- a/TAO/TAO_IDL/be/be_interface_strategy.cpp
+++ b/TAO/TAO_IDL/be/be_interface_strategy.cpp
@@ -1,23 +1,32 @@
-
-//=============================================================================
-/**
- *  @file    be_interface_strategy.cpp
- *
- *  $Id$
- *
- *  A strategy to cover the differences between various variants
- *  of an interface
- *
- *
- *  @author Michael Kircher
- */
-//=============================================================================
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_interface_strategy.cpp
+//
+// = DESCRIPTION
+//    A strategy to cover the differences between various variants
+//    of an interface
+//
+// = AUTHOR
+//    Michael Kircher
+//
+// ============================================================================
 
 #include "be_interface_strategy.h"
 #include "be_interface.h"
 #include "be_extern.h"
 #include "utl_identifier.h"
 
+ACE_RCSID (be,
+           be_interface_strategy,
+           "$Id$")
+
+
 be_interface_strategy::be_interface_strategy (be_interface *node,
                                               Strategy_Kind strategy_type)
   : local_name_(0),
diff --git a/TAO/TAO_IDL/be/be_mirror_port.cpp b/TAO/TAO_IDL/be/be_mirror_port.cpp
index 7b330b35869..952bf7e06dc 100644
--- a/TAO/TAO_IDL/be/be_mirror_port.cpp
+++ b/TAO/TAO_IDL/be/be_mirror_port.cpp
@@ -19,8 +19,6 @@ be_mirror_port::be_mirror_port (
                        porttype_ref),
     AST_Mirror_Port (n,
                      porttype_ref),
-    be_decl (AST_Decl::NT_interface,
-             n),
     be_field (porttype_ref,
               n),
     be_extended_port (n,
diff --git a/TAO/TAO_IDL/be/be_module.cpp b/TAO/TAO_IDL/be/be_module.cpp
index 12830451390..88d73078ad8 100644
--- a/TAO/TAO_IDL/be/be_module.cpp
+++ b/TAO/TAO_IDL/be/be_module.cpp
@@ -1,22 +1,40 @@
+// $Id$
 
-//=============================================================================
-/**
- *  @file    be_module.cpp
- *
- *  $Id$
- *
- *  Extension of class AST_Module that provides additional means for C++
- *  mapping of a module
- *
- *
- *  @author Copyright 1994-1995 by Sun Microsystems
- *  @author Inc. and Aniruddha Gokhale
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_module.cpp
+//
+// = DESCRIPTION
+//    Extension of class AST_Module that provides additional means for C++
+//    mapping of a module
+//
+// = AUTHOR
+//    Copyright 1994-1995 by Sun Microsystems, Inc.
+//    and
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #include "be_module.h"
 #include "be_visitor.h"
 
+ACE_RCSID (be,
+           be_module,
+           "$Id$")
+
+be_module::be_module (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    UTL_Scope (),
+    be_scope (),
+    be_decl ()
+{
+}
+
 be_module::be_module (UTL_ScopedName *n)
   : COMMON_Base (),
     AST_Decl (AST_Decl::NT_module,
diff --git a/TAO/TAO_IDL/be/be_native.cpp b/TAO/TAO_IDL/be/be_native.cpp
index 07a69c8df18..3c439fe2097 100644
--- a/TAO/TAO_IDL/be/be_native.cpp
+++ b/TAO/TAO_IDL/be/be_native.cpp
@@ -1,20 +1,44 @@
+// $Id$
 
-//=============================================================================
-/**
- *  @file    be_native.cpp
- *
- *  $Id$
- *
- *  The native IDL type
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_native.cpp
+//
+// = DESCRIPTION
+//    The native IDL type
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #include "be_native.h"
 #include "be_visitor.h"
 
+ACE_RCSID (be,
+           be_native,
+           "$Id$")
+
+
+be_native::be_native (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    AST_Type (),
+    AST_ConcreteType (),
+    UTL_Scope (),
+    AST_Structure (),
+    AST_Native (),
+    be_scope (),
+    be_decl (),
+    be_type (),
+    be_exception ()
+{
+}
+
 be_native::be_native (UTL_ScopedName *n)
   : COMMON_Base (),
     AST_Decl (AST_Decl::NT_native,
@@ -36,9 +60,6 @@ be_native::be_native (UTL_ScopedName *n)
              n),
     be_type (AST_Decl::NT_native,
              n),
-    be_structure (n,
-                  true,
-                  false),
     be_exception (n,
                   true,
                   false)
diff --git a/TAO/TAO_IDL/be/be_null_return_emitter.cpp b/TAO/TAO_IDL/be/be_null_return_emitter.cpp
index d8b689dbf4e..ba97a4d4afa 100644
--- a/TAO/TAO_IDL/be/be_null_return_emitter.cpp
+++ b/TAO/TAO_IDL/be/be_null_return_emitter.cpp
@@ -1,18 +1,21 @@
+// $Id$
 
-//=============================================================================
-/**
- *  @file    be_null_return_emitter.cpp
- *
- *  $Id$
- *
- *  Emits 'return x;' for all CORBA types and ACE-supported
- *  platforms.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO_IDL_BE
+//
+// = FILENAME
+//    be_null_return_emitter.cpp
+//
+// = DESCRIPTION
+//    Emits 'return x;' for all CORBA types and ACE-supported
+//    platforms.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #include "be_null_return_emitter.h"
 #include "be_visitor_null_return_value.h"
@@ -22,6 +25,10 @@
 #include "be_structure.h"
 #include "be_union.h"
 
+ACE_RCSID (be, 
+           be_null_return_emitter, 
+           "$Id$")
+
 be_null_return_emitter::be_null_return_emitter (
     be_visitor_context *ctx)
   : ctx_ (ctx),
diff --git a/TAO/TAO_IDL/be/be_operation.cpp b/TAO/TAO_IDL/be/be_operation.cpp
index 7caa058666a..9c59d831a46 100644
--- a/TAO/TAO_IDL/be/be_operation.cpp
+++ b/TAO/TAO_IDL/be/be_operation.cpp
@@ -1,18 +1,23 @@
-
-//=============================================================================
-/**
- *  @file    be_operation.cpp
- *
- *  $Id$
- *
- *  Extension of class AST_Operation that provides additional means for C++
- *  mapping.
- *
- *
- *  @author Copyright 1994-1995 by Sun Microsystems
- *  @author Inc. and Aniruddha Gokhale
- */
-//=============================================================================
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_operation.cpp
+//
+// = DESCRIPTION
+//    Extension of class AST_Operation that provides additional means for C++
+//    mapping.
+//
+// = AUTHOR
+//    Copyright 1994-1995 by Sun Microsystems, Inc.
+//    and
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #include "be_operation.h"
 #include "be_operation_strategy.h"
@@ -27,6 +32,19 @@
 
 #include "global_extern.h"
 
+be_operation::be_operation (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    UTL_Scope (),
+    AST_Operation (),
+    be_scope (),
+    be_decl (),
+    original_operation_ (0)
+{
+  ACE_NEW (this->strategy_,
+           be_operation_default_strategy (this));
+}
+
 be_operation::be_operation (AST_Type *rt,
                             AST_Operation::Flags fl,
                             UTL_ScopedName *n,
diff --git a/TAO/TAO_IDL/be/be_operation_strategy.cpp b/TAO/TAO_IDL/be/be_operation_strategy.cpp
index 2136d86e0e0..95ec61dc61c 100644
--- a/TAO/TAO_IDL/be/be_operation_strategy.cpp
+++ b/TAO/TAO_IDL/be/be_operation_strategy.cpp
@@ -1,21 +1,29 @@
-
-//=============================================================================
-/**
- *  @file    be_operation_strategy.cpp
- *
- *  $Id$
- *
- *  A strategy to cover the differences between various variants
- *  of an operations, e.g. AMI sendc_, AMI raise_
- *
- *
- *  @author Michael Kircher
- */
-//=============================================================================
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_operation_strategy.cpp
+//
+// = DESCRIPTION
+//    A strategy to cover the differences between various variants
+//    of an operations, e.g. AMI sendc_, AMI raise_
+//
+// = AUTHOR
+//    Michael Kircher
+//
+// ============================================================================
 
 #include "be_operation_strategy.h"
 #include "be_operation.h"
 
+ACE_RCSID (be,
+           be_operation_strategy,
+           "$Id$")
+
 be_operation_strategy::be_operation_strategy (be_operation *node,
                                               Strategy_Kind strategy_type)
   : node_ (node),
@@ -165,7 +173,6 @@ be_operation_ami_sendc_strategy::marshaling (void)
   return marshaling_;
 }
 
-
 be_operation*
 be_operation_ami_sendc_strategy::arguments (void)
 {
@@ -353,8 +360,7 @@ be_operation_amh_strategy::arguments (void)
 
 int
 be_operation_amh_strategy::has_extra_code_generation (
-    TAO_CodeGen::CG_STATE
-  )
+    TAO_CodeGen::CG_STATE)
 {
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_param_holder.cpp b/TAO/TAO_IDL/be/be_param_holder.cpp
index 2e51be56b44..a0b13e44f91 100644
--- a/TAO/TAO_IDL/be/be_param_holder.cpp
+++ b/TAO/TAO_IDL/be/be_param_holder.cpp
@@ -1,18 +1,21 @@
-
-//=============================================================================
-/**
- *  @file    be_param_holder.cpp
- *
- *  $Id$
- *
- *  Place holder referenced by AST_Field (or subclass) 
- *  representing a corresponding template parameter in IDL.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_param_holder.cpp
+//
+// = DESCRIPTION
+//    Place holder referenced by AST_Field (or subclass) 
+//    representing a corresponding template parameter in IDL.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #include "be_param_holder.h"
 #include "be_visitor.h"
diff --git a/TAO/TAO_IDL/be/be_porttype.cpp b/TAO/TAO_IDL/be/be_porttype.cpp
index c0eef67e4fa..03f7585d0da 100644
--- a/TAO/TAO_IDL/be/be_porttype.cpp
+++ b/TAO/TAO_IDL/be/be_porttype.cpp
@@ -8,8 +8,6 @@ be_porttype::be_porttype (UTL_ScopedName *n)
                  false),
     AST_Decl (AST_Decl::NT_porttype,
               n),
-    AST_Type (AST_Decl::NT_porttype,
-              n),
     UTL_Scope (AST_Decl::NT_porttype),
     AST_PortType (n),
     be_scope (AST_Decl::NT_porttype),
diff --git a/TAO/TAO_IDL/be/be_predefined_type.cpp b/TAO/TAO_IDL/be/be_predefined_type.cpp
index 4370f2e4ccf..7b7ef968486 100644
--- a/TAO/TAO_IDL/be/be_predefined_type.cpp
+++ b/TAO/TAO_IDL/be/be_predefined_type.cpp
@@ -1,18 +1,23 @@
+// $Id$
 
-//=============================================================================
-/**
- *  @file    be_predefined_type.cpp
- *
- *  $Id$
- *
- *  Extension of class AST_PredefinedType that provides additional means for C++
- *  mapping.
- *
- *
- *  @author Copyright 1994-1995 by Sun Microsystems
- *  @author Inc. and Aniruddha Gokhale
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_predefined_type.cpp
+//
+// = DESCRIPTION
+//    Extension of class AST_PredefinedType that provides additional means for C++
+//    mapping.
+//
+// = AUTHOR
+//    Copyright 1994-1995 by Sun Microsystems, Inc.
+//    and
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #include "be_predefined_type.h"
 #include "be_visitor.h"
@@ -24,9 +29,23 @@
 #include "ace/ACE.h"
 #include "ace/OS_NS_stdio.h"
 
-be_predefined_type::be_predefined_type (
-      AST_PredefinedType::PredefinedType t,
-      UTL_ScopedName *n)
+ACE_RCSID (be,
+           be_predefined_type,
+           "$Id$")
+
+be_predefined_type::be_predefined_type (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    AST_Type (),
+    AST_ConcreteType (),
+    AST_PredefinedType (),
+    be_decl (),
+    be_type ()
+{
+}
+
+be_predefined_type::be_predefined_type (AST_PredefinedType::PredefinedType t,
+                                        UTL_ScopedName *n)
   : COMMON_Base (),
     AST_Decl (AST_Decl::NT_pre_defined,
               n,
diff --git a/TAO/TAO_IDL/be/be_produce.cpp b/TAO/TAO_IDL/be/be_produce.cpp
index 425bccc2ee9..4300a53bd8e 100644
--- a/TAO/TAO_IDL/be/be_produce.cpp
+++ b/TAO/TAO_IDL/be/be_produce.cpp
@@ -228,7 +228,8 @@ BE_produce (void)
       BE_visit_root (root_svs_visitor, "CIAO executor IDL");
     }
 
-  if (be_global->gen_ciao_exec_impl ())
+  // We can eliminate some overhead in IDL files without components.
+  if (be_global->gen_ciao_exec_impl () && idl_global->component_seen_)
     {
       ctx.state (TAO_CodeGen::TAO_ROOT_EXH);
       be_visitor_root_exh root_exh_visitor (&ctx);
@@ -239,17 +240,6 @@ BE_produce (void)
       BE_visit_root (root_exs_visitor, "CIAO exec impl source");
     }
     
-  if (be_global->gen_ciao_conn_impl ())
-    {
-      ctx.state (TAO_CodeGen::TAO_ROOT_CNH);
-      be_visitor_root_cnh root_cnh_visitor (&ctx);
-      BE_visit_root (root_cnh_visitor, "CIAO conn impl header");
-
-      ctx.state (TAO_CodeGen::TAO_ROOT_CNS);
-      be_visitor_root_cns root_cns_visitor (&ctx);
-      BE_visit_root (root_cns_visitor, "CIAO conn impl source");
-    }
-    
   tao_cg->gen_export_files ();
 
   // Done with this IDL file.
diff --git a/TAO/TAO_IDL/be/be_provides.cpp b/TAO/TAO_IDL/be/be_provides.cpp
index e58276a3cc8..f336f1188f3 100644
--- a/TAO/TAO_IDL/be/be_provides.cpp
+++ b/TAO/TAO_IDL/be/be_provides.cpp
@@ -284,9 +284,7 @@ be_facet_op_attr_defn_helper::emit (be_interface * /* derived_interface */,
                                     TAO_OutStream *os,
                                     be_interface *base_interface)
 {
-  AST_Decl::NodeType nt = base_interface->node_type ();
-
-  if (nt == AST_Decl::NT_component || nt == AST_Decl::NT_connector)
+  if (base_interface->node_type () == AST_Decl::NT_component)
     {
       return 0;
     }
diff --git a/TAO/TAO_IDL/be/be_root.cpp b/TAO/TAO_IDL/be/be_root.cpp
index 4044a2f912d..dab2e285df8 100644
--- a/TAO/TAO_IDL/be/be_root.cpp
+++ b/TAO/TAO_IDL/be/be_root.cpp
@@ -1,18 +1,23 @@
+// $Id$
 
-//=============================================================================
-/**
- *  @file    be_root.cpp
- *
- *  $Id$
- *
- *  Extension of class AST_Root that provides additional means for C++
- *  mapping.
- *
- *
- *  @author Copyright 1994-1995 by Sun Microsystems
- *  @author Inc. and Aniruddha Gokhale
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_root.cpp
+//
+// = DESCRIPTION
+//    Extension of class AST_Root that provides additional means for C++
+//    mapping.
+//
+// = AUTHOR
+//    Copyright 1994-1995 by Sun Microsystems, Inc.
+//    and
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #include "be_root.h"
 #include "be_visitor.h"
@@ -20,6 +25,22 @@
 #include "ast_string.h"
 #include "ast_array.h"
 
+ACE_RCSID (be, 
+           be_root, 
+           "$Id$")
+
+// Default Constructor.
+be_root::be_root (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    UTL_Scope (),
+    AST_Root (),
+    be_scope (),
+    be_decl ()
+{
+}
+
+// Constructor used to build the root of the abstract syntax tree (AST).
 be_root::be_root (UTL_ScopedName *n)
   : COMMON_Base (),
     AST_Decl (AST_Decl::NT_root,
@@ -37,6 +58,48 @@ be_root::~be_root (void)
 {
 }
 
+// We had to provide these since the AST_Root::fe_* method was setting the
+// names of these three to "local type".
+
+// Add this AST_Sequence to the locally defined types in this scope.
+AST_Sequence *
+be_root::fe_add_sequence (AST_Sequence *t)
+{
+  if (t == 0)
+    {
+      return 0;
+    }
+
+  add_to_local_types (t);
+  return t;
+}
+
+// Add this AST_String to the locally defined types in this scope
+AST_String *
+be_root::fe_add_string (AST_String *t)
+{
+  if (t == 0)
+    {
+      return 0;
+    }
+
+  add_to_local_types (t);
+  return t;
+}
+
+// Add this AST_Array to the locally defined types in this scope
+AST_Array *
+be_root::fe_add_array (AST_Array *t)
+{
+  if (t == 0)
+    {
+      return 0;
+    }
+
+  add_to_local_types (t);
+  return t;
+}
+
 void
 be_root::destroy (void)
 {
diff --git a/TAO/TAO_IDL/be/be_scope.cpp b/TAO/TAO_IDL/be/be_scope.cpp
index cd1381b1d03..ce0663c8be7 100644
--- a/TAO/TAO_IDL/be/be_scope.cpp
+++ b/TAO/TAO_IDL/be/be_scope.cpp
@@ -4,7 +4,7 @@
 #include "be_scope.h"
 #include "be_valuetype.h"
 #include "be_eventtype.h"
-#include "be_connector.h"
+#include "be_component.h"
 #include "be_home.h"
 #include "be_module.h"
 #include "be_exception.h"
@@ -13,7 +13,6 @@
 #include "be_enum.h"
 #include "be_operation.h"
 #include "be_factory.h"
-#include "be_finder.h"
 #include "be_root.h"
 #include "be_visitor.h"
 
@@ -75,8 +74,6 @@ be_scope::decl (void)
       return be_eventtype::narrow_from_scope (this);
     case AST_Decl::NT_component:
       return be_component::narrow_from_scope (this);
-    case AST_Decl::NT_connector:
-      return be_connector::narrow_from_scope (this);
     case AST_Decl::NT_home:
       return be_home::narrow_from_scope (this);
     case AST_Decl::NT_module:
@@ -95,8 +92,6 @@ be_scope::decl (void)
       return be_operation::narrow_from_scope (this);
     case AST_Decl::NT_factory:
       return be_factory::narrow_from_scope (this);
-    case AST_Decl::NT_finder:
-      return be_finder::narrow_from_scope (this);
     default:
       return (be_decl *)0;
     }
diff --git a/TAO/TAO_IDL/be/be_sequence.cpp b/TAO/TAO_IDL/be/be_sequence.cpp
index 8cfe07450a1..63e4bce34e6 100644
--- a/TAO/TAO_IDL/be/be_sequence.cpp
+++ b/TAO/TAO_IDL/be/be_sequence.cpp
@@ -1,18 +1,23 @@
-
-//=============================================================================
-/**
- *  @file    be_sequence.cpp
- *
- *  $Id$
- *
- *  Extension of class AST_Sequence that provides additional means for C++
- *  mapping.
- *
- *
- *  @author Copyright 1994-1995 by Sun Microsystems
- *  @author Inc. and Aniruddha Gokhale
- */
-//=============================================================================
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_sequence.cpp
+//
+// = DESCRIPTION
+//    Extension of class AST_Sequence that provides additional means for C++
+//    mapping.
+//
+// = AUTHOR
+//    Copyright 1994-1995 by Sun Microsystems, Inc.
+//    and
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #include "be_sequence.h"
 #include "be_typedef.h"
@@ -31,6 +36,23 @@
 
 #include "ace/Log_Msg.h"
 
+be_sequence::be_sequence (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    AST_Type (),
+    AST_ConcreteType (),
+    AST_Sequence (),
+    UTL_Scope (),
+    be_scope (),
+    be_decl (),
+    be_type (),
+    mt_ (be_sequence::MNG_UNKNOWN),
+    field_node_ (0)
+{
+  // Always the case.
+  this->has_constructor (true);
+}
+
 be_sequence::be_sequence (AST_Expression *v,
                           AST_Type *t,
                           UTL_ScopedName *n,
@@ -183,6 +205,7 @@ be_sequence::gen_name (void)
       // template and non-template implementations of IDL sequences.
       UTL_Scope *parent = this->defined_in ();
       seq->set_defined_in (parent);
+      parent->add_sequence (seq);
       char *seq_name = seq->gen_name ();
 
       ACE_OS::sprintf (namebuf,
@@ -311,7 +334,6 @@ be_sequence::managed_type (void)
           case AST_Decl::NT_interface_fwd:
           case AST_Decl::NT_component:
           case AST_Decl::NT_component_fwd:
-          case AST_Decl::NT_connector:
             this->mt_ = be_sequence::MNG_OBJREF;
             break;
           case AST_Decl::NT_valuebox:
diff --git a/TAO/TAO_IDL/be/be_string.cpp b/TAO/TAO_IDL/be/be_string.cpp
index b16aeb60867..4be5b3bd792 100644
--- a/TAO/TAO_IDL/be/be_string.cpp
+++ b/TAO/TAO_IDL/be/be_string.cpp
@@ -1,18 +1,23 @@
-
-//=============================================================================
-/**
- *  @file    be_string.cpp
- *
- *  $Id$
- *
- *  Extension of class AST_String that provides additional means for C++
- *  mapping.
- *
- *
- *  @author Copyright 1994-1995 by Sun Microsystems
- *  @author Inc. and Aniruddha Gokhale
- */
-//=============================================================================
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_string.cpp
+//
+// = DESCRIPTION
+//    Extension of class AST_String that provides additional means for C++
+//    mapping.
+//
+// = AUTHOR
+//    Copyright 1994-1995 by Sun Microsystems, Inc.
+//    and
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #include "be_string.h"
 #include "be_visitor.h"
@@ -21,6 +26,22 @@
 #include "utl_identifier.h"
 #include "global_extern.h"
 
+ACE_RCSID (be,
+           be_string,
+           "$Id$")
+
+be_string::be_string (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    AST_Type (),
+    AST_String (),
+    be_decl (),
+    be_type ()
+{
+  // Always the case.
+  this->size_type (AST_Type::VARIABLE);
+}
+
 be_string::be_string (AST_Decl::NodeType nt,
                       UTL_ScopedName * n,
                       AST_Expression * v,
@@ -31,8 +52,6 @@ be_string::be_string (AST_Decl::NodeType nt,
               true),
     AST_Type (nt,
               n),
-    AST_ConcreteType (nt,
-                      n),
     AST_String (nt,
                 n,
                 v,
diff --git a/TAO/TAO_IDL/be/be_structure.cpp b/TAO/TAO_IDL/be/be_structure.cpp
index 39141f84456..dd4522e1d27 100644
--- a/TAO/TAO_IDL/be/be_structure.cpp
+++ b/TAO/TAO_IDL/be/be_structure.cpp
@@ -1,18 +1,23 @@
+// $Id$
 
-//=============================================================================
-/**
- *  @file    be_structure.cpp
- *
- *  $Id$
- *
- *  Extension of class AST_Structure that provides additional means for C++
- *  mapping.
- *
- *
- *  @author Copyright 1994-1995 by Sun Microsystems
- *  @author Inc. and Aniruddha Gokhale
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_structure.cpp
+//
+// = DESCRIPTION
+//    Extension of class AST_Structure that provides additional means for C++
+//    mapping.
+//
+// = AUTHOR
+//    Copyright 1994-1995 by Sun Microsystems, Inc.
+//    and
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #include "be_structure.h"
 #include "be_field.h"
@@ -25,6 +30,19 @@
 #include "idl_defines.h"
 #include "global_extern.h"
 
+be_structure::be_structure (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    AST_Type (),
+    AST_ConcreteType (),
+    UTL_Scope (),
+    AST_Structure (),
+    be_scope (),
+    be_decl (),
+    be_type ()
+{
+}
+
 be_structure::be_structure (UTL_ScopedName *n,
                             bool local,
                             bool abstract)
@@ -52,35 +70,6 @@ be_structure::be_structure (UTL_ScopedName *n,
     }
 }
 
-be_structure::be_structure (AST_Decl::NodeType nt,
-                            UTL_ScopedName *n,
-                            bool local,
-                            bool abstract)
-  : COMMON_Base (local,
-                 abstract),
-    AST_Decl (nt,
-              n),
-    AST_Type (nt,
-              n),
-    AST_ConcreteType (nt,
-                      n),
-    UTL_Scope (nt),
-    AST_Structure (nt,
-                   n,
-                   local,
-                   abstract),
-    be_scope (nt),
-    be_decl (nt,
-             n),
-    be_type (nt,
-             n)
-{
-  if (!this->imported ())
-    {
-      idl_global->aggregate_seen_ = true;
-    }
-}
-
 void
 be_structure::redefine (AST_Structure *from)
 {
diff --git a/TAO/TAO_IDL/be/be_structure_fwd.cpp b/TAO/TAO_IDL/be/be_structure_fwd.cpp
index 6c3bf9d2559..5346ffb3f14 100644
--- a/TAO/TAO_IDL/be/be_structure_fwd.cpp
+++ b/TAO/TAO_IDL/be/be_structure_fwd.cpp
@@ -1,21 +1,39 @@
+// $Id$
 
-//=============================================================================
-/**
- *  @file    be_structure_fwd.cpp
- *
- *  $Id$
- *
- *  Extension of class AST_StructureFwd that provides additional means for C++
- *  mapping of a struct.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_structure_fwd.cpp
+//
+// = DESCRIPTION
+//    Extension of class AST_StructureFwd that provides additional means for C++
+//    mapping of a struct.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #include "be_structure_fwd.h"
 #include "be_visitor.h"
 
+ACE_RCSID (be, 
+           be_structure_fwd, 
+           "$Id$")
+
+be_structure_fwd::be_structure_fwd (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    AST_Type (),
+    AST_StructureFwd (),
+    be_decl (),
+    be_type ()
+{
+}
+
 be_structure_fwd::be_structure_fwd (AST_Structure *dummy,
                                     UTL_ScopedName *n)
   : COMMON_Base (),
diff --git a/TAO/TAO_IDL/be/be_template_module.cpp b/TAO/TAO_IDL/be/be_template_module.cpp
index 86ada735c42..57842da91a4 100644
--- a/TAO/TAO_IDL/be/be_template_module.cpp
+++ b/TAO/TAO_IDL/be/be_template_module.cpp
@@ -12,8 +12,6 @@ be_template_module::be_template_module (
               n),
     UTL_Scope (AST_Decl::NT_module),
     AST_Module (n),
-    AST_Type (AST_Decl::NT_module,
-              n),
     AST_Template_Module (n,
                          template_params),
     be_scope (AST_Decl::NT_module),
diff --git a/TAO/TAO_IDL/be/be_type.cpp b/TAO/TAO_IDL/be/be_type.cpp
index c17342ac563..59799f69749 100644
--- a/TAO/TAO_IDL/be/be_type.cpp
+++ b/TAO/TAO_IDL/be/be_type.cpp
@@ -1,18 +1,23 @@
+// $Id$
 
-//=============================================================================
-/**
- *  @file    be_type.cpp
- *
- *  $Id$
- *
- *  Extension of class AST_Type that provides additional means for C++
- *  mapping.
- *
- *
- *  @author Copyright 1994-1995 by Sun Microsystems
- *  @author Inc. and Aniruddha Gokhale
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_type.cpp
+//
+// = DESCRIPTION
+//    Extension of class AST_Type that provides additional means for C++
+//    mapping.
+//
+// = AUTHOR
+//    Copyright 1994-1995 by Sun Microsystems, Inc.
+//    and
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #include "be_type.h"
 #include "be_scope.h"
@@ -23,6 +28,22 @@
 #include "idl_defines.h"
 #include "nr_extern.h"
 
+ACE_RCSID (be,
+           be_type,
+           "$Id$")
+
+be_type::be_type (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    AST_Type (),
+    be_decl (),
+    tc_name_ (0),
+    common_varout_gen_ (false),
+    seen_in_sequence_ (false),
+    seen_in_operation_ (false)
+{
+}
+
 be_type::be_type (AST_Decl::NodeType nt,
                   UTL_ScopedName *n)
   : COMMON_Base (),
diff --git a/TAO/TAO_IDL/be/be_typedef.cpp b/TAO/TAO_IDL/be/be_typedef.cpp
index 4cd3107942b..f62d3be7b35 100644
--- a/TAO/TAO_IDL/be/be_typedef.cpp
+++ b/TAO/TAO_IDL/be/be_typedef.cpp
@@ -1,18 +1,23 @@
-
-//=============================================================================
-/**
- *  @file    be_typedef.cpp
- *
- *  $Id$
- *
- *  Extension of class AST_Typedef that provides additional means for C++
- *  mapping.
- *
- *
- *  @author Copyright 1994-1995 by Sun Microsystems
- *  @author Inc. and Aniruddha Gokhale
- */
-//=============================================================================
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_typedef.cpp
+//
+// = DESCRIPTION
+//    Extension of class AST_Typedef that provides additional means for C++
+//    mapping.
+//
+// = AUTHOR
+//    Copyright 1994-1995 by Sun Microsystems, Inc.
+//    and
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #include "be_typedef.h"
 #include "be_visitor.h"
diff --git a/TAO/TAO_IDL/be/be_union.cpp b/TAO/TAO_IDL/be/be_union.cpp
index 660bdf84aab..aa3552f9fd8 100644
--- a/TAO/TAO_IDL/be/be_union.cpp
+++ b/TAO/TAO_IDL/be/be_union.cpp
@@ -1,18 +1,23 @@
-
-//=============================================================================
-/**
- *  @file    be_union.cpp
- *
- *  $Id$
- *
- *  Extension of class AST_Union that provides additional means for C++
- *  mapping.
- *
- *
- *  @author Copyright 1994-1995 by Sun Microsystems
- *  @author Inc. and Aniruddha Gokhale
- */
-//=============================================================================
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_union.cpp
+//
+// = DESCRIPTION
+//    Extension of class AST_Union that provides additional means for C++
+//    mapping.
+//
+// = AUTHOR
+//    Copyright 1994-1995 by Sun Microsystems, Inc.
+//    and
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #include "be_union.h"
 #include "be_union_branch.h"
@@ -28,6 +33,27 @@
 #include "idl_defines.h"
 #include "global_extern.h"
 
+ACE_RCSID (be,
+           be_union,
+           "$Id$")
+
+
+be_union::be_union (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    AST_Type (),
+    AST_ConcreteType (),
+    UTL_Scope (),
+    AST_Structure (),
+    AST_Union (),
+    be_scope (),
+    be_decl (),
+    be_type ()
+{
+  // Always the case.
+  this->has_constructor (true);
+}
+
 be_union::be_union (AST_ConcreteType *dt,
                     UTL_ScopedName *n,
                     bool local,
@@ -205,68 +231,49 @@ be_union::gen_empty_default_label (void)
     }
 
   AST_ConcreteType *disc = this->disc_type ();
-  if (disc == 0)
-    {
-      return true; // In reality this is an error.
-    }
-
   AST_Decl::NodeType nt = disc->node_type ();
-  ACE_UINT64 n_labels = this->nlabels ();
+  unsigned long n_labels = this->nlabels ();
 
   if (nt == AST_Decl::NT_enum)
     {
-      // Enums in CORBA are always 32bits in size, so unless
-      // there are that many enum labels in the set, it is
-      // incomplete (reguardless as to the actual member_count).
-      return (n_labels <= ACE_UINT32_MAX);
+      AST_Enum *e = AST_Enum::narrow_from_decl (disc);
+      
+      if (e == 0)
+        {
+          return true;
+        }
+
+      // If we have an enum and the number of labels if as big as the enum
+      // has members we don't have to generate a default label
+      if (n_labels == static_cast<unsigned long> (e->member_count ()))
+        {
+           return false;
+        }
+      else
+        {
+          return true;
+        }
     }
 
   AST_PredefinedType *pdt = AST_PredefinedType::narrow_from_decl (disc);
+
   if (pdt == 0)
     {
-      return true; // In reality this is an error.
+      return true;
     }
 
-  switch (pdt->pt ())
+  if (pdt->pt () == AST_PredefinedType::PT_boolean && n_labels == 2)
     {
-    case AST_PredefinedType::PT_boolean:
-      return (n_labels < 2);
-
-    case AST_PredefinedType::PT_char:
-      return (n_labels <= ACE_OCTET_MAX);
-
-    case AST_PredefinedType::PT_short:
-    case AST_PredefinedType::PT_ushort:
-      return (n_labels <= ACE_UINT16_MAX);
-
-    case AST_PredefinedType::PT_long:
-    case AST_PredefinedType::PT_ulong:
-      return (n_labels <= ACE_UINT32_MAX);
-
-    case AST_PredefinedType::PT_longlong:
-    case AST_PredefinedType::PT_ulonglong:
-      // We would wrap to 0 here - we are using a 64 bit count
-      // this case is so marginal as to always be incomplete.
-      return true;
-
-    // Keep fussy compilers happy.
-    default:
-      break;
+      return false;
     }
 
   return true;
 }
 
-AST_UnionBranch *
-be_union::be_add_union_branch (AST_UnionBranch *b)
-{
-  return this->fe_add_union_branch (b);
-}
-
-ACE_UINT64
+unsigned long
 be_union::nlabels (void)
 {
-  ACE_UINT64 retval = 0;
+  unsigned long retval = 0;
 
   for (UTL_ScopeActiveIterator si (this, UTL_Scope::IK_decls);
        !si.is_done ();
diff --git a/TAO/TAO_IDL/be/be_union_branch.cpp b/TAO/TAO_IDL/be/be_union_branch.cpp
index 288f79e1fce..aab57f0735c 100644
--- a/TAO/TAO_IDL/be/be_union_branch.cpp
+++ b/TAO/TAO_IDL/be/be_union_branch.cpp
@@ -1,18 +1,23 @@
-
-//=============================================================================
-/**
- *  @file    be_union_branch.cpp
- *
- *  $Id$
- *
- *  Extension of class AST_UnionBranch that provides additional means for C++
- *  mapping.
- *
- *
- *  @author Copyright 1994-1995 by Sun Microsystems
- *  @author Inc. and Aniruddha Gokhale
- */
-//=============================================================================
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_union_branch.cpp
+//
+// = DESCRIPTION
+//    Extension of class AST_UnionBranch that provides additional means for C++
+//    mapping.
+//
+// = AUTHOR
+//    Copyright 1994-1995 by Sun Microsystems, Inc.
+//    and
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #include "be_union_branch.h"
 #include "be_union.h"
@@ -23,6 +28,20 @@
 #include "ast_union_label.h"
 #include "ace/Log_Msg.h"
 
+ACE_RCSID (be,
+           be_union_branch,
+           "$Id$")
+
+be_union_branch::be_union_branch (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    AST_Field (),
+    AST_UnionBranch (),
+    be_decl (),
+    be_field ()
+{
+}
+
 be_union_branch::be_union_branch (UTL_LabelList *ll,
                                   AST_Type *ft,
                                   UTL_ScopedName *n)
diff --git a/TAO/TAO_IDL/be/be_union_fwd.cpp b/TAO/TAO_IDL/be/be_union_fwd.cpp
index 316804de873..ee989abaaab 100644
--- a/TAO/TAO_IDL/be/be_union_fwd.cpp
+++ b/TAO/TAO_IDL/be/be_union_fwd.cpp
@@ -1,22 +1,42 @@
+// $Id$
 
-//=============================================================================
-/**
- *  @file    be_union_fwd.cpp
- *
- *  $Id$
- *
- *  Extension of class AST_UnionFwd that provides additional means for C++
- *  mapping of a union.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_union_fwd.cpp
+//
+// = DESCRIPTION
+//    Extension of class AST_UnionFwd that provides additional means for C++
+//    mapping of a union.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #include "be_union_fwd.h"
 #include "be_visitor.h"
 #include "ast_union.h"
 
+ACE_RCSID (be, 
+           be_union_fwd, 
+           "$Id$")
+
+be_union_fwd::be_union_fwd (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    AST_Type (),
+    AST_StructureFwd (),
+    AST_UnionFwd (),
+    be_decl (),
+    be_type (),
+    be_structure_fwd ()
+{
+}
+
 be_union_fwd::be_union_fwd (AST_Union *dummy,
                             UTL_ScopedName *n)
   : COMMON_Base (),
diff --git a/TAO/TAO_IDL/be/be_union_label.cpp b/TAO/TAO_IDL/be/be_union_label.cpp
index af2906934d8..0707dfd59dd 100644
--- a/TAO/TAO_IDL/be/be_union_label.cpp
+++ b/TAO/TAO_IDL/be/be_union_label.cpp
@@ -5,6 +5,11 @@
 #include "be_union_label.h"
 #include "be_visitor.h"
 
+be_union_label::be_union_label (void)
+  : AST_UnionLabel ()
+{
+}
+
 be_union_label::be_union_label (AST_UnionLabel::UnionLabel ul,
                                 AST_Expression *v)
   : AST_UnionLabel (ul, v)
diff --git a/TAO/TAO_IDL/be/be_util.cpp b/TAO/TAO_IDL/be/be_util.cpp
index 64980632d32..9943bdc4c80 100644
--- a/TAO/TAO_IDL/be/be_util.cpp
+++ b/TAO/TAO_IDL/be/be_util.cpp
@@ -1,17 +1,20 @@
-
-//=============================================================================
-/**
- *  @file    be_util.cpp
- *
- *  $Id$
- *
- *  Static helper methods used by multiple visitors.
- *
- *
- *  @author Gary Maxey
- *  @author Jeff Parsons
- */
-//=============================================================================
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_util.cpp
+//
+// = DESCRIPTION
+//    Static helper methods used by multiple visitors.
+//
+// = AUTHOR
+//    Gary Maxey, Jeff Parsons
+//
+// ============================================================================
 
 #include "be_util.h"
 #include "be_helper.h"
diff --git a/TAO/TAO_IDL/be/be_valuebox.cpp b/TAO/TAO_IDL/be/be_valuebox.cpp
index f39483ddb34..855c695c4e2 100644
--- a/TAO/TAO_IDL/be/be_valuebox.cpp
+++ b/TAO/TAO_IDL/be/be_valuebox.cpp
@@ -1,23 +1,53 @@
+// $Id$
 
-//=============================================================================
-/**
- *  @file    be_valuebox.cpp
- *
- *  $Id$
- *
- *  Extension of class AST_Valuebox that provides additional means for C++
- *  mapping.
- *
- *
- *  @author Gary Maxey
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_valuebox.cpp
+//
+// = DESCRIPTION
+//    Extension of class AST_Valuebox that provides additional means for C++
+//    mapping.
+//
+// = AUTHOR
+//    Gary Maxey
+//
+// ============================================================================
 
 #include "be_valuebox.h"
 #include "be_type.h"
 #include "be_visitor.h"
 #include "global_extern.h"
 
+ACE_RCSID (be,
+           be_valuebox,
+           "be_valuebox.cpp Exp")
+
+// Default constructor.
+be_valuebox::be_valuebox (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    AST_Type (),
+    AST_ConcreteType (),
+    AST_ValueBox (),
+    be_decl (),
+    be_type ()
+{
+  // Always the case (according to C++ mapping specification).
+  this->size_type (AST_Type::VARIABLE);
+
+  // Set the flag  that says we have a valuetype in this IDL file.
+  // This allows the correct #include to be generated (see be_codegen.cpp).
+  idl_global->valuebase_seen_ = true;
+
+  // Set the flag that says we have a valuetype in this IDL file.
+  // This allows the correct #include to be generated (see be_codegen.cpp).
+  idl_global->valuetype_seen_ = true;
+}
+
 be_valuebox::be_valuebox (AST_Type *boxed_type,
                           UTL_ScopedName *n)
   : COMMON_Base (),
diff --git a/TAO/TAO_IDL/be/be_valuetype.cpp b/TAO/TAO_IDL/be/be_valuetype.cpp
index ff80bc34256..ae63b7e2678 100644
--- a/TAO/TAO_IDL/be/be_valuetype.cpp
+++ b/TAO/TAO_IDL/be/be_valuetype.cpp
@@ -1,17 +1,22 @@
-
-//=============================================================================
-/**
- *  @file    be_valuetype.cpp
- *
- *  $Id$
- *
- *  Extension of class AST_Interface and be_interface that provides
- *  additional means for C++ mapping of an valuetype.
- *
- *
- *  @author Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
- */
-//=============================================================================
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_valuetype.cpp
+//
+// = DESCRIPTION
+//    Extension of class AST_Interface and be_interface that provides
+//    additional means for C++ mapping of an valuetype.
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//    derived from be_interface.cpp
+//
+// ============================================================================
 
 #include "be_valuetype.h"
 #include "be_visitor.h"
@@ -24,6 +29,39 @@
 #include "global_extern.h"
 #include "ace/Log_Msg.h"
 
+ACE_RCSID (be,
+           be_valuetype,
+           "$Id$")
+
+// Default constructor.
+be_valuetype::be_valuetype (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    AST_Type (),
+    UTL_Scope (),
+    AST_Interface (),
+    be_scope (),
+    be_decl (),
+    be_type (),
+    be_interface (),
+    AST_ValueType (),
+    full_obv_skel_name_ (0)
+{
+  // Always the case.
+  this->size_type (AST_Type::VARIABLE);
+
+  AST_Module *m = AST_Module::narrow_from_scope (this->defined_in ());
+
+  if (m != 0)
+    {
+      m->set_has_nested_valuetype ();
+    }
+
+  // Always the case.
+  this->has_constructor (true);
+}
+
+// Constructor used to build the AST.
 be_valuetype::be_valuetype (UTL_ScopedName *n,
                             AST_Type **inherits,
                             long n_inherits,
diff --git a/TAO/TAO_IDL/be/be_valuetype_fwd.cpp b/TAO/TAO_IDL/be/be_valuetype_fwd.cpp
index 865b318377f..609b34f9bd9 100644
--- a/TAO/TAO_IDL/be/be_valuetype_fwd.cpp
+++ b/TAO/TAO_IDL/be/be_valuetype_fwd.cpp
@@ -1,23 +1,46 @@
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_valuetype_fwd.h
+//
+// = DESCRIPTION
+//    Extension of class be_interface_fwd that provides additional
+//    means for C++ mapping of an valuetype.
+//
+// = AUTHOR
+//    Copyright 1994-1995 by Sun Microsystems, Inc.
+//    and
+//    Aniruddha Gokhale
+//    changed for valuetypes by Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//
+// ============================================================================
 
-//=============================================================================
-/**
- *  @file    be_valuetype_fwd.cpp
- *
- *  $Id$
- *
- *  Extension of class be_interface_fwd that provides additional
- *  means for C++ mapping of an valuetype.
- *
- *
- *  @author Copyright 1994-1995 by Sun Microsystems Inc.
- *  @author Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
- */
-//=============================================================================
 
 #include "be_valuetype_fwd.h"
 #include "be_visitor.h"
 #include "ast_interface.h"
 
+ACE_RCSID (be, 
+           be_valuetype_fwd, 
+           "$Id$")
+
+be_valuetype_fwd::be_valuetype_fwd (void)
+  : COMMON_Base (),
+    AST_Decl (),
+    AST_Type (),
+    AST_InterfaceFwd (),
+    be_decl (),
+    be_type (),
+    be_interface_fwd (),
+    AST_ValueTypeFwd ()
+{
+}
+
 be_valuetype_fwd::be_valuetype_fwd (AST_Interface *dummy,
                                     UTL_ScopedName *n)
   : COMMON_Base (dummy->is_local (),
diff --git a/TAO/TAO_IDL/be/be_visitor.cpp b/TAO/TAO_IDL/be/be_visitor.cpp
index a495ff7fa02..264d86a8980 100644
--- a/TAO/TAO_IDL/be/be_visitor.cpp
+++ b/TAO/TAO_IDL/be/be_visitor.cpp
@@ -1,20 +1,25 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    be_visitor.cpp
- *
- *  $Id$
- *
- *  Abstract class for back end visitors.
- *
- * = NOTES
- *  This is not a pure abstract class
- *
- *
- *  @author Aniruddha Gokhale and Carlos O'Ryan
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor.h
+//
+// = DESCRIPTION
+//    Abstract class for back end visitors.
+//
+// = NOTES
+//    This is not a pure abstract class
+//
+// = AUTHOR
+//    Aniruddha Gokhale and Carlos O'Ryan
+//
+// ============================================================================
 
 #include "be_visitor.h"
 
@@ -28,8 +33,7 @@ be_visitor::~be_visitor (void)
 {
 }
 
-// All the visit methods. Concrete visitors will selectively
-// override each one.
+// all the visit methods. Concrete visitors will selectively override each one
 int be_visitor::visit_decl (be_decl *)
 {
   return 0;
@@ -203,12 +207,6 @@ be_visitor::visit_factory (be_factory *)
 }
 
 int
-be_visitor::visit_finder (be_finder *)
-{
-  return 0;
-}
-
-int
 be_visitor::visit_structure (be_structure *)
 {
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp b/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp
index df008b1f061..8bd02c761aa 100644
--- a/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_amh_pre_proc.cpp
@@ -29,6 +29,10 @@
 #include "global_extern.h"
 #include "ace/Log_Msg.h"
 
+ACE_RCSID (be,
+           be_visitor_amh_pre_proc,
+           "$Id$")
+
 be_visitor_amh_pre_proc::be_visitor_amh_pre_proc (be_visitor_context *ctx)
   : be_visitor_scope (ctx)
 {
diff --git a/TAO/TAO_IDL/be/be_visitor_ami4ccm_pre_proc.cpp b/TAO/TAO_IDL/be/be_visitor_ami4ccm_pre_proc.cpp
index f84760bc29f..77853e85ba2 100644
--- a/TAO/TAO_IDL/be/be_visitor_ami4ccm_pre_proc.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_ami4ccm_pre_proc.cpp
@@ -1,21 +1,26 @@
+//
+// $Id$
+//
 
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    be_visitor_ami4ccm_pre_proc.cpp
- *
- *  $Id$
- *
- *  This visitor creates for AMI4CCM implied IDL constructs
- *  the appropriate AST (Abstract Syntax Tree) node,
- *  sets the corresponding interface or operation strategy
- *  on it and enteres the nodes into the AST.
- *
- *
- *  @author Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_ami4ccm_pre_proc.cpp
+//
+// = DESCRIPTION
+//    This visitor creates for AMI4CCM implied IDL constructs
+//    the appropriate AST (Abstract Syntax Tree) node,
+//    sets the corresponding interface or operation strategy
+//    on it and enteres the nodes into the AST.
+//
+// = AUTHOR
+//    Johnny Willemsen  <jwillemsen@remedy.nl>
+//
+// ============================================================================
 
 #include "be_visitor_ami4ccm_pre_proc.h"
 #include "be_visitor_context.h"
diff --git a/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp b/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp
index a18741b352e..f898574c2c0 100644
--- a/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp
@@ -1,21 +1,26 @@
+//
+// $Id$
+//
 
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    be_visitor_ami_pre_proc.cpp
- *
- *  $Id$
- *
- *  This visitor creates for AMI implied IDL constructs
- *  the appropriate AST (Abstract Syntax Tree) node,
- *  sets the corresponding interface or operation strategy
- *  on it and enteres the nodes into the AST.
- *
- *
- *  @author Michael Kircher <Michael.Kircher@mchp.siemens.de>
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_ami_pre_proc.cpp
+//
+// = DESCRIPTION
+//    This visitor creates for AMI implied IDL constructs
+//    the appropriate AST (Abstract Syntax Tree) node,
+//    sets the corresponding interface or operation strategy
+//    on it and enteres the nodes into the AST.
+//
+// = AUTHOR
+//    Michael Kircher <Michael.Kircher@mchp.siemens.de>
+//
+// ============================================================================
 
 #include "be_visitor_ami_pre_proc.h"
 #include "be_visitor_context.h"
@@ -37,6 +42,11 @@
 #include "global_extern.h"
 #include "ace/Log_Msg.h"
 
+ACE_RCSID (be,
+           be_visitor_ami_pre_proc,
+           "$Id$")
+
+
 be_visitor_ami_pre_proc::be_visitor_ami_pre_proc (be_visitor_context *ctx)
   : be_visitor_scope (ctx)
 {
diff --git a/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp b/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp
index f22ed7b5e6f..ad42243dd6e 100644
--- a/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp
@@ -20,7 +20,7 @@
 #include "be_interface_fwd.h"
 #include "be_valuetype_fwd.h"
 #include "be_component_fwd.h"
-#include "be_connector.h"
+#include "be_component.h"
 #include "be_home.h"
 #include "be_eventtype.h"
 #include "be_eventtype_fwd.h"
@@ -46,6 +46,11 @@
 
 #include <string>
 
+
+ACE_RCSID (be,
+           be_visitor_arg_traits,
+           "$Id$")
+
 be_visitor_arg_traits::be_visitor_arg_traits (const char *S,
                                               be_visitor_context *ctx)
   : be_visitor_scope (ctx),
@@ -1154,12 +1159,6 @@ be_visitor_arg_traits::visit_component_fwd (be_component_fwd *node)
 }
 
 int
-be_visitor_arg_traits::visit_connector (be_connector *node)
-{
-  return this->visit_component (node);
-}
-
-int
 be_visitor_arg_traits::visit_home (be_home *node)
 {
   return this->visit_interface (node);
diff --git a/TAO/TAO_IDL/be/be_visitor_argument.cpp b/TAO/TAO_IDL/be/be_visitor_argument.cpp
index 662ddac2c93..1024f14f6bd 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument.cpp
@@ -1,17 +1,22 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    be_visitor_argument.cpp
- *
- *  $Id$
- *
- *  Visitors for generation of code for Argument
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_args.cpp
+//
+// = DESCRIPTION
+//    Visitors for generation of code for Argument
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #include "be_visitor_argument.h"
 #include "be_visitor_context.h"
@@ -51,3 +56,6 @@
 #include "be_visitor_argument/invoke_cs.cpp"
 #include "be_visitor_argument/paramlist.cpp"
 
+ACE_RCSID (be,
+           be_visitor_argument,
+           "$Id$")
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp b/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp
index 23ad8185ff3..475e7598227 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/arglist.cpp
@@ -1,16 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    arglist.cpp
- *
- *  $Id$
- *
- *  Visitor that generates the parameters in an Operation signature
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    arglist.cpp
+//
+// = DESCRIPTION
+//    Visitor that generates the parameters in an Operation signature
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_argument,
+           arglist,
+           "$Id$")
 
 
 // ************************************************************
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/argument.cpp b/TAO/TAO_IDL/be/be_visitor_argument/argument.cpp
index b20bc5f29b5..8ec03e0e1b8 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/argument.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/argument.cpp
@@ -1,17 +1,26 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    argument.cpp
- *
- *  $Id$
- *
- *  generic visitor for Argument node
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    argument.cpp
+//
+// = DESCRIPTION
+//    generic visitor for Argument node
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
+ACE_RCSID (be_visitor_argument,
+           argument,
+           "$Id$")
 
 be_visitor_args::be_visitor_args (be_visitor_context *ctx)
   : be_visitor_decl (ctx),
@@ -28,9 +37,9 @@ int be_visitor_args::visit_argument (be_argument *)
   return -1;
 }
 
-// Helper that returns the type name either as a nested type name (for header
+// helper that returns the type name either as a nested type name (for header
 // files) or as a fully scoped name. In addition, we make sure that if the type
-// is an alias, we use that name.
+// is an alias, we use that name
 const char *
 be_visitor_args::type_name (be_type *node,
                             const char *suffix)
@@ -65,7 +74,7 @@ be_visitor_args::type_name (be_type *node,
   return namebuf;
 }
 
-// Helper that returns the direction type of the argument
+// helper that returns the direction type of the argument
 AST_Argument::Direction
 be_visitor_args::direction (void)
 {
@@ -74,11 +83,11 @@ be_visitor_args::direction (void)
       return AST_Argument::Direction (this->fixed_direction_);
     }
 
-  // Grab the argument node. We know that our context has stored the right
-  // argument node.
-  be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
+  // grab the argument node. We know that our context has stored the right
+  // argument node
+  be_argument *arg = this->ctx_->be_node_as_argument ();
 
+  ACE_ASSERT (arg != 0);
   return arg->direction ();
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/invoke_cs.cpp b/TAO/TAO_IDL/be/be_visitor_argument/invoke_cs.cpp
index 69b8732cd48..4001e6417e9 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/invoke_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/invoke_cs.cpp
@@ -1,16 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    invoke_cs.cpp
- *
- *  $Id$
- *
- *  Visitor generating the code that passes arguments to the CDR operators
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    invoke_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating the code that passes arguments to the CDR operators
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_argument,
+           invoke_cs,
+           "$Id$")
 
 
 // ****************************************************************************
@@ -128,8 +138,7 @@ int be_visitor_args_invoke_cs::visit_argument (be_argument *node)
 int be_visitor_args_invoke_cs::visit_array (be_array *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
+  be_argument *arg = this->ctx_->be_node_as_argument ();
 
   if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_OUTPUT)
     {
@@ -175,8 +184,7 @@ int be_visitor_args_invoke_cs::visit_array (be_array *node)
 int be_visitor_args_invoke_cs::visit_enum (be_enum *)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
+  be_argument *arg = this->ctx_->be_node_as_argument ();
 
   if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_OUTPUT)
     {
@@ -243,8 +251,7 @@ be_visitor_args_invoke_cs::visit_valuetype_fwd (be_valuetype_fwd *)
 int be_visitor_args_invoke_cs::visit_predefined_type (be_predefined_type *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
+  be_argument *arg = this->ctx_->be_node_as_argument ();
 
   if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_OUTPUT)
     {
@@ -393,8 +400,7 @@ int be_visitor_args_invoke_cs::visit_predefined_type (be_predefined_type *node)
 int be_visitor_args_invoke_cs::visit_sequence (be_sequence *)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
+  be_argument *arg = this->ctx_->be_node_as_argument ();
 
   if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_OUTPUT)
     {
@@ -437,8 +443,7 @@ int be_visitor_args_invoke_cs::visit_sequence (be_sequence *)
 int be_visitor_args_invoke_cs::visit_string (be_string *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
+  be_argument *arg = this->ctx_->be_node_as_argument ();
 
   if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_OUTPUT)
     {
@@ -589,8 +594,7 @@ be_visitor_args_invoke_cs::visit_home (
 int be_visitor_args_invoke_cs::emit_common (void)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
+  be_argument *arg = this->ctx_->be_node_as_argument ();
 
   if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_OUTPUT)
     {
@@ -633,8 +637,7 @@ int be_visitor_args_invoke_cs::emit_common (void)
 int be_visitor_args_invoke_cs::emit_common2 (be_type *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
+  be_argument *arg = this->ctx_->be_node_as_argument ();
 
   if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_OUTPUT)
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/marshal_ss.cpp b/TAO/TAO_IDL/be/be_visitor_argument/marshal_ss.cpp
index 82581388e1b..39ea6f27f8c 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/marshal_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/marshal_ss.cpp
@@ -1,17 +1,27 @@
-
-//=============================================================================
-/**
- *  @file    marshal_ss.cpp
- *
- *  $Id$
- *
- *  Visitor that generates code that passes the argument variable to the
- *  marshal operations.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    marshal_ss.cpp
+//
+// = DESCRIPTION
+//    Visitor that generates code that passes the argument variable to the
+//    marshal operations.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_argument,
+           marshal_ss,
+           "$Id$")
 
 
 // ************************************************************************
@@ -130,8 +140,7 @@ int be_visitor_args_marshal_ss::visit_argument (be_argument *node)
 int be_visitor_args_marshal_ss::visit_array (be_array *)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
+  be_argument *arg = this->ctx_->be_node_as_argument ();
 
   if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_INPUT)
     {
@@ -176,8 +185,7 @@ int be_visitor_args_marshal_ss::visit_array (be_array *)
 int be_visitor_args_marshal_ss::visit_enum (be_enum *)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
+  be_argument *arg = this->ctx_->be_node_as_argument ();
 
   if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_INPUT)
     {
@@ -245,8 +253,7 @@ int be_visitor_args_marshal_ss::visit_predefined_type (
   )
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
+  be_argument *arg = this->ctx_->be_node_as_argument ();
 
   if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_INPUT)
     {
@@ -404,8 +411,7 @@ int be_visitor_args_marshal_ss::visit_predefined_type (
 int be_visitor_args_marshal_ss::visit_sequence (be_sequence *)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
+  be_argument *arg = this->ctx_->be_node_as_argument ();
 
   if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_INPUT)
     {
@@ -448,8 +454,7 @@ int be_visitor_args_marshal_ss::visit_sequence (be_sequence *)
 int be_visitor_args_marshal_ss::visit_string (be_string *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
+  be_argument *arg = this->ctx_->be_node_as_argument ();
 
   if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_INPUT)
     {
@@ -602,11 +607,10 @@ be_visitor_args_marshal_ss::visit_home (
 }
 
 int
-be_visitor_args_marshal_ss::emit_common (void)
+be_visitor_args_marshal_ss::emit_common ()
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
+  be_argument *arg = this->ctx_->be_node_as_argument ();
 
   if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_INPUT)
     {
@@ -648,8 +652,7 @@ int
 be_visitor_args_marshal_ss::emit_common2 (be_type *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
+  be_argument *arg = this->ctx_->be_node_as_argument ();
 
   if (this->ctx_->sub_state () == TAO_CodeGen::TAO_CDR_INPUT)
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/paramlist.cpp b/TAO/TAO_IDL/be/be_visitor_argument/paramlist.cpp
index 2c917295603..e8f10292638 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/paramlist.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/paramlist.cpp
@@ -1,16 +1,27 @@
-
-//=============================================================================
-/**
- *  @file    paramlist.cpp
- *
- *  $Id$
- *
- *  Visitor that generates the Dyanmic::ParameterList
- *
- *
- *  @author Kirthika Parameswaran  <kirthika@cs.wustl.edu> Ossama Othman <ossama@uci.edu>
- */
-//=============================================================================
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    paramlist.cpp
+//
+// = DESCRIPTION
+//    Visitor that generates the Dyanmic::ParameterList
+//
+// = AUTHOR
+//    Kirthika Parameswaran  <kirthika@cs.wustl.edu>
+//    Ossama Othman <ossama@uci.edu>
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_argument,
+           paramlist,
+           "$Id$")
 
 
 // ************************************************************
@@ -163,8 +174,7 @@ be_visitor_args_paramlist::visit_string (be_string *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Get the argument.
-  be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
+  be_argument *arg = this->ctx_->be_node_as_argument ();
 
   // We need to make a distinction between bounded and unbounded strings.
   if (node->max_size ()->ev ()->u.ulval != 0)
@@ -192,15 +202,13 @@ be_visitor_args_paramlist::visit_string (be_string *node)
 }
 
 int
-be_visitor_args_paramlist::visit_predefined_type (
-  be_predefined_type *node)
+be_visitor_args_paramlist::visit_predefined_type (be_predefined_type *node)
 {
   // Get output stream.
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Get the argument.
-  be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
+  be_argument *arg = this->ctx_->be_node_as_argument ();
 
   switch (node->pt ())
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/post_upcall_ss.cpp b/TAO/TAO_IDL/be/be_visitor_argument/post_upcall_ss.cpp
index 887e166f7b2..41c9e5b9d10 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/post_upcall_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/post_upcall_ss.cpp
@@ -1,18 +1,27 @@
-
-//=============================================================================
-/**
- *  @file    post_upcall_ss.cpp
- *
- *  $Id$
- *
- *  Visitor generating code to do post-processing of arguments following an
- *  upcall.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    post_upcall_ss.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code to do post-processing of arguments following an
+//    upcall.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_argument, 
+           post_upcall_ss, 
+           "$Id$")
 
 // ************************************************************************
 //  visitor for doing any post-processing after the upcall is made
@@ -69,8 +78,7 @@ int be_visitor_args_post_upcall_ss::visit_argument (be_argument *node)
 int be_visitor_args_post_upcall_ss::visit_array (be_array *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
+  be_argument *arg = this->ctx_->be_node_as_argument ();
 
   // if the current type is an alias, use that
   be_type *bt = node;
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/upcall_ss.cpp b/TAO/TAO_IDL/be/be_visitor_argument/upcall_ss.cpp
index 84e17cfc4fc..e5b9a0f45f5 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/upcall_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/upcall_ss.cpp
@@ -1,17 +1,27 @@
-
-//=============================================================================
-/**
- *  @file    upcall_ss.cpp
- *
- *  $Id$
- *
- *  Visitor that generates code that passes argument variables to the
- *  upcall.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    upcall_ss.cpp
+//
+// = DESCRIPTION
+//    Visitor that generates code that passes argument variables to the
+//    upcall.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_argument, 
+           upcall_ss, 
+           "$Id$")
 
 
 // ************************************************************************
@@ -62,8 +72,7 @@ int be_visitor_args_upcall_ss::visit_argument (be_argument *node)
 int be_visitor_args_upcall_ss::visit_array (be_array *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
+  be_argument *arg = this->ctx_->be_node_as_argument ();
 
   switch (this->direction ())
     {
@@ -109,8 +118,7 @@ int be_visitor_args_upcall_ss::visit_array (be_array *node)
 int be_visitor_args_upcall_ss::visit_enum (be_enum *)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
+  be_argument *arg = this->ctx_->be_node_as_argument ();
 
   switch (this->direction ())
     {
@@ -145,18 +153,15 @@ int be_visitor_args_upcall_ss::visit_valuetype (be_valuetype *)
   return this->emit_common ();
 }
 
-int be_visitor_args_upcall_ss::visit_valuetype_fwd (
-  be_valuetype_fwd *)
+int be_visitor_args_upcall_ss::visit_valuetype_fwd (be_valuetype_fwd *)
 {
   return this->emit_common ();
 }
 
-int be_visitor_args_upcall_ss::visit_predefined_type (
-  be_predefined_type *node)
+int be_visitor_args_upcall_ss::visit_predefined_type (be_predefined_type *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
+  be_argument *arg = this->ctx_->be_node_as_argument ();
   AST_PredefinedType::PredefinedType pt = node->pt ();
 
   if (pt == AST_PredefinedType::PT_any)
@@ -244,8 +249,7 @@ int be_visitor_args_upcall_ss::visit_predefined_type (
 int be_visitor_args_upcall_ss::visit_sequence (be_sequence *)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
+  be_argument *arg = this->ctx_->be_node_as_argument ();
 
   switch (this->direction ())
     {
@@ -338,8 +342,7 @@ be_visitor_args_upcall_ss::visit_eventtype_fwd (
 int be_visitor_args_upcall_ss::emit_common (void)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
+  be_argument *arg = this->ctx_->be_node_as_argument ();
 
   switch (this->direction ())
     {
@@ -387,8 +390,7 @@ int be_visitor_args_upcall_ss::emit_common (void)
 int be_visitor_args_upcall_ss::emit_common2 (be_type *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
+  be_argument *arg = this->ctx_->be_node_as_argument ();
 
   switch (this->direction ())
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp
index 6aa3e0e35e8..c1846c2fda7 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/vardecl_ss.cpp
@@ -1,17 +1,27 @@
-
-//=============================================================================
-/**
- *  @file    vardecl_ss.cpp
- *
- *  $Id$
- *
- *  Visitor that generates the variable declaration in the skeleton
- *  corresponding to the Argument node
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    vardecl_ss.cpp
+//
+// = DESCRIPTION
+//    Visitor that generates the variable declaration in the skeleton
+//    corresponding to the Argument node
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_argument,
+           vardecl_ss,
+           "$Id$")
 
 
 // ************************************************************************
@@ -64,8 +74,7 @@ int be_visitor_args_vardecl_ss::visit_argument (be_argument *node)
 int be_visitor_args_vardecl_ss::visit_array (be_array *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
+  be_argument *arg = this->ctx_->be_node_as_argument ();
   be_type *bt = 0;
 
   if (this->ctx_->alias ())
@@ -109,8 +118,7 @@ int be_visitor_args_vardecl_ss::visit_array (be_array *node)
 int be_visitor_args_vardecl_ss::visit_enum (be_enum *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
+  be_argument *arg = this->ctx_->be_node_as_argument ();
   be_type *bt = 0;
 
   if (this->ctx_->alias ())
@@ -164,8 +172,7 @@ int be_visitor_args_vardecl_ss::visit_valuetype_fwd (be_valuetype_fwd *node)
 int be_visitor_args_vardecl_ss::visit_predefined_type (be_predefined_type *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
+  be_argument *arg = this->ctx_->be_node_as_argument ();
   be_type *bt = 0;
 
   if (this->ctx_->alias ())
@@ -250,8 +257,7 @@ int be_visitor_args_vardecl_ss::visit_predefined_type (be_predefined_type *node)
 int be_visitor_args_vardecl_ss::visit_sequence (be_sequence *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
+  be_argument *arg = this->ctx_->be_node_as_argument ();
   be_type *bt = 0;
 
   if (this->ctx_->alias ())
@@ -283,8 +289,7 @@ int be_visitor_args_vardecl_ss::visit_sequence (be_sequence *node)
 int be_visitor_args_vardecl_ss::visit_string (be_string *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
+  be_argument *arg = this->ctx_->be_node_as_argument ();
 
   switch (this->direction ())
     {
@@ -380,8 +385,7 @@ int
 be_visitor_args_vardecl_ss::emit_common (be_type *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
+  be_argument *arg = this->ctx_->be_node_as_argument ();
   be_type *bt = 0;
 
   if (this->ctx_->alias ())
@@ -416,8 +420,7 @@ int
 be_visitor_args_vardecl_ss::emit_common2 (be_type *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_argument *arg =
-    be_argument::narrow_from_decl (this->ctx_->node ());
+  be_argument *arg = this->ctx_->be_node_as_argument ();
   be_type *bt = 0;
 
   if (this->ctx_->alias ())
diff --git a/TAO/TAO_IDL/be/be_visitor_array.cpp b/TAO/TAO_IDL/be/be_visitor_array.cpp
index 68470b962bf..2fe641619f9 100644
--- a/TAO/TAO_IDL/be/be_visitor_array.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array.cpp
@@ -1,17 +1,22 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    be_visitor_array.cpp
- *
- *  $Id$
- *
- *  Visitors for generation of code for Array
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_array.cpp
+//
+// = DESCRIPTION
+//    Visitors for generation of code for Array
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #include "be_enum.h"
 #include "be_type.h"
diff --git a/TAO/TAO_IDL/be/be_visitor_array/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_array/any_op_ch.cpp
index cc5644aae2f..b3ec2642578 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/any_op_ch.cpp
@@ -1,18 +1,27 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    any_op_ch.cpp
- *
- *  $Id$
- *
- *  Visitor for code generation of Arrays for the Any operators in the client
- *  header.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    any_op_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor for code generation of Arrays for the Any operators in the client
+//    header.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
+ACE_RCSID (be_visitor_array,
+           any_op_ch,
+           "$Id$")
 
 // ***************************************************************************
 // Array visitor for generating Any operator declarations in the client header
diff --git a/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp
index 8a957354afe..2941a15de99 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/any_op_cs.cpp
@@ -1,17 +1,27 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    any_op_cs.cpp
- *
- *  $Id$
- *
- *  Visitor for code generation of Arrays for the Any operators in the client
- *  stubs.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    any_op_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor for code generation of Arrays for the Any operators in the client
+//    stubs.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_array,
+           any_op_cs,
+           "$Id$")
 
 
 // ***************************************************************************
diff --git a/TAO/TAO_IDL/be/be_visitor_array/array.cpp b/TAO/TAO_IDL/be/be_visitor_array/array.cpp
index fab9b64af87..5ea63d3fbc9 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/array.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/array.cpp
@@ -1,16 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    array.cpp
- *
- *  $Id$
- *
- *  Generic visitor for code generation for Arrays
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    array.cpp
+//
+// = DESCRIPTION
+//    Generic visitor for code generation for Arrays
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_array,
+           array,
+           "$Id$")
 
 
 // ************************************************************************
diff --git a/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp b/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp
index 7033368a0d6..5a3afd070f5 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp
@@ -1,17 +1,18 @@
-//=============================================================================
-/**
- *  @file    array_ch.cpp
- *
- *  $Id$
-
- *
- *  Visitor for Array code generation in client header
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    array_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor for Array code generation in client header
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 ACE_RCSID (be_visitor_array,
            array_ch,
diff --git a/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp b/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp
index 02afb1016e6..2362c37dff6 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 // ============================================================================
 //
 // = LIBRARY
@@ -16,6 +14,11 @@
 //
 // ============================================================================
 
+ACE_RCSID (be_visitor_array,
+           array_ci,
+           "$Id$")
+
+
 // ************************************************************************
 //  visitor for array declaration in client inline
 // ************************************************************************
diff --git a/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp b/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp
index 5e37c22ef61..7a4a4900be9 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    array_cs.cpp
- *
- *  $Id$
- *
- *  Visitor for code generation of Arrays in the client stubs
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    array_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor for code generation of Arrays in the client stubs
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_array,
+           array_cs,
+           "$Id$")
 
 // ************************************************************************
 //  visitor for array declaration in client stubs
diff --git a/TAO/TAO_IDL/be/be_visitor_array/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_array/cdr_op_ch.cpp
index 8c92b6eecea..9cf85191781 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/cdr_op_ch.cpp
@@ -1,21 +1,30 @@
-
-//=============================================================================
-/**
- *  @file    cdr_op_ch.cpp
- *
- *  $Id$
- *
- *  Visitor for code generation of Arrays for the Cdr operators in the client
- *  header.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor for code generation of Arrays for the Cdr operators in the client
+//    header.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #include "be_visitor_sequence/cdr_op_ch.h"
 
+ACE_RCSID (be_visitor_array,
+           cdr_op_ch,
+           "$Id$")
+
 // ***************************************************************************
 // Array visitor for generating CDR operator declarations in the client header
 // ***************************************************************************
diff --git a/TAO/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp
index c6973b1a09c..0c975f942ed 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/cdr_op_cs.cpp
@@ -1,18 +1,27 @@
-
-//=============================================================================
-/**
- *  @file    cdr_op_cs.cpp
- *
- *  $Id$
- *
- *  Visitor for code generation of Arrays for the CDR operators in the client
- *  stubs.
- *
- *
- *  @author Jeff Parsons <parsons@cs.wustl.edu>
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor for code generation of Arrays for the CDR operators in the client
+//    stubs.
+//
+// = AUTHOR
+//    Jeff Parsons <parsons@cs.wustl.edu>
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_array,
+           cdr_op_cs,
+           "$Id$")
 
 // ***************************************************************************
 // Array visitor for generating CDR operator declarations in the client
@@ -259,8 +268,7 @@ be_visitor_array_cdr_op_cs::visit_valuetype_fwd (be_valuetype_fwd *node)
 }
 
 int
-be_visitor_array_cdr_op_cs::visit_predefined_type (
-  be_predefined_type *node)
+be_visitor_array_cdr_op_cs::visit_predefined_type (be_predefined_type *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
@@ -293,10 +301,9 @@ be_visitor_array_cdr_op_cs::visit_predefined_type (
   unsigned long i;
 
   // Grab the array node.
-  be_array *array =
-    be_array::narrow_from_decl (this->ctx_->node ());
+  be_array *array = this->ctx_->be_node_as_array ();
 
-  if (array == 0)
+  if (!node)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_array_cdr_op_cs::"
@@ -560,11 +567,10 @@ be_visitor_array_cdr_op_cs::visit_node (be_type *bt)
 {
   TAO_OutStream *os = this->ctx_->stream ();
   ACE_CDR::ULong i;
-  be_array *node =
-    be_array::narrow_from_decl (this->ctx_->node ());
+  be_array *node = this->ctx_->be_node_as_array ();
   AST_Decl::NodeType nt = bt->node_type ();
 
-  if (node == 0)
+  if (!node)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_array_cdr_op_cs::"
diff --git a/TAO/TAO_IDL/be/be_visitor_array/serializer_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_array/serializer_op_ch.cpp
index e96a8cf10ec..33dda140d8c 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/serializer_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/serializer_op_ch.cpp
@@ -1,21 +1,30 @@
-
-//=============================================================================
-/**
- *  @file    serializer_op_ch.cpp
- *
- *  $Id$
- *
- *  Visitor for code generation of Arrays for the 
- *  TAO::DCPS::Serializer operators in the client header.
- *
- *
- *  @author Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    serializer_op_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor for code generation of Arrays for the 
+//    TAO::DCPS::Serializer operators in the client header.
+//
+// = AUTHOR
+//    Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
+//
+// ============================================================================
 
 #include "be_visitor_sequence/serializer_op_ch.h"
 
+ACE_RCSID (be_visitor_array, 
+           serializer_op_ch, 
+           "$Id$")
+
 // ***************************************************************************
 // Array visitor for generating Serializer operator declarations in the client header
 // ***************************************************************************
diff --git a/TAO/TAO_IDL/be/be_visitor_array/serializer_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_array/serializer_op_cs.cpp
index d9de2d00506..15b2357003f 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/serializer_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/serializer_op_cs.cpp
@@ -1,18 +1,28 @@
-
-//=============================================================================
-/**
- *  @file    serializer_op_cs.cpp
- *
- *  $Id$
- *
- *  Visitor for code generation of Arrays for the
- *  TAO::DCPS::Serializer operators in the client stubs.
- *
- *
- *  @author Scott Harris <harris_s@ociweb.com> based on code by Jeff Parsons <parsons@cs.wustl.edu>
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    serializer_op_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor for code generation of Arrays for the
+//    TAO::DCPS::Serializer operators in the client stubs.
+//
+// = AUTHOR
+//    Scott Harris <harris_s@ociweb.com> based on code by
+//    Jeff Parsons <parsons@cs.wustl.edu>
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_array,
+           serializer_op_cs,
+           "$Id$")
 
 // ***************************************************************************
 // Array visitor for generating Serializer operator declarations in the client
@@ -274,10 +284,9 @@ be_visitor_array_serializer_op_cs::visit_enum (be_enum *node)
   unsigned long i;
 
   // Grab the array node.
-  be_array *array =
-    be_array::narrow_from_decl (this->ctx_->node ());
+  be_array *array = this->ctx_->be_node_as_array ();
 
-  if (array == 0)
+  if (!node)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_array_serializer_op_cs::"
@@ -410,10 +419,9 @@ be_visitor_array_serializer_op_cs::visit_predefined_type (
   unsigned long i;
 
   // Grab the array node.
-  be_array *array =
-    be_array::narrow_from_decl (this->ctx_->node ());
+  be_array *array = this->ctx_->be_node_as_array ();
 
-  if (array == 0)
+  if (!node)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_array_serializer_op_cs::"
@@ -745,11 +753,10 @@ be_visitor_array_serializer_op_cs::visit_node (be_type *bt)
 {
   TAO_OutStream *os = this->ctx_->stream ();
   ACE_CDR::ULong i;
-  be_array *node =
-    be_array::narrow_from_decl (this->ctx_->node ());
+  be_array *node = this->ctx_->be_node_as_array ();
   AST_Decl::NodeType nt = bt->node_type ();
 
-  if (node == 0)
+  if (!node)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_array_serializer_op_cs::"
diff --git a/TAO/TAO_IDL/be/be_visitor_attribute.cpp b/TAO/TAO_IDL/be/be_visitor_attribute.cpp
index 67a651f7d4e..88f3910e46d 100644
--- a/TAO/TAO_IDL/be/be_visitor_attribute.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_attribute.cpp
@@ -1,17 +1,22 @@
-
-//=============================================================================
-/**
- *  @file    be_visitor_attribute.cpp
- *
- *  $Id$
- *
- *  Visitors for generation of code for Attribute
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_attribute.cpp
+//
+// = DESCRIPTION
+//    Visitors for generation of code for Attribute
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #include "be_array.h"
 #include "be_component.h"
diff --git a/TAO/TAO_IDL/be/be_visitor_attribute/attribute.cpp b/TAO/TAO_IDL/be/be_visitor_attribute/attribute.cpp
index 1dd199c106d..540e8304543 100644
--- a/TAO/TAO_IDL/be/be_visitor_attribute/attribute.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_attribute/attribute.cpp
@@ -1,17 +1,22 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    attribute.cpp
- *
- *  $Id$
- *
- *  Visitor for generation of code for Attribute
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    attribute.cpp
+//
+// = DESCRIPTION
+//    Visitor for generation of code for Attribute
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 // Attribute gets mapped to one or possibly two operations based on whether
 // it is readonly or not. The two operations "get" and "set" the value of the
@@ -185,9 +190,6 @@ be_visitor_attribute::visit_attribute (be_attribute *node)
         status = get_op.accept (&visitor);
         break;
       }
-    case TAO_CodeGen::TAO_ROOT_CNH:
-    case TAO_CodeGen::TAO_ROOT_CNS:
-      break;
     default:
       get_op.destroy ();
       return 0;
@@ -401,9 +403,6 @@ be_visitor_attribute::visit_attribute (be_attribute *node)
         status = set_op.accept (&visitor);
         break;
       }
-    case TAO_CodeGen::TAO_ROOT_CNH:
-    case TAO_CodeGen::TAO_ROOT_CNS:
-      break;
     default:
       // Error.
       set_op.destroy ();
diff --git a/TAO/TAO_IDL/be/be_visitor_attribute/component_init.cpp b/TAO/TAO_IDL/be/be_visitor_attribute/component_init.cpp
index 630702d8203..33c54a91151 100644
--- a/TAO/TAO_IDL/be/be_visitor_attribute/component_init.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_attribute/component_init.cpp
@@ -1,18 +1,23 @@
-
-//=============================================================================
-/**
- *  @file    component_init.cpp
- *
- *  $Id$
- *
- *  Visitor for generation of code for CIAO component attribute
- *  initialization
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    component_init.cpp
+//
+// = DESCRIPTION
+//    Visitor for generation of code for CIAO component attribute
+//    initialization
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 be_visitor_attribute_component_init::be_visitor_attribute_component_init (
     be_visitor_context *ctx)
diff --git a/TAO/TAO_IDL/be/be_visitor_attribute/set_from_extracted.cpp b/TAO/TAO_IDL/be/be_visitor_attribute/set_from_extracted.cpp
index b307839df90..e39a6f44cc4 100644
--- a/TAO/TAO_IDL/be/be_visitor_attribute/set_from_extracted.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_attribute/set_from_extracted.cpp
@@ -1,18 +1,23 @@
-
-//=============================================================================
-/**
- *  @file    set_from_extracted.cpp
- *
- *  $Id$
- *
- *  Visitor for generation of arguments to attribute mutators
- *  that were first extracted from an Any
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    set_from_extracted.cpp
+//
+// = DESCRIPTION
+//    Visitor for generation of arguments to attribute mutators
+//    that were first extracted from an Any
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 be_visitor_attribute_set_from_extracted::be_visitor_attribute_set_from_extracted (
     be_visitor_context *ctx)
diff --git a/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp b/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp
index 4ec7df0e816..629100adadc 100644
--- a/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_ccm_pre_proc.cpp
@@ -9,7 +9,6 @@
 
 #include "be_visitor_ccm_pre_proc.h"
 #include "be_visitor_context.h"
-#include "be_visitor_xplicit_pre_proc.h"
 #include "be_root.h"
 #include "be_operation.h"
 #include "be_argument.h"
@@ -22,7 +21,7 @@
 #include "be_template_module_inst.h"
 #include "be_field.h"
 #include "be_typedef.h"
-#include "be_connector.h"
+#include "be_component.h"
 #include "be_provides.h"
 #include "be_uses.h"
 #include "be_publishes.h"
@@ -33,7 +32,6 @@
 #include "be_eventtype.h"
 #include "be_eventtype_fwd.h"
 #include "be_home.h"
-#include "be_finder.h"
 #include "be_extern.h"
 
 #include "ast_generator.h"
@@ -160,12 +158,6 @@ be_visitor_ccm_pre_proc::visit_component (be_component *node)
 }
 
 int
-be_visitor_ccm_pre_proc::visit_connector (be_connector *node)
-{
-  return this->visit_component (node);
-}
-
-int
 be_visitor_ccm_pre_proc::visit_provides (be_provides *node)
 {
   if (node->provides_type ()->is_local ())
@@ -344,11 +336,6 @@ be_visitor_ccm_pre_proc::visit_consumes (be_consumes *node)
 int
 be_visitor_ccm_pre_proc::visit_home (be_home *node)
 {
-  if (node->imported ())
-    {
-      return 0;
-    }
-    
   AST_Interface *xplicit = this->create_explicit (node);
 
   if (xplicit == 0)
@@ -371,6 +358,24 @@ be_visitor_ccm_pre_proc::visit_home (be_home *node)
                         -1);
     }
 
+  if (this->gen_factories (node, xplicit) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ACE_TEXT ("be_visitor_ccm_pre_proc::")
+                         ACE_TEXT ("visit_home - code generation ")
+                         ACE_TEXT ("for factories declarations failed\n")),
+                        -1);
+    }
+
+  if (this->gen_finders (node, xplicit) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ACE_TEXT ("be_visitor_ccm_pre_proc::")
+                         ACE_TEXT ("visit_home - code generation ")
+                         ACE_TEXT ("for finders declarations failed\n")),
+                        -1);
+    }
+
   if (this->gen_implicit_ops (node, implicit) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -424,6 +429,84 @@ be_visitor_ccm_pre_proc::visit_eventtype_fwd (be_eventtype_fwd *node)
 }
 
 int
+be_visitor_ccm_pre_proc::gen_factories (be_home *node,
+                                        AST_Interface *xplicit)
+{
+  AST_Operation **item = 0;
+
+  for (ACE_Unbounded_Queue_Iterator<AST_Operation *> i (node->factories ());
+       ! i.done ();
+       i.advance ())
+    {
+      i.next (item);
+      be_operation *op = be_operation::narrow_from_decl (*item);
+      
+      op->set_defined_in (xplicit);
+      UTL_ScopedName *new_name =
+        this->create_scoped_name (0,
+                                  op->local_name ()->get_string (),
+                                  0,
+                                  xplicit);
+      op->set_name (new_name);
+
+      if (op->be_insert_exception (this->create_failure_) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             ACE_TEXT ("be_visitor_ccm_pre_proc::")
+                             ACE_TEXT ("gen_factories - ")
+                             ACE_TEXT ("exception insertion failed\n")),
+                            -1);
+        }
+
+      if (0 == xplicit->be_add_operation (op))
+        {
+          return -1;
+        }
+    }
+
+  return 0;
+}
+
+int
+be_visitor_ccm_pre_proc::gen_finders (be_home *node,
+                                      AST_Interface *xplicit)
+{
+  AST_Operation **item = 0;
+
+  for (ACE_Unbounded_Queue_Iterator<AST_Operation *> i (node->finders ());
+       ! i.done ();
+       i.advance ())
+    {
+      i.next (item);
+      be_operation *op = be_operation::narrow_from_decl (*item);
+      
+      op->set_defined_in (xplicit);
+      UTL_ScopedName *new_name =
+        this->create_scoped_name (0,
+                                  op->local_name ()->get_string (),
+                                  0,
+                                  xplicit);
+      (*item)->set_name (new_name);
+
+      if (op->be_insert_exception (this->finder_failure_) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             ACE_TEXT ("be_visitor_ccm_pre_proc::")
+                             ACE_TEXT ("gen_factories - ")
+                             ACE_TEXT ("exception insertion failed\n")),
+                            -1);
+        }
+
+      if (0 == xplicit->be_add_operation (op))
+        {
+          return -1;
+        }
+    }
+
+  return 0;
+}
+
+int
 be_visitor_ccm_pre_proc::gen_implicit_ops (be_home *node,
                                            AST_Interface *implicit)
 {
@@ -1468,18 +1551,73 @@ be_visitor_ccm_pre_proc::lookup_consumer (be_field *node)
 AST_Interface *
 be_visitor_ccm_pre_proc::create_explicit (be_home *node)
 {
-  be_visitor_xplicit_pre_proc v (this->ctx_);
-  
-  if (v.visit_home (node) != 0)
+  UTL_NameList *parent_list = this->compute_inheritance (node);
+  FE_InterfaceHeader header (0,
+                             parent_list,
+                             false,
+                             false,
+                             true);
+
+  // We're at global scope here so we need to fool the scope stack
+  // for a minute so the correct repo id can be calculated at
+  // interface construction time.
+  idl_global->scopes ().push (node->defined_in ());
+
+  UTL_ScopedName *explicit_name =
+  this->create_scoped_name (0,
+                            node->local_name (),
+                            "Explicit",
+                            ScopeAsDecl (node->defined_in ()));
+
+  be_interface *i = 0;
+  ACE_NEW_RETURN (i,
+                  be_interface (explicit_name,
+                                header.inherits (),
+                                header.n_inherits (),
+                                header.inherits_flat (),
+                                header.n_inherits_flat (),
+                                false,
+                                false),
+                  0);
+
+  // Back to reality.
+  idl_global->scopes ().pop ();
+
+  i->set_name (explicit_name);
+  i->set_defined_in (node->defined_in ());
+  i->set_imported (node->imported ());
+  i->gen_fwd_helper_name ();
+  i->original_interface (node);
+
+  // Reuse the home's decls in the explicit interface. No need
+  // to check for name clashes, redefinition, etc. because it
+  // has already been done in the home and the explicit interface
+  // is empty at this point. Later addition of factory and finder
+  // operations will do these checks to make sure they don't
+  // clash with the other decls.
+  for (UTL_ScopeActiveIterator iter (node, UTL_Scope::IK_decls);
+       ! iter.is_done ();
+       iter.next ())
     {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("be_visitor_ccm_pre_proc::")
-                         ACE_TEXT ("create_explicit - ")
-                         ACE_TEXT ("home xplicit visitor failed\n")),
-                        0);
+      AST_Decl *d = iter.item ();
+      d->set_defined_in (i);
+      UTL_ScopedName *new_name =
+        this->create_scoped_name (0,
+                                  d->local_name ()->get_string (),
+                                  0,
+                                  i);
+      d->set_name (new_name);
+      i->add_to_scope (d);
     }
     
-  return v.xplicit ();
+  header.destroy ();
+  parent_list->destroy ();
+  delete parent_list;
+  parent_list = 0;
+
+  AST_Module *m = AST_Module::narrow_from_scope (node->defined_in ());
+  m->be_add_interface (i);
+  return i;
 }
 
 AST_Interface *
diff --git a/TAO/TAO_IDL/be/be_visitor_component.cpp b/TAO/TAO_IDL/be/be_visitor_component.cpp
index c93784fb454..16802a84032 100644
--- a/TAO/TAO_IDL/be/be_visitor_component.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component.cpp
@@ -1,17 +1,22 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    be_visitor_component.cpp
- *
- *  $Id$
- *
- *  Visitors for generation of code for Component.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_component.cpp
+//
+// = DESCRIPTION
+//    Visitors for generation of code for Component.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #include "ace/Log_Msg.h"
 
@@ -23,7 +28,7 @@
 #include "ast_argument.h"
 #include "ast_exception.h"
 
-#include "be_connector.h"
+#include "be_component.h"
 #include "be_provides.h"
 #include "be_uses.h"
 #include "be_publishes.h"
@@ -61,6 +66,8 @@
 #include "be_visitor_component/component_sh.cpp"
 #include "be_visitor_component/component_si.cpp"
 #include "be_visitor_component/component_ss.cpp"
+#include "be_visitor_component/component_ih.cpp"
+#include "be_visitor_component/component_is.cpp"
 #include "be_visitor_component/component_svh.cpp"
 #include "be_visitor_component/facet_svh.cpp"
 #include "be_visitor_component/context_svh.cpp"
diff --git a/TAO/TAO_IDL/be/be_visitor_component/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_component/any_op_ch.cpp
index bd4c141cf49..ff140c4ab35 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/any_op_ch.cpp
@@ -1,18 +1,27 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    any_op_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Any operators for an Component in the client
- *  header.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    any_op_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Any operators for an Component in the client
+//    header.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
+ACE_RCSID (be_visitor_component, 
+           any_op_ch, 
+           "$Id$")
 
 // ***************************************************************************
 // Interface visitor for generating Any operator declarations in the client header
@@ -35,9 +44,3 @@ be_visitor_component_any_op_ch::visit_component (be_component *node)
   be_visitor_interface_any_op_ch visitor (&ctx);
   return visitor.visit_interface (node);
 }
-
-int
-be_visitor_component_any_op_ch::visit_connector (be_connector *node)
-{
-  return this->visit_component (node);
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_component/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_component/any_op_cs.cpp
index 1c32fe52ac0..9abc8f02047 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/any_op_cs.cpp
@@ -1,4 +1,4 @@
-// $Id$
+// $id: any_op_cs.cpp,v 1.12 1998/10/30 19:46:55 levine Exp $
 
 // ============================================================================
 //
@@ -17,6 +17,10 @@
 //
 // ============================================================================
 
+ACE_RCSID (be_visitor_component, 
+           any_op_cs, 
+           "$Id$")
+
 // ***************************************************************************
 // Interface visitor for generating Any operator declarations in the client
 // stubs file
@@ -40,9 +44,3 @@ be_visitor_component_any_op_cs::visit_component (be_component *node)
   be_visitor_interface_any_op_cs visitor (&ctx);
   return visitor.visit_interface (node);
 }
-
-int
-be_visitor_component_any_op_cs::visit_connector (be_connector *node)
-{
-  return this->visit_component (node);
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_component/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_component/cdr_op_ch.cpp
index ce9876e004a..eba4a289938 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/cdr_op_ch.cpp
@@ -1,17 +1,27 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    cdr_op_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for CDR operators for components. This uses
- *  compiled marshaling.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for CDR operators for components. This uses
+//    compiled marshaling.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_component, 
+           cdr_op_ch, 
+           "$Id$")
 
 // ***************************************************************************
 // Interface visitor for generating CDR operator declarations in the client header
@@ -35,9 +45,3 @@ be_visitor_component_cdr_op_ch::visit_component (be_component *node)
   be_visitor_interface_cdr_op_ch visitor (&ctx);
   return visitor.visit_interface (node);
 }
-
-int
-be_visitor_component_cdr_op_ch::visit_connector (be_connector *node)
-{
-  return this->visit_component (node);
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_component/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_component/cdr_op_cs.cpp
index b43bf3e0d12..d69ae7b8a06 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/cdr_op_cs.cpp
@@ -1,16 +1,26 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    cdr_op_cs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for CDR operators for components
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for CDR operators for components
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_component, 
+           cdr_op_cs, 
+           "$Id$")
 
 be_visitor_component_cdr_op_cs::be_visitor_component_cdr_op_cs (
     be_visitor_context *ctx
@@ -30,9 +40,3 @@ be_visitor_component_cdr_op_cs::visit_component (be_component *node)
   be_visitor_interface_cdr_op_cs visitor (&ctx);
   return visitor.visit_interface (node);
 }
-
-int
-be_visitor_component_cdr_op_cs::visit_connector (be_connector *node)
-{
-  return this->visit_component (node);
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_component/component.cpp b/TAO/TAO_IDL/be/be_visitor_component/component.cpp
index 9ee6bade01e..d92ae2c5538 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    component.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Components. This is a generic visitor.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    component.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Components. This is a generic visitor.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_component,
+           component,
+           "$Id$")
 
 // ******************************************************
 // Generic Component visitor
@@ -115,8 +124,6 @@ be_visitor_component::visit_operation (be_operation *node)
     case TAO_CodeGen::TAO_ROOT_SVS:
     case TAO_CodeGen::TAO_ROOT_EXH:
     case TAO_CodeGen::TAO_ROOT_EXS:
-    case TAO_CodeGen::TAO_ROOT_CNH:
-    case TAO_CodeGen::TAO_ROOT_CNS:
     case TAO_CodeGen::TAO_ROOT_EX_IDL:
       return 0; // nothing to be done
     default:
@@ -336,8 +343,6 @@ be_visitor_component::visit_typedef (be_typedef *node)
     case TAO_CodeGen::TAO_ROOT_SVS:
     case TAO_CodeGen::TAO_ROOT_EXH:
     case TAO_CodeGen::TAO_ROOT_EXS:
-    case TAO_CodeGen::TAO_ROOT_CNH:
-    case TAO_CodeGen::TAO_ROOT_CNS:
     case TAO_CodeGen::TAO_ROOT_EX_IDL:
       return 0; // nothing to be done
     default:
diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_ch.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_ch.cpp
index ffb4ec7b262..51ee32f8f5b 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component_ch.cpp
@@ -1,16 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    component_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Components in the client header.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    component_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Components in the client header.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_component,
+           component_ch,
+           "$Id$")
 
 // ******************************************************
 // Component visitor for client header
@@ -141,7 +151,7 @@ be_visitor_component_ch::visit_component (be_component *node)
     }
 
   // If we inherit from both CORBA::Object and CORBA::AbstractBase,
-  // we have to override _add_ref() to avoid ambiguity. A component
+  // we have to override _add_ref() to avoid ambiguity. A comopnent
   // can have mixed parentage if it supports an abstract or mixed-
   // parentage interface.
   if (node->has_mixed_parentage ())
@@ -182,23 +192,27 @@ be_visitor_component_ch::visit_component (be_component *node)
   if (be_global->gen_direct_collocation() || be_global->gen_thru_poa_collocation ())
     {
       *os << be_nl << be_nl
-          << "/// This method traverse the inheritance tree and sets the"
+          << "// These methods traverse the inheritance tree and set the"
           << be_nl
-          << "/// parents piece of the given class in the right mode."
+          << "// parents piece of the given class in the right mode."
           << be_nl
           << "virtual void " << node->flat_name ()
           << "_setup_collocation (void);";
     }
 
   *os << be_nl << be_nl
-      << node->local_name () << " (::IOP::IOR *ior, TAO_ORB_Core *orb_core);";
+      << node->local_name () << " (" << be_idt << be_idt_nl
+      << "::IOP::IOR *ior," << be_nl
+      << "TAO_ORB_Core *orb_core" << be_uidt_nl
+      << ");" << be_uidt;
 
   *os << be_nl << be_nl
       << node->local_name ()
       << " (" << be_idt << be_idt_nl << "TAO_Stub *objref, " << be_nl
       << "::CORBA::Boolean _tao_collocated = false," << be_nl
       << "TAO_Abstract_ServantBase *servant = 0," << be_nl
-      << "TAO_ORB_Core *oc = 0);" << be_uidt << be_uidt;
+      << "TAO_ORB_Core *oc = 0" << be_uidt_nl
+      << ");" << be_uidt;
 
   // Friends declarations.
   *os << be_nl << be_nl
@@ -260,10 +274,3 @@ be_visitor_component_ch::visit_component (be_component *node)
   node->cli_hdr_gen (true);
   return 0;
 }
-
-int
-be_visitor_component_ch::visit_connector (be_connector *node)
-{
-  return this->visit_component (node);
-}
-
diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_ci.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_ci.cpp
index 5d48b7d2747..2942c4cc72f 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component_ci.cpp
@@ -1,16 +1,26 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    component_ci.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Components in the client inline.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    component_ci.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Components in the client inline.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_component,
+           component_ci,
+           "$Id$")
 
 // ******************************************************
 // Component visitor for client inline
@@ -56,10 +66,3 @@ be_visitor_component_ci::visit_component (be_component *node)
   node->cli_inline_gen (true);
   return 0;
 }
-
-int
-be_visitor_component_ci::visit_connector (be_connector *node)
-{
-  return this->visit_component (node);
-}
-
diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp
index ef17e36e34c..8909a3aa37c 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component_cs.cpp
@@ -1,16 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    component_cs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Components in the client stub.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    component_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Components in the client stub.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_component,
+           component_cs,
+           "$Id$")
 
 // ******************************************************
 // Component visitor for client stub
@@ -335,10 +345,3 @@ be_visitor_component_cs::visit_component (be_component *node)
 
   return 0;
 }
-
-int
-be_visitor_component_cs::visit_connector (be_connector *node)
-{
-  return this->visit_component (node);
-}
-
diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_ex_idl.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_ex_idl.cpp
index 61b5dc4f35e..969292182d8 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component_ex_idl.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component_ex_idl.cpp
@@ -1,16 +1,22 @@
-
-//=============================================================================
-/**
- *  @file    component_ex_idl.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Components in the CIAO executor IDL.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    component_ex_idl.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Components in the CIAO executor IDL.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 be_visitor_component_ex_idl::be_visitor_component_ex_idl (
     be_visitor_context *ctx)
@@ -103,9 +109,3 @@ be_visitor_component_ex_idl::visit_component (
   return 0;
 }
 
-int
-be_visitor_component_ex_idl::visit_connector (be_connector *node)
-{
-  return this->visit_component (node);
-}
-
diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_exh.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_exh.cpp
index 02c22e5aef9..bb474af29a2 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component_exh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component_exh.cpp
@@ -1,26 +1,30 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    component_exh.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Components in the exec impl header.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO_IDL_BE
+//
+// = FILENAME
+//    component_exh.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Components in the exec impl header.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
-
-be_visitor_component_exh::be_visitor_component_exh (
-      be_visitor_context *ctx)
+be_visitor_component_exh::be_visitor_component_exh (be_visitor_context *ctx)
   : be_visitor_component_scope (ctx)
 {
   // This is initialized in the base class to svnt_export_macro()
   // or skel_export_macro(), since there are many more visitor
   // classes generating servant code. So we can just override
-  // all that here.
+  // all that here
   export_macro_ = be_global->exec_export_macro ();
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_exs.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_exs.cpp
index a2002665f7c..4871359b5be 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component_exs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component_exs.cpp
@@ -1,17 +1,22 @@
-
-//=============================================================================
-/**
- *  @file    component_exs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Components in the exec impl source.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO_IDL_BE
+//
+// = FILENAME
+//    component_exs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Components in the exec impl source.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 be_visitor_component_exs::be_visitor_component_exs (
       be_visitor_context *ctx)
@@ -86,9 +91,7 @@ Component_Exec_Op_Attr_Generator::emit (be_interface * /*derived_interface */,
                                         TAO_OutStream * /* os */,
                                         be_interface * base_interface)
 {
-  AST_Decl::NodeType nt = base_interface->node_type ();
-
-  if (nt == AST_Decl::NT_component || nt == AST_Decl::NT_connector)
+  if (base_interface->node_type () == AST_Decl::NT_component)
     {
       return 0;
     }
diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_ih.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_ih.cpp
new file mode 100644
index 00000000000..9b710986475
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_component/component_ih.cpp
@@ -0,0 +1,42 @@
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    component_ih.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Interfaces in the implementation header
+//
+// = AUTHOR
+//   Jeff Parsons
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_component, 
+           component_ih, 
+           "$Id$")
+
+// ************************************************************
+// Interface visitor for implementation header.
+// ************************************************************
+
+be_visitor_component_ih::be_visitor_component_ih (be_visitor_context *ctx)
+  : be_visitor_component (ctx)
+{
+}
+
+be_visitor_component_ih::~be_visitor_component_ih (void)
+{
+}
+
+int
+be_visitor_component_ih::visit_component (be_component *node)
+{
+  be_visitor_context ctx (*this->ctx_);
+  be_visitor_interface_ih visitor (&ctx);
+  return visitor.visit_interface (node);
+}
diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_is.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_is.cpp
new file mode 100644
index 00000000000..5acd37d6a98
--- /dev/null
+++ b/TAO/TAO_IDL/be/be_visitor_component/component_is.cpp
@@ -0,0 +1,43 @@
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    component_is.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Components 
+//    in the implementation skeletons file.
+//
+// = AUTHOR
+//   Jeff Parsons
+//
+// ============================================================================
+
+// ************************************************************
+// Component visitor for implementation skeletons.
+// ************************************************************
+
+ACE_RCSID (be_visitor_component, 
+           component_is, 
+           "$Id$")
+
+be_visitor_component_is::be_visitor_component_is (be_visitor_context *ctx)
+  : be_visitor_component (ctx)
+{
+}
+
+be_visitor_component_is::~be_visitor_component_is (void)
+{
+}
+
+int
+be_visitor_component_is::visit_component (be_component *node)
+{
+  be_visitor_context ctx (*this->ctx_);
+  be_visitor_interface_is visitor (&ctx);
+  return visitor.visit_interface (node);
+}
diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_sh.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_sh.cpp
index 18dedb9d02e..2d5bb5d1e33 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component_sh.cpp
@@ -1,16 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    component_sh.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Components in the server header.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    component_sh.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Components in the server header.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_component,
+           component_sh,
+           "$Id$")
 
 // ******************************************************
 // Component visitor for server header
@@ -294,12 +304,6 @@ be_visitor_component_sh::visit_component (be_component *node)
 }
 
 int
-be_visitor_component_sh::visit_connector (be_connector *node)
-{
-  return this->visit_component (node);
-}
-
-int
 be_visitor_component_sh::generate_amh_classes (be_component *node)
 {
    if (be_global->gen_amh_classes ())
diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_si.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_si.cpp
index f483e95ad4a..1e54cc1218e 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component_si.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component_si.cpp
@@ -1,16 +1,26 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    component_si.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Components in the server inline.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    component_si.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Components in the server inline.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_component,
+           component_si,
+           "$Id$")
 
 // ******************************************************
 // Component visitor for server inline
@@ -32,10 +42,3 @@ be_visitor_component_si::visit_component (be_component *node)
   be_visitor_interface_si visitor (&ctx);
   return visitor.visit_interface (node);
 }
-
-int
-be_visitor_component_si::visit_connector (be_connector *node)
-{
-  return this->visit_component (node);
-}
-
diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_ss.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_ss.cpp
index 630ce78c0f7..e318af98c75 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component_ss.cpp
@@ -1,16 +1,26 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    component_ss.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Components in the server skeleton.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    component_si.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Components in the server skeleton.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_component,
+           component_ss,
+           "$Id$")
 
 // ******************************************************
 // Component visitor for server skeleton
@@ -32,10 +42,3 @@ be_visitor_component_ss::visit_component (be_component *node)
   be_visitor_interface_ss visitor (&ctx);
   return visitor.visit_interface (node);
 }
-
-int
-be_visitor_component_ss::visit_connector (be_connector *node)
-{
-  return this->visit_component (node);
-}
-
diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_svh.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_svh.cpp
index e7f619acd82..c025672d119 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component_svh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component_svh.cpp
@@ -1,16 +1,22 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    component_svh.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Components in the servant header.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    component_svh.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Components in the servant header.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 // ******************************************************
 // Component visitor for server header
@@ -38,11 +44,6 @@ be_visitor_component_svh::~be_visitor_component_svh (void)
 int
 be_visitor_component_svh::visit_component (be_component *node)
 {
-  if (node->imported ())
-    {
-      return 0;
-    }
-  
   // Generate the facet servant class declaration.
   be_visitor_facet_svh facet_visitor (this->ctx_);
   
@@ -94,12 +95,6 @@ be_visitor_component_svh::visit_component (be_component *node)
   return 0;
 }
 
-int
-be_visitor_component_svh::visit_connector (be_connector *node)
-{
-  return this->visit_component (node);
-}
-
 void
 be_visitor_component_svh::gen_entrypoint (be_component *node)
 {
diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_svs.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_svs.cpp
index f29abb41295..636b5fc4464 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component_svs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component_svs.cpp
@@ -1,16 +1,22 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    component_svs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Components in the servant source.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    component_svs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Components in the servant source.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 // ******************************************************
 // Component visitor for servant source
@@ -38,11 +44,6 @@ be_visitor_component_svs::~be_visitor_component_svs (void)
 int
 be_visitor_component_svs::visit_component (be_component *node)
 {
-  if (node->imported ())
-    {
-      return 0;
-    }
-  
   be_visitor_facet_svs facet_visitor (this->ctx_);
 
   if (facet_visitor.visit_component_scope (node) == -1)
@@ -91,12 +92,6 @@ be_visitor_component_svs::visit_component (be_component *node)
   return 0;
 }
 
-int
-be_visitor_component_svs::visit_connector (be_connector *node)
-{
-  return this->visit_component (node);
-}
-
 void
 be_visitor_component_svs::gen_entrypoint (AST_Component *node)
 {
diff --git a/TAO/TAO_IDL/be/be_visitor_component/context_ex_idl.cpp b/TAO/TAO_IDL/be/be_visitor_component/context_ex_idl.cpp
index 909703f641c..2edb5f99659 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/context_ex_idl.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/context_ex_idl.cpp
@@ -1,17 +1,23 @@
-
-//=============================================================================
-/**
- *  @file    context_ex_idl.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for the contect class
- *  in the CIAO executor IDL.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    context_ex_idl.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for the contect class
+//    in the CIAO executor IDL.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 be_visitor_context_ex_idl::be_visitor_context_ex_idl (
       be_visitor_context *ctx)
@@ -25,7 +31,8 @@ be_visitor_context_ex_idl::~be_visitor_context_ex_idl (
 }
 
 int
-be_visitor_context_ex_idl::visit_component (be_component *node)
+be_visitor_context_ex_idl::visit_component (
+  be_component *node)
 {
   node_ = node;
 
@@ -78,13 +85,8 @@ be_visitor_context_ex_idl::visit_component (be_component *node)
 }
 
 int
-be_visitor_context_ex_idl::visit_connector (be_connector *node)
-{
-  return this->visit_component (node);
-}
-
-int
-be_visitor_context_ex_idl::visit_uses (be_uses *node)
+be_visitor_context_ex_idl::visit_uses (
+  be_uses *node)
 {
   be_type *impl = node->uses_type ();
 
@@ -138,7 +140,8 @@ be_visitor_context_ex_idl::visit_uses (be_uses *node)
 }
 
 int
-be_visitor_context_ex_idl::visit_publishes (be_publishes *node)
+be_visitor_context_ex_idl::visit_publishes (
+  be_publishes *node)
 {
   be_eventtype *impl = node->publishes_type ();
 
@@ -152,7 +155,8 @@ be_visitor_context_ex_idl::visit_publishes (be_publishes *node)
 }
 
 int
-be_visitor_context_ex_idl::visit_emits (be_emits *node)
+be_visitor_context_ex_idl::visit_emits (
+  be_emits *node)
 {
   be_eventtype *impl = node->emits_type ();
 
diff --git a/TAO/TAO_IDL/be/be_visitor_component/context_svh.cpp b/TAO/TAO_IDL/be/be_visitor_component/context_svh.cpp
index 5b3959505b1..254f1d420aa 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/context_svh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/context_svh.cpp
@@ -1,17 +1,23 @@
-
-//=============================================================================
-/**
- *  @file    context_svh.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for a context class in the
- *  servant header.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    context_svh.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for a context class in the
+//    servant header.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 be_visitor_context_svh::be_visitor_context_svh (be_visitor_context *ctx)
   : be_visitor_component_scope (ctx)
@@ -25,10 +31,6 @@ be_visitor_context_svh::~be_visitor_context_svh (void)
 int
 be_visitor_context_svh::visit_component (be_component *node)
 {
-  // This visitor is spawned by be_visitor_component_svh,
-  // which already does a check for imported node, so none
-  // is needed here.
-  
   node_ = node;
 
   AST_Decl *scope = ScopeAsDecl (node->defined_in ());
@@ -48,6 +50,7 @@ be_visitor_context_svh::visit_component (be_component *node)
   os_ << "class " << export_macro_.c_str () << " " << lname
       << "_Context" << be_idt_nl
       << ": public virtual ::CIAO::"
+      << (swapping_ ? "Upgradeable_" : "")
       << "Context_Impl<" << be_idt << be_idt_nl
       << global << sname << "::CCM_" << lname
       << "_Context," << be_nl
@@ -101,6 +104,17 @@ be_visitor_context_svh::visit_component (be_component *node)
                         -1);
     }
 
+  if (swapping_)
+    {
+      os_ << be_nl << be_nl
+          << "/// Operation defined in " << sname << "::CCM_"
+          << lname << "_Context" << be_nl
+          << "/// that enable component swapping in the container."
+          << be_nl
+          << "virtual ::Components::ConsumerDescriptions *" << be_nl
+          << "get_registered_consumers (const char * publisher_name);";
+    }
+
   os_ << be_uidt_nl
       << "};";
 
@@ -108,12 +122,6 @@ be_visitor_context_svh::visit_component (be_component *node)
 }
 
 int
-be_visitor_context_svh::visit_connector (be_connector *node)
-{
-  return this->visit_component (node);
-}
-
-int
 be_visitor_context_svh::visit_uses (be_uses *node)
 {
   ACE_CString prefix (this->port_prefix_);
diff --git a/TAO/TAO_IDL/be/be_visitor_component/context_svs.cpp b/TAO/TAO_IDL/be/be_visitor_component/context_svs.cpp
index d70db594b20..d5f44fcb9ab 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/context_svs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/context_svs.cpp
@@ -1,17 +1,23 @@
-
-//=============================================================================
-/**
- *  @file    context_svs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for a context class in the
- *  servant sourece.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    context_svs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for a context class in the
+//    servant sourece.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 be_visitor_context_svs::be_visitor_context_svs (be_visitor_context *ctx)
   : be_visitor_component_scope (ctx)
@@ -25,10 +31,6 @@ be_visitor_context_svs::~be_visitor_context_svs (void)
 int
 be_visitor_context_svs::visit_component (be_component *node)
 {
-  // This visitor is spawned by be_visitor_component_svh,
-  // which already does a check for imported node, so none
-  // is needed here.
-  
   node_ = node;
 
   AST_Decl *scope = ScopeAsDecl (node->defined_in ());
@@ -50,6 +52,17 @@ be_visitor_context_svs::visit_component (be_component *node)
       << lname << "_Context," << be_nl
       << "::" << node->full_name () << "> (h, c, sv, id)";
 
+  if (swapping_)
+    {
+      os_ << "," << be_uidt_nl
+          << "::CIAO::Upgradeable_Context_Impl<" << be_idt_nl
+          << global << sname << "::CCM_" << lname
+          << "_Context," << be_nl
+          << lname << "_Servant," << be_nl
+          << "::" << node_->full_name ()
+          << "> (h, c, sv)";
+    }
+
   os_ << be_uidt << be_uidt << be_uidt_nl
       << "{" << be_nl
       << "}";
@@ -81,13 +94,51 @@ be_visitor_context_svs::visit_component (be_component *node)
                         -1);
     }
 
-  return 0;
-}
+  if (swapping_)
+    {
+      os_ << be_nl << be_nl
+          << "/// Operations defined in " << sname
+          << "::CCM_" << lname << "_Context" << be_nl
+          << "/// that enable component swapping in the container"
+          << be_nl << be_nl
+          << "::Components::ConsumerDescriptions *" << be_nl
+          << lname << "_Context::get_registered_consumers ("
+          << be_idt_nl
+          << "const char * publisher_name)" << be_uidt_nl
+          << "{" << be_idt_nl
+          << "if (publisher_name == 0)" << be_idt_nl
+          << "{" << be_idt_nl
+          << "throw ::Components::InvalidName ();" << be_uidt_nl
+          << "}" << be_uidt_nl << be_nl
+          << "::Components::ConsumerDescriptions * tmp = 0;"
+          << be_nl
+          << "::Components::ConsumerDescriptions_var retval;"
+          << be_nl
+          << "::CORBA::ULong _ciao_index = 0UL;" << be_nl
+          << "::CORBA::ULong _ciao_size = 0UL;" << be_nl
+          << "ACE_UNUSED_ARG (tmp);" << be_nl
+          << "ACE_UNUSED_ARG (retval);" << be_nl
+          << "ACE_UNUSED_ARG (_ciao_index);" << be_nl
+          << "ACE_UNUSED_ARG (_ciao_size);";
+
+      be_visitor_swapping_get_consumer v (this->ctx_);
+
+      if (v.visit_component_scope (node) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             ACE_TEXT ("be_visitor_context_svs")
+                             ACE_TEXT ("::visit_component - ")
+                             ACE_TEXT ("swapping_get_consumer ")
+                             ACE_TEXT ("visitor failed\n")),
+                            -1);
+        }
 
-int
-be_visitor_context_svs::visit_connector (be_connector *node)
-{
-  return this->visit_component (node);
+      os_ << be_nl << be_nl
+          << "throw ::Components::InvalidName ();" << be_uidt_nl
+          << "}";
+    }
+
+  return 0;
 }
 
 int
@@ -693,3 +744,86 @@ be_visitor_context_svs::gen_uses_multiplex (
       << "}";
 }
 
+// ===============================================
+
+be_visitor_swapping_get_consumer::be_visitor_swapping_get_consumer (
+      be_visitor_context *ctx)
+  : be_visitor_component_scope (ctx)
+{
+}
+
+be_visitor_swapping_get_consumer::~be_visitor_swapping_get_consumer (
+  void)
+{
+}
+
+int
+be_visitor_swapping_get_consumer::visit_publishes (
+  be_publishes *node)
+{
+  const char *port_name =
+    node->local_name ()->get_string ();
+
+  os_ << be_nl << be_nl
+      << "if (ACE_OS::strcmp (publisher_name, \""
+      << port_name << "\") == 0)" << be_idt_nl
+      << "{" << be_idt_nl
+      << "_ciao_size = this->_ciao_publishes_"
+      << port_name << "_.size ();" << be_nl << be_nl
+      << "ACE_NEW_THROW_EX (tmp," << be_nl
+      << "                  ::Components::"
+      << "ConsumerDescriptions (_ciao_size)," << be_nl
+      << "                  ::CORBA::NO_MEMORY ());";
+
+  if (! static_config_)
+    {
+      os_ << be_nl << be_nl
+          << "{" << be_idt_nl
+          << "ACE_READ_GUARD_RETURN (TAO_SYNCH_MUTEX," << be_nl
+          << "                       mon," << be_nl
+          << "                       this->" << port_name
+          << "_lock_," << be_nl
+          << "                       0);";
+    }
+
+  os_ << be_nl << be_nl
+      << "for (" << tao_cg->upcase (port_name)
+      << "_TABLE::const_iterator iter =" << be_idt_nl
+      << "     this->ciao_publishes_" << port_name
+      << "_.begin ();" << be_uidt_nl
+      << "     iter != this->ciao_publishes_" << port_name
+      << ".end ();" << be_nl
+      << "     ++iter, ++_ciao_index)" << be_idt_nl
+      << "{" << be_idt_nl
+      << "if ( ::CORBA::is_nil (iter->second.in ()))" << be_idt_nl
+      << "{" << be_idt_nl
+      << "throw ::Components::InvalidConnection ();" << be_uidt_nl
+      << "}" << be_uidt_nl << be_nl
+      << "::Components::ConsumerDescription * cd = 0;" << be_nl
+      << "ACE_NEW_THROW_EX (cd," << be_nl
+      << "                  OBV_Components::ConsumerDescription,"
+      << be_nl
+      << "                  ::CORBA::NO_MEMORY ());"
+      << be_nl << be_nl
+      << "::Components::ConsumerDescription_var safe = cd;"
+      << be_nl
+      << "safe->name (\"\");" << be_nl
+      << "safe->type_id (\"\");" << be_nl
+      << "safe->consumer (iter->second.in ());"
+      << be_nl << be_nl
+      << "retval[_ciao_index] = safe;" << be_uidt_nl
+      << "}" << be_uidt;
+
+  if (! static_config_)
+    {
+      os_ << be_uidt_nl
+          << "}";
+    }
+
+  os_ << be_uidt_nl << be_nl
+      << "return retval._retn ();" << be_uidt_nl
+      << "}";
+
+  return 0;
+}
+
diff --git a/TAO/TAO_IDL/be/be_visitor_component/executor_ex_idl.cpp b/TAO/TAO_IDL/be/be_visitor_component/executor_ex_idl.cpp
index 631fbff5dd6..33890f7ffbb 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/executor_ex_idl.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/executor_ex_idl.cpp
@@ -1,17 +1,23 @@
-
-//=============================================================================
-/**
- *  @file    executor_ex_idl.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for components
- *  in the CIAO executor IDL.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    executor_ex_idl.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for components
+//    in the CIAO executor IDL.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 be_visitor_executor_ex_idl::be_visitor_executor_ex_idl (
       be_visitor_context *ctx)
@@ -76,13 +82,8 @@ be_visitor_executor_ex_idl::visit_component (
 }
 
 int
-be_visitor_executor_ex_idl::visit_connector (be_connector *node)
-{
-  return this->visit_component (node);
-}
-
-int
-be_visitor_executor_ex_idl::visit_attribute (be_attribute *node)
+be_visitor_executor_ex_idl::visit_attribute (
+  be_attribute *node)
 {
    bool rd_only = node->readonly ();
 
diff --git a/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp b/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp
index efcb3f9bb58..6ba4a50e192 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp
@@ -1,17 +1,22 @@
-
-//=============================================================================
-/**
- *  @file    executor_exh.cpp
- *
- *  $Id$
- *
- *  Visitor generating code in the exec impl header.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO_IDL_BE
+//
+// = FILENAME
+//    executor_exh.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code in the exec impl header.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 be_visitor_executor_exh::be_visitor_executor_exh (
       be_visitor_context *ctx)
diff --git a/TAO/TAO_IDL/be/be_visitor_component/executor_exs.cpp b/TAO/TAO_IDL/be/be_visitor_component/executor_exs.cpp
index 276bf3b7de2..1ec5ad27891 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/executor_exs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/executor_exs.cpp
@@ -1,17 +1,22 @@
-
-//=============================================================================
-/**
- *  @file    executor_exs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code in the exec impl source.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO_IDL_BE
+//
+// = FILENAME
+//    executor_exs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code in the exec impl source.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 be_visitor_executor_exs::be_visitor_executor_exs (
       be_visitor_context *ctx)
@@ -35,7 +40,7 @@ be_visitor_executor_exs::visit_operation (be_operation *node)
 
   // Components have implied IDL operations added to the AST, but
   // we are interested only in supported interface operations.
-  if (nt == AST_Decl::NT_component || nt == AST_Decl::NT_connector)
+  if (nt == AST_Decl::NT_component)
     {
       return 0;
     }
diff --git a/TAO/TAO_IDL/be/be_visitor_component/facet_ex_idl.cpp b/TAO/TAO_IDL/be/be_visitor_component/facet_ex_idl.cpp
index 3c5b2a7e57c..7bf8ebe2328 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/facet_ex_idl.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/facet_ex_idl.cpp
@@ -1,17 +1,22 @@
-
-//=============================================================================
-/**
- *  @file    facet_ex_idl.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for facets in the CIAO executor IDL.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    facet_ex_idl.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for facets in the CIAO executor IDL.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 be_visitor_facet_ex_idl::be_visitor_facet_ex_idl (
       be_visitor_context *ctx)
diff --git a/TAO/TAO_IDL/be/be_visitor_component/facet_exh.cpp b/TAO/TAO_IDL/be/be_visitor_component/facet_exh.cpp
index 2016e248f0f..366ea23a8af 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/facet_exh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/facet_exh.cpp
@@ -1,17 +1,22 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    facet_exh.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for facets in the exec impl header.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO_IDL_BE
+//
+// = FILENAME
+//    facet_exh.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for facets in the exec impl header.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 be_visitor_facet_exh::be_visitor_facet_exh (
       be_visitor_context *ctx)
diff --git a/TAO/TAO_IDL/be/be_visitor_component/facet_exs.cpp b/TAO/TAO_IDL/be/be_visitor_component/facet_exs.cpp
index e21b1e3cc20..f17c7bd3654 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/facet_exs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/facet_exs.cpp
@@ -1,17 +1,22 @@
-
-//=============================================================================
-/**
- *  @file    facet_exs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for facets in the exec impl source.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO_IDL_BE
+//
+// = FILENAME
+//    facet_exs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for facets in the exec impl source.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 be_visitor_facet_exs::be_visitor_facet_exs (
       be_visitor_context *ctx)
@@ -35,7 +40,7 @@ be_visitor_facet_exs::visit_operation (be_operation *node)
 
   // Components have implied IDL operations added to the AST, but
   // we are interested only in supported interface operations.
-  if (nt == AST_Decl::NT_component || nt == AST_Decl::NT_connector)
+  if (nt == AST_Decl::NT_component)
     {
       return 0;
     }
@@ -53,7 +58,7 @@ be_visitor_facet_exs::visit_attribute (be_attribute *node)
 
   // Components have implied IDL operations added to the AST, but
   // we are interested only in supported interface operations.
-  if (nt == AST_Decl::NT_component || nt == AST_Decl::NT_connector)
+  if (nt == AST_Decl::NT_component)
     {
       return 0;
     }
diff --git a/TAO/TAO_IDL/be/be_visitor_component/facet_svh.cpp b/TAO/TAO_IDL/be/be_visitor_component/facet_svh.cpp
index 9453829ca70..f101db9a78b 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/facet_svh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/facet_svh.cpp
@@ -1,18 +1,23 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    facet_svh.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for a facet servant class in the
- *  servant header.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    facet_svh.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for a facet servant class in the
+//    servant header.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 be_visitor_facet_svh::be_visitor_facet_svh (be_visitor_context *ctx)
   : be_visitor_component_scope (ctx)
diff --git a/TAO/TAO_IDL/be/be_visitor_component/facet_svs.cpp b/TAO/TAO_IDL/be/be_visitor_component/facet_svs.cpp
index cc7b2d59dc2..9df81807a4f 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/facet_svs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/facet_svs.cpp
@@ -1,17 +1,23 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    facet_svs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for a facet servant class in the
- *  servant source.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    facet_svs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for a facet servant class in the
+//    servant source.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 be_visitor_facet_svs::be_visitor_facet_svs (be_visitor_context *ctx)
   : be_visitor_component_scope (ctx)
diff --git a/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp b/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp
index 0d8d2b45a49..ff9d8b3e61b 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp
@@ -1,17 +1,23 @@
-
-//=============================================================================
-/**
- *  @file    servant_svh.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for a servant class in the
- *  servant header.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    servant_svh.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for a servant class in the
+//    servant header.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 be_visitor_servant_svh::be_visitor_servant_svh (be_visitor_context *ctx)
   : be_visitor_component_scope (ctx)
@@ -25,10 +31,6 @@ be_visitor_servant_svh::~be_visitor_servant_svh (void)
 int
 be_visitor_servant_svh::visit_component (be_component *node)
 {
-  // This visitor is spawned by be_visitor_component_svh,
-  // which already does a check for imported node, so none
-  // is needed here.
-  
   node_ = node;
 
   AST_Decl *scope = ScopeAsDecl (node_->defined_in ());
@@ -114,12 +116,6 @@ be_visitor_servant_svh::visit_component (be_component *node)
 }
 
 int
-be_visitor_servant_svh::visit_connector (be_connector *node)
-{
-  return this->visit_component (node);
-}
-
-int
 be_visitor_servant_svh::visit_attribute (be_attribute *node)
 {
   be_visitor_attribute v (this->ctx_);
diff --git a/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp b/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp
index 5f042b92d99..1d7c93dd6a7 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp
@@ -1,17 +1,23 @@
-
-//=============================================================================
-/**
- *  @file    servant_svs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for a servant class in the
- *  servant source file.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    servant_svs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for a servant class in the
+//    servant source file.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 be_visitor_servant_svs::be_visitor_servant_svs (be_visitor_context *ctx)
   : be_visitor_component_scope (ctx),
@@ -31,10 +37,6 @@ be_visitor_servant_svs::~be_visitor_servant_svs (void)
 int
 be_visitor_servant_svs::visit_component (be_component *node)
 {
-  // This visitor is spawned by be_visitor_component_svh,
-  // which already does a check for imported node, so none
-  // is needed here.
-  
   node_ = node;
 
   n_provides_ = 0UL;
@@ -104,6 +106,11 @@ be_visitor_servant_svs::visit_component (be_component *node)
       << "const ::Components::ConfigValues & descr)" << be_uidt_nl
       << "{" << be_idt_nl;
 
+  if (swapping_)
+    {
+      os_ << "this->activate_component ();" << be_nl << be_nl;
+    }
+
   os_ << "for ( ::CORBA::ULong i = 0; i < descr.length (); ++i)"
       << be_idt_nl
       << "{" << be_idt_nl
@@ -206,12 +213,6 @@ be_visitor_servant_svs::visit_component (be_component *node)
 }
 
 int
-be_visitor_servant_svs::visit_connector (be_connector *node)
-{
-  return this->visit_component (node);
-}
-
-int
 be_visitor_servant_svs::visit_operation (be_operation *node)
 {
   AST_Decl::NodeType nt =
@@ -219,7 +220,7 @@ be_visitor_servant_svs::visit_operation (be_operation *node)
 
   // Components have implied IDL operations added to the AST, but
   // we are interested only in supported interface operations.
-  if (nt == AST_Decl::NT_component || nt == AST_Decl::NT_connector)
+  if (nt == AST_Decl::NT_component)
     {
       return 0;
     }
@@ -272,6 +273,11 @@ be_visitor_servant_svs::visit_provides (be_provides *node)
       << port_name << " (void)" << be_nl
       << "{" << be_idt_nl;
 
+  if (swapping_)
+    {
+      os_ << "this->activate_component ();" << be_nl << be_nl;
+    }
+
   os_ << "if ( ::CORBA::is_nil (this->provide_"
       << port_name << "_.in ()))" << be_idt_nl
       << "{" << be_idt_nl
@@ -484,6 +490,11 @@ be_visitor_servant_svs::visit_publishes (be_publishes *node)
       << "::" << obj_name << "Consumer_ptr c)" << be_uidt_nl
       << "{" << be_idt_nl;
 
+   if (swapping_)
+    {
+      os_ << "this->activate_component ();" << be_nl;
+    }
+
  os_ << "return this->context_->subscribe_" << port_name
       << " (c);" << be_uidt_nl
       << "}";
@@ -495,6 +506,11 @@ be_visitor_servant_svs::visit_publishes (be_publishes *node)
       << "::Components::EventConsumerBase_ptr c)" << be_uidt_nl
       << "{" << be_idt_nl;
 
+  if (swapping_)
+    {
+      os_ << "this->activate_component ();" << be_nl;
+    }
+
   os_ << "return this->context_->subscribe_" << port_name
       << "_generic (c);" << be_uidt_nl
       << "}";
@@ -506,6 +522,11 @@ be_visitor_servant_svs::visit_publishes (be_publishes *node)
       << "::Components::Cookie * ck)" << be_uidt_nl
       << "{" << be_idt_nl;
 
+  if (swapping_)
+    {
+      os_ << "this->activate_component ();" << be_nl;
+    }
+
   os_ << "return this->context_->unsubscribe_" << port_name
       << " (ck);" << be_uidt_nl
       << "}";
@@ -805,6 +826,11 @@ be_visitor_servant_svs::gen_provides_top (void)
       << "const char * name)" << be_uidt_nl
       << "{" << be_idt_nl;
 
+  if (swapping_)
+    {
+      os_ << "this->activate_component ();" << be_nl << be_nl;
+    }
+
   os_ << "if (name == 0)" << be_idt_nl
       << "{" << be_idt_nl
       << "throw ::CORBA::BAD_PARAM ();" << be_uidt_nl
@@ -839,6 +865,11 @@ be_visitor_servant_svs::gen_publishes_top (void)
       << be_uidt_nl
       << "{" << be_idt_nl;
 
+  if (swapping_)
+    {
+      os_ << "this->activate_component ();" << be_nl << be_nl;
+    }
+
   os_ << "ACE_UNUSED_ARG (subscribe);" << be_nl << be_nl
       << "if (publisher_name == 0)" << be_idt_nl
       << "{" << be_idt_nl
@@ -869,6 +900,11 @@ be_visitor_servant_svs::gen_publishes_top (void)
       << "::Components::Cookie * ck)" << be_uidt_nl
       << "{" << be_idt_nl;
 
+  if (swapping_)
+    {
+      os_ << "this->activate_component ();" << be_nl << be_nl;
+    }
+
   os_ << "ACE_UNUSED_ARG (ck);" << be_nl << be_nl
       << "if (publisher_name == 0)" << be_idt_nl
       << "{" << be_idt_nl
@@ -934,6 +970,11 @@ be_visitor_servant_svs::gen_uses_top (void)
       << "::CORBA::Object_ptr connection)" << be_uidt_nl
       << "{" << be_idt_nl;
 
+  if (swapping_)
+    {
+      os_ << "this->activate_component ();" << be_nl << be_nl;
+    }
+
   os_ << "/// If the component has no receptacles, "
       << "arg will be unused." << be_nl
       << "ACE_UNUSED_ARG (connection);" << be_nl << be_nl
@@ -966,6 +1007,11 @@ be_visitor_servant_svs::gen_uses_top (void)
       << "::Components::Cookie * ck)" << be_uidt_nl
       << "{" << be_idt_nl;
 
+  if (swapping_)
+    {
+      os_ << "this->activate_component ();" << be_nl << be_nl;
+    }
+
   os_ << "ACE_UNUSED_ARG (ck);" << be_nl << be_nl
       << "if (name == 0)" << be_idt_nl
       << "{" << be_idt_nl
@@ -1033,6 +1079,11 @@ be_visitor_servant_svs::gen_emits_top (void)
       << be_uidt_nl
       << "{" << be_idt_nl;
 
+  if (swapping_)
+    {
+      os_ << "this->activate_component ();" << be_nl << be_nl;
+    }
+
   os_ << "if (emitter_name == 0)" << be_idt_nl
       << "{" << be_idt_nl
       << "throw ::CORBA::BAD_PARAM ();" << be_uidt_nl
@@ -1062,6 +1113,11 @@ be_visitor_servant_svs::gen_emits_top (void)
       << "const char * source_name)" << be_uidt_nl
       << "{" << be_idt_nl;
 
+  if (swapping_)
+    {
+      os_ << "this->activate_component ();" << be_nl << be_nl;
+    }
+
   os_ << "if (source_name == 0)" << be_idt_nl
       << "{" << be_idt_nl
       << "throw ::CORBA::BAD_PARAM ();" << be_uidt_nl
@@ -1760,9 +1816,7 @@ Component_Op_Attr_Generator::emit (be_interface * /* derived_interface */,
                                    TAO_OutStream * /* os */,
                                    be_interface * base_interface)
 {
-  AST_Decl::NodeType nt = base_interface->node_type ();
-
-  if (nt == AST_Decl::NT_component || nt == AST_Decl::NT_connector)
+  if (base_interface->node_type () == AST_Decl::NT_component)
     {
       return 0;
     }
diff --git a/TAO/TAO_IDL/be/be_visitor_component_fwd.cpp b/TAO/TAO_IDL/be/be_visitor_component_fwd.cpp
index 3881e528ee7..baf29faad36 100644
--- a/TAO/TAO_IDL/be/be_visitor_component_fwd.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component_fwd.cpp
@@ -1,17 +1,22 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    be_visitor_component_fwd.cpp
- *
- *  $Id$
- *
- *  Visitors for generation of code for forward declared Component
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_component_fwd.cpp
+//
+// = DESCRIPTION
+//    Visitors for generation of code for forward declared Component
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #include "be_component_fwd.h"
 #include "be_helper.h"
@@ -24,3 +29,7 @@
 #include "be_visitor_component_fwd/any_op_ch.cpp"
 #include "be_visitor_component_fwd/cdr_op_ch.cpp"
 
+ACE_RCSID (be, 
+           be_visitor_component_fwd, 
+           "$Id$")
+
diff --git a/TAO/TAO_IDL/be/be_visitor_component_fwd/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_component_fwd/any_op_ch.cpp
index 09aa5f42b18..bfa9474be87 100644
--- a/TAO/TAO_IDL/be/be_visitor_component_fwd/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component_fwd/any_op_ch.cpp
@@ -1,18 +1,27 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    any_op_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Any operators for a forward declared 
- *  component in the client header.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    any_op_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Any operators for a forward declared 
+//    component in the client header.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
+ACE_RCSID (be_visitor_component_fwd, 
+           any_op_ch, 
+           "$Id$")
 
 // ***************************************************************************
 // Generates Any operator declarations in the client header
diff --git a/TAO/TAO_IDL/be/be_visitor_component_fwd/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_component_fwd/cdr_op_ch.cpp
index 601c4631607..b532b2f8248 100644
--- a/TAO/TAO_IDL/be/be_visitor_component_fwd/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component_fwd/cdr_op_ch.cpp
@@ -1,18 +1,27 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    cdr_op_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for CDR operators for forward declared
- *  components. This uses compiled marshaling.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for CDR operators for forward declared
+//    components. This uses compiled marshaling.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
+ACE_RCSID (be_visitor_component_fwd, 
+           cdr_op_ch, 
+           "$Id$")
 
 // ***************************************************************************
 // Forward declared component visitor for generating CDR operator declarations
diff --git a/TAO/TAO_IDL/be/be_visitor_component_fwd/component_fwd_ch.cpp b/TAO/TAO_IDL/be/be_visitor_component_fwd/component_fwd_ch.cpp
index 29adfb70916..8e3336853b4 100644
--- a/TAO/TAO_IDL/be/be_visitor_component_fwd/component_fwd_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component_fwd/component_fwd_ch.cpp
@@ -1,17 +1,26 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    component_fwd_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Component_Fwd node in the client header.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    component_fwd_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Component_Fwd node in the client header.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
+ACE_RCSID (be_visitor_component_fwd, 
+           component_fwd_ch, 
+           "$Id$")
 
 // ********************************************************************
 // Visitor implementation for the Component_Fwd type
diff --git a/TAO/TAO_IDL/be/be_visitor_component_scope.cpp b/TAO/TAO_IDL/be/be_visitor_component_scope.cpp
index 47b06b8ac88..e0c3cdb6b96 100644
--- a/TAO/TAO_IDL/be/be_visitor_component_scope.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component_scope.cpp
@@ -1,17 +1,22 @@
-
-//=============================================================================
-/**
- *  @file    be_visitor_component_scope.cpp
- *
- *  $Id$
- *
- *  Abstract visitor providing ancestor scope visitation.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_component_scope.cpp
+//
+// = DESCRIPTION
+//    Abstract visitor providing ancestor scope visitation.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #include "be_visitor_component_scope.h"
 #include "be_visitor_context.h"
@@ -33,6 +38,7 @@ be_visitor_component_scope::be_visitor_component_scope (
     node_ (0),
     os_ (*ctx->stream ()),
     export_macro_ (be_global->svnt_export_macro ()),
+    swapping_ (be_global->gen_component_swapping ()),
     static_config_ (be_global->gen_ciao_static_config ())
 {
   /// All existing CIAO examples set the servant export values in the CIDL
@@ -56,17 +62,17 @@ be_visitor_component_scope::visit_extended_port (
 {
   AST_Decl::NodeType nt =
     ScopeAsDecl (node->defined_in ())->node_type ();
-
-  // Store this to prefix to contained provides or uses node name.
+  
+  // Store this to prefix to contained provides or uses node name.  
   if (nt == AST_Decl::NT_component || nt == AST_Decl::NT_connector)
     {
       this->port_prefix_ = node->local_name ()->get_string ();
       this->port_prefix_ += '_';
     }
-
+    
   int status =
     this->visit_porttype_scope (node->port_type ());
-
+    
   if (status == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -75,7 +81,7 @@ be_visitor_component_scope::visit_extended_port (
                          ACE_TEXT ("visit_porttype_scope failed\n")),
                         -1);
     }
-
+  
   this->port_prefix_ = "";
   return 0;
 }
@@ -86,17 +92,17 @@ be_visitor_component_scope::visit_mirror_port (
 {
   AST_Decl::NodeType nt =
     ScopeAsDecl (node->defined_in ())->node_type ();
-
-  // Store this to prefix to contained provides or uses node name.
+    
+  // Store this to prefix to contained provides or uses node name.  
   if (nt == AST_Decl::NT_component || nt == AST_Decl::NT_connector)
     {
       this->port_prefix_ = node->local_name ()->get_string ();
       this->port_prefix_ += '_';
     }
-
+    
   int status =
     this->visit_porttype_scope_mirror (node->port_type ());
-
+    
   if (status == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -106,7 +112,7 @@ be_visitor_component_scope::visit_mirror_port (
                          ACE_TEXT ("_mirror failed\n")),
                         -1);
     }
-
+  
   this->port_prefix_ = "";
   return 0;
 }
@@ -119,7 +125,7 @@ be_visitor_component_scope::visit_component_scope (
     {
       return 0;
     }
-
+    
   if (this->visit_scope (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -129,7 +135,7 @@ be_visitor_component_scope::visit_component_scope (
                          ACE_TEXT ("failed\n")),
                         -1);
     }
-
+    
   return this->visit_component_scope (node->base_component ());
 }
 
@@ -148,18 +154,18 @@ be_visitor_component_scope::visit_porttype_scope_mirror (be_porttype *node)
        si.next ())
     {
       be_decl *d = be_decl::narrow_from_decl (si.item ());
-
+      
       switch (d->node_type ())
         {
           case AST_Decl::NT_provides:
             {
               be_provides *p =
                 be_provides::narrow_from_decl (d);
-
+                
               be_uses mirror_node (p->name (),
                                    p->provides_type (),
                                    false);
-
+                                   
               if (this->visit_uses (&mirror_node) == -1)
                 {
                   ACE_ERROR_RETURN ((LM_ERROR,
@@ -168,7 +174,7 @@ be_visitor_component_scope::visit_porttype_scope_mirror (be_porttype *node)
                                      ACE_TEXT ("visit_uses() failed\n")),
                                     -1);
                 }
-
+                
               mirror_node.destroy ();
               break;
             }
@@ -176,10 +182,10 @@ be_visitor_component_scope::visit_porttype_scope_mirror (be_porttype *node)
             {
               be_uses *u =
                 be_uses::narrow_from_decl (d);
-
+                
               be_provides mirror_node (u->name (),
                                        u->uses_type ());
-
+                                   
               if (this->visit_provides (&mirror_node) == -1)
                 {
                   ACE_ERROR_RETURN ((LM_ERROR,
@@ -188,7 +194,7 @@ be_visitor_component_scope::visit_porttype_scope_mirror (be_porttype *node)
                                      ACE_TEXT ("visit_provides() failed\n")),
                                     -1);
                 }
-
+                
               mirror_node.destroy ();
               break;
             }
@@ -196,7 +202,7 @@ be_visitor_component_scope::visit_porttype_scope_mirror (be_porttype *node)
             return d->accept (this);
         }
     }
-
+    
   return 0;
 }
 
@@ -259,7 +265,7 @@ be_visitor_component_scope::gen_exec_entrypoint_decl (void)
       << "extern \"C\" " << export_macro_.c_str ()
       << " ::Components::EnterpriseComponent_ptr" << be_nl
       << "create_" << node_->flat_name ()
-      << "_Impl (void);";
+      << "_Impl (void);"; 
 }
 
 void
diff --git a/TAO/TAO_IDL/be/be_visitor_connector.cpp b/TAO/TAO_IDL/be/be_visitor_connector.cpp
index fb139f785ed..bff55072b91 100644
--- a/TAO/TAO_IDL/be/be_visitor_connector.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_connector.cpp
@@ -1,26 +1,27 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    be_visitor_connector.cpp
- *
- *  $Id$
- *
- *  Visitors for generation of code for Connector.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
-#include "ast_template_module_inst.h"
-
-#include "nr_extern.h"
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_connector.cpp
+//
+// = DESCRIPTION
+//    Visitors for generation of code for Connector.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #include "be_connector.h"
 
 #include "be_visitor_connector.h"
 #include "be_visitor_context.h"
 
-#include "be_visitor_connector/connector_dds_ex_base.cpp"
 #include "be_visitor_connector/connector_dds_exh.cpp"
 #include "be_visitor_connector/connector_dds_exs.cpp"
diff --git a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_ex_base.cpp b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_ex_base.cpp
deleted file mode 100644
index 0352f5a57f9..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_ex_base.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-
-//=============================================================================
-/**
- *  @file    connector_dds_ex_base.cpp
- *
- *  $Id$
- *
- *  Base class for visitors generating code for DDS Connectors in
- *  the exec impl.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
-
-be_visitor_connector_dds_ex_base::be_visitor_connector_dds_ex_base (
-      be_visitor_context *ctx)
-  : be_visitor_component_scope (ctx),
-    t_inst_ (0),
-    t_args_ (0)
-{
-}
-
-be_visitor_connector_dds_ex_base::~be_visitor_connector_dds_ex_base (void)
-{
-}
-
-void
-be_visitor_connector_dds_ex_base::process_template_args (
-  AST_Connector *base)
-{
-  AST_Decl *d =
-    node_->defined_in ()->lookup_by_name (
-      ScopeAsDecl (base->defined_in ())->name (),
-      true);
-
-  // The template module instantiation and the corresponding
-  // implied IDL module have the same name, but the instantiation
-  // comes first in the scope list, so that is what the scope
-  // iteration will find first.
-  this->t_inst_ =
-    AST_Template_Module_Inst::narrow_from_decl (d);
-
-  if (this->t_inst_ == 0)
-    {
-      // More shaky logic, but it's the best we have for now.
-      // Depends on the application connector have a base
-      // connector declared in the instantiation of a template
-      // module.
-      return;
-    }
-
-  this->t_args_ = this->t_inst_->template_args ();
-
-  // We depend on the DDS datatype being the first template
-  // argument for now, this may change.
-  AST_Decl **datatype = 0;
-  int status = this->t_args_->get (datatype, 0UL);
-
-  if (status != 0)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("be_visitor_connector_dds_ex_base::")
-                  ACE_TEXT ("process_template_args - ")
-                  ACE_TEXT ("template arg not found\n ")));
-
-      return;
-    }
-
-  this->dds_traits_name_ = (*datatype)->flat_name ();
-  this->dds_traits_name_ += "_DDS_Traits";
-}
-
diff --git a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp
index 0fd991f105a..28640d3be6f 100644
--- a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp
@@ -1,27 +1,32 @@
-
-//=============================================================================
-/**
- *  @file    connector_dds_exh.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for DDS Connectors in the exec impl header.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO_IDL_BE
+//
+// = FILENAME
+//    connector_dds_exh.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for DDS Connectors in the exec impl header.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 be_visitor_connector_dds_exh::be_visitor_connector_dds_exh (
       be_visitor_context *ctx)
-  : be_visitor_connector_dds_ex_base (ctx)
+  : be_visitor_component_scope (ctx)
 {
   // This is initialized in the base class to svnt_export_macro()
   // or skel_export_macro(), since there are many more visitor
   // classes generating servant code. So we can just override
   // all that here.
-  export_macro_ = be_global->conn_export_macro ();
+  export_macro_ = be_global->exec_export_macro ();
 }
 
 be_visitor_connector_dds_exh::~be_visitor_connector_dds_exh (void)
@@ -31,189 +36,22 @@ be_visitor_connector_dds_exh::~be_visitor_connector_dds_exh (void)
 int
 be_visitor_connector_dds_exh::visit_connector (be_connector *node)
 {
-  if (node->imported ())
-    {
-      return 0;
-    }
-
-  AST_Connector *base = node->base_connector ();
-
-  // Hack for the time being to skip codegen for DDS_State
-  // and DDS_Event, both of which come along with the template
-  // module instantiation.
-  if (base == 0)
-    {
-      return 0;
-    }
-
   node_ = node;
 
-  // More shaky logic that will have to be improved. If our
-  // base connector does not come from an instantiated
-  // template module, we skip the code generation.
-  this->process_template_args (base);
-
-  if (this->t_args_ == 0)
-    {
-      return 0;
-    }
-
   /// CIDL-generated namespace used 'CIDL_' + composition name.
   /// Now we use 'CIAO_' + component's flat name.
   os_ << be_nl << be_nl
       << "namespace CIAO_" << node->flat_name ()
       << "_Impl" << be_nl
       << "{" << be_idt;
-
-  this->gen_dds_traits ();
-  this->gen_connector_traits ();
-
-  if (this->t_args_ == 0)
-    {
-      return 0;
-    }
-
-  /// Assumes parent connector exists and is either DDS_State
-  /// or DDS_Event, so we generate inheritance from the
-  /// corresponding template. May have to generalize this logic.
-  os_ << be_nl << be_nl
-      << "class " << this->export_macro_.c_str () << " "
-      << this->node_->local_name () << "_exec_i" << be_idt_nl
-      << ": public " << node->base_connector ()->local_name ()
-      << "_Connector_T";
-
-  AST_Decl **datatype = 0;
-  int status = this->t_args_->get (datatype, 0UL);
-
-  if (status != 0)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("be_visitor_connector_dds_exh::")
-                  ACE_TEXT ("gen_dds_traits - ")
-                  ACE_TEXT ("template arg not found\n ")));
-
-      return -1;
-    }
-
-  AST_Type *ut = AST_Type::narrow_from_decl (*datatype);
-
-  os_ << " <" << be_idt << be_idt_nl
-      << this->dds_traits_name_.c_str () << "," << be_nl
-      << "DDS" << this->node_->local_name ()
-      << "_Traits," << be_nl;
-
-  if (ut->size_type () == AST_Type::FIXED)
-    {
-      os_ << "true> ";
-    }
-  else
-    {
-      os_ << "false> ";
-    }
-
-  os_ << be_uidt << be_uidt << be_uidt_nl
-      << "{" << be_nl
-      << "public:" << be_idt_nl
-      << this->node_->local_name () << "_exec_i (void);" << be_nl
-      << "virtual ~" << this->node_->local_name ()
-      << "_exec_i (void);";
-
-  if (this->visit_scope (node) != 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("be_visitor_connector_dds_exh::")
-                         ACE_TEXT ("visit_connector - ")
-                         ACE_TEXT ("visit_scope() failed\n ")),
-                        -1);
-    }
-
-  os_ << be_uidt_nl
-      << "};";
-
+      
+  // TODO - template class declaration.
+      
   this->gen_exec_entrypoint_decl ();
-
+     
   os_ << be_uidt_nl
       << "}";
-
+     
   return 0;
 }
 
-void
-be_visitor_connector_dds_exh::gen_dds_traits (void)
-{
-  // We depend on the DDS datatype being the first template
-  // argument for now, this may change.
-  AST_Decl **datatype = 0;
-  int status = this->t_args_->get (datatype, 0UL);
-
-  if (status != 0)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("be_visitor_connector_dds_exh::")
-                  ACE_TEXT ("gen_dds_traits - ")
-                  ACE_TEXT ("template arg not found\n ")));
-
-      return;
-    }
-
-  UTL_ScopedName *dt_name = (*datatype)->name ();
-
-  // More generic logic TBI.
-  bool rti_dds_connector = true;
-
-  if (rti_dds_connector)
-    {
-      os_ << be_nl
-          << "typedef CIAO::DDS4CCM::RTI::Type_Traits <"
-          << be_idt_nl
-          << "::" << dt_name << "," << be_nl
-          << "::" << dt_name << "Seq," << be_nl
-          << "::" << dt_name << "TypeSupport," << be_nl
-          << "::" << dt_name << "DataWriter," << be_nl
-          << "::" << dt_name << "DataReader>";
-      os_ << this->dds_traits_name_.c_str () << ";" << be_uidt;
-    }
-}
-
-void
-be_visitor_connector_dds_exh::gen_connector_traits (void)
-{
-  AST_Decl **item = 0;
-  int status = this->t_args_->get (item, 1UL);
-
-  if (status != 0)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("be_visitor_connector_dds_exh::")
-                  ACE_TEXT ("gen_connector_traits - ")
-                  ACE_TEXT ("template arg not found\n ")));
-
-      return;
-    }
-
-  os_ << be_nl << be_nl
-      << "typedef ::CIAO::DDS4CCM::Connector_Traits <"
-      << be_idt_nl
-      << "::CIAO_" << this->node_->flat_name () << "_Impl::"
-      << this->node_->local_name () << "_Exec," << be_nl
-      << "::" << (*item)->name () << "," << be_nl
-      << "::" << this->t_inst_->name ()
-      << "::CCM_Writer," << be_nl
-      << "::" << this->t_inst_->name ()
-      << "::CCM_Updater," << be_nl
-      << "::" << this->t_inst_->name ()
-      << "::CCM_Getter," << be_nl
-      << "::" << this->t_inst_->name ()
-      << "::CCM_Reader," << be_nl
-      << "::" << ScopeAsDecl (this->node_->defined_in ())->name ()
-      << "::CCM_" << this->node_->local_name ()
-      << "_Context," << be_nl
-      << "::" << this->t_inst_->name ()
-      << "::Listener," << be_nl
-      << "::" << this->t_inst_->name ()
-      << "::StateListener," << be_nl
-      << "::CCM_DDS::ConnectorStatusListener> DDS"
-      << this->node_->local_name () << "_Traits;";
-}
-
-
diff --git a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp
index 6f4268f5f7f..a85a638a54c 100644
--- a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp
@@ -1,27 +1,32 @@
-
-//=============================================================================
-/**
- *  @file    connector_dds_exs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Connectors in the exec impl source.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO_IDL_BE
+//
+// = FILENAME
+//    connector_dds_exs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Connectors in the exec impl source.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 be_visitor_connector_dds_exs::be_visitor_connector_dds_exs (
       be_visitor_context *ctx)
-  : be_visitor_connector_dds_ex_base (ctx)
+  : be_visitor_component_scope (ctx)
 {
   // This is initialized in the base class to svnt_export_macro()
   // or skel_export_macro(), since there are many more visitor
   // classes generating servant code. So we can just override
   // all that here.
-  export_macro_ = be_global->conn_export_macro ();
+  export_macro_ = be_global->exec_export_macro ();
 }
 
 be_visitor_connector_dds_exs::~be_visitor_connector_dds_exs (void)
@@ -31,93 +36,22 @@ be_visitor_connector_dds_exs::~be_visitor_connector_dds_exs (void)
 int
 be_visitor_connector_dds_exs::visit_connector (be_connector *node)
 {
-  if (node->imported ())
-    {
-      return 0;
-    }
-
-  AST_Connector *base = node->base_connector ();
-
-  // Hack for the time being to skip codegen for DDS_State
-  // and DDS_Event, both of which come along with the template
-  // module instantiation.
-  if (base == 0)
-    {
-      return 0;
-    }
-
   node_ = node;
 
-  // Shaky logic that will have to be improved. If our
-  // base connector does not come from an instantiated
-  // template module, we skip the code generation.
-  this->process_template_args (base);
-
-  if (this->t_args_ == 0)
-    {
-      return 0;
-    }
-
   /// CIDL-generated namespace used 'CIDL_' + composition name.
   /// Now we use 'CIAO_' + component's flat name.
   os_ << be_nl << be_nl
       << "namespace CIAO_" << node->flat_name ()
       << "_Impl" << be_nl
       << "{" << be_idt;
-
-  os_ << be_nl
-      << this->node_->local_name () << "_exec_i::"
-      << this->node_->local_name () << "_exec_i (void)"
-      << be_idt_nl
-      << ": " << node->base_connector ()->local_name ()
-      << "_Connector_T";
-
-  AST_Decl **datatype = 0;
-  int status = this->t_args_->get (datatype, 0UL);
-
-  if (status != 0)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("be_visitor_connector_dds_exh::")
-                  ACE_TEXT ("gen_dds_traits - ")
-                  ACE_TEXT ("template arg not found\n ")));
-
-      return -1;
-    }
-
-  AST_Type *ut = AST_Type::narrow_from_decl (*datatype);
-
-  /// Assumes parent connector exists and is either DDS_State
-  /// or DDS_Event, so we generate inheritance from the
-  /// corresponding template. May have to generalize this logic.
-  os_ << " <" << be_idt << be_idt_nl
-      << this->dds_traits_name_.c_str () << "," << be_nl
-      << "DDS" << this->node_->local_name () << "_Traits," << be_nl;
-
-  if (ut->size_type () == AST_Type::FIXED)
-    {
-      os_ << "true> ";
-    }
-  else
-    {
-      os_ << "false> ";
-    }
-  os_ << "()"
-      << be_uidt << be_uidt << be_uidt_nl
-      << "{" << be_nl
-      << "}";
-
-  os_ << be_nl << be_nl
-      << this->node_->local_name () << "_exec_i::~"
-      << this->node_->local_name () << "_exec_i (void)" << be_nl
-      << "{" << be_nl
-      << "}";
-
+      
+  // TODO - template class constructor and destructor.
+      
   this->gen_exec_entrypoint_defn ();
-
+     
   os_ << be_uidt_nl
       << "}";
-
+     
   return 0;
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_constant.cpp b/TAO/TAO_IDL/be/be_visitor_constant.cpp
index 1a9bf45abe7..31fe34ea8fc 100644
--- a/TAO/TAO_IDL/be/be_visitor_constant.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_constant.cpp
@@ -1,17 +1,22 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    be_visitor_constant.cpp
- *
- *  $Id$
- *
- *  Visitors for generation of code for Constant
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_constant.cpp
+//
+// = DESCRIPTION
+//    Visitors for generation of code for Constant
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #include "be_constant.h"
 #include "be_module.h"
@@ -26,3 +31,7 @@
 #include "be_visitor_constant/constant_ch.cpp"
 #include "be_visitor_constant/constant_cs.cpp"
 
+ACE_RCSID (be, 
+           be_visitor_constant, 
+           "$Id$")
+
diff --git a/TAO/TAO_IDL/be/be_visitor_constant/constant_ch.cpp b/TAO/TAO_IDL/be/be_visitor_constant/constant_ch.cpp
index 4c78540881c..87eb012138e 100644
--- a/TAO/TAO_IDL/be/be_visitor_constant/constant_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_constant/constant_ch.cpp
@@ -1,16 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    constant_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for the Constant node in the client header.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    constant_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for the Constant node in the client header.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_constant,
+           constant_ch,
+           "$Id$")
 
 
 // ********************************************************************
diff --git a/TAO/TAO_IDL/be/be_visitor_constant/constant_cs.cpp b/TAO/TAO_IDL/be/be_visitor_constant/constant_cs.cpp
index 32d7b725d99..194e193a38f 100644
--- a/TAO/TAO_IDL/be/be_visitor_constant/constant_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_constant/constant_cs.cpp
@@ -1,16 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    constant_cs.cpp
- *
- *  $Id$
- *
- *  Visitor for code generation of Constant code in the client stubs file.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    constant_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor for code generation of Constant code in the client stubs file.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_constant,
+           constant_cs,
+           "$Id$")
 
 
 // ********************************************************************
diff --git a/TAO/TAO_IDL/be/be_visitor_context.cpp b/TAO/TAO_IDL/be/be_visitor_context.cpp
index 9a3cac5baaf..b7b41d1781a 100644
--- a/TAO/TAO_IDL/be/be_visitor_context.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_context.cpp
@@ -1,20 +1,46 @@
-
-//=============================================================================
-/**
- *  @file    be_visitor_context.cpp
- *
- *  $Id$
- *
- *   Maintains the context information for visitors
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO_IDL_FE
+//
+// = FILENAME
+//    be_visitor_context.cpp
+//
+// = DESCRIPTION
+//     Maintains the context information for visitors
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+#include "be_argument.h"
+#include "be_array.h"
+#include "be_attribute.h"
+#include "be_constant.h"
+#include "be_enum.h"
+#include "be_enum_val.h"
+#include "be_exception.h"
+#include "be_extern.h"
+#include "be_field.h"
+#include "be_interface.h"
+#include "be_interface_fwd.h"
+#include "be_module.h"
+#include "be_operation.h"
+#include "be_predefined_type.h"
+#include "be_root.h"
+#include "be_sequence.h"
+#include "be_string.h"
+#include "be_structure.h"
+#include "be_typedef.h"
+#include "be_union.h"
+#include "be_union_branch.h"
 
 #include "be_visitor_context.h"
-#include "be_extern.h"
 
 be_visitor_context::be_visitor_context (void)
   : ast_visitor_context (),
@@ -225,6 +251,372 @@ be_visitor_context::interface (void) const
   return this->interface_;
 }
 
+// ****************************************************************
+
+be_argument *
+be_visitor_context::be_node_as_argument (void)
+{
+  if (this->node_ != 0)
+    {
+      return be_argument::narrow_from_decl (this->node_);
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+be_array *
+be_visitor_context::be_node_as_array (void)
+{
+  if (this->node_ != 0)
+    {
+      return be_array::narrow_from_decl (this->node_);
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+be_attribute *
+be_visitor_context::be_node_as_attribute (void)
+{
+  if (this->node_ != 0)
+    {
+      return be_attribute::narrow_from_decl (this->node_);
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+be_constant *
+be_visitor_context::be_node_as_constant (void)
+{
+  if (this->node_ != 0)
+    {
+      return be_constant::narrow_from_decl (this->node_);
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+be_enum *
+be_visitor_context::be_node_as_enum (void)
+{
+  if (this->node_ != 0)
+    {
+      return be_enum::narrow_from_decl (this->node_);
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+be_enum_val *
+be_visitor_context::be_node_as_enum_val (void)
+{
+  if (this->node_ != 0)
+    {
+      return be_enum_val::narrow_from_decl (this->node_);
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+be_exception *
+be_visitor_context::be_node_as_exception (void)
+{
+  if (this->node_ != 0)
+    {
+      return be_exception::narrow_from_decl (this->node_);
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+be_field *
+be_visitor_context::be_node_as_field (void)
+{
+  if (this->node_ != 0)
+    {
+      return be_field::narrow_from_decl (this->node_);
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+be_interface *
+be_visitor_context::be_node_as_interface (void)
+{
+  if (this->node_ != 0)
+    {
+      return be_interface::narrow_from_decl (this->node_);
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+be_interface_fwd *
+be_visitor_context::be_node_as_interface_fwd (void)
+{
+  if (this->node_ != 0)
+    {
+      return be_interface_fwd::narrow_from_decl (this->node_);
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+be_module *
+be_visitor_context::be_node_as_module (void)
+{
+  if (this->node_ != 0)
+    {
+      return be_module::narrow_from_decl (this->node_);
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+be_operation *
+be_visitor_context::be_node_as_operation (void)
+{
+  if (this->node_ != 0)
+    {
+      return be_operation::narrow_from_decl (this->node_);
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+be_predefined_type *
+be_visitor_context::be_node_as_predefined_type (void)
+{
+  if (this->node_ != 0)
+    {
+      return be_predefined_type::narrow_from_decl (this->node_);
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+be_root *
+be_visitor_context::be_node_as_root (void)
+{
+  if (this->node_ != 0)
+    {
+      return be_root::narrow_from_decl (this->node_);
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+be_sequence *
+be_visitor_context::be_node_as_sequence (void)
+{
+  if (this->node_ != 0)
+    {
+      return be_sequence::narrow_from_decl (this->node_);
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+be_string *
+be_visitor_context::be_node_as_string (void)
+{
+  if (this->node_ != 0)
+    {
+      return be_string::narrow_from_decl (this->node_);
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+be_structure *
+be_visitor_context::be_node_as_structure (void)
+{
+  if (this->node_ != 0)
+    {
+      return be_structure::narrow_from_decl (this->node_);
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+be_typedef *
+be_visitor_context::be_node_as_typedef (void)
+{
+  if (this->node_ != 0)
+    {
+      return be_typedef::narrow_from_decl (this->node_);
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+be_union *
+be_visitor_context::be_node_as_union (void)
+{
+  if (this->node_ != 0)
+    {
+      return be_union::narrow_from_decl (this->node_);
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+be_union_branch *
+be_visitor_context::be_node_as_union_branch (void)
+{
+  if (this->node_ != 0)
+    {
+      return be_union_branch::narrow_from_decl (this->node_);
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+be_enum *
+be_visitor_context::be_scope_as_enum (void)
+{
+  if (this->scope_ != 0)
+    {
+      return be_enum::narrow_from_decl (this->scope_->decl ());
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+be_exception *
+be_visitor_context::be_scope_as_exception (void)
+{
+  if (this->scope_ != 0)
+    {
+      return be_exception::narrow_from_decl (this->scope_->decl ());
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+be_interface *
+be_visitor_context::be_scope_as_interface (void)
+{
+  if (this->scope_ != 0)
+    {
+      return be_interface::narrow_from_decl (this->scope_->decl ());
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+be_module *
+be_visitor_context::be_scope_as_module (void)
+{
+  if (this->scope_ != 0)
+    {
+      return be_module::narrow_from_decl (this->scope_->decl ());
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+be_operation *
+be_visitor_context::be_scope_as_operation (void)
+{
+  if (this->scope_ != 0)
+    {
+      return be_operation::narrow_from_decl (this->scope_->decl ());
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+be_root *
+be_visitor_context::be_scope_as_root (void)
+{
+  if (this->scope_ != 0)
+    {
+      return be_root::narrow_from_decl (this->scope_->decl ());
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+be_structure *
+be_visitor_context::be_scope_as_structure (void)
+{
+  if (this->scope_ != 0)
+    {
+      return be_structure::narrow_from_decl (this->scope_->decl ());
+    }
+  else
+    {
+      return 0;
+    }
+}
+
+be_union *
+be_visitor_context::be_scope_as_union (void)
+{
+  if (this->scope_ != 0)
+    {
+      return be_union::narrow_from_decl (this->scope_->decl ());
+    }
+  else
+    {
+      return 0;
+    }
+}
+
 const char *
 be_visitor_context::export_macro (void) const
 {
diff --git a/TAO/TAO_IDL/be/be_visitor_decl.cpp b/TAO/TAO_IDL/be/be_visitor_decl.cpp
index 70c5c1eb8c8..379d71a67c8 100644
--- a/TAO/TAO_IDL/be/be_visitor_decl.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_decl.cpp
@@ -1,18 +1,23 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    be_visitor_decl.cpp
- *
- *  $Id$
- *
- *  Visitor for the base be_decl node. This serves to maintain the current
- *  state (context) of code generation for the derived visitor.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_decl.cpp
+//
+// = DESCRIPTION
+//    Visitor for the base be_decl node. This serves to maintain the current
+//    state (context) of code generation for the derived visitor.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #include "be_visitor_decl.h"
 #include "be_visitor_sequence.h"
@@ -21,6 +26,10 @@
 #include "be_type.h"
 #include "ace/Log_Msg.h"
 
+ACE_RCSID (be, 
+           be_visitor_decl, 
+           "$Id$")
+
 // Root visitor for client header
 be_visitor_decl::be_visitor_decl (be_visitor_context *ctx)
   : ctx_ (ctx)
diff --git a/TAO/TAO_IDL/be/be_visitor_enum.cpp b/TAO/TAO_IDL/be/be_visitor_enum.cpp
index 69faa92d2ac..be1a2adce3d 100644
--- a/TAO/TAO_IDL/be/be_visitor_enum.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_enum.cpp
@@ -1,17 +1,22 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    be_visitor_enum.cpp
- *
- *  $Id$
- *
- *  Visitors for generation of code for Enum
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_enum.cpp
+//
+// = DESCRIPTION
+//    Visitors for generation of code for Enum
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #include "be_enum.h"
 #include "be_enum_val.h"
@@ -30,3 +35,6 @@
 #include "be_visitor_enum/serializer_op_ch.cpp"
 #include "be_visitor_enum/serializer_op_cs.cpp"
 
+ACE_RCSID (be, 
+           be_visitor_enum, 
+           "$Id$")
diff --git a/TAO/TAO_IDL/be/be_visitor_enum/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_enum/any_op_ch.cpp
index 79ddce9f48f..4b815165473 100644
--- a/TAO/TAO_IDL/be/be_visitor_enum/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_enum/any_op_ch.cpp
@@ -1,17 +1,26 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    any_op_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Enums for the Any operators
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    any_op_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Enums for the Any operators
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
+ACE_RCSID (be_visitor_enum,
+           any_op_ch,
+           "$Id$")
 
 // ***************************************************************************
 // Enum visitor for generating Any operator declarations in the client header
diff --git a/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp
index dcef9a62cae..effcd2e15ce 100644
--- a/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_enum/any_op_cs.cpp
@@ -1,17 +1,26 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    any_op_cs.cpp
- *
- *  $Id$
- *
- *  Visitors for generation of code for Enum for the Any operators
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    any_op_cs.cpp
+//
+// = DESCRIPTION
+//    Visitors for generation of code for Enum for the Any operators
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
+ACE_RCSID (be_visitor_enum,
+           any_op_cs,
+           "$Id$")
 
 // ***************************************************************************
 // Enum visitor for generating Any operator declarations in the client
diff --git a/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_ch.cpp
index fcac3e1c015..85f8cf0204c 100644
--- a/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_ch.cpp
@@ -1,16 +1,26 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    cdr_op_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Enums for the CDR operators
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Enums for the CDR operators
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_enum,
+           cdr_op_ch,
+           "$Id$")
 
 
 // ***************************************************************************
diff --git a/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_cs.cpp
index cc754ea58da..b1384d64794 100644
--- a/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_enum/cdr_op_cs.cpp
@@ -1,16 +1,26 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    cdr_op_cs.cpp
- *
- *  $Id$
- *
- *  Visitors for generation of code for Enum for the CDR operators
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_cs.cpp
+//
+// = DESCRIPTION
+//    Visitors for generation of code for Enum for the CDR operators
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_enum,
+           cdr_op_cs,
+           "$Id$")
 
 
 // ***************************************************************************
diff --git a/TAO/TAO_IDL/be/be_visitor_enum/enum_ch.cpp b/TAO/TAO_IDL/be/be_visitor_enum/enum_ch.cpp
index 57f16d8986e..583b177c659 100644
--- a/TAO/TAO_IDL/be/be_visitor_enum/enum_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_enum/enum_ch.cpp
@@ -1,19 +1,29 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    enum_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Enums in the client header
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
-//=============================================================================
-/**
- *  @file    enum_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Enums in the client header
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
+#include "be_visitor_typecode/typecode_decl.h"
 
+ACE_RCSID (be_visitor_enum, 
+           enum_ch, 
+           "$Id$")
 
-#include "be_visitor_typecode/typecode_decl.h"
 
 // ********************************************************************
 // Visitor implementation for the Enum type
diff --git a/TAO/TAO_IDL/be/be_visitor_enum/enum_cs.cpp b/TAO/TAO_IDL/be/be_visitor_enum/enum_cs.cpp
index 60c505b29c2..452cfeb3a7a 100644
--- a/TAO/TAO_IDL/be/be_visitor_enum/enum_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_enum/enum_cs.cpp
@@ -1,20 +1,30 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    enum_cs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Enums in the client stubs
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    enum_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Enums in the client stubs
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #include "be_visitor_typecode/enum_typecode.h"
 
+ACE_RCSID (be_visitor_enum,
+           enum_cs,
+           "$Id$")
+
+
 // ********************************************************************
 // Visitor implementation for the Enum type
 // This one for the client stubs file
diff --git a/TAO/TAO_IDL/be/be_visitor_enum/serializer_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_enum/serializer_op_ch.cpp
index fefd745ed86..fa543f76d59 100644
--- a/TAO/TAO_IDL/be/be_visitor_enum/serializer_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_enum/serializer_op_ch.cpp
@@ -1,16 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    serializer_op_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Enums for the TAO::DCPS::Serializer operators
- *
- *
- *  @author Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
- */
-//=============================================================================
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    serializer_op_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Enums for the TAO::DCPS::Serializer operators
+//
+// = AUTHOR
+//    Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_enum, 
+           serializer_op_ch, 
+           "$Id$")
 
 
 // ***************************************************************************
diff --git a/TAO/TAO_IDL/be/be_visitor_enum/serializer_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_enum/serializer_op_cs.cpp
index dbe1732044e..8ee3eab7b30 100644
--- a/TAO/TAO_IDL/be/be_visitor_enum/serializer_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_enum/serializer_op_cs.cpp
@@ -1,17 +1,27 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    serializer_op_cs.cpp
- *
- *  $Id$
- *
- *  Visitors for generation of code for Enum for the 
- *  TAO::DCPS::Serializer operators
- *
- *
- *  @author Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    serializer_op_cs.cpp
+//
+// = DESCRIPTION
+//    Visitors for generation of code for Enum for the 
+//    TAO::DCPS::Serializer operators
+//
+// = AUTHOR
+//    Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_enum,
+           serializer_op_cs,
+           "$Id$")
 
 
 // ***************************************************************************
diff --git a/TAO/TAO_IDL/be/be_visitor_exception.cpp b/TAO/TAO_IDL/be/be_visitor_exception.cpp
index ca41b57cc19..b1abf086343 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception.cpp
@@ -1,17 +1,22 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    be_visitor_exception.cpp
- *
- *  $Id$
- *
- *  Visitors for generation of code for Exception
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_exception.cpp
+//
+// = DESCRIPTION
+//    Visitors for generation of code for Exception
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #include "be_field.h"
 #include "be_exception.h"
@@ -48,3 +53,6 @@
 #include "be_visitor_exception/cdr_op_ch.cpp"
 #include "be_visitor_exception/cdr_op_cs.cpp"
 
+ACE_RCSID (be,
+           be_visitor_exception,
+           "$Id$")
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp
index 2656807808e..3682ee0670d 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    any_op_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for the Any operators for Exceptions
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    any_op_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for the Any operators for Exceptions
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_exception,
+           any_op_ch,
+           "$Id$")
 
 // ***************************************************************************
 // Exception visitor for generating Any operator declarations in the client header
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp
index 3b38b21e2ce..c1f5ced2ea5 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 // ============================================================================
 //
 // = LIBRARY
@@ -16,6 +14,10 @@
 //
 // ============================================================================
 
+ACE_RCSID (be_visitor_exception,
+           any_op_cs,
+           "$Id$")
+
 // ***************************************************************************
 // Exception visitor for generating Any operator declarations in the client
 // stubs file
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_ch.cpp
index 70351c7ebcf..3cb08db5470 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_ch.cpp
@@ -1,18 +1,27 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    cdr_op_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for CDR operators for exceptions. This uses
- *  compiled marshaling.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for CDR operators for exceptions. This uses
+//    compiled marshaling.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
+ACE_RCSID (be_visitor_exception, 
+           cdr_op_ch, 
+           "$Id$")
 
 // ***************************************************************************
 // Exception visitor for generating CDR operator declarations in the client header
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp
index 90da8e330aa..d04849fd46f 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_cs.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    cdr_op_cs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for CDR operators for exceptions
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for CDR operators for exceptions
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_exception, 
+           cdr_op_cs, 
+           "$Id$")
 
 be_visitor_exception_cdr_op_cs::be_visitor_exception_cdr_op_cs (
     be_visitor_context *ctx
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/ctor_assign.cpp b/TAO/TAO_IDL/be/be_visitor_exception/ctor_assign.cpp
index 5445fd9f8dc..ea3c3fbdda0 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/ctor_assign.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/ctor_assign.cpp
@@ -1,18 +1,27 @@
-
-//=============================================================================
-/**
- *  @file    ctor_assign.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for the special CTOR and assignment operator for
- *  Exceptions.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    ctor_assign.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for the special CTOR and assignment operator for
+//    Exceptions.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_exception,
+           ctor_assign,
+           "$Id$")
 
 // ************************************************************************
 // Used for the body of the assignment operator and the copy constructor.
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception.cpp
index be772c13e67..b805b899cf1 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/exception.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/exception.cpp
@@ -1,16 +1,26 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    exception.cpp
- *
- *  $Id$
- *
- *  Generic visitor generating code for Exceptions.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    .cpp
+//
+// = DESCRIPTION
+//    Generic visitor generating code for Exceptions.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_exception, 
+           exception, 
+           "$Id$")
 
 
 // Generic exception visitor.
@@ -81,7 +91,7 @@ be_visitor_exception::visit_field (be_field *node)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "(%N:%l) be_visitor_exception::"
                            "visit_field - "
-                           "Bad context state\n"),
+                           "Bad context state\n"), 
                           -1);
       }
     }
@@ -91,7 +101,7 @@ be_visitor_exception::visit_field (be_field *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_exception::"
                          "visit_field - "
-                         "failed to accept visitor\n"),
+                         "failed to accept visitor\n"),  
                         -1);
     }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp
index 968118c2e61..f6b36894144 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp
@@ -1,22 +1,31 @@
-
-//=============================================================================
-/**
- *  @file    exception_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Exception in the client header
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    exception_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Exception in the client header
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #include "be_visitor_typecode/typecode_decl.h"
 #include "global_extern.h"
 #include "utl_err.h"
 
+ACE_RCSID (be_visitor_exception,
+           exception_ch,
+           "$Id$")
+
 // ******************************************************
 // For client header.
 // ******************************************************
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_ci.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_ci.cpp
index 5464067f9ee..25edecd0bac 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/exception_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_ci.cpp
@@ -1,16 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    exception_ci.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Exception in the inline file.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    exception_ci.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Exception in the inline file.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_exception, 
+           exception_ci, 
+           "$Id$")
 
 
 // ******************************************************
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
index 64e765b5865..5af3eaedb71 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
@@ -1,20 +1,29 @@
-
-//=============================================================================
-/**
- *  @file    exception_cs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Exception in the stubs file
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    exception_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Exception in the stubs file
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #include "be_visitor_typecode/typecode_defn.h"
 
+ACE_RCSID (be_visitor_exception,
+           exception_cs,
+           "$Id$")
+
 // ***************************************************************************
 // For client stubs.
 // ***************************************************************************
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp
index 10f0003425c..6231586d0bd 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_ctor.cpp
@@ -1,16 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    exception_ctor.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for the special constructor for Exceptions
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    exception_ctor.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for the special constructor for Exceptions
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_exception,
+           exception_ctor,
+           "$Id$")
 
 
 // ************************************************************************
diff --git a/TAO/TAO_IDL/be/be_visitor_factory.cpp b/TAO/TAO_IDL/be/be_visitor_factory.cpp
index bb71e8967e5..2a228ffe01d 100644
--- a/TAO/TAO_IDL/be/be_visitor_factory.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_factory.cpp
@@ -1,20 +1,23 @@
+// $Id$
 
-//=============================================================================
-/**
- *  @file    be_visitor_factory.cpp
- *
- *  $Id$
- *
- *  Defines a factory that returns a specialized visitor object based on the
- *  code generation state. This factory creates visitors associated with
- *  Asynchronous Messaging Invocations (AMI) since, because of implied IDL,
- *  state is not locally known at visitor creation time.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL Backend
+//
+// = FILENAME
+//    be_visitor_factory.cpp
+//
+// = DESCRIPTION
+//    Defines a factory that returns a specialized visitor object based on the
+//    code generation state. This factory creates visitors associated with
+//    Asynchronous Messaging Invocations (AMI) since, because of implied IDL,
+//    state is not locally known at visitor creation time.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #include "ast_argument.h"
 
@@ -41,6 +44,10 @@
 #include "be_visitor_operation/ami_handler_reply_stub_operation_cs.h"
 #include "be_visitor_operation/ami_exception_holder_operation_cs.h"
 
+ACE_RCSID (be, 
+           be_visitor_factory, 
+           "$Id$")
+
 TAO_Visitor_Factory::TAO_Visitor_Factory (void)
 {
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_field.cpp b/TAO/TAO_IDL/be/be_visitor_field.cpp
index 14a3821b79d..1401c0c62f8 100644
--- a/TAO/TAO_IDL/be/be_visitor_field.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_field.cpp
@@ -1,16 +1,21 @@
-//=============================================================================
-/**
- *  @file    be_visitor_field.cpp
- *
- *  $Id$
- *
- *  Concrete visitor for the base "BE_Field" node
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_field.cpp
+//
+// = DESCRIPTION
+//    Concrete visitor for the base "BE_Field" node
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #include "be_type.h"
 #include "be_field.h"
diff --git a/TAO/TAO_IDL/be/be_visitor_field/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_field/cdr_op_ch.cpp
index c83b2e29807..1d1c82eaae9 100644
--- a/TAO/TAO_IDL/be/be_visitor_field/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_field/cdr_op_ch.cpp
@@ -1,17 +1,22 @@
-
-//=============================================================================
-/**
- *  @file    cdr_op_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating CDR operator declarator for field in the client header
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating CDR operator declarator for field in the client header
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #include "be_visitor_array/cdr_op_ch.h"
 #include "be_visitor_enum/cdr_op_ch.h"
@@ -21,6 +26,11 @@
 #include "be_visitor_union/union.h"
 #include "be_visitor_union/cdr_op_ch.h"
 
+ACE_RCSID (be_visitor_field, 
+           cdr_op_ch, 
+           "$Id$")
+
+
 // **********************************************
 //  Visitor for field in the client header file.
 // **********************************************
diff --git a/TAO/TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp
index aa707202c06..fd4f8c1060b 100644
--- a/TAO/TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp
@@ -1,17 +1,22 @@
-
-//=============================================================================
-/**
- *  @file    cdr_op_cs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Field in the client stubs file.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    field_cdr_op_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Field in the client stubs file.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #include "be_visitor_array/cdr_op_cs.h"
 #include "be_visitor_sequence/cdr_op_cs.h"
@@ -86,8 +91,7 @@ be_visitor_field_cdr_op_cs::visit_array (be_array *node)
   // field.
 
   TAO_OutStream *os = this->ctx_->stream ();
-  be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+  be_field *f = this->ctx_->be_node_as_field ();
 
   if (f == 0)
     {
@@ -193,8 +197,7 @@ be_visitor_field_cdr_op_cs::visit_enum (be_enum *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Retrieve the field node.
-  be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+  be_field *f = this->ctx_->be_node_as_field ();
 
   if (f == 0)
     {
@@ -236,10 +239,9 @@ int
 be_visitor_field_cdr_op_cs::visit_interface (be_interface *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+  be_field *f = this->ctx_->be_node_as_field ();
 
-  if (f == 0)
+  if (!f)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_field_cdr_op_cs::"
@@ -310,8 +312,7 @@ be_visitor_field_cdr_op_cs::visit_interface_fwd (be_interface_fwd *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Retrieve the field node.
-  be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+  be_field *f = this->ctx_->be_node_as_field ();
 
   if (f == 0)
     {
@@ -413,10 +414,9 @@ int
 be_visitor_field_cdr_op_cs::emit_valuetype_common (void)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+  be_field *f = this->ctx_->be_node_as_field ();
 
-  if (f == 0)
+  if (!f)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_field_cdr_op_cs::"
@@ -461,8 +461,7 @@ be_visitor_field_cdr_op_cs::visit_predefined_type (be_predefined_type *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Retrieve the field node.
-  be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+  be_field *f = this->ctx_->be_node_as_field ();
 
   if (f == 0)
     {
@@ -584,8 +583,7 @@ be_visitor_field_cdr_op_cs::visit_sequence (be_sequence *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Retrieve the field node.
-  be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+  be_field *f = this->ctx_->be_node_as_field ();
 
   if (f == 0)
     {
@@ -629,8 +627,7 @@ be_visitor_field_cdr_op_cs::visit_string (be_string *str)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Retrieve the field node.
-  be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+  be_field *f = this->ctx_->be_node_as_field ();
 
   if (f == 0)
     {
@@ -731,8 +728,7 @@ be_visitor_field_cdr_op_cs::visit_structure (be_structure *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // retrieve the field node.
-  be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+  be_field *f = this->ctx_->be_node_as_field ();
 
   if (f == 0)
     {
@@ -816,8 +812,7 @@ be_visitor_field_cdr_op_cs::visit_union (be_union *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Retrieve the field node.
-  be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+  be_field *f = this->ctx_->be_node_as_field ();
 
   if (f == 0)
     {
@@ -906,8 +901,7 @@ be_visitor_cdr_op_field_decl::visit_array (be_array *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Retrieve the field node.
-  be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+  be_field *f = this->ctx_->be_node_as_field ();
 
   if (f == 0)
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp b/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp
index d88f3f24e69..77bee361ff1 100644
--- a/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_field/field_ch.cpp
@@ -1,22 +1,31 @@
-
-//=============================================================================
-/**
- *  @file    field_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Field node in the client header
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    field_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Field node in the client header
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #include "be_visitor_enum/enum_ch.h"
 #include "be_visitor_sequence/sequence_ch.h"
 #include "nr_extern.h"
 
+ACE_RCSID (be_visitor_field,
+           field_ch,
+           "$Id$")
+
 // **********************************************
 //  Visitor for field in the client header file.
 // **********************************************
diff --git a/TAO/TAO_IDL/be/be_visitor_field/field_ci.cpp b/TAO/TAO_IDL/be/be_visitor_field/field_ci.cpp
index eb7cde0e9be..c50b84902db 100644
--- a/TAO/TAO_IDL/be/be_visitor_field/field_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_field/field_ci.cpp
@@ -1,22 +1,32 @@
-
-//=============================================================================
-/**
- *  @file    field_ci.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Field in the client inline file
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    field_ci.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Field in the client inline file
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #include "be_visitor_array/array_ci.h"
 #include "be_visitor_structure/structure_ci.h"
 #include "be_visitor_union/union_ci.h"
 
+ACE_RCSID (be_visitor_field, 
+           field_ci, 
+           "$Id$")
+
+
 be_visitor_field_ci::be_visitor_field_ci (be_visitor_context *ctx)
   : be_visitor_decl (ctx)
 {
diff --git a/TAO/TAO_IDL/be/be_visitor_field/field_cs.cpp b/TAO/TAO_IDL/be/be_visitor_field/field_cs.cpp
index af26f8b3d66..435125f9d70 100644
--- a/TAO/TAO_IDL/be/be_visitor_field/field_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_field/field_cs.cpp
@@ -1,17 +1,22 @@
-
-//=============================================================================
-/**
- *  @file    field_cs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Field in the client stubs file.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    field_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Field in the client stubs file.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #include "be_visitor_array/array_cs.h"
 #include "be_visitor_enum/enum_cs.h"
@@ -19,6 +24,11 @@
 #include "be_visitor_structure/structure_cs.h"
 #include "be_visitor_union/union_cs.h"
 
+ACE_RCSID (be_visitor_field, 
+           field_cs, 
+           "$Id$")
+
+
 // **********************************************
 //  Visitor for field in the client stubs file.
 // **********************************************
diff --git a/TAO/TAO_IDL/be/be_visitor_field/serializer_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_field/serializer_op_ch.cpp
index 48891c1aead..e3c829f59e2 100644
--- a/TAO/TAO_IDL/be/be_visitor_field/serializer_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_field/serializer_op_ch.cpp
@@ -1,18 +1,23 @@
-
-//=============================================================================
-/**
- *  @file    serializer_op_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating TAO::DCPS::Serializer operator declarator for field 
- *  in the client header
- *
- *
- *  @author Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    serializer_op_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating TAO::DCPS::Serializer operator declarator for field 
+//    in the client header
+//
+// = AUTHOR
+//    Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
+//
+// ============================================================================
 
 #include "be_visitor_array/serializer_op_ch.h"
 #include "be_visitor_enum/serializer_op_ch.h"
@@ -22,6 +27,11 @@
 #include "be_visitor_union/union.h"
 #include "be_visitor_union/serializer_op_ch.h"
 
+ACE_RCSID (be_visitor_field, 
+           serializer_op_ch, 
+           "$Id$")
+
+
 // **********************************************
 //  Visitor for field in the client header file.
 // **********************************************
diff --git a/TAO/TAO_IDL/be/be_visitor_field/serializer_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_field/serializer_op_cs.cpp
index d01d7c8fd06..05696512e36 100644
--- a/TAO/TAO_IDL/be/be_visitor_field/serializer_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_field/serializer_op_cs.cpp
@@ -1,18 +1,23 @@
-
-//=============================================================================
-/**
- *  @file    serializer_op_cs.cpp
- *
- *  $Id$
- *
- *  Visitor generating TAO::DCPS::Serializer operators code for Field in
- *  the client stubs file.
- *
- *
- *  @author Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    field_serializer_op_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating TAO::DCPS::Serializer operators code for Field in
+//    the client stubs file.
+//
+// = AUTHOR
+//    Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
+//
+// ============================================================================
 
 #include "be_visitor_array/serializer_op_cs.h"
 #include "be_visitor_sequence/serializer_op_cs.h"
@@ -87,8 +92,7 @@ be_visitor_field_serializer_op_cs::visit_array (be_array *node)
   // field.
 
   TAO_OutStream *os = this->ctx_->stream ();
-  be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+  be_field *f = this->ctx_->be_node_as_field ();
 
   if (f == 0)
     {
@@ -208,8 +212,7 @@ be_visitor_field_serializer_op_cs::visit_enum (be_enum *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Retrieve the field node.
-  be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+  be_field *f = this->ctx_->be_node_as_field ();
 
   if (f == 0)
     {
@@ -259,10 +262,9 @@ int
 be_visitor_field_serializer_op_cs::visit_interface (be_interface *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+  be_field *f = this->ctx_->be_node_as_field ();
 
-  if (f == 0)
+  if (!f)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_field_serializer_op_cs::"
@@ -333,8 +335,7 @@ be_visitor_field_serializer_op_cs::visit_interface_fwd (be_interface_fwd *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Retrieve the field node.
-  be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+  be_field *f = this->ctx_->be_node_as_field ();
 
   if (f == 0)
     {
@@ -412,10 +413,9 @@ int
 be_visitor_field_serializer_op_cs::visit_valuetype (be_valuetype *)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+  be_field *f = this->ctx_->be_node_as_field ();
 
-  if (f == 0)
+  if (!f)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_field_serializer_op_cs::"
@@ -464,8 +464,7 @@ be_visitor_field_serializer_op_cs::visit_valuetype_fwd (be_valuetype_fwd *)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Retrieve the field node.
-  be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+  be_field *f = this->ctx_->be_node_as_field ();
 
   if (f == 0)
     {
@@ -512,14 +511,12 @@ be_visitor_field_serializer_op_cs::visit_eventtype_fwd (be_eventtype_fwd *node)
 
 // Visit predefined type.
 int
-be_visitor_field_serializer_op_cs::visit_predefined_type (
-  be_predefined_type *node)
+be_visitor_field_serializer_op_cs::visit_predefined_type (be_predefined_type *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Retrieve the field node.
-  be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+  be_field *f = this->ctx_->be_node_as_field ();
 
   if (f == 0)
     {
@@ -694,8 +691,7 @@ be_visitor_field_serializer_op_cs::visit_sequence (be_sequence *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Retrieve the field node.
-  be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+  be_field *f = this->ctx_->be_node_as_field ();
 
   if (f == 0)
     {
@@ -751,8 +747,7 @@ be_visitor_field_serializer_op_cs::visit_string (be_string *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Retrieve the field node.
-  be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+  be_field *f = this->ctx_->be_node_as_field ();
 
   if (f == 0)
     {
@@ -843,9 +838,8 @@ be_visitor_field_serializer_op_cs::visit_structure (be_structure *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  // Retrieve the field node.
-  be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+  // retrieve the field node.
+  be_field *f = this->ctx_->be_node_as_field ();
 
   if (f == 0)
     {
@@ -941,8 +935,7 @@ be_visitor_field_serializer_op_cs::visit_union (be_union *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Retrieve the field node.
-  be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+  be_field *f = this->ctx_->be_node_as_field ();
 
   if (f == 0)
     {
@@ -1043,8 +1036,7 @@ be_visitor_serializer_op_field_decl::visit_array (be_array *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Retrieve the field node.
-  be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+  be_field *f = this->ctx_->be_node_as_field ();
 
   if (f == 0)
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_home.cpp b/TAO/TAO_IDL/be/be_visitor_home.cpp
index 58fe5ac82ad..cd527f54e06 100644
--- a/TAO/TAO_IDL/be/be_visitor_home.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_home.cpp
@@ -1,17 +1,22 @@
-
-//=============================================================================
-/**
- *  @file    be_visitor_home.cpp
- *
- *  $Id$
- *
- *  Visitors for generation of code for a component home.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO_IDL_BE
+//
+// = FILENAME
+//    be_visitor_home.cpp
+//
+// = DESCRIPTION
+//    Visitors for generation of code for a component home.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #include "ace/Log_Msg.h"
 
@@ -28,8 +33,6 @@
 #include "be_attribute.h"
 #include "be_home.h"
 #include "be_component.h"
-#include "be_factory.h"
-#include "be_finder.h"
 #include "be_operation.h"
 #include "be_sequence.h"
 #include "be_string.h"
@@ -39,7 +42,6 @@
 #include "be_visitor_operation.h"
 #include "be_visitor_typecode/typecode_defn.h"
 #include "be_visitor_typecode/objref_typecode.h"
-#include "be_visitor_valuetype/valuetype_init_arglist_ch.h"
 #include "be_visitor_context.h"
 
 #include "be_visitor_home/home_ch.cpp"
@@ -50,3 +52,7 @@
 #include "be_visitor_home/home_exh.cpp"
 #include "be_visitor_home/home_exs.cpp"
 
+ACE_RCSID (be, 
+           be_visitor_home, 
+           "$Id$")
+
diff --git a/TAO/TAO_IDL/be/be_visitor_home/home_ch.cpp b/TAO/TAO_IDL/be/be_visitor_home/home_ch.cpp
index 54500e6f8f0..69fbfd2e92d 100644
--- a/TAO/TAO_IDL/be/be_visitor_home/home_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_home/home_ch.cpp
@@ -1,17 +1,26 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    home_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Component Home node in the client header.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    home_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Component Home node in the client header.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
+ACE_RCSID (be_visitor_home, 
+           home_ch, 
+           "$Id$")
 
 be_visitor_home_ch::be_visitor_home_ch (
     be_visitor_context *ctx
diff --git a/TAO/TAO_IDL/be/be_visitor_home/home_cs.cpp b/TAO/TAO_IDL/be/be_visitor_home/home_cs.cpp
index e497508d8f4..d57f034cc09 100644
--- a/TAO/TAO_IDL/be/be_visitor_home/home_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_home/home_cs.cpp
@@ -1,17 +1,26 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    home_cs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Component Home node in the client source.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    home_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Component Home node in the client source.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
+ACE_RCSID (be_visitor_home, 
+           home_cs, 
+           "$Id$")
 
 be_visitor_home_cs::be_visitor_home_cs (
     be_visitor_context *ctx
diff --git a/TAO/TAO_IDL/be/be_visitor_home/home_ex_idl.cpp b/TAO/TAO_IDL/be/be_visitor_home/home_ex_idl.cpp
index a6e62a94f58..51d1c7f9dc4 100644
--- a/TAO/TAO_IDL/be/be_visitor_home/home_ex_idl.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_home/home_ex_idl.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    home_ex_idl.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Homes in the CIAO executor IDL.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO_IDL_BE
+//
+// = FILENAME
+//    home_ex_idl.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Homes in the CIAO executor IDL.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_home,
+           home_ex_idl,
+           "$Id$")
 
 // ******************************************************
 // Home visitor for CIAO executor IDL
@@ -153,32 +162,6 @@ be_visitor_home_ex_idl::visit_argument (be_argument *node)
 }
 
 int
-be_visitor_home_ex_idl::visit_factory (be_factory *node)
-{
-  os_ << be_nl
-      << "::Components::EnterpriseComponent "
-      << IdentifierHelper::try_escape (node->original_local_name ()).c_str ()
-      << " (" << be_idt << be_idt;
-
-  if (this->visit_scope (node) == -1)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("be_visitor_home_ex_idl::")
-                  ACE_TEXT ("visit_factory - ")
-                  ACE_TEXT ("codegen for scope failed\n")));
-    }
-
-  os_ << ")"
-      << be_uidt << be_uidt;
-
-  this->gen_exception_list (node->exceptions (), "", true);
-
-  os_ << ";";
-
-  return 0;
-}
-
-int
 be_visitor_home_ex_idl::visit_sequence (be_sequence *node)
 {
   // Keep output statements separate because of side effects.
@@ -335,6 +318,9 @@ be_visitor_home_ex_idl::gen_explicit (void)
                   ACE_TEXT ("visit_scope() failed\n")));
     }
 
+  this->gen_factories ();
+  this->gen_finders ();
+
   os_ << be_uidt_nl
       << "};";
 }
@@ -421,6 +407,52 @@ be_visitor_home_ex_idl::gen_exception_list (
 }
 
 void
+be_visitor_home_ex_idl::gen_factories (void)
+{
+  this->gen_init_ops (node_->factories ());
+}
+
+void
+be_visitor_home_ex_idl::gen_finders (void)
+{
+  this->gen_init_ops (node_->finders ());
+}
+
+void
+be_visitor_home_ex_idl::gen_init_ops (AST_Home::INIT_LIST & list)
+{
+  AST_Operation **op = 0;
+
+  for (AST_Home::INIT_LIST::ITERATOR i = list.begin ();
+       !i.done ();
+       i.advance ())
+    {
+      i.next (op);
+      be_operation *bop = be_operation::narrow_from_decl (*op);
+
+      os_ << be_nl
+          << "::Components::EnterpriseComponent "
+          << IdentifierHelper::try_escape (bop->original_local_name ()).c_str ()
+          << " (" << be_idt << be_idt;
+
+      if (this->visit_scope (bop) == -1)
+        {
+          ACE_ERROR ((LM_ERROR,
+                      ACE_TEXT ("be_visitor_home_ex_idl::")
+                      ACE_TEXT ("gen_init_ops - ")
+                      ACE_TEXT ("visit_scope() failed\n")));
+        }
+
+      os_ << ")"
+          << be_uidt << be_uidt;
+
+      this->gen_exception_list (bop->exceptions (), "", true);
+
+      os_ << ";";
+    }
+}
+
+void
 be_visitor_home_ex_idl::gen_home_executor (void)
 {
   AST_Component *comp = node_->managed_component ();
diff --git a/TAO/TAO_IDL/be/be_visitor_home/home_exh.cpp b/TAO/TAO_IDL/be/be_visitor_home/home_exh.cpp
index 93af6b5c8f5..b9bc66cac48 100644
--- a/TAO/TAO_IDL/be/be_visitor_home/home_exh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_home/home_exh.cpp
@@ -1,17 +1,26 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    home_exh.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for homes in the exec impl header.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO_IDL_BE
+//
+// = FILENAME
+//    home_exh.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for homes in the exec impl header.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
+ACE_RCSID (be_visitor_home,
+           home_exh,
+           "$Id$")
 
 // ******************************************************
 // Home visitor for exec impl header
@@ -79,31 +88,6 @@ be_visitor_home_exh::visit_attribute (be_attribute *node)
 }
 
 int
-be_visitor_home_exh::visit_factory (be_factory *node)
-{
-  os_ << be_nl << be_nl
-      << "virtual ::Components::EnterpriseComponent_ptr" << be_nl
-      << node->local_name ();
-      
-  // We can reuse this visitor.
-  be_visitor_valuetype_init_arglist_ch v (this->ctx_);
-  
-  if (v.visit_factory (node) != 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("be_visitor_home_exh::")
-                         ACE_TEXT ("visit_factory - ")
-                         ACE_TEXT ("codegen for argument ")
-                         ACE_TEXT ("list failed\n")),
-                        -1);
-    }
-    
-  os_ << ";";
-    
-  return 0;
-}
-
-int
 be_visitor_home_exh::gen_exec_class (void)
 {
   // We don't want a '_cxx_' prefix here.
@@ -125,46 +109,12 @@ be_visitor_home_exh::gen_exec_class (void)
   os_ << be_nl << be_nl
       << "virtual ~" << lname << "_exec_i (void);";
       
-  be_home *h = node_;
+  this->gen_ops_attrs ();
+ 
+  this->gen_factories ();
+  
+  this->gen_finders ();
   
-  while (h != 0)
-    {
-      if (this->visit_scope (h) != 0)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             ACE_TEXT ("be_visitor_home_exh::")
-                             ACE_TEXT ("gen_exec_class - ")
-                             ACE_TEXT ("visit_scope() failed\n")),
-                            -1);
-        }
-        
-      for (long i = 0; i < h->n_inherits (); ++i)
-        {
-          // A closure of all the supported interfaces is stored
-          // in the base class 'pd_inherits_flat' member.
-          be_interface *bi =
-            be_interface::narrow_from_decl (h->inherits ()[i]);
-            
-          int status =
-            bi->traverse_inheritance_graph (
-              be_visitor_home_exh::op_attr_decl_helper,
-              &os_);
-              
-          if (status == -1)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 ACE_TEXT ("be_visitor_home_exh::")
-                                 ACE_TEXT ("gen_exec_class - ")
-                                 ACE_TEXT ("traverse_inheritance_graph() ")
-                                 ACE_TEXT ("failed on %s\n"),
-                                 bi->full_name ()),
-                                -1);
-            }
-        }  
-        
-      h = be_home::narrow_from_decl (h->base_home ());
-    }
-    
   os_ << be_nl << be_nl
       << "// Implicit operations.";
       
@@ -178,6 +128,129 @@ be_visitor_home_exh::gen_exec_class (void)
   return 0;
 }
 
+int
+be_visitor_home_exh::gen_ops_attrs (void)
+{
+  os_ << be_nl << be_nl
+      << "// All operations and attributes.";
+      
+  int status =
+    node_->traverse_inheritance_graph (
+      be_visitor_home_exh::op_attr_decl_helper,
+      &os_);
+      
+  if (status == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ACE_TEXT ("be_visitor_home_exh::")
+                         ACE_TEXT ("gen_ops_attrs - ")
+                         ACE_TEXT ("traverse_inheritance_graph() ")
+                         ACE_TEXT ("failed\n")),
+                        -1);
+    }
+    
+  return 0;
+}
+
+int
+be_visitor_home_exh::gen_factories (void)
+{
+  os_ << be_nl << be_nl
+      << "// Factory operations.";
+  
+  return this->gen_factories_r (node_);
+}
+
+int
+be_visitor_home_exh::gen_factories_r (AST_Home *node)
+{
+  if (node == 0)
+    {
+      return 0;
+    }
+    
+  if (this->gen_init_ops_i (node->factories ()) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ACE_TEXT ("be_visitor_home_exh::")
+                         ACE_TEXT ("gen_factories_r - ")
+                         ACE_TEXT ("gen_init_ops_i() failed\n")),
+                        -1);
+    }
+    
+  AST_Home *base = node->base_home ();
+  
+  return this->gen_factories_r (base);
+}
+
+int
+be_visitor_home_exh::gen_finders (void)
+{
+  os_ << be_nl << be_nl
+      << "// Finder operations.";
+  
+  return this->gen_finders_r (node_);
+}
+
+int
+be_visitor_home_exh::gen_finders_r (AST_Home *node)
+{
+  if (node == 0)
+    {
+      return 0;
+    }
+    
+  if (this->gen_init_ops_i (node->finders ()) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ACE_TEXT ("be_visitor_home_exh::")
+                         ACE_TEXT ("gen_finders_r - ")
+                         ACE_TEXT ("gen_init_ops_i() failed\n")),
+                        -1);
+    }
+    
+  AST_Home *base = node->base_home ();
+  
+  return this->gen_finders_r (base);
+}
+
+int
+be_visitor_home_exh::gen_init_ops_i (AST_Home::INIT_LIST & list)
+{
+  AST_Operation **op = 0;
+  
+  for (AST_Home::INIT_LIST::ITERATOR i = list.begin ();
+       !i.done ();
+       i.advance ())
+    {
+      i.next (op);
+      be_operation *bop = be_operation::narrow_from_decl (*op);
+      
+      /// Return type for home exec factories and finders is not
+      /// the same as for the corresponding home servant, so we
+      /// generate the return type and op name by hand, then finish
+      /// the operation traversal with an arglist visitor.
+      os_ << be_nl << be_nl
+          << "::Components::EnterpriseComponent_ptr" << be_nl
+          << bop->local_name ();
+          
+      be_visitor_operation_arglist visitor (this->ctx_);
+      
+      if (visitor.visit_operation (bop) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             ACE_TEXT ("be_visitor_home_exh::")
+                             ACE_TEXT ("gen_init_ops_i - ")
+                             ACE_TEXT ("visit_operation() failed\n")),
+                            -1);
+        }
+        
+      os_ << ";";
+    }
+    
+  return 0;
+}
+
 void
 be_visitor_home_exh::gen_entrypoint (void)
 {
@@ -204,3 +277,5 @@ be_visitor_home_exh::op_attr_decl_helper (be_interface * /* derived */,
   /// visit_attribute(), we can get away with this for the declarations.
   return visitor.visit_scope (ancestor);
 }
+
+
diff --git a/TAO/TAO_IDL/be/be_visitor_home/home_exs.cpp b/TAO/TAO_IDL/be/be_visitor_home/home_exs.cpp
index f4123dfd28e..f3000e78f7c 100644
--- a/TAO/TAO_IDL/be/be_visitor_home/home_exs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_home/home_exs.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    home_exs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for homes in the exec impl source.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO_IDL_BE
+//
+// = FILENAME
+//    home_exs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for homes in the exec impl source.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_home,
+           home_exs,
+           "$Id$")
 
 // ******************************************************
 // Home visitor for exec impl source
@@ -84,42 +93,6 @@ be_visitor_home_exs::visit_attribute (be_attribute *node)
 }
 
 int
-be_visitor_home_exs::visit_factory (be_factory *node)
-{
-  AST_Decl *scope = ScopeAsDecl (comp_->defined_in ());
-  ACE_CString sname_str (scope->full_name ());
-  const char *sname = sname_str.c_str ();
-  const char *lname = comp_->local_name ()->get_string ();
-  const char *global = (sname_str == "" ? "" : "::");
-
-  os_ << be_nl << be_nl
-      << "::Components::EnterpriseComponent_ptr" << be_nl
-      << node_->original_local_name ()->get_string ()
-      << "_exec_i::" << node->local_name ();
-
-  be_visitor_operation_arglist visitor (this->ctx_);
-  visitor.unused (true);
-
-  if (visitor.visit_factory (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("be_visitor_home_exs::")
-                         ACE_TEXT ("visit_factory - ")
-                         ACE_TEXT ("codegen for arglist failed\n")),
-                        -1);
-    }
-
-  os_ << be_nl
-      << "{" << be_idt_nl
-      << your_code_here_ << be_nl
-      << "return " << global << sname << "::CCM_"
-      << lname << "::_nil ();" << be_uidt_nl
-      << "}";
-
-  return 0;
-}
-
-int
 be_visitor_home_exs::gen_exec_class (void)
 {
   // No '_cxx_' prefix.
@@ -141,54 +114,12 @@ be_visitor_home_exs::gen_exec_class (void)
       << lname << "_exec_i::~" << lname << "_exec_i (void)" << be_nl
       << "{" << be_nl
       << "}";
-      
-  be_home *h = node_;
-  
-  while (h != 0)
-    {
-      if (this->visit_scope (h) != 0)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             ACE_TEXT ("be_visitor_home_exs::")
-                             ACE_TEXT ("gen_exec_class - ")
-                             ACE_TEXT ("codegen for scope ")
-                             ACE_TEXT ("failed\n")),
-                            -1);
-        }
-        
-      for (long i = 0; i < h->n_inherits (); ++i)
-        {
-          // A closure of all the supported interfaces is stored
-          // in the base class 'pd_inherits_flat' member.
-          be_interface *bi =
-            be_interface::narrow_from_decl (h->inherits ()[i]);
-   
-          bi->get_insert_queue ().reset ();
-          bi->get_del_queue ().reset ();
-          bi->get_insert_queue ().enqueue_tail (bi);
-
-          Home_Exec_Op_Attr_Generator op_attr_gen (this);
-
-          int status =
-            bi->traverse_inheritance_graph (op_attr_gen,
-                                            &os_,
-                                            false,
-                                            false);
-
-          if (status == -1)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 ACE_TEXT ("be_visitor_home_exs::")
-                                 ACE_TEXT ("gen_exec_class - ")
-                                 ACE_TEXT ("traverse_inheritance_graph() ")
-                                 ACE_TEXT ("failed for %s\n"),
-                                 bi->full_name ()),
-                                -1);
-            }
-        }  
-        
-      h = be_home::narrow_from_decl (h->base_home ());
-    }
+
+  this->gen_ops_attrs ();
+
+  this->gen_factories ();
+
+  this->gen_finders ();
 
   os_ << be_nl << be_nl
       << "// Implicit operations.";
@@ -213,6 +144,150 @@ be_visitor_home_exs::gen_exec_class (void)
   return 0;
 }
 
+int
+be_visitor_home_exs::gen_ops_attrs (void)
+{
+  os_ << be_nl << be_nl
+      << "// All operations and attributes.";
+
+  node_->get_insert_queue ().reset ();
+  node_->get_del_queue ().reset ();
+  node_->get_insert_queue ().enqueue_tail (node_);
+
+  Home_Exec_Op_Attr_Generator op_attr_gen (this);
+
+  int status =
+    node_->traverse_inheritance_graph (op_attr_gen,
+                                       &os_,
+                                       false,
+                                       false);
+
+  if (status == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ACE_TEXT ("be_visitor_home_exs::")
+                         ACE_TEXT ("gen_ops_attrs - ")
+                         ACE_TEXT ("traverse_inheritance_graph() ")
+                         ACE_TEXT ("failed\n")),
+                        -1);
+    }
+
+  return 0;
+}
+
+int
+be_visitor_home_exs::gen_factories (void)
+{
+  os_ << be_nl << be_nl
+      << "// Factory operations.";
+
+  return this->gen_factories_r (node_);
+}
+
+int
+be_visitor_home_exs::gen_factories_r (AST_Home *node)
+{
+  if (node == 0)
+    {
+      return 0;
+    }
+
+  if (this->gen_init_ops_i (node->factories ()) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ACE_TEXT ("be_visitor_home_exs::")
+                         ACE_TEXT ("gen_factories_r - ")
+                         ACE_TEXT ("gen_init_ops_i() failed\n")),
+                        -1);
+    }
+
+  AST_Home *base = node->base_home ();
+
+  return this->gen_factories_r (base);
+}
+
+int
+be_visitor_home_exs::gen_finders (void)
+{
+  os_ << be_nl << be_nl
+      << "// Finder operations.";
+
+  return this->gen_finders_r (node_);
+}
+
+int
+be_visitor_home_exs::gen_finders_r (AST_Home *node)
+{
+  if (node == 0)
+    {
+      return 0;
+    }
+
+  if (this->gen_init_ops_i (node->finders ()) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ACE_TEXT ("be_visitor_home_exs::")
+                         ACE_TEXT ("gen_finders_r - ")
+                         ACE_TEXT ("gen_init_ops_i() failed\n")),
+                        -1);
+    }
+
+  AST_Home *base = node->base_home ();
+
+  return this->gen_finders_r (base);
+}
+
+int
+be_visitor_home_exs::gen_init_ops_i (AST_Home::INIT_LIST & list)
+{
+  AST_Decl *scope = ScopeAsDecl (comp_->defined_in ());
+  ACE_CString sname_str (scope->full_name ());
+  const char *sname = sname_str.c_str ();
+  const char *lname = comp_->local_name ()->get_string ();
+  const char *global = (sname_str == "" ? "" : "::");
+
+  AST_Operation **op = 0;
+
+  for (AST_Home::INIT_LIST::ITERATOR i = list.begin ();
+       !i.done ();
+       i.advance ())
+    {
+      i.next (op);
+      be_operation *bop = be_operation::narrow_from_decl (*op);
+
+      /// Return type for home exec factories and finders is not
+      /// the same as for the corresponding home servant, so we
+      /// generate the return type and op name by hand, then finish
+      /// the operation traversal with an arglist visitor.
+      os_ << be_nl << be_nl
+          << "::Components::EnterpriseComponent_ptr" << be_nl
+          << node_->original_local_name ()->get_string ()
+          << "_exec_i::"
+          << bop->local_name ();
+
+      be_visitor_operation_arglist visitor (this->ctx_);
+      visitor.unused (true);
+
+      if (visitor.visit_operation (bop) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             ACE_TEXT ("be_visitor_home_exs::")
+                             ACE_TEXT ("gen_init_ops_i - ")
+                             ACE_TEXT ("visit_operation() failed\n")),
+                            -1);
+        }
+
+      os_ << be_nl
+          << "{" << be_idt_nl
+          << your_code_here_ << be_nl
+          << "return " << global << sname << "::CCM_"
+          << lname << "::_nil ();" << be_uidt_nl
+          << "}";
+    }
+
+  return 0;
+}
+
 void
 be_visitor_home_exs::gen_entrypoint (void)
 {
@@ -247,3 +322,4 @@ Home_Exec_Op_Attr_Generator::emit (be_interface * /* derived_interface */,
   return visitor_->visit_scope (base_interface);
 }
 
+
diff --git a/TAO/TAO_IDL/be/be_visitor_home/home_svh.cpp b/TAO/TAO_IDL/be/be_visitor_home/home_svh.cpp
index c625d5f4945..4df0dab9b12 100644
--- a/TAO/TAO_IDL/be/be_visitor_home/home_svh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_home/home_svh.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    home_svh.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for HOmes in the servant header.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    home_svh.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for HOmes in the servant header.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_home,
+           home_svh,
+           "$Id$")
 
 // ******************************************************
 // Home visitor for server header
@@ -45,16 +54,16 @@ be_visitor_home_svh::visit_home (be_home *node)
     {
       return 0;
     }
-
+    
   node_ = node;
   comp_ = node_->managed_component ();
-
+  
   /// CIDL-generated namespace used 'CIDL_' + composition name.
   /// Now we use 'CIAO_' + component's flat name.
   os_ << be_nl << be_nl
       << "namespace CIAO_" << comp_->flat_name () << "_Impl" << be_nl
       << "{" << be_idt;
-
+     
   if (this->gen_servant_class () == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
@@ -63,12 +72,12 @@ be_visitor_home_svh::visit_home (be_home *node)
                          ACE_TEXT ("gen_servant_class() failed\n")),
                         -1);
     }
-
+    
   this->gen_entrypoint ();
 
   os_ << be_uidt_nl
       << "}";
-
+     
   return 0;
 }
 
@@ -87,62 +96,26 @@ be_visitor_home_svh::visit_attribute (be_attribute *node)
 }
 
 int
-be_visitor_home_svh::visit_factory (be_factory *node)
-{
-  // An inherited factory/finder needs to return the managed
-  // component of the home where it is defined.
-  be_home *h =
-    be_home::narrow_from_scope (node->defined_in ());
-
-  AST_Component *c = h->managed_component ();
-
-  os_ << be_nl << be_nl
-      << "virtual ::" << c->name () << "_ptr" << be_nl
-      << node->local_name ();
-
-  // We can reuse this visitor.
-  be_visitor_valuetype_init_arglist_ch v (this->ctx_);
-
-  if (v.visit_factory (node) != 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("be_visitor_home_svh::")
-                         ACE_TEXT ("visit_factory - ")
-                         ACE_TEXT ("codegen for argument ")
-                         ACE_TEXT ("list failed\n")),
-                        -1);
-    }
-
-  os_ << ";";
-
-  return 0;
-}
-
-int
-be_visitor_home_svh::visit_finder (be_finder *node)
-{
-  return this->visit_factory (node);
-}
-
-int
 be_visitor_home_svh::gen_servant_class (void)
 {
   AST_Decl *scope = ScopeAsDecl (node_->defined_in ());
   ACE_CString sname_str (scope->full_name ());
   const char *sname = sname_str.c_str ();
-
+  
   // No '_cxx_' prefix.
   const char *lname =
     node_->original_local_name ()->get_string ();
-
+    
   const char *clname = comp_->local_name ()->get_string ();
   const char *global = (sname_str == "" ? "" : "::");
-
+  bool swapping = be_global->gen_component_swapping ();
+  
   os_ << be_nl
       << "class " << export_macro_.c_str () << " " << lname
       << "_Servant" << be_idt_nl
       << ": public virtual" << be_idt << be_idt_nl
       << "::CIAO::"
+      << (swapping ? "Swapping_" : "")
       << "Home_Servant_Impl<" << be_idt_nl
       << "::" << node_->full_skel_name () << "," << be_nl
       << global << sname << "::CCM_" << lname << "," << be_nl
@@ -150,86 +123,135 @@ be_visitor_home_svh::gen_servant_class (void)
       << be_uidt << be_uidt << be_uidt << be_uidt_nl
       << "{" << be_nl
       << "public:" << be_idt_nl;
-
+      
   os_ << lname << "_Servant (" << be_idt_nl
       << global << sname << "::CCM_" << lname << "_ptr exe," << be_nl
       << "const char * ins_name," << be_nl
       << "::CIAO::Container_ptr c);" << be_uidt;
-
+      
   os_ << be_nl << be_nl
       << "virtual ~" << lname << "_Servant (void);";
+      
+  this->gen_ops_attrs ();
+  
+  this->gen_factories ();
+  
+  this->gen_finders ();
+      
+  os_ << be_uidt_nl
+      << "};";
+     
+  return 0;
+}
 
-  AST_Type *pk = node_->primary_key ();
-
-  if (pk != 0)
+int
+be_visitor_home_svh::gen_ops_attrs (void)
+{
+  os_ << be_nl << be_nl
+      << "// All operations and attributes.";
+      
+  int status =
+    node_->traverse_inheritance_graph (
+      be_visitor_home_svh::op_attr_decl_helper,
+      &os_);
+      
+  if (status == -1)
     {
-      os_ << be_nl << be_nl
-          << "// Implicit home primary key operations - not supported.";
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ACE_TEXT ("be_visitor_home_svh::")
+                         ACE_TEXT ("gen_ops_attrs - ")
+                         ACE_TEXT ("traverse_inheritance_graph() ")
+                         ACE_TEXT ("failed\n")),
+                        -1);
+    }
+    
+  return 0;
+}
 
-      os_ << be_nl << be_nl
-          << "virtual ::" << comp_->name () << "_ptr" << be_nl
-          << "create (" << be_idt_nl
-          << "::" << pk->name () << " * key);" << be_uidt;
+int
+be_visitor_home_svh::gen_factories (void)
+{
+  os_ << be_nl << be_nl
+      << "// Factory operations.";
+  
+  return this->gen_factories_r (node_);
+}
 
-      os_ << be_nl << be_nl
-          << "virtual ::" << comp_->name () << "_ptr" << be_nl
-          << "find_by_primary_key (" << be_idt_nl
-          << "::" << pk->name () << " * key);" << be_uidt;
+int
+be_visitor_home_svh::gen_factories_r (AST_Home *node)
+{
+  if (node == 0)
+    {
+      return 0;
+    }
+    
+  if (this->gen_init_ops_i (node->factories ()) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ACE_TEXT ("be_visitor_home_svh::")
+                         ACE_TEXT ("gen_factories_r - ")
+                         ACE_TEXT ("gen_init_ops_i() failed\n")),
+                        -1);
+    }
+    
+  AST_Home *base = node->base_home ();
+  
+  return this->gen_factories_r (base);
+}
 
-      os_ << be_nl << be_nl
-          << "virtual void" << be_nl
-          << "remove (" << be_idt_nl
-          << "::" << pk->name () << " * key);" << be_uidt;
+int
+be_visitor_home_svh::gen_finders (void)
+{
+  os_ << be_nl << be_nl
+      << "// Finder operations.";
+  
+  return this->gen_finders_r (node_);
+}
 
-      os_ << be_nl << be_nl
-          << "virtual ::" << pk->name () << " *" << be_nl
-          << "get_primary_key (" << be_idt_nl
-          << "::" << comp_->name () << "_ptr comp);" << be_uidt;
+int
+be_visitor_home_svh::gen_finders_r (AST_Home *node)
+{
+  if (node == 0)
+    {
+      return 0;
     }
+    
+  if (this->gen_init_ops_i (node->finders ()) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ACE_TEXT ("be_visitor_home_svh::")
+                         ACE_TEXT ("gen_finders_r - ")
+                         ACE_TEXT ("gen_init_ops_i() failed\n")),
+                        -1);
+    }
+    
+  AST_Home *base = node->base_home ();
+  
+  return this->gen_finders_r (base);
+}
 
-  be_home *h = node_;
-
-  while (h != 0)
+int
+be_visitor_home_svh::gen_init_ops_i (AST_Home::INIT_LIST & list)
+{
+  AST_Operation **op = 0;
+  
+  for (AST_Home::INIT_LIST::ITERATOR i = list.begin ();
+       !i.done ();
+       i.advance ())
     {
-      if (this->visit_scope (h) != 0)
+      i.next (op);
+      be_operation *bop = be_operation::narrow_from_decl (*op);
+      
+      if (this->visit_operation (bop) == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              ACE_TEXT ("be_visitor_home_svh::")
-                             ACE_TEXT ("gen_servant_class - ")
-                             ACE_TEXT ("visit_scope() failed\n")),
+                             ACE_TEXT ("gen_init_ops_i - ")
+                             ACE_TEXT ("visit_operation() failed\n")),
                             -1);
         }
-
-      for (long i = 0; i < h->n_inherits (); ++i)
-        {
-          // A closure of all the supported interfaces is stored
-          // in the base class 'pd_inherits_flat' member.
-          be_interface *bi =
-            be_interface::narrow_from_decl (h->inherits ()[i]);
-
-          int status =
-            bi->traverse_inheritance_graph (
-              be_visitor_home_svh::op_attr_decl_helper,
-              &os_);
-
-          if (status == -1)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 ACE_TEXT ("be_visitor_home_svh::")
-                                 ACE_TEXT ("gen_servant_class - ")
-                                 ACE_TEXT ("traverse_inheritance_graph() ")
-                                 ACE_TEXT ("failed for %s\n"),
-                                 bi->full_name ()),
-                                -1);
-            }
-        }
-
-      h = be_home::narrow_from_decl (h->base_home ());
     }
-
-  os_ << be_uidt_nl
-      << "};";
-
+    
   return 0;
 }
 
@@ -243,7 +265,7 @@ be_visitor_home_svh::gen_entrypoint (void)
       << "_Servant (" << be_idt_nl
       << "::Components::HomeExecutorBase_ptr p," << be_nl
       << "::CIAO::Container_ptr c," << be_nl
-      << "const char * ins_name);" << be_uidt;
+      << "const char * ins_name);" << be_uidt; 
 }
 
 int
@@ -257,8 +279,8 @@ be_visitor_home_svh::op_attr_decl_helper (be_interface * /* derived */,
   ctx.state (TAO_CodeGen::TAO_ROOT_SVH);
   ctx.stream (os);
   be_visitor_home_svh visitor (&ctx);
-
-  /// Since this visitor overriddes only visit_operation() and
+  
+  /// Since this visitor overriddes only visit_operation() and 
   /// visit_attribute(), we can get away with this for the declarations.
   return visitor.visit_scope (ancestor);
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_home/home_svs.cpp b/TAO/TAO_IDL/be/be_visitor_home/home_svs.cpp
index 3d36384758a..47109d0584e 100644
--- a/TAO/TAO_IDL/be/be_visitor_home/home_svs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_home/home_svs.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    home_svs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Homes in the servant source.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    home_svs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Homes in the servant source.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_home,
+           home_svs,
+           "$Id$")
 
 // ******************************************************
 // Home visitor for server source
@@ -23,7 +32,7 @@ be_visitor_home_svs::be_visitor_home_svs (be_visitor_context *ctx)
     comp_ (0),
     os_ (*ctx->stream ()),
     export_macro_ (be_global->svnt_export_macro ()),
-    for_finder_ (false)
+    swapping_ (be_global->gen_component_swapping ())
 {
   /// All existing CIAO examples set the servant export values in the CIDL
   /// compiler to equal the IDL compiler's skel export values. Below is a
@@ -103,95 +112,6 @@ be_visitor_home_svs::visit_argument (be_argument *node)
 }
 
 int
-be_visitor_home_svs::visit_factory (be_factory *node)
-{
-  // An inherited factory/finder needs to return the managed
-  // component of the home where it is defined.
-  be_home *h =
-    be_home::narrow_from_scope (node->defined_in ());
-
-  AST_Component *c = h->managed_component ();
-
-  os_ << be_nl << be_nl
-      << "::" << c->name () << "_ptr" << be_nl
-      << node_->original_local_name ()->get_string ()
-      << "_Servant::" << node->local_name ();
-
-  be_visitor_operation_arglist al_visitor (this->ctx_);
-  al_visitor.unused (this->for_finder_);
-
-  if (al_visitor.visit_factory (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "be_visitor_factory_svs::"
-                         "visit_factory - "
-                         "codegen for argument list failed\n"),
-                        -1);
-    }
-
-  os_ << be_nl
-      << "{" << be_idt_nl;
-
-  if (this->for_finder_)
-    {
-      os_ << "throw ::CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8,"
-          << be_nl
-          << "                             CORBA::COMPLETED_NO);";
-    }
-  else
-    {
-      ACE_CString comp_sname_str (
-        ScopeAsDecl (comp_->defined_in ())->full_name ());
-      const char *comp_sname = comp_sname_str.c_str ();
-      const char *comp_lname = comp_->local_name ()->get_string ();
-      const char *global = (comp_sname_str == "" ? "" : "::");
-
-      os_ << "::Components::EnterpriseComponent_var _ciao_ec ="
-          << be_idt_nl
-          << "this->executor_->" << node->local_name () << " (";
-
-      if (node->argument_count () > 0)
-        {
-          os_ << be_idt_nl;
-
-          if (this->visit_scope (node) != 0)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "be_visitor_factory_svs::"
-                                 "visit_factory - "
-                                 "codegen for scope failed\n"),
-                                -1);
-            }
-
-          os_ << be_uidt;
-        }
-
-      os_ << ");" << be_uidt_nl << be_nl
-          << global << comp_sname << "::CCM_" << comp_lname
-          << "_var _ciao_comp =" << be_idt_nl
-          << global << comp_sname << "::CCM_" << comp_lname
-          << "::_narrow (_ciao_ec.in ());" << be_uidt_nl << be_nl
-          << "return this->_ciao_activate_component "
-          << "(_ciao_comp.in ());";
-    }
-
-  os_ << be_uidt_nl
-      << "}";
-
-  // In case it was set for the call above.
-  this->for_finder_ = false;
-
-  return 0;
-}
-
-int
-be_visitor_home_svs::visit_finder (be_finder *node)
-{
-  this->for_finder_ = true;
-  return this->visit_factory (node);
-}
-
-int
 be_visitor_home_svs::gen_servant_class (void)
 {
   AST_Decl *scope = ScopeAsDecl (node_->defined_in ());
@@ -212,7 +132,7 @@ be_visitor_home_svs::gen_servant_class (void)
       << "const char * ins_name," << be_nl
       << "::CIAO::Container_ptr c)" << be_uidt_nl
       << ": ::CIAO::Home_Servant_Impl_Base (c)," << be_idt_nl
-      << "::CIAO::"
+      << "::CIAO::" << (swapping_ ? "Swapping_" : "" )
       << "Home_Servant_Impl<" << be_idt_nl
       << "::" << node_->full_skel_name () << "," << be_nl
       << global << sname << "::CCM_" << lname << "," << be_nl
@@ -227,101 +147,213 @@ be_visitor_home_svs::gen_servant_class (void)
       << "{" << be_nl
       << "}";
 
-  AST_Type *pk = node_->primary_key ();
+  this->gen_ops_attrs ();
+
+  os_ << be_nl << be_nl
+      << "/// Factory operations.";
+
+  this->gen_factories_r (node_);
+
+  os_ << be_nl << be_nl
+      << "/// Finder operations.";
+
+  this->gen_finders_r (node_);
 
-  if (pk != 0)
+  return 0;
+}
+
+int
+be_visitor_home_svs::gen_ops_attrs (void)
+{
+  os_ << be_nl << be_nl
+      << "/// All home operations and attributes.";
+
+  node_->get_insert_queue ().reset ();
+  node_->get_del_queue ().reset ();
+  node_->get_insert_queue ().enqueue_tail (node_);
+
+  Home_Op_Attr_Generator op_attr_gen (this);
+
+  int status =
+    node_->traverse_inheritance_graph (op_attr_gen,
+                                       &os_,
+                                       false,
+                                       false);
+
+  if (status == -1)
     {
-      os_ << be_nl << be_nl
-          << "::" << comp_->name () << "_ptr" << be_nl
-          << lname << "_Servant::create (" << be_idt_nl
-          << "::" << pk->name () << " * /* key */)" << be_uidt_nl
-          << "{" << be_idt_nl
-          << "throw ::CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8,"
-          << be_nl
-          << "                             CORBA::COMPLETED_NO);"
-          << be_uidt_nl
-          << "}";
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ACE_TEXT ("be_visitor_home_svs::")
+                         ACE_TEXT ("gen_ops_attrs - ")
+                         ACE_TEXT ("traverse_inheritance_graph() ")
+                         ACE_TEXT ("failed\n")),
+                        -1);
+    }
 
-      os_ << be_nl << be_nl
-          << "::" << comp_->name () << "_ptr" << be_nl
-          << lname << "_Servant::find_by_primary_key (" << be_idt_nl
-          << "::" << pk->name () << " * /* key */)" << be_uidt_nl
-          << "{" << be_idt_nl
-          << "throw ::CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8,"
-          << be_nl
-          << "                             CORBA::COMPLETED_NO);"
-          << be_uidt_nl
-          << "}";
+  return 0;
+}
 
-      os_ << be_nl << be_nl
-          << "void" << be_nl
-          << lname << "_Servant::remove (" << be_idt_nl
-          << "::" << pk->name () << " * /* key */)" << be_uidt_nl
-          << "{" << be_idt_nl
-          << "throw ::CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8,"
-          << be_nl
-          << "                             CORBA::COMPLETED_NO);"
-          << be_uidt_nl
-          << "}";
+int
+be_visitor_home_svs::gen_factories (void)
+{
+  return this->gen_factories_r (node_);
+}
 
-      os_ << be_nl << be_nl
-          << "::" << pk->name () << " *" << be_nl
-          << lname << "_Servant::get_primary_key (" << be_idt_nl
-          << "::" << comp_->name () << "_ptr /* comp */)" << be_uidt_nl
-          << "{" << be_idt_nl
-          << "throw ::CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8,"
-          << be_nl
-          << "                             CORBA::COMPLETED_NO);"
-          << be_uidt_nl
-          << "}";
+int
+be_visitor_home_svs::gen_factories_r (AST_Home *node)
+{
+  if (node == 0)
+    {
+      return 0;
     }
 
-  be_home *h = node_;
+  if (this->gen_init_ops (node->factories (), false) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ACE_TEXT ("be_visitor_home_svs::")
+                         ACE_TEXT ("gen_factories_r - ")
+                         ACE_TEXT ("gen_init_ops_i() failed\n")),
+                        -1);
+    }
+
+  AST_Home *base = node->base_home ();
+
+  return this->gen_factories_r (base);
+}
+
+int
+be_visitor_home_svs::gen_finders (void)
+{
+  os_ << be_nl << be_nl
+      << "// Finder operations.";
 
-  while (h != 0)
+  return this->gen_finders_r (node_);
+}
+
+int
+be_visitor_home_svs::gen_finders_r (AST_Home *node)
+{
+  if (node == 0)
     {
-      if (this->visit_scope (h) != 0)
+      return 0;
+    }
+
+  if (this->gen_init_ops (node->finders (), true) == -1)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         ACE_TEXT ("be_visitor_home_svs::")
+                         ACE_TEXT ("gen_finders_r - ")
+                         ACE_TEXT ("gen_init_ops_i() failed\n")),
+                        -1);
+    }
+
+  AST_Home *base = node->base_home ();
+
+  return this->gen_finders_r (base);
+}
+
+int
+be_visitor_home_svs::gen_init_ops (AST_Home::INIT_LIST & list,
+                                   bool finder_list)
+{
+  AST_Operation **op = 0;
+  ACE_CString comp_sname_str (
+    ScopeAsDecl (comp_->defined_in ())->full_name ());
+  const char *comp_sname = comp_sname_str.c_str ();
+  const char *comp_lname = comp_->local_name ()->get_string ();
+  const char *global = (comp_sname_str == "" ? "" : "::");
+
+  for (AST_Home::INIT_LIST::ITERATOR i = list.begin ();
+       !i.done ();
+       i.advance ())
+    {
+      i.next (op);
+      be_operation *bop = be_operation::narrow_from_decl (*op);
+
+      // Retrieve the operation return type.
+      be_type *bt = be_type::narrow_from_decl (bop->return_type ());
+
+      if (bt == 0)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
-                             ACE_TEXT ("be_visitor_home_svs::")
-                             ACE_TEXT ("gen_servant_class - ")
-                             ACE_TEXT ("codegen for scope failed\n")),
+                             "be_visitor_home_svs::"
+                             "gen_init_ops - "
+                             "Bad return type\n"),
                             -1);
         }
 
-      for (long i = 0; i < h->n_inherits (); ++i)
+      os_ << be_nl << be_nl;
+
+      be_visitor_operation_rettype rt_visitor (this->ctx_);
+
+      if (bt->accept (&rt_visitor) == -1)
         {
-          // A closure of all the supported interfaces is stored
-          // in the base class 'pd_inherits_flat' member.
-          be_interface *bi =
-            be_interface::narrow_from_decl (h->inherits ()[i]);
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "be_visitor_home_svs::"
+                             "gen_init_ops - "
+                             "codegen for return type failed\n"),
+                            -1);
+        }
 
-          bi->get_insert_queue ().reset ();
-          bi->get_del_queue ().reset ();
-          bi->get_insert_queue ().enqueue_tail (bi);
+      os_ << be_nl
+          << node_->original_local_name ()->get_string ()
+          << "_Servant::" << bop->local_name ();
 
-          Home_Op_Attr_Generator op_attr_gen (this);
+      be_visitor_operation_arglist al_visitor (this->ctx_);
 
-          int status =
-            bi->traverse_inheritance_graph (op_attr_gen,
-                                            &os_,
-                                            false,
-                                            false);
+      // Finder operations are as yet unimplemented in CIAO, so
+      // any args will be unused and should be commented out.
+      al_visitor.unused (finder_list);
 
-          if (status == -1)
+      if (bop->accept (&al_visitor) == -1)
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "be_visitor_home_svs::"
+                             "gen_init_ops - "
+                             "codegen for argument list failed\n"),
+                            -1);
+        }
+
+      os_ << be_nl
+          << "{" << be_idt_nl;
+
+      if (finder_list)
+        {
+          os_ << "throw ::CORBA::NO_IMPLEMENT ();";
+        }
+      else
+        {
+          os_ << "::Components::EnterpriseComponent_var _ciao_ec ="
+              << be_idt_nl
+              << "this->executor_->" << bop->local_name () << " (";
+
+          if (bop->argument_count () != 0)
             {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 ACE_TEXT ("be_visitor_home_svs::")
-                                 ACE_TEXT ("gen_servant_class - ")
-                                 ACE_TEXT ("traverse_inheritance_graph() ")
-                                 ACE_TEXT ("failed for %s\n"),
-                                 bi->full_name ()),
-                                -1);
+              os_ << be_idt_nl;
+
+              if (this->visit_scope (bop) == -1)
+                {
+                  ACE_ERROR_RETURN ((LM_ERROR,
+                                     ACE_TEXT ("be_visitor_home_svs")
+                                     ACE_TEXT ("::gen_init_ops - ")
+                                     ACE_TEXT ("visit_scope() failed\n")),
+                                    -1);
+                }
+
+              os_ << be_uidt;
             }
 
+          os_ << ");" << be_uidt_nl << be_nl
+              << global << comp_sname << "::CCM_" << comp_lname
+              << "_var _ciao_comp =" << be_idt_nl
+              << global << comp_sname << "::CCM_" << comp_lname
+              << "::_narrow (_ciao_ec.in ());" << be_uidt_nl << be_nl
+              << "return this->_ciao_activate_component "
+              << "(_ciao_comp.in ());";
         }
 
-      h = be_home::narrow_from_decl (h->base_home ());
+      os_ << be_uidt_nl
+          << "}";
     }
 
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_interface.cpp b/TAO/TAO_IDL/be/be_visitor_interface.cpp
index 2cec5ecd095..7c493ab5e40 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface.cpp
@@ -1,17 +1,21 @@
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    be_visitor_interface.cpp
- *
- *  $Id$
- *
- *  Visitors for generation of code for Interface
- *
- *
- *  @author Aniruddha Gokhale and Carlos O'Ryan
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_interface.cpp
+//
+// = DESCRIPTION
+//    Visitors for generation of code for Interface
+//
+// = AUTHOR
+//    Aniruddha Gokhale and Carlos O'Ryan
+//
+// ============================================================================
 
 #include "be_argument.h"
 #include "be_interface.h"
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_ch.cpp
index 07d305d17bd..67a1f887644 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/amh_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_ch.cpp
@@ -11,6 +11,10 @@
 */
 //=============================================================================
 
+ACE_RCSID (be_visitor_interface,
+           amh_ch,
+           "$Id$")
+
 be_visitor_amh_interface_ch::be_visitor_amh_interface_ch (
     be_visitor_context *ctx
   )
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_sh.cpp
index 6b4d85365b1..b2bd001d7b0 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_sh.cpp
@@ -11,6 +11,10 @@
 */
 //=============================================================================
 
+ACE_RCSID (be_visitor_interface,
+           amh_rh_sh,
+           "$Id$")
+
 be_visitor_amh_rh_interface_sh::be_visitor_amh_rh_interface_sh (
     be_visitor_context *ctx
   )
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_ss.cpp
index e6f482a87f7..dd51983df52 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_ss.cpp
@@ -11,6 +11,10 @@
 */
 //=============================================================================
 
+ACE_RCSID (be_visitor_interface,
+           amh_rh_ss,
+           "$Id$")
+
 be_visitor_amh_rh_interface_ss::be_visitor_amh_rh_interface_ss (
     be_visitor_context *ctx
   )
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp
index 0747f9b1896..002cad64667 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp
@@ -11,6 +11,10 @@
 */
 //=============================================================================
 
+ACE_RCSID (be_visitor_interface,
+           amh_sh,
+           "$Id$")
+
 be_visitor_amh_interface_sh::be_visitor_amh_interface_sh (
     be_visitor_context *ctx
   )
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_si.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_si.cpp
index 354dd6418e9..ada8c73a682 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/amh_si.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_si.cpp
@@ -11,6 +11,10 @@
 */
 //=============================================================================
 
+ACE_RCSID (be_visitor_interface,
+           amh_si,
+           "$Id$")
+
 be_visitor_amh_interface_si::be_visitor_amh_interface_si (
     be_visitor_context *ctx
   )
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp
index c703391bff5..085e8229696 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp
@@ -10,6 +10,10 @@
 */
 //=============================================================================
 
+ACE_RCSID (be_visitor_interface,
+           amh_ss,
+           "$Id$")
+
 be_visitor_amh_interface_ss::be_visitor_amh_interface_ss (
     be_visitor_context *ctx
   )
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/ami_interface_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/ami_interface_ch.cpp
index 4ff6fbfa7c4..e59249b3831 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/ami_interface_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/ami_interface_ch.cpp
@@ -1,18 +1,27 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    ami_interface_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for AMI Interfaces in the client header
- *
- *
- *  @author Aniruddha Gokhale
- *  @author Michael Kircher
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    ami_interface_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for AMI Interfaces in the client header
+//
+// = AUTHOR
+//    Aniruddha Gokhale,
+//    Michael Kircher
+//
+// ============================================================================
 
+ACE_RCSID (be_visitor_interface, 
+           ami_interface_ch, 
+           "$Id$")
 
 // ******************************************************
 // Interface visitor for client header
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp
index e700abb9696..0ac3043f090 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp
@@ -1,18 +1,27 @@
-
-//=============================================================================
-/**
- *  @file    any_op_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Any operators for an Interface in the client
- *  header.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    any_op_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Any operators for an Interface in the client
+//    header.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_interface,
+           any_op_ch,
+           "$Id$")
 
 // ***************************************************************************
 // Interface visitor for generating Any operator declarations in the client header
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp
index d9974e2aae1..88b1d1db183 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 // ============================================================================
 //
 // = LIBRARY
@@ -17,6 +15,10 @@
 //
 // ============================================================================
 
+ACE_RCSID (be_visitor_interface,
+           any_op_cs,
+           "$Id$")
+
 // ***************************************************************************
 // Interface visitor for generating Any operator declarations in the client
 // stubs file
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/base_proxy_broker_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/base_proxy_broker_ch.cpp
index ede48682033..22f87873065 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/base_proxy_broker_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/base_proxy_broker_ch.cpp
@@ -1,5 +1,9 @@
 //$Id$
 
+ACE_RCSID (be_visitor_interface,
+           base_proxy_broker_ch,
+           "$Id$")
+
 be_visitor_interface_base_proxy_broker_ch::
 be_visitor_interface_base_proxy_broker_ch (be_visitor_context *ctx)
   : be_visitor_interface (ctx)
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/base_proxy_impl_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/base_proxy_impl_ch.cpp
index 52f688404c0..0958fa5e06d 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/base_proxy_impl_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/base_proxy_impl_ch.cpp
@@ -2,6 +2,10 @@
 // $Id$
 //
 
+ACE_RCSID (be_visitor_interface, 
+           base_proxy_impl_ch, 
+           "$Id$")
+
 be_visitor_interface_base_proxy_impl_ch::
 be_visitor_interface_base_proxy_impl_ch (be_visitor_context *ctx)
   : be_visitor_interface (ctx)
@@ -36,10 +40,8 @@ be_visitor_interface_base_proxy_impl_ch::visit_interface (be_interface *node)
       << ": ";
 
   int has_concrete_parent = 0;
-  
-  AST_Decl::NodeType nt = node->node_type ();
 
-  if (nt == AST_Decl::NT_component || nt == AST_Decl::NT_connector)
+  if (node->node_type () == AST_Decl::NT_component)
     {
       be_component *bc = be_component::narrow_from_decl (node);
       AST_Component *ac_base = bc->base_component ();
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp
index 56f76a83e04..f5f65407bf4 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_ch.cpp
@@ -1,18 +1,27 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    cdr_op_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for CDR operators for interfaces. This uses
- *  compiled marshaling.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for CDR operators for interfaces. This uses
+//    compiled marshaling.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
+ACE_RCSID (be_visitor_interface,
+           cdr_op_ch,
+           "$Id$")
 
 // ***************************************************************************
 // Interface visitor for generating CDR operator declarations in the client header
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp
index 20d93d00cdc..97d63ee26f1 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    cdr_op_cs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for CDR operators for interfaces
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for CDR operators for interfaces
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_interface,
+           cdr_op_cs,
+           "$Id$")
 
 be_visitor_interface_cdr_op_cs::be_visitor_interface_cdr_op_cs (
     be_visitor_context *ctx
@@ -63,14 +72,12 @@ be_visitor_interface_cdr_op_cs::visit_interface (be_interface *node)
       << "const " << node->full_name () << "_ptr _tao_objref)" << be_uidt
       << be_uidt_nl
       << "{" << be_idt_nl;
-      
-  AST_Decl::NodeType nt = node->node_type ();
 
   if (node->is_abstract ())
     {
       *os << "::CORBA::AbstractBase_ptr";
     }
-  else if (nt == AST_Decl::NT_component || nt == AST_Decl::NT_connector)
+  else if (node->node_type () == AST_Decl::NT_component)
     {
       *os << "Components::CCMObject_ptr";
     }
@@ -96,7 +103,7 @@ be_visitor_interface_cdr_op_cs::visit_interface (be_interface *node)
     {
       *os << "::CORBA::AbstractBase_var obj;";
     }
-  else if (nt == AST_Decl::NT_component || nt == AST_Decl::NT_connector)
+  else if (node->node_type () == AST_Decl::NT_component)
     {
       *os << "Components::CCMObject_var obj;";
     }
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp
index bed337f0d7b..7bd98a387bd 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp
@@ -2,6 +2,10 @@
 // $Id$
 //
 
+ACE_RCSID (be_visitor_interface,
+           direct_proxy_impl_sh,
+           "$Id$")
+
 be_visitor_interface_direct_proxy_impl_sh::
 be_visitor_interface_direct_proxy_impl_sh (be_visitor_context *ctx)
   : be_visitor_interface (ctx)
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp
index 44fe3052750..82880cf9668 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp
@@ -2,6 +2,10 @@
 //$Id$
 //
 
+ACE_RCSID (be_visitor_interface,
+           direct_proxy_impl_ss,
+           "$Id$")
+
 be_visitor_interface_direct_proxy_impl_ss::
 be_visitor_interface_direct_proxy_impl_ss (be_visitor_context *ctx)
   : be_visitor_interface (ctx)
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp
index d02c21c6f76..9994a015bc4 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    interface.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Interfaces. This is a generic visitor.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    interface.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Interfaces. This is a generic visitor.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_interface,
+           interface,
+           "$Id$")
 
 // ******************************************************
 // Generic Interface visitor
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
index e4f9335954e..eca268c294e 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
@@ -1,17 +1,22 @@
-
-//=============================================================================
-/**
- *  @file    interface_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Interfaces in the client header
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    interface_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Interfaces in the client header
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 // ******************************************************
 // Interface visitor for client header
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp
index fb03eac7a04..1647d5ca727 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 // ============================================================================
 //
 // = LIBRARY
@@ -16,6 +14,10 @@
 //
 // ============================================================================
 
+ACE_RCSID (be_visitor_interface,
+           interface_ci,
+           "$Id$")
+
 // **************************************************
 // Interface visitor for client inline
 // **************************************************
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
index ef6f7cff982..811a951aeea 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
@@ -1,15 +1,24 @@
-//=============================================================================
-/**
- *  @file    interface_cs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Interfaces in the client stubs file.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
+//
+// $Id$
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    interface_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Interfaces in the client stubs file.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_interface,
+           interface_cs,
+           "$Id$")
 
 
 // ************************************************************
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ex_idl.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ex_idl.cpp
index 8423d3102de..5aecbfdd134 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ex_idl.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ex_idl.cpp
@@ -1,18 +1,21 @@
-
-//=============================================================================
-/**
- *  @file    interface_ex_idl.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Interfaces in the
- *  CIAO executor IDL file.
- *
- *
- *  @author Jeff Parsons <j.parsons@vanderbilt.edu>
- */
-//=============================================================================
-
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO_IDL_BE
+//
+// = FILENAME
+//    interface_ex_idl.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Interfaces in the
+//    CIAO executor IDL file.
+//
+// = AUTHOR
+//   Jeff Parsons <j.parsons@vanderbilt.edu>
+//
+// ============================================================================
 
 // ************************************************************
 // Interface visitor for CIAO executor IDL.
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ih.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ih.cpp
index 42df2c46677..2f30a58b14d 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ih.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ih.cpp
@@ -1,17 +1,24 @@
-
-//=============================================================================
-/**
- *  @file    interface_ih.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Interfaces in the implementation header
- *
- *
- *  @author Yamuna Krishnamurthy (yamuna@cs.wustl.edu)
- */
-//=============================================================================
-
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    interface_ih.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Interfaces in the implementation header
+//
+// = AUTHOR
+//   Yamuna Krishnamurthy (yamuna@cs.wustl.edu)
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_interface,
+           interface_ih,
+           "$Id$")
 
 // ************************************************************
 // Interface visitor for implementation header.
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_is.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_is.cpp
index 442423b63bf..39e561b1319 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_is.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_is.cpp
@@ -1,22 +1,29 @@
-
-//=============================================================================
-/**
- *  @file    interface_is.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Interfaces in the implementation skeletons file.
- *
- *
- *  @author Yamuna Krishnamurthy (yamuna@cs.wustl.edu)
- */
-//=============================================================================
-
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    interface_is.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Interfaces in the implementation skeletons file.
+//
+// = AUTHOR
+//   Yamuna Krishnamurthy (yamuna@cs.wustl.edu)
+//
+// ============================================================================
 
 // ************************************************************
 // Interface visitor for implementation skeletons.
 // ************************************************************
 
+ACE_RCSID (be_visitor_interface,
+           interface_is,
+           "$Id$")
+
 be_visitor_interface_is::be_visitor_interface_is (be_visitor_context *ctx)
   : be_visitor_interface (ctx)
 {
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
index 7aef35018f4..510e0eb8038 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    interface_sh.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Interfaces in the server header
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    interface_sh.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Interfaces in the server header
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_interface,
+           interface_sh,
+           "$Id$")
 
 // ************************************************************
 // Interface visitor for server header.
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_si.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_si.cpp
index a9326103e00..deacb66cb3d 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_si.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_si.cpp
@@ -1,16 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    interface_si.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Interfaces in the server inline file
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    interface_si.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Interfaces in the server inline file
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_interface,
+           interface_si,
+           "$Id$")
 
 
 // ************************************************************************
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
index 9ae2fcaa120..765eae17379 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp
@@ -1,22 +1,33 @@
-
-//=============================================================================
-/**
- *  @file    interface_ss.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Interfaces in the server skeletons file.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    interface_ss.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Interfaces in the server skeletons file.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #include "global_extern.h"
 #include "ast_generator.h"
 #include "ast_string.h"
 
+
+ACE_RCSID (be_visitor_interface,
+           interface_ss,
+           "$Id$")
+
+
 // ************************************************************
 // Interface visitor for server skeletons.
 // ************************************************************
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_svh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_svh.cpp
index 431cc2f0159..a23dcae58b2 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_svh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_svh.cpp
@@ -1,23 +1,30 @@
+// $Id$
 
-//=============================================================================
-/**
- *  @file    interface_svh.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Interfaces in the
- *  CIAO servant header file.
- *
- *
- *  @author Jeff Parsons <j.parsons@vanderbilt.edu>
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO_IDL_BE
+//
+// = FILENAME
+//    interface_svh.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Interfaces in the
+//    CIAO servant header file.
+//
+// = AUTHOR
+//   Jeff Parsons <j.parsons@vanderbilt.edu>
+//
+// ============================================================================
 
 // ************************************************************
 // Interface visitor for CIAO servant header.
 // ************************************************************
 
+ACE_RCSID (be_visitor_interface,
+           interface_svh,
+           "$Id$")
+
 be_visitor_interface_svh::be_visitor_interface_svh (
   be_visitor_context *ctx)
   : be_visitor_interface (ctx)
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_svs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_svs.cpp
index cfdfe89ec39..eab219d0f00 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_svs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_svs.cpp
@@ -1,23 +1,30 @@
+// $Id$
 
-//=============================================================================
-/**
- *  @file    interface_svs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Interfaces in the
- *  CIAO servant source file.
- *
- *
- *  @author Jeff Parsons <j.parsons@vanderbilt.edu>
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO_IDL_BE
+//
+// = FILENAME
+//    interface_svs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Interfaces in the
+//    CIAO servant source file.
+//
+// = AUTHOR
+//   Jeff Parsons <j.parsons@vanderbilt.edu>
+//
+// ============================================================================
 
 // ************************************************************
 // Interface visitor for CIAO servant source.
 // ************************************************************
 
+ACE_RCSID (be_visitor_interface,
+           interface_svs,
+           "$Id$")
+
 be_visitor_interface_svs::be_visitor_interface_svs (
   be_visitor_context *ctx)
   : be_visitor_interface (ctx)
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/proxy_brokers_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/proxy_brokers_ch.cpp
index 54b0d683465..8b4a8415806 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/proxy_brokers_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/proxy_brokers_ch.cpp
@@ -2,6 +2,10 @@
 // $Id$
 //
 
+ACE_RCSID (be_visitor_interface,
+           proxy_brokers_ch,
+           "$Id$")
+
 be_visitor_interface_proxy_brokers_ch::be_visitor_interface_proxy_brokers_ch (
     be_visitor_context *ctx
   )
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/proxy_impls_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/proxy_impls_ch.cpp
index 5dd88202211..ae043a1c56e 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/proxy_impls_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/proxy_impls_ch.cpp
@@ -2,6 +2,10 @@
 // $Id$
 //
 
+ACE_RCSID (be_visitor_interface,
+           base_proxy_broker_impl_ch,
+           "$Id$")
+
 be_visitor_interface_proxy_impls_ch::be_visitor_interface_proxy_impls_ch (
     be_visitor_context *ctx
   )
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_ch.cpp
index d94b82e4811..fca454e14bf 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_ch.cpp
@@ -2,6 +2,10 @@
 // $Id$
 //
 
+ACE_RCSID (be_visitor_interface,
+           be_visitor_interface_remote_proxy_broker_ch,
+           "$Id$")
+
 be_visitor_interface_remote_proxy_broker_ch::
 be_visitor_interface_remote_proxy_broker_ch (be_visitor_context *ctx)
   : be_visitor_interface (ctx)
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_cs.cpp
index 437b13e8c39..8c9fd65d0e0 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_broker_cs.cpp
@@ -2,6 +2,10 @@
 // $Id$
 //
 
+ACE_RCSID (be_visitor_interface,
+           remote_proxy_broker_cs,
+           "$Id$")
+
 be_visitor_interface_remote_proxy_broker_cs::
 be_visitor_interface_remote_proxy_broker_cs (be_visitor_context *ctx)
   : be_visitor_interface (ctx)
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_impl_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_impl_ch.cpp
index 65ffc391896..6c83426fdee 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_impl_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/remote_proxy_impl_ch.cpp
@@ -2,6 +2,10 @@
 // $Id$
 //
 
+ACE_RCSID (be_visitor_interface, 
+           remote_proxy_impl_ch, 
+           "$Id$")
+
 be_visitor_interface_remote_proxy_impl_ch::
 be_visitor_interface_remote_proxy_impl_ch (be_visitor_context *ctx)
   : be_visitor_interface (ctx)
@@ -39,9 +43,7 @@ be_visitor_interface_remote_proxy_impl_ch::visit_interface (
       << "," << be_idt_nl << "public virtual " 
       << "TAO_Remote_Object_Proxy_Impl";
 
-  AST_Decl::NodeType nt = node->node_type ();
-
-  if (nt == AST_Decl::NT_component || nt == AST_Decl::NT_connector)
+  if (node->node_type () == AST_Decl::NT_component)
     {
       be_component *bc = be_component::narrow_from_decl (node);
       AST_Component *ac_base = bc->base_component ();
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp
index c1919a3c5c6..5f574b1e824 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp
@@ -1,16 +1,26 @@
-//=============================================================================
-/**
- *  @file    smart_proxy_ch.cpp
- *
- *  $Id$
- *
- *  This provides code generation for smart proxy classes for an
- *  interface in the client header.
- *
- *
- *  @author Kirthika Parameswaran  <kirthika@cs.wustl.edu>
- */
-//=============================================================================
+//
+// $Id$
+//
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    smart_proxy_ch.cpp
+//
+// = DESCRIPTION
+//    This provides code generation for smart proxy classes for an
+//    interface in the client header.
+//
+// = AUTHOR
+//    Kirthika Parameswaran  <kirthika@cs.wustl.edu>
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_interface,
+           smart_proxy_ch,
+           "$Id$")
 
 
 // ************************************************************
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp
index 76f62ecf011..0c57077fdff 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp
@@ -1,18 +1,25 @@
-
-//=============================================================================
-/**
- *  @file    smart_proxy_cs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for smart_proxy classes for an Interface in the
- *  client proxy file.
- *
- *
- *  @author Kirthika Parameswaran  <kirthika@cs.wustl.edu>
- */
-//=============================================================================
-
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    smart_proxy_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for smart_proxy classes for an Interface in the
+//    client proxy file.
+//
+// = AUTHOR
+//    Kirthika Parameswaran  <kirthika@cs.wustl.edu>
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_interface,
+           smart_proxy_cs,
+           "$Id$")
 
 // ************************************************************
 //  be_visitor_interface_smart_proxy_cs
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp
index 4a1d80b9434..d330144fd43 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_sh.cpp
@@ -2,6 +2,10 @@
 // $Id$
 //
 
+ACE_RCSID (be_visitor_interface,
+           base_proxy_broker_sh,
+           "$Id$")
+
 be_visitor_interface_strategized_proxy_broker_sh::
 be_visitor_interface_strategized_proxy_broker_sh (be_visitor_context *ctx)
   : be_visitor_interface (ctx)
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp
index d93e1bed7ae..4e2dc1f6442 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp
@@ -2,6 +2,10 @@
 // $Id$
 //
 
+ACE_RCSID (be_visitor_interface,
+           strategized_proxy_broker_ss,
+           "$Id$")
+
 be_visitor_interface_strategized_proxy_broker_ss::
 be_visitor_interface_strategized_proxy_broker_ss (be_visitor_context *ctx)
   : be_visitor_interface (ctx)
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp
index 6ba50a98d63..72843dc3259 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp
@@ -1,18 +1,27 @@
-
-//=============================================================================
-/**
- *  @file    tie_sh.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for TIE class for an Interface in the header
- *  file.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    tie_sh.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for TIE class for an Interface in the header
+//    file.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_interface,
+           tie_sh,
+           "$Id$")
 
 // ************************************************************
 // Interface visitor for server header.
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/tie_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/tie_ss.cpp
index cdaad5a88cc..c96e1e7381e 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/tie_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/tie_ss.cpp
@@ -1,17 +1,27 @@
-
-//=============================================================================
-/**
- *  @file    tie_ss.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for TIE classes for the Interface node in the
- *  inline file.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    tie_ss.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for TIE classes for the Interface node in the
+//    inline file.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_interface,
+           tie_ss,
+           "$Id$")
 
 
 // ************************************************************************
diff --git a/TAO/TAO_IDL/be/be_visitor_interface_fwd.cpp b/TAO/TAO_IDL/be/be_visitor_interface_fwd.cpp
index 9a416863ba3..1dc664073ea 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface_fwd.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface_fwd.cpp
@@ -1,17 +1,22 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    be_visitor_interface_fwd.cpp
- *
- *  $Id$
- *
- *  Visitors for generation of code for Interface_Fwd
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_interface_fwd.cpp
+//
+// = DESCRIPTION
+//    Visitors for generation of code for Interface_Fwd
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #include "be_interface_fwd.h"
 #include "be_interface.h"
@@ -29,3 +34,6 @@
 #include "be_visitor_interface_fwd/cdr_op_ch.cpp"
 #include "be_visitor_interface_fwd/any_op_ch.cpp"
 
+ACE_RCSID (be, 
+           be_visitor_interface_fwd, 
+           "$Id$")
diff --git a/TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp
index 6d54b8cc9e8..d08ba25559b 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp
@@ -1,18 +1,27 @@
-
-//=============================================================================
-/**
- *  @file    any_op_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Any operators for a forward declared interface
- *  in the client header.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    any_op_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Any operators for a forward declared interface
+//    in the client header.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_interface_fwd,
+           any_op_ch,
+           "$Id$")
 
 // ***************************************************************************
 // Generates Any operator declarations in the client header
diff --git a/TAO/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp
index 9a250cebe6d..442d4bd54f0 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface_fwd/cdr_op_ch.cpp
@@ -1,18 +1,27 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    cdr_op_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for CDR operators for forward declared
- *  interfaces. This uses compiled marshaling.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for CDR operators for forward declared
+//    interfaces. This uses compiled marshaling.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
+ACE_RCSID (be_visitor_interface_fwd, 
+           cdr_op_ch, 
+           "$Id$")
 
 // ***************************************************************************
 // Forward declared interface visitor for generating CDR operator declarations
diff --git a/TAO/TAO_IDL/be/be_visitor_interface_fwd/interface_fwd_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface_fwd/interface_fwd_ch.cpp
index b98c37d1e57..5985b56e260 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface_fwd/interface_fwd_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface_fwd/interface_fwd_ch.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    interface_fwd_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Interface_Fwd node in the client header.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    interface_fwd_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Interface_Fwd node in the client header.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_interface_fwd, 
+           interface_fwd_ch, 
+           "$Id$")
 
 // ********************************************************************
 // Visitor implementation for the Interface_Fwd type
diff --git a/TAO/TAO_IDL/be/be_visitor_module.cpp b/TAO/TAO_IDL/be/be_visitor_module.cpp
index a7f84583a71..463e6a6c506 100644
--- a/TAO/TAO_IDL/be/be_visitor_module.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_module.cpp
@@ -1,17 +1,22 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    be_visitor_module.cpp
- *
- *  $Id$
- *
- *  Visitors for generation of code for Module
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_module.cpp
+//
+// = DESCRIPTION
+//    Visitors for generation of code for Module
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #include "be_module.h"
 #include "be_constant.h"
@@ -33,7 +38,6 @@
 #include "be_component.h"
 #include "be_component_fwd.h"
 #include "be_home.h"
-#include "be_connector.h"
 #include "be_extern.h"
 #include "be_helper.h"
 #include "utl_err.h"
@@ -56,7 +60,6 @@
 #include "be_visitor_component.h"
 #include "be_visitor_component_fwd.h"
 #include "be_visitor_home.h"
-#include "be_visitor_connector.h"
 #include "be_visitor_context.h"
 
 #include "be_visitor_module/module.cpp"
diff --git a/TAO/TAO_IDL/be/be_visitor_module/any_op.cpp b/TAO/TAO_IDL/be/be_visitor_module/any_op.cpp
index aaf05f86ec7..5819d998f17 100644
--- a/TAO/TAO_IDL/be/be_visitor_module/any_op.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_module/any_op.cpp
@@ -1,18 +1,27 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    any_op.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Any operators for elements in the scope of
- *  the Module.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    any_op.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Any operators for elements in the scope of
+//    the Module.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
+ACE_RCSID (be_visitor_module, 
+           any_op, 
+           "$Id$")
 
 // ***************************************************************************
 // Module visitor for generating Any operator declarations in the client header
diff --git a/TAO/TAO_IDL/be/be_visitor_module/cdr_op.cpp b/TAO/TAO_IDL/be/be_visitor_module/cdr_op.cpp
index 64bacbcde9d..540057da455 100644
--- a/TAO/TAO_IDL/be/be_visitor_module/cdr_op.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_module/cdr_op.cpp
@@ -1,18 +1,27 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    cdr_op.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for the CDR operators for types defined in Module's
- *  scope.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for the CDR operators for types defined in Module's
+//    scope.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
+ACE_RCSID (be_visitor_module, 
+           cdr_op, 
+           "$Id: cdr_op.cpp,v 1.2 1999/05/28 02:16:43 coryan Exp ")
 
 // ***************************************************************************
 // Module visitor for generating CDR operator declarations in the client header
diff --git a/TAO/TAO_IDL/be/be_visitor_module/module.cpp b/TAO/TAO_IDL/be/be_visitor_module/module.cpp
index 70077480c96..533430e1624 100644
--- a/TAO/TAO_IDL/be/be_visitor_module/module.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_module/module.cpp
@@ -1,16 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    module.cpp
- *
- *  $Id$
- *
- *  Generic visitor generating code for Module
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    module.cpp
+//
+// = DESCRIPTION
+//    Generic visitor generating code for Module
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_module,
+           module,
+           "$Id$")
 
 
 // ******************************************************
@@ -371,8 +381,6 @@ be_visitor_module::visit_interface (be_interface *node)
     case TAO_CodeGen::TAO_ROOT_SERIALIZER_OP_CS:
     case TAO_CodeGen::TAO_ROOT_EXH:
     case TAO_CodeGen::TAO_ROOT_EXS:
-    case TAO_CodeGen::TAO_ROOT_CNH:
-    case TAO_CodeGen::TAO_ROOT_CNS:
       {
         // Nothing to be done for these cases.
         return 0;
@@ -822,10 +830,18 @@ be_visitor_module::visit_component (be_component *node)
         status = node->accept (&visitor);
         break;
       }
-    // Nothing for these with components, they have the executor.  
     case TAO_CodeGen::TAO_ROOT_IH:
+      {
+        be_visitor_component_ih visitor (&ctx);
+        status = node->accept (&visitor);
+        break;
+      }
     case TAO_CodeGen::TAO_ROOT_IS:
-      break;
+      {
+        be_visitor_component_is visitor (&ctx);
+        status = node->accept (&visitor);
+        break;
+      }
     case TAO_CodeGen::TAO_ROOT_SVH:
       {
         be_visitor_component_svh visitor (&ctx);
@@ -856,9 +872,6 @@ be_visitor_module::visit_component (be_component *node)
         status = node->accept (&visitor);
         break;
       }
-    case TAO_CodeGen::TAO_ROOT_CNH:
-    case TAO_CodeGen::TAO_ROOT_CNS:
-      break;
     default:
       {
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -973,9 +986,6 @@ be_visitor_module::visit_home (be_home *node)
         status = node->accept (&visitor);
         break;
       }
-    case TAO_CodeGen::TAO_ROOT_CNH:
-    case TAO_CodeGen::TAO_ROOT_CNS:
-      break;
     default:
       return 0; // nothing to be done
     }
@@ -993,43 +1003,6 @@ be_visitor_module::visit_home (be_home *node)
 }
 
 int
-be_visitor_module::visit_connector (be_connector *node)
-{
-  // Instantiate a visitor context with a copy of our context. This info
-  // will be modified based on what type of node we are visiting.
-  be_visitor_context ctx (*this->ctx_);
-  ctx.node (node);
-  int status = 0;
-
-  switch (this->ctx_->state ())
-    {
-      case TAO_CodeGen::TAO_ROOT_CNH:
-        {
-          be_visitor_connector_dds_exh visitor (&ctx);
-          status = node->accept (&visitor);
-          break;
-        }
-      case TAO_CodeGen::TAO_ROOT_CNS:
-        {
-          be_visitor_connector_dds_exs visitor (&ctx);
-          status = node->accept (&visitor);
-          break;
-        }
-      // Skip these contexts, the connector impl is
-      // generated in a separate pass, using the states
-      // above.
-      case TAO_CodeGen::TAO_ROOT_EXH:
-      case TAO_CodeGen::TAO_ROOT_EXS:
-        break;
-      default:
-        // In all other cases, same as component.
-        return this->visit_component (node);
-    }
-    
-  return 0;
-}
-
-int
 be_visitor_module::visit_structure (be_structure *node)
 {
   // Instantiate a visitor context with a copy of our context. This info
diff --git a/TAO/TAO_IDL/be/be_visitor_module/module_ch.cpp b/TAO/TAO_IDL/be/be_visitor_module/module_ch.cpp
index 0980c135019..11f1678c300 100644
--- a/TAO/TAO_IDL/be/be_visitor_module/module_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_module/module_ch.cpp
@@ -1,17 +1,25 @@
-
-//=============================================================================
-/**
- *  @file    module_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Module in the client header
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    module_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Module in the client header
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_module,
+           module_ch,
+           "$Id$")
 
 // ******************************************************
 // Module visitor for client header
diff --git a/TAO/TAO_IDL/be/be_visitor_module/module_ih.cpp b/TAO/TAO_IDL/be/be_visitor_module/module_ih.cpp
index 0e70e377f49..92eacef28aa 100644
--- a/TAO/TAO_IDL/be/be_visitor_module/module_ih.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_module/module_ih.cpp
@@ -1,17 +1,24 @@
+// $Id$
 
-//=============================================================================
-/**
- *  @file    module_ih.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Module in the implementation header
- *
- *
- *  @author Yamuna Krishnamurthy (yamuna@cs.wustl.edu)
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    module_ih.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Module in the implementation header
+//
+// = AUTHOR
+//    Yamuna Krishnamurthy (yamuna@cs.wustl.edu)
+//
+// ============================================================================
 
+ACE_RCSID (be_visitor_module, 
+           module_ih, 
+           "$Id$")
 
 // ************************************************************
 // Module visitor for server header
diff --git a/TAO/TAO_IDL/be/be_visitor_module/module_sh.cpp b/TAO/TAO_IDL/be/be_visitor_module/module_sh.cpp
index 648a9d77167..7466b7aa0f6 100644
--- a/TAO/TAO_IDL/be/be_visitor_module/module_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_module/module_sh.cpp
@@ -1,17 +1,25 @@
-
-//=============================================================================
-/**
- *  @file    module_sh.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Module in the server header
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    module_sh.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Module in the server header
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_module, 
+           module_sh, 
+           "$Id$")
 
 // ************************************************************
 // Module visitor for server header
diff --git a/TAO/TAO_IDL/be/be_visitor_module/serializer_op.cpp b/TAO/TAO_IDL/be/be_visitor_module/serializer_op.cpp
index cae4ec74c42..46418fd81bb 100644
--- a/TAO/TAO_IDL/be/be_visitor_module/serializer_op.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_module/serializer_op.cpp
@@ -1,18 +1,27 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    serializer_op.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for the TAO::DCPS::Serializer operators 
- *  for types defined in Module's scope.
- *
- *
- *  @author Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    serializer_op.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for the TAO::DCPS::Serializer operators 
+//    for types defined in Module's scope.
+//
+// = AUTHOR
+//    Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
+//
+// ============================================================================
 
+ACE_RCSID (be_visitor_module, 
+           serializer_op, 
+           "$Id: serializer_op.cpp,v 1.2 1999/05/28 02:16:43 coryan Exp ")
 
 // ***************************************************************************
 // Module visitor for generating Serializer operator declarations in the client header
diff --git a/TAO/TAO_IDL/be/be_visitor_native.cpp b/TAO/TAO_IDL/be/be_visitor_native.cpp
index 5c5cb513ff4..1f0b7a45424 100644
--- a/TAO/TAO_IDL/be/be_visitor_native.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_native.cpp
@@ -1,17 +1,22 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    be_visitor_native.cpp
- *
- *  $Id$
- *
- *  Visitors for generation of code for native
- *
- *
- *  @author Johnny Willemsen
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_native.cpp
+//
+// = DESCRIPTION
+//    Visitors for generation of code for native
+//
+// = AUTHOR
+//    Johnny Willemsen
+//
+// ============================================================================
 
 #include "be_native.h"
 #include "be_helper.h"
@@ -22,3 +27,6 @@
 
 #include "be_visitor_native/native_ch.cpp"
 
+ACE_RCSID (be,
+           be_visitor_native,
+           "$Id$")
diff --git a/TAO/TAO_IDL/be/be_visitor_native/native_ch.cpp b/TAO/TAO_IDL/be/be_visitor_native/native_ch.cpp
index 9e774b8c4dd..a822d9dec14 100644
--- a/TAO/TAO_IDL/be/be_visitor_native/native_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_native/native_ch.cpp
@@ -1,21 +1,31 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    native_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Native in the client header
- *
- *
- *  @author Johnny Willemsen
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    enum_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Native in the client header
+//
+// = AUTHOR
+//    Johnny Willemsen
+//
+// ============================================================================
 
 #include "be_visitor_typecode/typecode_decl.h"
 #include "global_extern.h"
 
+ACE_RCSID (be_visitor_native,
+           native_ch,
+           "$Id$")
+
+
 // ********************************************************************
 // Visitor implementation for the Native type
 // This one for the client header file
@@ -41,30 +51,23 @@ be_visitor_native_ch::visit_native (be_native *node)
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_nl << be_nl
-      << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__
-      << be_nl << be_nl;
+  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
   const char *node_name = node->full_name ();
-  
   if (ACE_OS::strcmp (node_name, "PortableServer::ServantLocator::Cookie") == 0)
-    {
-      *os << "typedef void *Cookie;" << be_nl;
-    }
+    *os << "typedef void *Cookie;" << be_nl;
   else if (ACE_OS::strcmp (node_name, "CORBA::VoidData") == 0)
-    {
-      *os << "typedef void *VoidData;" << be_nl;
-    }
+    *os << "typedef void *VoidData;" << be_nl;
   else if (idl_global->dcps_support_zero_copy_read ()
            && 0 == ACE_OS::strcmp (node->full_name (),"DDS::SampleInfoSeq"))
     {
       // DDS/DCPS zero-copy read sequence type support.
       *os << be_nl << be_nl
           << "typedef ::TAO::DCPS::ZeroCopyInfoSeq< "
-          << "SampleInfo"
-          << ", DCPS_ZERO_COPY_SEQ_DEFAULT_SIZE> "
-          << "SampleInfo"
+          << "SampleInfo" 
+          << ", DCPS_ZERO_COPY_SEQ_DEFAULT_SIZE> " 
+          << "SampleInfo" 
           << "Seq;" << be_nl;
     }
   else if (idl_global->dcps_support_zero_copy_read ()
@@ -75,23 +78,19 @@ be_visitor_native_ch::visit_native (be_native *node)
 
       // strip  the "Seq" ending to get the sample's name
       const size_t max_name_length = 2000;
-      
       if (ACE_OS::strlen (node_name) >= max_name_length)
         {
           return -1;
         }
-        
       char sample_name[max_name_length];
-      ACE_OS::strncpy (sample_name,
-                       node_name,
-                       ACE_OS::strlen (node_name) - 3);
-      sample_name[ACE_OS::strlen (node_name) - 3] = '\0';
+      ACE_OS::strncpy (sample_name, node_name, ACE_OS::strlen (node_name)-3);
+      sample_name[ACE_OS::strlen (node_name)-3] = '\0';
 
       *os << be_nl << be_nl
           << "typedef ::TAO::DCPS::ZeroCopyDataSeq< "
-          << sample_name
-          << ", DCPS_ZERO_COPY_SEQ_DEFAULT_SIZE> "
-          << node->local_name ()
+          << sample_name 
+          << ", DCPS_ZERO_COPY_SEQ_DEFAULT_SIZE> " 
+          << node->local_name () 
           << ";" << be_nl;
     }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_operation.cpp b/TAO/TAO_IDL/be/be_visitor_operation.cpp
index 7717e7e17f0..e6ceb76baa5 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation.cpp
@@ -1,17 +1,22 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    be_visitor_operation.cpp
- *
- *  $Id$
- *
- *  Visitors for generation of code for Operation
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO_IDL_BE
+//
+// = FILENAME
+//    be_visitor_operation.cpp
+//
+// = DESCRIPTION
+//    Visitors for generation of code for Operation
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #include "be_argument.h"
 #include "be_array.h"
@@ -37,7 +42,6 @@
 #include "be_eventtype.h"
 #include "be_eventtype_fwd.h"
 #include "be_home.h"
-#include "be_factory.h"
 #include "be_extern.h"
 #include "be_helper.h"
 #include "be_identifier_helper.h"
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_sh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_sh.cpp
index 772f6990fa2..2bdca1eeb58 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_sh.cpp
@@ -1,17 +1,27 @@
-//=============================================================================
-/**
- *  @file    amh_rh_sh.cpp
- *
- *  $Id$
- *
- *  Visitor generating AMH-RH skeleton code for Operation node in the
- *  skeleton header.
- *
- *
- *  @author Mayur Deshpande <mayur@ics.uci.edu>
- */
-//=============================================================================
-
+//
+// $Id$
+//
+//
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    amh_rh_sh.cpp
+//
+// = DESCRIPTION
+//    Visitor generating AMH-RH skeleton code for Operation node in the
+//    skeleton header.
+//
+// = AUTHOR
+//    Mayur Deshpande <mayur@ics.uci.edu>
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_operation, 
+           operation_amh_rh_sh, 
+           "$Id$")
 
 // ******************************************************
 // Visitor for generating AMH-RH skeleton for "operation"
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp
index 0eb913f7e25..41fff5467c0 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_rh_ss.cpp
@@ -10,6 +10,10 @@
  */
 //=============================================================================
 
+ACE_RCSID (be_visitor_operation,
+           amh_rh_ss,
+           "$Id$")
+
 be_visitor_amh_rh_operation_ss::be_visitor_amh_rh_operation_ss (
     be_visitor_context *ctx
   )
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp
index de25f99dd77..a32733c740c 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_sh.cpp
@@ -1,18 +1,27 @@
-
-//=============================================================================
-/**
- *  @file    amh_sh.cpp
- *
- *  $Id$
- *
- *  Visitor generating AMH skeleton code for Operation node in the
- *  skeleton header.
- *
- *
- *  @author Mayur Deshpande <mayur@ics.uci.edu>
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    amh_sh.cpp
+//
+// = DESCRIPTION
+//    Visitor generating AMH skeleton code for Operation node in the
+//    skeleton header.
+//
+// = AUTHOR
+//    Mayur Deshpande <mayur@ics.uci.edu>
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_operation,
+           amh_sh,
+           "$Id$")
 
 // ******************************************************
 // Visitor for generating AMH skeleton for "operation" in skeleton header.
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp
index 35be7beb37c..c03dd389ea8 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/amh_ss.cpp
@@ -10,6 +10,10 @@
 */
 //=============================================================================
 
+ACE_RCSID (be_visitor_operation,
+           amh_ss,
+           "$Id$")
+
 #include "ace/SString.h"
 
 be_visitor_amh_operation_ss::be_visitor_amh_operation_ss (
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_ch.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_ch.cpp
index 9a880d92228..499e8884793 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/ami_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_ch.cpp
@@ -1,18 +1,27 @@
-
-//=============================================================================
-/**
- *  @file    ami_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating AMI stub code for Operation node in the
- *  client header.
- *
- *
- *  @author Alexander Babu Arulanthu <alex@cs.wustl.edu>
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    ami_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating AMI stub code for Operation node in the
+//    client header.
+//
+// = AUTHOR
+//    Alexander Babu Arulanthu <alex@cs.wustl.edu>
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_operation, 
+           operation_ami_ch, 
+           "$Id$")
 
 // ******************************************************
 // Visitor for generating AMI stub for "operation" in client header.
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp
index 8e79a814125..a5925da6fc4 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp
@@ -1,18 +1,27 @@
-
-//=============================================================================
-/**
- *  @file    ami_cs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Operation in the stubs file.
- *
- *
- *  @author Aniruddha Gokhale
- *  @author Alexander Babu Arulanthu <alex@cs.wustl.edu> Michael Kircher
- */
-//=============================================================================
-
+//
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    ami_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Operation in the stubs file.
+//
+// = AUTHOR
+//    Aniruddha Gokhale,
+//    Alexander Babu Arulanthu <alex@cs.wustl.edu>
+//    Michael Kircher
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_operation,
+           operation_ami_cs,
+           "$Id$")
 
 // ************************************************************
 // Operation visitor for client stubs
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_cs.cpp
index 6235741fd1d..07a98139f2d 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_exception_holder_operation_cs.cpp
@@ -1,17 +1,26 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    ami_exception_holder_operation_cs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Operation in the stubs file.
- *
- *
- *  @author Michael Kircher <Michael.Kircher@mchp.siemens.de>
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    ami_exception_holder_operation_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Operation in the stubs file.
+//
+// = AUTHOR
+//    Michael Kircher <Michael.Kircher@mchp.siemens.de>
+//
+// ============================================================================
 
+ACE_RCSID (be_visitor_operation,
+           ami_exception_holder_operation_cs,
+           "$Id$")
 
 // ************************************************************
 // Operation visitor for client stubs
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_ch.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_ch.cpp
index 2fb1a24027d..3533db0816f 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_ch.cpp
@@ -1,18 +1,28 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    ami_handler_reply_stub_operation_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for AMI Handler call back operation in
- *  the client header.
- *
- *
- *  @author Aniruddha Gokhale and Alexander Babu Arulanthu <alex@cs.wustl.edu>
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    ami_handler_reply_stub_operation_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for AMI Handler call back operation in
+//    the client header.
+//
+// = AUTHOR
+//    Aniruddha Gokhale and Alexander Babu Arulanthu
+//    <alex@cs.wustl.edu>
+//
+// ============================================================================
 
+ACE_RCSID (be_visitor_operation,
+           ami_handler_reply_stub_operation_ch,
+           "$Id$")
 
 // ************************************************************
 // Operation visitor for server header
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp
index ea6304febe3..a17b1f890c7 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    ami_handler_reply_stub_operation_cs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Operation in the stubs file.
- *
- *
- *  @author Alexander Babu Arulanthu <alex@cs.wustl.edu>
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    ami_handler_reply_stub_operation_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Operation in the stubs file.
+//
+// = AUTHOR
+//    Alexander Babu Arulanthu <alex@cs.wustl.edu>
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_operation,
+           ami_handler_reply_stub_operation_cs,
+           "$Id$")
 
 // ************************************************************
 // Operation visitor for client stubs.
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp b/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp
index 1ed170d9bec..9ed77596b7c 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/arglist.cpp
@@ -1,17 +1,22 @@
-
-//=============================================================================
-/**
- *  @file    arglist.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for the parameter list of the Operation signature.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    arglist.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for the parameter list of the Operation signature.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 // ************************************************************
 //   operation visitor  to generate the argument list.
@@ -107,48 +112,6 @@ be_visitor_operation_arglist::visit_operation (be_operation *node)
 }
 
 int
-be_visitor_operation_arglist::visit_factory (be_factory *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-  bool has_args = node->argument_count () > 0;
-
-  *os << " (";
-  
-  if (has_args)
-    {
-      *os << be_idt_nl;
-    }
-
-  // All we do is hand over code generation to our scope.
-  if (this->visit_scope (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("be_visitor_operation_arglist::")
-                         ACE_TEXT ("visit_factory - ")
-                         ACE_TEXT ("codegen for scope failed\n")),
-                        -1);
-    }
-
-  if (!has_args)
-    {
-      *os << "void";
-    }
-
-  *os << ")";
-  
-  if (has_args)
-    {
-      *os << be_uidt;
-    }
-    
-  // At present, visit_factory() is called only from the home
-  // servant source visitor, so we don't need to check the state
-  // for semicolon generation.
-
-  return 0;
-}
-
-int
 be_visitor_operation_arglist::visit_argument (be_argument *node)
 {
   // Get the visitor that will dump the argument's mapping in the operation
@@ -159,27 +122,33 @@ be_visitor_operation_arglist::visit_argument (be_argument *node)
   // defined. We need this since argument types may very well be declared
   // inside the scope of the interface node. In such cases, we would like to
   // generate the appropriate relative scoped names.
-  be_operation *op =
-    be_operation::narrow_from_scope (this->ctx_->scope ());
-  be_interface *intf = 0;
+  be_operation *op = this->ctx_->be_scope_as_operation ();
+
+  if (!op)
+    {
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_arglist::"
+                         "visit_argument - "
+                         "Bad operation\n"),
+                        -1);
+    }
 
   // We need the interface node in which this operation was defined. However,
   // if this operation node was an attribute node in disguise, we get this
   // information from the context
-  if (op == 0)
-    {
-      be_factory *f =
-        be_factory::narrow_from_scope (this->ctx_->scope ());
-        
-      intf = be_interface::narrow_from_scope (f->defined_in ());
-    }
-  else
+  be_interface *intf = this->ctx_->attribute ()
+    ? be_interface::narrow_from_scope (this->ctx_->attribute ()->defined_in ())
+    : be_interface::narrow_from_scope (op->defined_in ());
+
+  if (!intf)
     {
-      intf = this->ctx_->attribute ()
-        ? be_interface::narrow_from_scope (this->ctx_->attribute ()->defined_in ())
-        : be_interface::narrow_from_scope (op->defined_in ());
+      ACE_ERROR_RETURN ((LM_ERROR,
+                         "(%N:%l) be_visitor_arglist::"
+                         "visit_argument - "
+                         "Bad interface\n"),
+                        -1);
     }
-    
+
   // Set new scope.
   ctx.scope (intf);
 
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp b/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp
index 4e0c0c0db38..413cb6a125e 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/argument.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    argument.cpp
- *
- *  $Id$
- *
- *  Visitor that calls the visitor for arguments.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    argument.cpp
+//
+// = DESCRIPTION
+//    Visitor that calls the visitor for arguments.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_operation,
+           argument,
+           "$Id$")
 
 // ************************************************************
 // Generic operation visitor to handle the pre/post
@@ -85,14 +94,13 @@ be_visitor_operation_argument::visit_argument (be_argument *node)
   // signature.
   be_visitor_context ctx (*this->ctx_);
 
-  // First grab the interface definition inside which this operation is
+  // first grab the interface definition inside which this operation is
   // defined. We need this since argument types may very well be declared
   // inside the scope of the interface node. In such cases, we would like to
   // generate the appropriate relative scoped names.
-  be_operation *op =
-    be_operation::narrow_from_scope (this->ctx_->scope ());
+  be_operation *op = this->ctx_->be_scope_as_operation ();
 
-  if (op == 0)
+  if (!op)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_arglist::"
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/argument_invoke.cpp b/TAO/TAO_IDL/be/be_visitor_operation/argument_invoke.cpp
index 17be11babac..d222235b04d 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/argument_invoke.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/argument_invoke.cpp
@@ -1,19 +1,28 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    argument_invoke.cpp
- *
- *  $Id$
- *
- *  Visitor to pass arguments to the CDR operators. This one helps in
- *  generating the && and the , at the right place. This one is for the
- *  client stub side.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    argument_invoke.cpp
+//
+// = DESCRIPTION
+//    Visitor to pass arguments to the CDR operators. This one helps in
+//    generating the && and the , at the right place. This one is for the
+//    client stub side.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
+ACE_RCSID (be_visitor_operation, 
+           argument_invoke, 
+           "$Id$")
 
 // ************************************************************
 // operation visitor to handle the passing of arguments to the CDR operators
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/argument_marshal.cpp b/TAO/TAO_IDL/be/be_visitor_operation/argument_marshal.cpp
index 52e6b9dc3ad..4cab39b61bf 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/argument_marshal.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/argument_marshal.cpp
@@ -1,19 +1,28 @@
-
-//=============================================================================
-/**
- *  @file    argument_marshal.cpp
- *
- *  $Id$
- *
- *  Visitor to pass arguments to the CDR operators. This one helps in
- *  generating the && and the , at the right place. This one is for the
- *  skeleton side.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    argument_marshal.cpp
+//
+// = DESCRIPTION
+//    Visitor to pass arguments to the CDR operators. This one helps in
+//    generating the && and the , at the right place. This one is for the
+//    skeleton side.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_operation, 
+           argument_marshal, 
+           "$Id$")
 
 // ************************************************************
 // operation visitor to handle the passing of arguments to the CDR operators
@@ -190,8 +199,7 @@ be_visitor_args_decl::visit_array (be_array *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // retrieve the field node
-  be_argument *f =
-    be_argument::narrow_from_decl (this->ctx_->node ());
+  be_argument *f = this->ctx_->be_node_as_argument ();
 
   if (f == 0)
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/base_proxy_impl_ch.cpp b/TAO/TAO_IDL/be/be_visitor_operation/base_proxy_impl_ch.cpp
index e5e32b8f36b..04890bc1de8 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/base_proxy_impl_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/base_proxy_impl_ch.cpp
@@ -1,5 +1,9 @@
 // $Id$
 
+ACE_RCSID (be_visitor_operation, 
+           x_proxy_impl_xh, 
+           "$Id$")
+
 be_visitor_operation_base_proxy_impl_ch::
 be_visitor_operation_base_proxy_impl_ch (be_visitor_context *ctx)
   : be_visitor_scope (ctx)
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp
index b7b88c34868..314e5c95c5c 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp
@@ -1,5 +1,9 @@
 // $Id$
 
+ACE_RCSID (be_visitor_operation,
+           direct_proxy_impl_ss,
+           "$Id$")
+
 be_visitor_operation_direct_proxy_impl_ss::
 be_visitor_operation_direct_proxy_impl_ss (be_visitor_context *ctx)
   : be_visitor_operation (ctx)
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_cs.cpp
index a3ae13db0dd..cc1ecbc87fe 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_cs.cpp
@@ -1,18 +1,27 @@
-
-//=============================================================================
-/**
- *  @file    exceptlist_cs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for the list of exceptions that an operation
- *  raises.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    exceptlist_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for the list of exceptions that an operation
+//    raises.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_operation,
+           exceptlist_cs,
+           "$Id$")
 
 // ****************************************************************************
 // visitor to generate the exception list for operations
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_ss.cpp
index 6512ff893cd..a309fde7125 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_ss.cpp
@@ -1,18 +1,25 @@
+// $Id$
 
-//=============================================================================
-/**
- *  @file    exceptlist_ss.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for the list of exceptions that an operation
- *  raises (skeleton/server side).
- *
- *
- *  @author Ossama Othman
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    exceptlist_ss.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for the list of exceptions that an operation
+//    raises (skeleton/server side).
+//
+// = AUTHOR
+//    Ossama Othman
+//
+// ============================================================================
 
+ACE_RCSID (be_visitor_operation,
+           exceptlist_ss,
+           "$Id$")
 
 // ****************************************************************************
 // visitor to generate the exception list for operations (skeleton/server_side)
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp
index 9ad5711709a..2475244e6ee 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    operation.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Operation in the stubs file.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    operation.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Operation in the stubs file.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_operation,
+           operation,
+           "$Id$")
 
 // ************************************************************
 // Generic Operation visitor
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_ch.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_ch.cpp
index 579e7d21307..e47955a69f8 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ch.cpp
@@ -1,17 +1,22 @@
-
-//=============================================================================
-/**
- *  @file    operation_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Operation node in the client header.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    operation_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Operation node in the client header.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 // ******************************************************
 // Primary visitor for "operation" in client header.
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp
index 04a2e70529a..a1a1e624389 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    operation_cs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Operation in the stubs file.
- *
- *
- *  @author Aniruddha Gokhale & Angelo Corsaro
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    operation_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Operation in the stubs file.
+//
+// = AUTHOR
+//    Aniruddha Gokhale & Angelo Corsaro
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_operation,
+           operation_cs,
+           "$Id$")
 
 // ************************************************************
 // Operation visitor for client stubs
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_exs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_exs.cpp
index 794ff672a1c..ca4b7c9f9da 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_exs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_exs.cpp
@@ -1,17 +1,22 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    operation_exs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Operation in the CIAO executor file.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO_IDL_BE
+//
+// = FILENAME
+//    operation_exs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Operation in the CIAO executor file.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 be_visitor_operation_exs::be_visitor_operation_exs (be_visitor_context *ctx)
   : be_visitor_scope (ctx),
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_ih.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_ih.cpp
index 0e402b7bbd2..f0a28386fb2 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ih.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ih.cpp
@@ -1,17 +1,24 @@
-
-//=============================================================================
-/**
- *  @file    operation_ih.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Operation in the implementation header
- *
- *
- *  @author Yamuna Krishnamurthy (yamuna@cs.wustl.edu)
- */
-//=============================================================================
-
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    operation_ih.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Operation in the implementation header
+//
+// = AUTHOR
+//   Yamuna Krishnamurthy (yamuna@cs.wustl.edu)
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_operation, 
+           operation_ih, 
+           "$Id$")
 
 // ************************************************************
 // Operation visitor for implementation header.
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_is.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_is.cpp
index 7af9a505113..e3390be880f 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_is.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_is.cpp
@@ -1,17 +1,24 @@
-
-//=============================================================================
-/**
- *  @file    operation_is.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Operation in the implementation skeleton
- *
- *
- *  @author Yamuna Krishnamurthy (yamuna@cs.wustl.edu)
- */
-//=============================================================================
-
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    operation_is.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Operation in the implementation skeleton
+//
+// = AUTHOR
+//   Yamuna Krishnamurthy (yamuna@cs.wustl.edu)
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_operation, 
+           operation_is, 
+           "$Id$")
 
 // ************************************************************
 // Operation visitor for implementation skeleton
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp
index 6740e8c2a9b..92bc5ab2eec 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_sh.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    operation_sh.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Operation in the server header
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    operation_sh.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Operation in the server header
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_operation,
+           operation_sh,
+           "$Id$")
 
 // ************************************************************
 // Operation visitor for server header
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
index a8d6ff41766..5b0fe601a71 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
@@ -1,17 +1,27 @@
-
-//=============================================================================
-/**
- *  @file    operation_ss.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Operation in the server skeleton
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    operation_ss.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Operation in the server skeleton
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+
+ACE_RCSID (be_visitor_operation,
+           operation_ss,
+           "$Id$")
 
 // ************************************************************
 // Operation visitor for server skeletons
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_svs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_svs.cpp
index 5fefae41801..cce85a96209 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_svs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_svs.cpp
@@ -1,22 +1,28 @@
-
-//=============================================================================
-/**
- *  @file    operation_svs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Operation in the CIAO servants file.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO_IDL_BE
+//
+// = FILENAME
+//    operation_svs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Operation in the CIAO servants file.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 be_visitor_operation_svs::be_visitor_operation_svs (
       be_visitor_context *ctx)
   : be_visitor_scope (ctx),
-    scope_ (0)
+    scope_ (0),
+    swapping_ (be_global->gen_component_swapping ())
 {
 }
 
@@ -89,6 +95,11 @@ be_visitor_operation_svs::gen_op_body (be_operation *node)
   os << be_nl
      << "{" << be_idt_nl;
 
+  if (swapping_)
+    {
+      os << "this->activate_component ();" << be_nl;
+    }
+
   os << "if ( ::CORBA::is_nil (this->executor_.in ()))" << be_idt_nl
      << "{"<< be_idt_nl
      << "throw ::CORBA::INV_OBJREF ();" << be_uidt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp
index eeab69929ab..b30e977fb54 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp
@@ -1,5 +1,9 @@
 // $Id$
 
+ACE_RCSID (be_visitor_operation,
+           proxy_impl_xh,
+           "$Id$")
+
 be_visitor_operation_proxy_impl_xh::be_visitor_operation_proxy_impl_xh (
     be_visitor_context *ctx
   )
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/remote_proxy_impl_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/remote_proxy_impl_cs.cpp
index 9d73f192cd8..b6c72a81241 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/remote_proxy_impl_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/remote_proxy_impl_cs.cpp
@@ -1,5 +1,9 @@
 // $Id$
 
+ACE_RCSID (be_visitor_operation,
+           be_visitor_operation_remote_proxy_impl_cs,
+           "$Id$")
+
 // ************************************************************
 // Operation visitor for client stubs
 // ************************************************************
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp b/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp
index b1b871e78c9..c11e30e7645 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/rettype.cpp
@@ -1,16 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    rettype.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for return type of the Operation node
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    rettype.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for return type of the Operation node
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_operation,
+           rettype,
+           "$Id$")
 
 
 // ****************************************************************************
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/rettype_return_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/rettype_return_cs.cpp
index 8f98370caec..fa7e91171b3 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/rettype_return_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/rettype_return_cs.cpp
@@ -1,17 +1,26 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    rettype_return_cs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for returning the return type variable.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    rettype_return_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for returning the return type variable.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
+ACE_RCSID (be_visitor_operation, 
+           rettype_return_cs, 
+           "$Id$")
 
 // ************************************************************
 //    be_visitor_operation_rettype_return_cs
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/smart_proxy_ch.cpp b/TAO/TAO_IDL/be/be_visitor_operation/smart_proxy_ch.cpp
index 73259335c25..1e34b2b8db5 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/smart_proxy_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/smart_proxy_ch.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    smart_proxy_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Operation node in the client header.
- *
- *
- *  @author Kirthika Parameswaran  <kirthika@cs.wustl.edu>
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    operation_smart_proxy_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Operation node in the client header.
+//
+// = AUTHOR
+//    Kirthika Parameswaran  <kirthika@cs.wustl.edu>
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_operation, 
+           smart_proxy_ch, 
+           "$Id$")
 
 // ******************************************************
 // Primary visitor for "operation" in client header.
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/smart_proxy_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/smart_proxy_cs.cpp
index 1246877421e..984a49b9da8 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/smart_proxy_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/smart_proxy_cs.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    smart_proxy_cs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Operation in the stubs file.
- *
- *
- *  @author Kirthika Parameswaran <kirthika@cs.wustl.edu>
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    operation_smart_proxy_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Operation in the stubs file.
+//
+// = AUTHOR
+//    Kirthika Parameswaran <kirthika@cs.wustl.edu>
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_operation, 
+           operation_smart_proxy_cs, 
+           "$Id$")
 
 // ************************************************************
 // Operation visitor for client stubs
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/tie_sh.cpp b/TAO/TAO_IDL/be/be_visitor_operation/tie_sh.cpp
index 066daefb8fc..6042227dc34 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/tie_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/tie_sh.cpp
@@ -1,18 +1,27 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    tie_sh.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for operations of the TIE class in the header
- *  file.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    tie_sh.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for operations of the TIE class in the header
+//    file.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
+ACE_RCSID (be_visitor_operation, 
+           tie_sh, 
+           "$Id$")
 
 // ************************************************************
 // Operation visitor for server header for TIE class operations.
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/tie_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/tie_ss.cpp
index 26467797ff2..8675c7ecd8f 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/tie_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/tie_ss.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    tie_ss.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for operations for the TIE class.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    tie_ss.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for operations for the TIE class.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_operation,
+           tie_ss,
+           "$Id$")
 
 // ************************************************************
 // Operation visitor for server inline for TIE class operations.
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp
index 0a70d7a112f..857f14ec7f9 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp
@@ -1,18 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    upcall_command_ss.cpp
- *
- *  $Id$
- *
- *  Visitor that generates operation-specific TAO::Upcall_Command
- *  objects in skeletons.
- *
- *
- *  @author Ossama Othman
- */
-//=============================================================================
-
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    upcall_command_ss.cpp
+//
+// = DESCRIPTION
+//    Visitor that generates operation-specific TAO::Upcall_Command
+//    objects in skeletons.
+//
+// = AUTHOR
+//    Ossama Othman
+//
+// ============================================================================
+
+
+ACE_RCSID (be_visitor_operation,
+           upcall_command_ss,
+           "$Id$")
 
 be_visitor_operation_upcall_command_ss
 ::be_visitor_operation_upcall_command_ss (
diff --git a/TAO/TAO_IDL/be/be_visitor_root.cpp b/TAO/TAO_IDL/be/be_visitor_root.cpp
index 59f1b25e64c..c98d61da331 100644
--- a/TAO/TAO_IDL/be/be_visitor_root.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root.cpp
@@ -1,17 +1,20 @@
+// $Id$
 
-//=============================================================================
-/**
- *  @file    be_visitor_root.cpp
- *
- *  $Id$
- *
- *  Visitors for generation of code for Root
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_root.cpp
+//
+// = DESCRIPTION
+//    Visitors for generation of code for Root
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #include "be_constant.h"
 #include "be_enum.h"
@@ -33,7 +36,6 @@
 #include "be_component.h"
 #include "be_component_fwd.h"
 #include "be_home.h"
-#include "be_connector.h"
 #include "be_helper.h"
 #include "be_extern.h"
 #include "be_native.h"
@@ -56,7 +58,6 @@
 #include "be_visitor_component.h"
 #include "be_visitor_component_fwd.h"
 #include "be_visitor_home.h"
-#include "be_visitor_connector.h"
 #include "be_visitor_traits.h"
 #include "be_visitor_arg_traits.h"
 #include "be_visitor_template_export.h"
@@ -78,9 +79,10 @@
 #include "be_visitor_root/root_ex_idl.cpp"
 #include "be_visitor_root/root_exh.cpp"
 #include "be_visitor_root/root_exs.cpp"
-#include "be_visitor_root/root_cnh.cpp"
-#include "be_visitor_root/root_cns.cpp"
 #include "be_visitor_root/any_op.cpp"
 #include "be_visitor_root/cdr_op.cpp"
 #include "be_visitor_root/serializer_op.cpp"
 
+ACE_RCSID (be,
+           be_visitor_root,
+           "$Id$")
diff --git a/TAO/TAO_IDL/be/be_visitor_root/any_op.cpp b/TAO/TAO_IDL/be/be_visitor_root/any_op.cpp
index 2537ca0b221..9455e261b8a 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/any_op.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/any_op.cpp
@@ -1,18 +1,27 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    any_op.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for the Any operators for types defined in Root's
- *  scope.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    any_op.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for the Any operators for types defined in Root's
+//    scope.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
+ACE_RCSID (be_visitor_root, 
+           any_op, 
+           "$Id$")
 
 // ***************************************************************************
 // Root visitor for generating Any operator declarations in the client header
diff --git a/TAO/TAO_IDL/be/be_visitor_root/cdr_op.cpp b/TAO/TAO_IDL/be/be_visitor_root/cdr_op.cpp
index 8bd4640be36..24bee065237 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/cdr_op.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/cdr_op.cpp
@@ -1,18 +1,27 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    cdr_op.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for the CDR operators for types defined
- *  in Root's scope.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for the CDR operators for types defined
+//    in Root's scope.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
+ACE_RCSID (be_visitor_root, 
+           cdr_op, 
+           "$Id$")
 
 // ***************************************************************************
 // Root visitor for generating CDR operator declarations in the client header
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root.cpp b/TAO/TAO_IDL/be/be_visitor_root/root.cpp
index b969860bb86..583c15c9058 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 // ============================================================================
 //
 // = LIBRARY
@@ -15,6 +13,9 @@
 //    Aniruddha Gokhale
 //
 // ============================================================================
+ACE_RCSID (be_visitor_root,
+           root,
+           "$Id$")
 
 // Generic Root visitor
 be_visitor_root::be_visitor_root (be_visitor_context *ctx)
@@ -151,7 +152,8 @@ int be_visitor_root::visit_root (be_root *node)
                   << i->base_proxy_broker_name ()
                   << "_Factory_function_pointer) ("
                   << be_idt << be_idt_nl
-                  << "::CORBA::Object_ptr obj);" << be_uidt << be_uidt;
+                  << "::CORBA::Object_ptr obj" << be_uidt_nl
+                  << ");" << be_uidt;
             }
         }
 
@@ -231,7 +233,7 @@ int be_visitor_root::visit_root (be_root *node)
   // Make one more pass over the entire tree and generate the OBV_ namespaces
   // and OBV_ classes.
 
-  bool obv = true;
+  bool obv = 1;
   status = 0;
 
   switch (this->ctx_->state ())
@@ -250,7 +252,7 @@ int be_visitor_root::visit_root (be_root *node)
       break;
     }
 
-  if (obv == true)
+  if (obv == 1)
     {
       be_visitor_obv_module visitor (&ctx);
       status = visitor.visit_scope (node);
@@ -365,8 +367,6 @@ int be_visitor_root::visit_root (be_root *node)
       case TAO_CodeGen::TAO_ROOT_SVS:
       case TAO_CodeGen::TAO_ROOT_EXH:
       case TAO_CodeGen::TAO_ROOT_EXS:
-      case TAO_CodeGen::TAO_ROOT_CNH:
-      case TAO_CodeGen::TAO_ROOT_CNS:
       case TAO_CodeGen::TAO_ROOT_EX_IDL:
         break;
       default:
@@ -412,8 +412,6 @@ int be_visitor_root::visit_root (be_root *node)
     case TAO_CodeGen::TAO_ROOT_SVS:
     case TAO_CodeGen::TAO_ROOT_EXH:
     case TAO_CodeGen::TAO_ROOT_EXS:
-    case TAO_CodeGen::TAO_ROOT_CNH:
-    case TAO_CodeGen::TAO_ROOT_CNS:
     case TAO_CodeGen::TAO_ROOT_EX_IDL:
     case TAO_CodeGen::TAO_ROOT_CI:
     case TAO_CodeGen::TAO_ROOT_SH:
@@ -467,8 +465,6 @@ int be_visitor_root::visit_root (be_root *node)
     case TAO_CodeGen::TAO_ROOT_SVS:
     case TAO_CodeGen::TAO_ROOT_EXH:
     case TAO_CodeGen::TAO_ROOT_EXS:
-    case TAO_CodeGen::TAO_ROOT_CNH:
-    case TAO_CodeGen::TAO_ROOT_CNS:
     case TAO_CodeGen::TAO_ROOT_EX_IDL:
       break; // nothing to be done
     default:
@@ -546,12 +542,6 @@ int be_visitor_root::visit_root (be_root *node)
     case TAO_CodeGen::TAO_ROOT_EX_IDL:
       (void) tao_cg->end_ciao_exec_idl ();
       break;
-    case TAO_CodeGen::TAO_ROOT_CNH:
-      (void) tao_cg->end_ciao_conn_header ();
-      break;
-    case TAO_CodeGen::TAO_ROOT_CNS:
-      (void) tao_cg->end_ciao_conn_source ();
-      break;
     default:
       break;
     }
@@ -856,8 +846,6 @@ be_visitor_root::visit_interface (be_interface *node)
     case TAO_CodeGen::TAO_ROOT_SERIALIZER_OP_CS:
     case TAO_CodeGen::TAO_ROOT_EXH:
     case TAO_CodeGen::TAO_ROOT_EXS:
-    case TAO_CodeGen::TAO_ROOT_CNH:
-    case TAO_CodeGen::TAO_ROOT_CNS:
       {
         return 0; // Nothing to be done.
         break;
@@ -1336,9 +1324,6 @@ be_visitor_root::visit_component (be_component *node)
         status = node->accept (&visitor);
         break;
       }
-    case TAO_CodeGen::TAO_ROOT_CNH:
-    case TAO_CodeGen::TAO_ROOT_CNS:
-      break;
     default:
       return 0;    // nothing to do.
     }
@@ -1458,9 +1443,6 @@ be_visitor_root::visit_home (be_home *node)
         status = node->accept (&visitor);
         break;
       }
-    case TAO_CodeGen::TAO_ROOT_CNH:
-    case TAO_CodeGen::TAO_ROOT_CNS:
-      break;
     default:
       return 0; // nothing to be done
     }
@@ -1478,52 +1460,6 @@ be_visitor_root::visit_home (be_home *node)
 }
 
 int
-be_visitor_root::visit_connector (be_connector *node)
-{
-  // Instantiate a visitor context with a copy of our context. This info
-  // will be modified based on what type of node we are visiting.
-  be_visitor_context ctx (*this->ctx_);
-  ctx.node (node);
-  int status = 0;
-
-  switch (this->ctx_->state ())
-    {
-      case TAO_CodeGen::TAO_ROOT_CNH:
-        {
-          be_visitor_connector_dds_exh visitor (&ctx);
-          status = node->accept (&visitor);
-          break;
-        }
-      case TAO_CodeGen::TAO_ROOT_CNS:
-        {
-          be_visitor_connector_dds_exs visitor (&ctx);
-          status = node->accept (&visitor);
-          break;
-        }
-      // Skip these contexts, the connector impl is
-      // generated in a separate pass, using the states
-      // above.
-      case TAO_CodeGen::TAO_ROOT_EXH:
-      case TAO_CodeGen::TAO_ROOT_EXS:
-        break;
-      default:
-        // In all other cases, same as component.
-        return this->visit_component (node);
-    }
-    
-  if (status == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("be_visitor_root::")
-                         ACE_TEXT ("visit_connector - ")
-                         ACE_TEXT ("failed to accept visitor\n")),
-                        -1);
-    }
-    
-  return 0;
-}
-
-int
 be_visitor_root::visit_module (be_module *node)
 {
   // Instantiate a visitor context with a copy of our context. This info
@@ -1549,8 +1485,6 @@ be_visitor_root::visit_module (be_module *node)
     case TAO_CodeGen::TAO_ROOT_SVS:
     case TAO_CodeGen::TAO_ROOT_EXH:
     case TAO_CodeGen::TAO_ROOT_EXS:
-    case TAO_CodeGen::TAO_ROOT_CNH:
-    case TAO_CodeGen::TAO_ROOT_CNS:
     case TAO_CodeGen::TAO_ROOT_EX_IDL:
       {
         be_visitor_module visitor (&ctx);
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_ch.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_ch.cpp
index 90c797d020d..85387b345d0 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root_ch.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    root_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Root in the client header
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    root_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Root in the client header
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_root,
+           root_ch,
+           "$Id$")
 
 // ********************************
 // Root visitor for client header
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_ci.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_ci.cpp
index 7840bfab032..4a6001866d6 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root_ci.cpp
@@ -1,17 +1,26 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    root_ci.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for the Root in the client inline
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    root_ci.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for the Root in the client inline
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
+ACE_RCSID (be_visitor_root, 
+           root_ci, 
+           "$Id$")
 
 // *********************************
 // Root visitor for client inline
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_cnh.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_cnh.cpp
deleted file mode 100644
index 24b5c18e2fe..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_root/root_cnh.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-
-//=============================================================================
-/**
- *  @file    root_cnh.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Root in the CIAO
- *  connector impl header
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
-
-// ********************************
-// Root visitor for CIAO connector impl header
-// ********************************
-
-be_visitor_root_cnh::be_visitor_root_cnh (be_visitor_context *ctx)
-  : be_visitor_root (ctx)
-{
-}
-
-be_visitor_root_cnh::~be_visitor_root_cnh (void)
-{
-}
-
-int
-be_visitor_root_cnh::init (void)
-{
-  // First open the client-side header file for writing.
-  int status =
-    tao_cg->start_ciao_conn_header (
-      be_global->be_get_ciao_conn_hdr_fname ());
-      
-  if (status == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("be_visitor_root_cnh::init - ")
-                         ACE_TEXT ("Error opening CIAO conn impl ")
-                         ACE_TEXT ("header file\n")),
-                        -1);
-    }
-
-  // Initialize the stream.
-  this->ctx_->stream (tao_cg->ciao_conn_header ());
-
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_cns.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_cns.cpp
deleted file mode 100644
index e3909ba17c7..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_root/root_cns.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-
-//=============================================================================
-/**
- *  @file    root_cns.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Root in the CIAO
- *  connector impl source
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
-
-// ********************************
-// Root visitor for CIAO connector impl source
-// ********************************
-
-be_visitor_root_cns::be_visitor_root_cns (be_visitor_context *ctx)
-  : be_visitor_root (ctx)
-{
-}
-
-be_visitor_root_cns::~be_visitor_root_cns (void)
-{
-}
-
-int
-be_visitor_root_cns::init (void)
-{
-  // First open the client-side header file for writing.
-  int status =
-    tao_cg->start_ciao_conn_source (
-      be_global->be_get_ciao_conn_src_fname ());
-      
-  if (status == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("be_visitor_root_cns::init - ")
-                         ACE_TEXT ("Error opening CIAO conn impl ")
-                         ACE_TEXT ("source file\n")),
-                        -1);
-    }
-
-  // Initialize the stream.
-  this->ctx_->stream (tao_cg->ciao_conn_source ());
-
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_cs.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_cs.cpp
index 4c9b4052b7c..2fcc8acd791 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root_cs.cpp
@@ -1,17 +1,26 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    root_cs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Root in the client stubs file.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    root_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Root in the client stubs file.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
+ACE_RCSID (be_visitor_root, 
+           root_cs, 
+           "$Id$")
 
 // ***********************************
 // Root visitor for client stubs
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_ex_idl.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_ex_idl.cpp
index 340403d3ed1..9d0a84e284c 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root_ex_idl.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root_ex_idl.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    root_ex_idl.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Root in the CIAO executor IDL
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    root_ex_idl.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Root in the CIAO executor IDL
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_root,
+           root_ex_idl,
+           "$Id$")
 
 // ********************************
 // Root visitor for CIAO executor IDL
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_exh.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_exh.cpp
index 2e74bd9789c..1d60ddbd9ee 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root_exh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root_exh.cpp
@@ -1,18 +1,27 @@
-
-//=============================================================================
-/**
- *  @file    root_exh.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Root in the CIAO
- *  exec impl header
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO_IDL_BE
+//
+// = FILENAME
+//    root_exh.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Root in the CIAO
+//    exec impl header
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_root,
+           root_exh,
+           "$Id$")
 
 // ********************************
 // Root visitor for CIAO exec impl header
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_exs.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_exs.cpp
index 4964e49f02f..2a3d8040e64 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root_exs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root_exs.cpp
@@ -1,18 +1,27 @@
-
-//=============================================================================
-/**
- *  @file    root_exs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Root in the CIAO
- *  exec impl source
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO_IDL_BE
+//
+// = FILENAME
+//    root_exs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Root in the CIAO
+//    exec impl source
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_root,
+           root_exs,
+           "$Id$")
 
 // ********************************
 // Root visitor for CIAO exec impl source
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_ih.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_ih.cpp
index 06cf9e425e9..5ff8eea3403 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root_ih.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root_ih.cpp
@@ -1,17 +1,24 @@
-
-//=============================================================================
-/**
- *  @file    root_ih.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Root in the server implementation header
- *
- *
- *  @author Yamuna  Krishnamurthy (yamuna@cs.wustl.edu)
- */
-//=============================================================================
-
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    root_ih.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Root in the server implementation header
+//
+// = AUTHOR
+//   Yamuna  Krishnamurthy (yamuna@cs.wustl.edu)
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_root, 
+           root_ih, 
+           "$Id$")
 
 // ***********************************
 // Root visitor for implementation header
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_is.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_is.cpp
index 2b33b907f24..82f3fe275c2 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root_is.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root_is.cpp
@@ -1,16 +1,25 @@
-//=============================================================================
-/**
- *  @file    root_is.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for the Root in the implementation skeletons file
- *
- *
- *  @author Yamuna Krishnamurthy (yamuna@cs.wustl.edu)
- */
-//=============================================================================
+//
+// $Id$
+//
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    root_is.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for the Root in the implementation skeletons file
+//
+// = AUTHOR
+//   Yamuna Krishnamurthy (yamuna@cs.wustl.edu)
+//
+// ============================================================================
 
+ACE_RCSID (be_visitor_root, 
+           root_is, 
+           "$Id$")
 
 // ******************************************************
 // Root visitor for implementation  skeletons
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_sh.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_sh.cpp
index 9df2fb7282e..affeb35db6c 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root_sh.cpp
@@ -1,17 +1,26 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    root_sh.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Root in the server header
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    root_sh.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Root in the server header
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
+ACE_RCSID (be_visitor_root, 
+           root_sh, 
+           "$Id$")
 
 // ***********************************
 // Root visitor for server header
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_si.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_si.cpp
index db113211591..86c0b7e6e71 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root_si.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root_si.cpp
@@ -1,17 +1,26 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    root_si.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for the Root in the server inline file
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    root_si.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for the Root in the server inline file
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
+ACE_RCSID (be_visitor_root,
+           root_si,
+           "$Id$")
 
 // ***********************************************
 // Root visitor for server inline
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_ss.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_ss.cpp
index b9b647b79e7..dbc1581678b 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root_ss.cpp
@@ -1,17 +1,26 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    root_ss.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for the Root in the server skeletons file
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    root_ss.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for the Root in the server skeletons file
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
+ACE_RCSID (be_visitor_root,
+           root_ss,
+           "$Id$")
 
 // ******************************************************
 // Root visitor for server skeletons
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_sth.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_sth.cpp
index 9cfeb2b2b2a..61cd0b6954f 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root_sth.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root_sth.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    root_sth.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Root in the server template header
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    root_sth.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Root in the server template header
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_root,
+           root_sth,
+           "$Id$")
 
 // ****************************************
 // Root visitor for server template header
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_svh.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_svh.cpp
index 78a0ea59cbb..7b1fe47680d 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root_svh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root_svh.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    root_svh.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Root in the CIAO servant header
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    root_svh.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Root in the CIAO servant header
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_root,
+           root_svh,
+           "$Id$")
 
 // ********************************
 // Root visitor for CIAO servant header
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root_svs.cpp b/TAO/TAO_IDL/be/be_visitor_root/root_svs.cpp
index 05f1bc60785..72b14ab719b 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root_svs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root_svs.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    root_svs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Root in the CIAO servant source
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    root_svs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Root in the CIAO servant source
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_root,
+           root_svs,
+           "$Id$")
 
 // ********************************
 // Root visitor for CIAO servant source
diff --git a/TAO/TAO_IDL/be/be_visitor_root/serializer_op.cpp b/TAO/TAO_IDL/be/be_visitor_root/serializer_op.cpp
index 9aaba342be3..09ee1429df7 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/serializer_op.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/serializer_op.cpp
@@ -1,18 +1,27 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    serializer_op.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for the TAO::DCPS::Serializer operators 
- *  for types defined in Root's scope.
- *
- *
- *  @author Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    serializer_op.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for the TAO::DCPS::Serializer operators 
+//    for types defined in Root's scope.
+//
+// = AUTHOR
+//    Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
+//
+// ============================================================================
 
+ACE_RCSID (be_visitor_root, 
+           serializer_op, 
+           "$Id$")
 
 // ***************************************************************************
 // Root visitor for generating Serializer operator declarations in the client header
diff --git a/TAO/TAO_IDL/be/be_visitor_scope.cpp b/TAO/TAO_IDL/be/be_visitor_scope.cpp
index 74d1a9e6c28..1842b5f9b63 100644
--- a/TAO/TAO_IDL/be/be_visitor_scope.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_scope.cpp
@@ -1,18 +1,23 @@
-
-//=============================================================================
-/**
- *  @file    be_visitor_scope.cpp
- *
- *  $Id$
- *
- *  Visitor for the base be_scope node. This serves to maintain the current
- *  state (context) of code generation for the derived visitor.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_scope.cpp
+//
+// = DESCRIPTION
+//    Visitor for the base be_scope node. This serves to maintain the current
+//    state (context) of code generation for the derived visitor.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #include "be_argument.h"
 #include "be_scope.h"
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence.cpp b/TAO/TAO_IDL/be/be_visitor_sequence.cpp
index fd14a8a6f5c..ef93fee6254 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence.cpp
@@ -1,17 +1,20 @@
+// $Id$
 
-//=============================================================================
-/**
- *  @file    be_visitor_sequence.cpp
- *
- *  $Id$
- *
- *  Visitors for generation of code for Sequence
- *
- *
- *  @author Aniruddha Gokhale and Carlos O'Ryan
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_sequence.cpp
+//
+// = DESCRIPTION
+//    Visitors for generation of code for Sequence
+//
+// = AUTHOR
+//    Aniruddha Gokhale and Carlos O'Ryan
+//
+// ============================================================================
 
 #include "be_array.h"
 #include "be_enum.h"
@@ -57,3 +60,6 @@
 #include "be_visitor_sequence/sequence_ch.cpp"
 #include "be_visitor_sequence/sequence_cs.cpp"
 
+ACE_RCSID (be, 
+           be_visitor_sequence, 
+           "$Id$")
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp
index 1099be78c56..9195f4c7d3e 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp
@@ -1,17 +1,26 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    any_op_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Any operators for the Sequence
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    any_op_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Any operators for the Sequence
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
+ACE_RCSID (be_visitor_sequence,
+           any_op_ch,
+           "$Id$")
 
 // ***************************************************************************
 // Sequence visitor for generating Any operator declarations in the client header
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp
index 8d75eae8193..217120aeb16 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    any_op_cs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Any operator for the Sequence node
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    any_op_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Any operator for the Sequence node
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_sequence,
+           any_op_cs,
+           "$Id$")
 
 // ***************************************************************************
 // Sequence visitor for generating Any operator declarations in the client
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/buffer_type.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/buffer_type.cpp
index f442e4d5ca6..7cb42484994 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/buffer_type.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/buffer_type.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    buffer_type.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for the internal buffer type of the Sequence node
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    buffer_type.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for the internal buffer type of the Sequence node
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_sequence,
+           buffer_type,
+           "$Id$")
 
 // ****************************************************************
 // We have to generate the buffer type in the constructor
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp
index dd2182c6cf8..ee680e0aad6 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_ch.cpp
@@ -1,18 +1,27 @@
-
-//=============================================================================
-/**
- *  @file    cdr_op_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for CDR operators for sequences. This uses
- *  compiled marshaling.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for CDR operators for sequences. This uses
+//    compiled marshaling.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_sequence,
+           cdr_op_ch,
+           "$Id$")
 
 // ***************************************************************************
 // Sequence visitor for generating CDR operator declarations in the client header
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp
index 7d8e4edd931..a5f751cfe42 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 // ============================================================================
 //
 // = LIBRARY
@@ -17,6 +15,10 @@
 //
 // ============================================================================
 
+ACE_RCSID (be_visitor_sequence,
+           cdr_op_cs,
+           "$Id$")
+
 // ***************************************************************************
 // Sequence visitor for generating CDR operator declarations in the client
 // stubs file.
@@ -132,7 +134,7 @@ be_visitor_sequence_cdr_op_cs::visit_sequence (be_sequence *node)
       << be_uidt_nl;
 
   *os << "}" << be_nl;
-
+  
   if (be_global->gen_ostream_operators ())
     {
       node->gen_ostream_operator (os, false);
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_base.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_base.cpp
index 0b8bbe83396..9f838684f28 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_base.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_base.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    sequence_base.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for the base type of the Sequence
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    sequence_base.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for the base type of the Sequence
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_sequence,
+           sequence_base,
+           "$Id$")
 
 // ****************************************************************
 // We have to generate the parameters for the template that implements
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp
index 94d8e9a90fa..ae7683e7c35 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    sequence_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Sequence in the client header
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    sequence_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Sequence in the client header
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_sequence,
+           sequence_ch,
+           "$Id$")
 
 // Root visitor for client header.
 be_visitor_sequence_ch::be_visitor_sequence_ch (be_visitor_context *ctx)
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp
index 8271306bb9a..00b6b85f23f 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    sequence_cs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Sequences in the client stubs file
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    sequence_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Sequences in the client stubs file
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_sequence,
+           sequence_cs,
+           "$Id$")
 
 // ************************************************************
 // Root visitor for client stub class
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_ch.cpp
index 3b79e6390ee..2a925960445 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_ch.cpp
@@ -1,18 +1,27 @@
-
-//=============================================================================
-/**
- *  @file    serializer_op_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for TAO::DCPS::Serializer operators for sequences. 
- *  This uses compiled marshaling.
- *
- *
- *  @author Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    serializer_op_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for TAO::DCPS::Serializer operators for sequences. 
+//    This uses compiled marshaling.
+//
+// = AUTHOR
+//    Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_sequence, 
+           serializer_op_ch, 
+           "$Id$")
 
 // ***************************************************************************
 // Sequence visitor for generating Serializer operator declarations in the client header
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp
index 9e346007206..bb93ef0fe19 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 // ============================================================================
 //
 // = LIBRARY
@@ -17,6 +15,10 @@
 //
 // ============================================================================
 
+ACE_RCSID (be_visitor_sequence,
+           serializer_op_cs,
+           "$Id$")
+
 // ***************************************************************************
 // Sequence visitor for generating Serializer operator declarations in the client
 // stubs file.
@@ -93,8 +95,8 @@ be_visitor_sequence_serializer_op_cs::visit_sequence (be_sequence *node)
 
   if (be_global->gen_dcps_type_support_only ())
     {
-      *os << be_nl << be_nl
-          << "#endif /* end of disabling TAO specific code */"
+      *os << be_nl << be_nl 
+          << "#endif /* end of disabling TAO specific code */" 
           << be_nl << be_nl;
     }
 
@@ -364,10 +366,9 @@ be_visitor_sequence_serializer_op_cs::visit_enum (be_enum *node)
   // the total length of the sequence as a cross product of the
   // dimensions.
 
-  be_sequence *sequence =
-    be_sequence::narrow_from_decl (this->ctx_->node ());
+  be_sequence *sequence = this->ctx_->be_node_as_sequence ();
 
-  if (sequence == 0)
+  if (!sequence)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_sequence_serializer_op_cs::"
@@ -501,10 +502,9 @@ be_visitor_sequence_serializer_op_cs::visit_predefined_type (
   // the total length of the sequence as a cross product of the
   // dimensions.
 
-  be_sequence *sequence =
-    be_sequence::narrow_from_decl (this->ctx_->node ());
+  be_sequence *sequence = this->ctx_->be_node_as_sequence ();
 
-  if (sequence == 0)
+  if (!sequence)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_sequence_serializer_op_cs::"
@@ -750,10 +750,9 @@ int
 be_visitor_sequence_serializer_op_cs::visit_node (be_type *bt)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  be_sequence *node =
-    be_sequence::narrow_from_decl (this->ctx_->node ());
+  be_sequence *node = this->ctx_->be_node_as_sequence ();
 
-  if (node == 0)
+  if (!node)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_sequence_serializer_op_cs::"
diff --git a/TAO/TAO_IDL/be/be_visitor_structure.cpp b/TAO/TAO_IDL/be/be_visitor_structure.cpp
index 151cdec8754..434ad33e4c1 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure.cpp
@@ -1,17 +1,22 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    be_visitor_structure.cpp
- *
- *  $Id$
- *
- *  Visitors for generation of code for Structure
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_structure.cpp
+//
+// = DESCRIPTION
+//    Visitors for generation of code for Structure
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #include "be_field.h"
 #include "be_structure.h"
diff --git a/TAO/TAO_IDL/be/be_visitor_structure/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_structure/any_op_ch.cpp
index 3f359421a8c..a296c638a10 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure/any_op_ch.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    any_op_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Any operators for structures
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    any_op_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Any operators for structures
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_structure,
+           any_op_ch,
+           "$Id$")
 
 // ***************************************************************************
 // Structure visitor for generating Any operator declarations in the client header
diff --git a/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp
index a4f6b4be42a..ec9ee323817 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    any_op_cs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Any operators for structures
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    any_op_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Any operators for structures
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_structure,
+           any_op_cs,
+           "$Id$")
 
 // ***************************************************************************
 // Structure visitor for generating Any operator declarations in the client
diff --git a/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_ch.cpp
index 8649bb5000f..7d9996e6df4 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_ch.cpp
@@ -1,18 +1,27 @@
-
-//=============================================================================
-/**
- *  @file    cdr_op_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for CDR operators for structures. This uses
- *  compiled marshaling.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for CDR operators for structures. This uses
+//    compiled marshaling.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_structure, 
+           cdr_op_ch, 
+           "$Id$")
 
 // ***************************************************************************
 // Structure visitor for generating CDR operator declarations in the client header
diff --git a/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp
index 93037b0067b..a2e882f665a 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure/cdr_op_cs.cpp
@@ -1,17 +1,22 @@
-
-//=============================================================================
-/**
- *  @file    cdr_op_cs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for CDR operators for structures
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for CDR operators for structures
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 be_visitor_structure_cdr_op_cs::be_visitor_structure_cdr_op_cs (
     be_visitor_context *ctx
diff --git a/TAO/TAO_IDL/be/be_visitor_structure/serializer_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_structure/serializer_op_ch.cpp
index 3ba993d300f..9e2cfaf1fda 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure/serializer_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure/serializer_op_ch.cpp
@@ -1,18 +1,27 @@
-
-//=============================================================================
-/**
- *  @file    serializer_op_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for TAO::DCPS::Serializer operators for 
- *  structures. This uses compiled marshaling.
- *
- *
- *  @author Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    serializer_op_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for TAO::DCPS::Serializer operators for 
+//    structures. This uses compiled marshaling.
+//
+// = AUTHOR
+//    Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_structure, 
+           serializer_op_ch, 
+           "$Id$")
 
 #include "global_extern.h"
 
diff --git a/TAO/TAO_IDL/be/be_visitor_structure/serializer_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_structure/serializer_op_cs.cpp
index de822568d77..4b3994baf7f 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure/serializer_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure/serializer_op_cs.cpp
@@ -1,20 +1,29 @@
-
-//=============================================================================
-/**
- *  @file    serializer_op_cs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for TAO::DCPS::Serializer operators for structures
- *
- *
- *  @author Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    serializer_op_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for TAO::DCPS::Serializer operators for structures
+//
+// = AUTHOR
+//    Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
+//
+// ============================================================================
 
 #include "utl_identifier.h"
 
+ACE_RCSID (be_visitor_structure, 
+           serializer_op_cs, 
+           "$Id$")
+
 be_visitor_structure_serializer_op_cs::be_visitor_structure_serializer_op_cs (
     be_visitor_context *ctx
   )
diff --git a/TAO/TAO_IDL/be/be_visitor_structure/structure.cpp b/TAO/TAO_IDL/be/be_visitor_structure/structure.cpp
index 23a5761d55e..7b766916e55 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure/structure.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure/structure.cpp
@@ -1,17 +1,26 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    structure.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Structures. This is a generic visitor.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    structure.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Structures. This is a generic visitor.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
+ACE_RCSID (be_visitor_structure, 
+           structure, 
+           "$Id$")
 
 be_visitor_structure::be_visitor_structure (be_visitor_context *ctx)
   : be_visitor_scope (ctx)
diff --git a/TAO/TAO_IDL/be/be_visitor_structure/structure_ch.cpp b/TAO/TAO_IDL/be/be_visitor_structure/structure_ch.cpp
index 702bc3091ff..180be301e35 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure/structure_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure/structure_ch.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    structure_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Structure in the client header.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    structure_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Structure in the client header.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_structure,
+           structure_ch,
+           "$Id$")
 
 // ******************************************************
 // for client header
diff --git a/TAO/TAO_IDL/be/be_visitor_structure/structure_ci.cpp b/TAO/TAO_IDL/be/be_visitor_structure/structure_ci.cpp
index 5f4a2a05e99..8feffbd15ea 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure/structure_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure/structure_ci.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    structure_ci.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Structure in the inline file.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    structure_ci.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Structure in the inline file.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_structure,
+           structure_ci,
+           "$Id$")
 
 // ******************************************************
 // for client inline
diff --git a/TAO/TAO_IDL/be/be_visitor_structure/structure_cs.cpp b/TAO/TAO_IDL/be/be_visitor_structure/structure_cs.cpp
index 598501fe506..2fe589782d5 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure/structure_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure/structure_cs.cpp
@@ -1,17 +1,26 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    structure_cs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Structures in the client stubs file.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    structure_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Structures in the client stubs file.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
+ACE_RCSID (be_visitor_structure,
+           structure_cs,
+           "$Id$")
 
 // ***************************************************************************
 // For client stubs.
diff --git a/TAO/TAO_IDL/be/be_visitor_structure_fwd.cpp b/TAO/TAO_IDL/be/be_visitor_structure_fwd.cpp
index 464a00c517d..85cb72ef70f 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure_fwd.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure_fwd.cpp
@@ -1,17 +1,22 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    be_visitor_structure_fwd.cpp
- *
- *  $Id$
- *
- *  Visitors for generation of code for be_structure_fwd
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_structure_fwd.cpp
+//
+// = DESCRIPTION
+//    Visitors for generation of code for be_structure_fwd
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #include "be_structure_fwd.h"
 #include "be_structure.h"
@@ -22,3 +27,6 @@
 
 #include "be_visitor_structure_fwd/structure_fwd_ch.cpp"
 
+ACE_RCSID (be, 
+           be_visitor_structure_fwd, 
+           "$Id$")
diff --git a/TAO/TAO_IDL/be/be_visitor_structure_fwd/structure_fwd_ch.cpp b/TAO/TAO_IDL/be/be_visitor_structure_fwd/structure_fwd_ch.cpp
index 4df083567e3..0df96e7e10a 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure_fwd/structure_fwd_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure_fwd/structure_fwd_ch.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    structure_fwd_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for be_structure_fwd node in the client header.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    structure_fwd_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for be_structure_fwd node in the client header.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_structure_fwd, 
+           structure_fwd_ch, 
+           "$Id$")
 
 be_visitor_structure_fwd_ch::be_visitor_structure_fwd_ch (
     be_visitor_context *ctx
diff --git a/TAO/TAO_IDL/be/be_visitor_template_export.cpp b/TAO/TAO_IDL/be/be_visitor_template_export.cpp
index f085d8f6789..1ce1e9058f0 100644
--- a/TAO/TAO_IDL/be/be_visitor_template_export.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_template_export.cpp
@@ -21,6 +21,10 @@
 #include "be_predefined_type.h"
 #include "ace/Log_Msg.h"
 
+ACE_RCSID (be,
+           be_visitor_template_export,
+           "$Id$")
+
 be_visitor_template_export::be_visitor_template_export (
   be_visitor_context *ctx)
   : be_visitor_scope (ctx)
diff --git a/TAO/TAO_IDL/be/be_visitor_traits.cpp b/TAO/TAO_IDL/be/be_visitor_traits.cpp
index dde1a3d5048..92b9d5b3c4c 100644
--- a/TAO/TAO_IDL/be/be_visitor_traits.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_traits.cpp
@@ -24,7 +24,7 @@
 #include "be_valuetype_fwd.h"
 #include "be_eventtype.h"
 #include "be_eventtype_fwd.h"
-#include "be_connector.h"
+#include "be_component.h"
 #include "be_component_fwd.h"
 #include "be_field.h"
 #include "be_union_branch.h"
@@ -41,6 +41,10 @@
 
 #include "ace/Log_Msg.h"
 
+ACE_RCSID (be,
+           be_visitor_traits,
+           "$Id$")
+
 be_visitor_traits::be_visitor_traits (be_visitor_context *ctx)
   : be_visitor_scope (ctx)
 {
@@ -122,13 +126,16 @@ be_visitor_traits::visit_interface (be_interface *node)
           << "{" << be_idt_nl
           << "static ::" << node->name () << "_ptr duplicate ("
           << be_idt << be_idt_nl
-          << "::" << node->name () << "_ptr p);" << be_uidt << be_uidt_nl
+          << "::" << node->name () << "_ptr p" << be_uidt_nl
+          << ");" << be_uidt_nl
           << "static void release (" << be_idt << be_idt_nl
-          << "::" << node->name () << "_ptr p);" << be_uidt << be_uidt_nl
+          << "::" << node->name () << "_ptr p" << be_uidt_nl
+          << ");" << be_uidt_nl
           << "static ::" << node->name () << "_ptr nil (void);" << be_nl
           << "static ::CORBA::Boolean marshal (" << be_idt << be_idt_nl
           << "const ::" << node->name () << "_ptr p," << be_nl
-          << "TAO_OutputCDR & cdr);" << be_uidt  << be_uidt << be_uidt_nl
+          << "TAO_OutputCDR & cdr" << be_uidt_nl
+          << ");" << be_uidt << be_uidt_nl
           << "};";
 
       os->gen_endif ();
@@ -285,12 +292,6 @@ be_visitor_traits::visit_component (be_component *node)
 }
 
 int
-be_visitor_traits::visit_connector (be_connector *node)
-{
-  return this->visit_component (node);
-}
-
-int
 be_visitor_traits::visit_component_fwd (be_component_fwd *node)
 {
   return this->visit_interface_fwd (node);
diff --git a/TAO/TAO_IDL/be/be_visitor_typecode.cpp b/TAO/TAO_IDL/be/be_visitor_typecode.cpp
index 975a477d47e..e8802efb7a0 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode.cpp
@@ -1,16 +1,22 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    be_visitor_typecode.cpp
- *
- *  $Id$
- *
- *  Visitors for generation of code for TypeCodes for various types
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_typecode.cpp
+//
+// = DESCRIPTION
+//    Visitors for generation of code for TypeCodes for various types
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #include "be_array.h"
 #include "be_enum.h"
@@ -18,7 +24,7 @@
 #include "be_exception.h"
 #include "be_field.h"
 #include "be_interface.h"
-#include "be_connector.h"
+#include "be_component.h"
 #include "be_home.h"
 #include "be_module.h"
 #include "be_predefined_type.h"
@@ -50,3 +56,7 @@
 #include "be_visitor_typecode/union_typecode.cpp"
 #include "be_visitor_typecode/value_typecode.cpp"
 
+
+ACE_RCSID (be,
+           be_visitor_typecode,
+           "$Id$")
diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_decl.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_decl.cpp
index be834a03c53..e29c13dc981 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_decl.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_decl.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    typecode_decl.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for TypeCode declaration for a type
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    typecode_decl.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for TypeCode declaration for a type
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_typecode,
+           typecode_decl,
+           "$Id$")
 
 // ******************************************************
 // TypeCode declarations
diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
index a199a069a86..a456530ad0a 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
@@ -1,16 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    typecode_defn.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for TypeCode definitions for types.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    typecode_defn.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for TypeCode definitions for types.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_typecode,
+           typecode_defn,
+           "$Id$")
 
 #include "be_interface_fwd.h"
 
@@ -489,12 +499,6 @@ be_visitor_typecode_defn::visit_component (be_component *node)
 }
 
 int
-be_visitor_typecode_defn::visit_connector (be_connector *node)
-{
-  return this->visit_interface (node);
-}
-
-int
 be_visitor_typecode_defn::visit_interface_fwd (be_interface_fwd * node)
 {
   return this->gen_forward_declared_typecode (node);
diff --git a/TAO/TAO_IDL/be/be_visitor_typedef.cpp b/TAO/TAO_IDL/be/be_visitor_typedef.cpp
index 70f5d759a58..1e3ebf45077 100644
--- a/TAO/TAO_IDL/be/be_visitor_typedef.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typedef.cpp
@@ -1,17 +1,22 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    be_visitor_typedef.cpp
- *
- *  $Id$
- *
- *  Visitors for generation of code for Typedef
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_typedef.cpp
+//
+// = DESCRIPTION
+//    Visitors for generation of code for Typedef
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #include "be_array.h"
 #include "be_enum.h"
@@ -52,3 +57,6 @@
 #include "be_visitor_typedef/serializer_op_ch.cpp"
 #include "be_visitor_typedef/serializer_op_cs.cpp"
 
+ACE_RCSID (be, 
+           be_visitor_typedef, 
+           "$Id$")
diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/any_op_ch.cpp
index 611dffeeb9a..16d6a33b9ba 100644
--- a/TAO/TAO_IDL/be/be_visitor_typedef/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typedef/any_op_ch.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    any_op_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Any operators of a Typedef node
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    any_op_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Any operators of a Typedef node
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_typedef,
+           any_op_ch,
+           "$Id$")
 
 // ***************************************************************************
 // Typedef visitor for generating Any operator declarations in the client header
diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/any_op_cs.cpp
index 256489d956a..e0947404ea1 100644
--- a/TAO/TAO_IDL/be/be_visitor_typedef/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typedef/any_op_cs.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    any_op_cs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Any operators in the client stubs
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    any_op_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Any operators in the client stubs
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_typedef,
+           any_op_cs,
+           "$Id$")
 
 // ***************************************************************************
 // Typedef visitor for generating Any operator declarations in the client
diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/cdr_op_ch.cpp
index 3f41ffcdc80..f6874a22e59 100644
--- a/TAO/TAO_IDL/be/be_visitor_typedef/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typedef/cdr_op_ch.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    cdr_op_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Cdr operators of a Typedef node
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Cdr operators of a Typedef node
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_typedef,
+           cdr_op_ch,
+           "$Id$")
 
 // ***************************************************************************
 // Typedef visitor for generating Cdr operator declarations in the client header
diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/cdr_op_cs.cpp
index 6017ca94d28..014d7f5a4ba 100644
--- a/TAO/TAO_IDL/be/be_visitor_typedef/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typedef/cdr_op_cs.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    cdr_op_cs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Cdr operators in the client stubs
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Cdr operators in the client stubs
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_typedef,
+           cdr_op_cs,
+           "$Id$")
 
 // ***************************************************************************
 // Typedef visitor for generating CDR operator declarations in the client
diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/serializer_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/serializer_op_ch.cpp
index 79c90ed799b..b57fb33f32a 100644
--- a/TAO/TAO_IDL/be/be_visitor_typedef/serializer_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typedef/serializer_op_ch.cpp
@@ -1,18 +1,27 @@
-
-//=============================================================================
-/**
- *  @file    serializer_op_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for TAO::DCPS::Serializer operators
- *  of a Typedef node
- *
- *
- *  @author Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    serializer_op_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for TAO::DCPS::Serializer operators
+//    of a Typedef node
+//
+// = AUTHOR
+//    Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_typedef,
+           serializer_op_ch,
+           "$Id$")
 
 // ***************************************************************************
 // Typedef visitor for generating Serializer operator declarations in the client header
diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/serializer_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/serializer_op_cs.cpp
index 49bc1b62232..8e44708dead 100644
--- a/TAO/TAO_IDL/be/be_visitor_typedef/serializer_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typedef/serializer_op_cs.cpp
@@ -1,18 +1,27 @@
-
-//=============================================================================
-/**
- *  @file    serializer_op_cs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for TAO::DCPS::Serializer operators
- *  in the client stubs
- *
- *
- *  @author Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    serializer_op_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for TAO::DCPS::Serializer operators
+//    in the client stubs
+//
+// = AUTHOR
+//    Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_typedef,
+           serializer_op_cs,
+           "$Id$")
 
 // ***************************************************************************
 // Typedef visitor for generating Serializer operator declarations in the client
diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/typedef.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/typedef.cpp
index f8ae13522e2..001de4594ab 100644
--- a/TAO/TAO_IDL/be/be_visitor_typedef/typedef.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typedef/typedef.cpp
@@ -1,17 +1,26 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    typedef.cpp
- *
- *  $Id$
- *
- *  Generic visitor generating code for Typedefs
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    typedef.cpp
+//
+// = DESCRIPTION
+//    Generic visitor generating code for Typedefs
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
+ACE_RCSID (be_visitor_typedef, 
+           typedef, 
+           "$Id$")
 
 // ******************************************************
 // Generic typedef visitor.
diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp
index cdc304c9e0a..8e3f36f94b1 100644
--- a/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    typedef_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Typedef in the client header
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    typedef_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Typedef in the client header
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID(be_visitor_typedef,
+          typedef_ch,
+          "$Id$")
 
 // ******************************************************
 // Typedef visitor for client header
diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp
index d2f6606070e..fff13e232c4 100644
--- a/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    typedef_ci.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Typedefs in the client inline file.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    typedef_ci.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Typedefs in the client inline file.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_typedef,
+           typedef_ci,
+           "$Id$")
 
 // ******************************************************
 // Typedef visitor for client inline
diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/typedef_cs.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_cs.cpp
index a9a24734c44..c17693c7226 100644
--- a/TAO/TAO_IDL/be/be_visitor_typedef/typedef_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_cs.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    typedef_cs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Typedef in the client stubs
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    typedef_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Typedef in the client stubs
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_typedef,
+           typedef_cs,
+           "$Id$")
 
 // ******************************************************
 // Typedef visitor for client stubs
diff --git a/TAO/TAO_IDL/be/be_visitor_union.cpp b/TAO/TAO_IDL/be/be_visitor_union.cpp
index 8db265851c4..dc35ee0b5c8 100644
--- a/TAO/TAO_IDL/be/be_visitor_union.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union.cpp
@@ -1,17 +1,22 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    be_visitor_union.cpp
- *
- *  $Id$
- *
- *  Visitors for generation of code for Union
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_union.cpp
+//
+// = DESCRIPTION
+//    Visitors for generation of code for Union
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #include "be_enum.h"
 #include "be_typedef.h"
@@ -44,3 +49,6 @@
 #include "be_visitor_union/serializer_op_ch.cpp"
 #include "be_visitor_union/serializer_op_cs.cpp"
 
+ACE_RCSID (be, 
+           be_visitor_union, 
+           "$Id$")
diff --git a/TAO/TAO_IDL/be/be_visitor_union/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union/any_op_ch.cpp
index 6b659bb6d10..897acca7ad6 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/any_op_ch.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    any_op_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Any operators for Union.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    any_op_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Any operators for Union.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_union,
+           any_op_ch,
+           "$Id$")
 
 // ***************************************************************************
 // Union visitor for generating Any operator declarations in the client header
diff --git a/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp
index e2e2fd57012..b84932013c1 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    any_op_cs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Any operators for Union.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    any_op_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Any operators for Union.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_union,
+           any_op_cs,
+           "$Id$")
 
 // ***************************************************************************
 // Union visitor for generating Any operator declarations in the client
diff --git a/TAO/TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp
index 3330928c7e0..b91c87710e8 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/cdr_op_ch.cpp
@@ -1,18 +1,27 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    cdr_op_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for CDR operators for unions. This uses
- *  compiled marshaling.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for CDR operators for unions. This uses
+//    compiled marshaling.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
+ACE_RCSID (be_visitor_union, 
+           cdr_op_ch, 
+           "$Id$")
 
 // ***************************************************************************
 // Union visitor for generating CDR operator declarations in the client header
diff --git a/TAO/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp
index 50d38749b3f..720fe5f58de 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp
@@ -1,17 +1,22 @@
-
-//=============================================================================
-/**
- *  @file    cdr_op_cs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for CDR operators for unions
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for CDR operators for unions
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 // ***************************************************************************
 // Union visitor for generating CDR operator declarations in the client
@@ -187,7 +192,7 @@ be_visitor_union_cdr_op_cs::visit_union (be_union *node)
     {
       *os << be_nl;
       *os << "default:" << be_idt_nl;
-      *os << "_tao_union._default ();" << be_nl;
+      *os << "_tao_union._d (_tao_discriminant);" << be_nl;
       *os << "break;" << be_uidt;
     }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_union/discriminant_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union/discriminant_ch.cpp
index 81140ae85ce..3000070664f 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/discriminant_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/discriminant_ch.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    discriminant_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for discriminant of the Union
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    discriminant_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for discriminant of the Union
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_union,
+           discriminant_ch,
+           "$Id$")
 
 // *************************************************************************
 // Visitor for discriminant in client header file.
@@ -32,8 +41,7 @@ int
 be_visitor_union_discriminant_ch::visit_enum (be_enum *node)
 {
   // Get the enclosing union backend.
-  be_union *bu =
-    be_union::narrow_from_decl (this->ctx_->node ());
+  be_union *bu = this->ctx_->be_node_as_union ();
   be_type *bt = 0;
 
   // Check if we are visiting this node via a visit to a typedef node.
@@ -87,8 +95,7 @@ be_visitor_union_discriminant_ch::visit_predefined_type (be_predefined_type
                                                          *node)
 {
   // get the enclosing union backend.
-  be_union *bu =
-    be_union::narrow_from_decl (this->ctx_->node ());
+  be_union *bu = this->ctx_->be_node_as_union ();
   be_type *bt = 0;
 
   // Check if we are visiting this node via a visit to a typedef node.
diff --git a/TAO/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp b/TAO/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp
index a665ecd4323..ceb5d435f18 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    discriminant_ci.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for discriminant of the union.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    discriminant_ci.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for discriminant of the union.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_union,
+           discriminant_ci,
+           "$Id$")
 
 // *************************************************************************
 // be_visitor_discriminant_ci - visitor for discriminant in client inline file
@@ -32,7 +41,7 @@ int
 be_visitor_union_discriminant_ci::visit_enum (be_enum *node)
 {
   be_union *bu =
-    be_union::narrow_from_decl (this->ctx_->node ());
+    this->ctx_->be_node_as_union ();
   be_type *bt = 0;
 
   if (this->ctx_->alias ())
@@ -69,12 +78,32 @@ be_visitor_union_discriminant_ci::visit_enum (be_enum *node)
           << "void " << be_nl
           << bu->name () << "::_default ()" << be_nl
           << "{" << be_idt_nl
-          << "this->_reset ();" << be_nl;
-      // Since CORBA defines enums to be 32bits, use MAXINT as the
-      // out-of-bounds value for the _default() function. It MUST not
-      // be any already defined enum label.
-      *os << "this->disc_ = (" << bt->name () << ") -1;" << be_uidt_nl;
-      *os << "}" << be_nl << be_nl;
+          << "this->_reset ();" << be_nl
+          << "this->disc_ = ";
+
+      be_type* dt =
+        be_type::narrow_from_decl (bu->disc_type ());
+
+      if (dt == 0)
+        {
+          return -1;
+        }
+
+      // Find where was the enum defined, if it was defined in the globa
+      // scope, then it is easy to generate the enum values....
+      be_scope* scope =
+        be_scope::narrow_from_scope (dt->defined_in ());
+
+      if (scope == 0)
+        {
+          *os << node->value_to_name (dv.u.enum_val);
+          return 0;
+        }
+
+      // The function value_to_name() takes care of adding
+      // any necessary scoping to the output.
+      *os << node->value_to_name (dv.u.enum_val);
+      *os << ";" << be_uidt_nl << "}" << be_nl << be_nl;
     }
 
   // the set method
@@ -105,7 +134,7 @@ be_visitor_union_discriminant_ci::visit_predefined_type (
   )
 {
   be_union *bu =
-    be_union::narrow_from_decl (this->ctx_->node ());
+    this->ctx_->be_node_as_union ();
 
   be_type *bt = 0;
 
@@ -166,7 +195,10 @@ be_visitor_union_discriminant_ci::visit_predefined_type (
 
           break;
         case AST_Expression::EV_char:
-          os->print ("'\\%o'", dv.u.char_val);
+          os->print ("'\\%d'", dv.u.char_val);
+          break;
+        case AST_Expression::EV_wchar:
+          os->print ("L'\\%d'", dv.u.wchar_val);
           break;
         case AST_Expression::EV_bool:
           *os << (dv.u.bool_val == 0 ? "false" : "true");
diff --git a/TAO/TAO_IDL/be/be_visitor_union/discriminant_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/discriminant_cs.cpp
index 4f0c3b250f5..cd5170d0c32 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/discriminant_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/discriminant_cs.cpp
@@ -1,17 +1,26 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    discriminant_cs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for discriminant of the union
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    discriminant_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for discriminant of the union
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
+ACE_RCSID (be_visitor_union,
+           discriminant_cs,
+           "$Id$")
 
 // *************************************************************************
 // Visitor for discriminant in client stubs.
@@ -32,7 +41,7 @@ int
 be_visitor_union_discriminant_cs::visit_enum (be_enum *node)
 {
   be_union *bu =
-    be_union::narrow_from_decl (this->ctx_->node ());
+    this->ctx_->be_node_as_union ();  // get the enclosing union backend
   be_type *bt = 0;
 
   if (this->ctx_->alias ())
diff --git a/TAO/TAO_IDL/be/be_visitor_union/serializer_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union/serializer_op_ch.cpp
index 9e3f2b37554..4fcef2945ff 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/serializer_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/serializer_op_ch.cpp
@@ -1,18 +1,27 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    serializer_op_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for TAO::DCPS::Serializer operators for unions. 
- *  This uses compiled marshaling.
- *
- *
- *  @author Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    serializer_op_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for TAO::DCPS::Serializer operators for unions. 
+//    This uses compiled marshaling.
+//
+// = AUTHOR
+//    Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
+//
+// ============================================================================
 
+ACE_RCSID (be_visitor_union, 
+           serializer_op_ch, 
+           "$Id$")
 
 // ***************************************************************************
 // Union visitor for generating Serializer operator declarations in the client header
diff --git a/TAO/TAO_IDL/be/be_visitor_union/serializer_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/serializer_op_cs.cpp
index 082e2e9b5e0..9befe5a698c 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/serializer_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/serializer_op_cs.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    serializer_op_cs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for TAO::DCPS::Serializer operators for unions
- *
- *
- *  @author Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    serializer_op_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for TAO::DCPS::Serializer operators for unions
+//
+// = AUTHOR
+//    Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_union,
+           serializer_op_cs,
+           "$Id$")
 
 // ***************************************************************************
 // Union visitor for generating Serializer operator declarations in the client
@@ -242,7 +251,7 @@ be_visitor_union_serializer_op_cs::visit_union (be_union *node)
   *os << "{" << be_idt_nl
       << "return 0;" << be_uidt_nl
       << "}" << be_uidt_nl << be_nl
-      << "::CORBA::Boolean result = true;" << be_nl << be_nl
+      << "::CORBA::Boolean result = 1;" << be_nl << be_nl
       << "switch (_tao_union._d ())" << be_nl
       << "{" << be_idt;
 
@@ -313,7 +322,7 @@ be_visitor_union_serializer_op_cs::visit_union (be_union *node)
   *os << "{" << be_idt_nl
       << "return 0;" << be_uidt_nl
       << "}" << be_uidt_nl << be_nl
-      << "::CORBA::Boolean result = true;" << be_nl << be_nl
+      << "::CORBA::Boolean result = 1;" << be_nl << be_nl
       << "switch (_tao_discriminant)" << be_nl
       << "{" << be_idt;
 
@@ -336,7 +345,7 @@ be_visitor_union_serializer_op_cs::visit_union (be_union *node)
     {
       *os << be_nl;
       *os << "default:" << be_idt_nl;
-      *os << "_tao_union._default ();" << be_nl;
+      *os << "_tao_union._d (_tao_discriminant);" << be_nl;
       *os << "break;" << be_uidt;
     }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_union/union.cpp b/TAO/TAO_IDL/be/be_visitor_union/union.cpp
index 7fdb4a0643e..30868bae313 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/union.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/union.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    union.cpp
- *
- *  $Id$
- *
- *  Generic visitor generating code for Unions
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    union.cpp
+//
+// = DESCRIPTION
+//    Generic visitor generating code for Unions
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_union, 
+           union, 
+           "$Id$")
 
 be_visitor_union::be_visitor_union (be_visitor_context *ctx)
   : be_visitor_scope (ctx)
@@ -141,12 +150,6 @@ be_visitor_union_cdr_op_cs::pre_process (be_decl *bd)
 
   be_union_branch* b =
     be_union_branch::narrow_from_decl (bd);
-    
-  // Could be a type decl.  
-  if (b == 0)
-    {
-      return 0;
-    }
 
   *os << be_nl;
 
diff --git a/TAO/TAO_IDL/be/be_visitor_union/union_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union/union_ch.cpp
index ab0ef09ddb2..d8969b0bc9c 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/union_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/union_ch.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    union_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Unions in the client header
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    union_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Unions in the client header
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_union,
+           union_ch,
+           "$Id$")
 
 // ******************************************************
 // For client header.
diff --git a/TAO/TAO_IDL/be/be_visitor_union/union_ci.cpp b/TAO/TAO_IDL/be/be_visitor_union/union_ci.cpp
index 9b2805e6c19..e0d5784c355 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/union_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/union_ci.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    union_ci.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Union in the client inline file
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    union_ci.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Union in the client inline file
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_union, 
+           union_ci, 
+           "$Id$")
 
 // ******************************************************
 // For client inline.
diff --git a/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp
index ba1b609706b..bab9c2a18ac 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    union_cs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Unions in the client stubs
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    union_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Unions in the client stubs
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_union,
+           union_cs,
+           "$Id$")
 
 // ******************************************************
 // For client stubs.
@@ -85,71 +94,63 @@ int be_visitor_union_cs::visit_union (be_union *node)
   *os << be_nl << be_nl
       << node->name () << "::" << node->local_name () << " (void)" << be_nl
       << "{" << be_idt_nl
-      << "ACE_OS::memset (&this->u_, 0, sizeof (this->u_));" << be_nl;
+      << "ACE_OS::memset (&this->u_, 0, sizeof (this->u_));" << be_nl
+      << "this->disc_ = ";
+
+  // The default constructor must initialize the discriminator
+  // to the first case label value found in the union declaration
+  // so that, if the uninitialized union is inserted into an Any,
+  // the Any destructor's call to deep_free() will work properly.
+  UTL_ScopeActiveIterator si (node, UTL_Scope::IK_decls);
+  be_union_branch *ub = 0;
+
+  // In case we have some bogus enum values from an enum declared
+  // in our scope.
+  while (ub == 0)
+    {
+      // Just get the union's first member.
+      AST_Decl *d = si.item ();
 
+      ub = be_union_branch::narrow_from_decl (d);
+      si.next ();
+    }
+
+  // Get the first label in its list.
+  AST_UnionLabel *ul = ub->label (0);
   AST_Union::DefaultValue dv;
+
   // This can indicate an error in the return value, but it is
   // caught elsewhere.
   (void) node->default_value (dv);
-  if ((dv.computed_ != 0) && node->default_index () == -1)
+
+  bool test = dv.computed_ == 0
+              && ul->label_kind () == AST_UnionLabel::UL_label;
+
+  if (test)
     {
-      // _default() function has been generated, use this.
-      *os << "this->_default ();";
+      ub->gen_label_value (os);
     }
   else
     {
-      // The default constructor must initialize the discriminator
-      // to the first case label value found in the union declaration
-      // so that, if the uninitialized union is inserted into an Any,
-      // the Any destructor's call to deep_free() will work properly.
-
-      *os << "this->disc_ = ";
-
-      UTL_ScopeActiveIterator si (node, UTL_Scope::IK_decls);
-      be_union_branch *ub = 0;
-
-      // In case we have some bogus enum values from an enum declared
-      // in our scope.
-      while (ub == 0)
-        {
-          // Just get the union's first member.
-          AST_Decl *d = si.item ();
-
-          ub = be_union_branch::narrow_from_decl (d);
-          si.next ();
-        }
-
-      // Get the first label in its list.
-      AST_UnionLabel *ul = ub->label (0);
-
-      bool test = dv.computed_ == 0
-                  && ul->label_kind () == AST_UnionLabel::UL_label;
-
-      if (test)
-        {
-          ub->gen_label_value (os);
-        }
-      else
-        {
-          ub->gen_default_label_value (os, node);
-        }
+      ub->gen_default_label_value (os, node);
+    }
 
-      *os << ";";
+  *os << ";";
 
-      if (dv.computed_ == 0)
+  if (dv.computed_ == 0)
+    {
+      *os << be_nl;
+      be_visitor_union_branch_public_constructor_cs const_visitor (this->ctx_);
+      if (ub->accept (&const_visitor) == -1)
         {
-          *os << be_nl;
-          be_visitor_union_branch_public_constructor_cs const_visitor (this->ctx_);
-          if (ub->accept (&const_visitor) == -1)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "(%N:%l) be_visitor_union_cs::"
-                                 "visit union - "
-                                 "codegen for constructor failed\n"),
-                                -1);
-            }
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "(%N:%l) be_visitor_union_cs::"
+                             "visit union - "
+                             "codegen for constructor failed\n"),
+                            -1);
         }
     }
+
   *os << be_uidt_nl << "}" << be_nl << be_nl;
 
   this->ctx_->state (TAO_CodeGen::TAO_UNION_PUBLIC_ASSIGN_CS);
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch.cpp
index 6f25d807211..0759cc2a9b4 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch.cpp
@@ -1,16 +1,21 @@
-//=============================================================================
-/**
- *  @file    be_visitor_union_branch.cpp
- *
- *  $Id$
- *
- *  Concrete visitor for the base "BE_Union_Branch" node
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_union_branch.cpp
+//
+// = DESCRIPTION
+//    Concrete visitor for the base "BE_Union_Branch" node
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #include "be_array.h"
 #include "be_enum.h"
@@ -52,3 +57,6 @@
 #include "be_visitor_union_branch/serializer_op_ch.cpp"
 #include "be_visitor_union_branch/serializer_op_cs.cpp"
 
+ACE_RCSID (be,
+           be_visitor_union_branch,
+           "$Id$")
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_ch.cpp
index 0df5ee6c9fa..12020e54074 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_ch.cpp
@@ -1,18 +1,27 @@
 
-
-//=============================================================================
-/**
- *  @file    cdr_op_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating CDR operator declarator for union_branch in the client header
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating CDR operator declarator for union_branch in the client header
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_union_branch, 
+           cdr_op_ch, 
+           "$Id$")
 
 // **********************************************
 //  Visitor for union_branch in the client header file.
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp
index 98af2ab7098..5552336939d 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp
@@ -85,10 +85,9 @@ be_visitor_union_branch_cdr_op_cs::visit_array (be_array *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Retrieve the union_branch node.
-  be_union_branch *f =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+  be_union_branch *f = this->ctx_->be_node_as_union_branch ();
 
-  if (f == 0)
+  if (!f)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_cdr_op_cs::"
@@ -185,10 +184,9 @@ be_visitor_union_branch_cdr_op_cs::visit_enum (be_enum *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Retrieve the union_branch node
-  be_union_branch *f =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+  be_union_branch *f = this->ctx_->be_node_as_union_branch ();
 
-  if (f == 0)
+  if (!f)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_cdr_op_cs::"
@@ -260,10 +258,9 @@ be_visitor_union_branch_cdr_op_cs::visit_interface (be_interface *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Retrieve the union_branch node.
-  be_union_branch *f =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+  be_union_branch *f = this->ctx_->be_node_as_union_branch ();
 
-  if (f == 0)
+  if (!f)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_cdr_op_cs::"
@@ -340,10 +337,9 @@ be_visitor_union_branch_cdr_op_cs::visit_interface_fwd (be_interface_fwd *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Retrieve the union_branch node.
-  be_union_branch *f =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+  be_union_branch *f = this->ctx_->be_node_as_union_branch ();
 
-  if (f == 0)
+  if (!f)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_cdr_op_cs::"
@@ -425,10 +421,9 @@ be_visitor_union_branch_cdr_op_cs::emit_valuetype_common (be_type *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Retrieve the union_branch node.
-  be_union_branch *f =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+  be_union_branch *f = this->ctx_->be_node_as_union_branch ();
 
-  if (f == 0)
+  if (!f)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_cdr_op_cs::"
@@ -483,10 +478,9 @@ be_visitor_union_branch_cdr_op_cs::visit_predefined_type (
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Retrieve the union_branch node.
-  be_union_branch *f =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+  be_union_branch *f = this->ctx_->be_node_as_union_branch ();
 
-  if (f == 0)
+  if (!f)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_cdr_op_cs::"
@@ -671,10 +665,8 @@ be_visitor_union_branch_cdr_op_cs::visit_sequence (be_sequence *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Retrieve the union_branch node.
-  be_union_branch *f =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
-    
-  if (f == 0)
+  be_union_branch *f = this->ctx_->be_node_as_union_branch ();
+  if (!f)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_cdr_op_ci::"
@@ -741,10 +733,9 @@ be_visitor_union_branch_cdr_op_cs::visit_string (be_string *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Retrieve the union_branch node.
-  be_union_branch *f =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+  be_union_branch *f = this->ctx_->be_node_as_union_branch ();
 
-  if (f == 0)
+  if (!f)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_cdr_op_ci::"
@@ -864,10 +855,9 @@ be_visitor_union_branch_cdr_op_cs::visit_structure (be_structure *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Retrieve the union_branch node.
-  be_union_branch *f =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+  be_union_branch *f = this->ctx_->be_node_as_union_branch ();
 
-  if (f == 0)
+  if (!f)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_cdr_op_ci::"
@@ -961,10 +951,9 @@ be_visitor_union_branch_cdr_op_cs::visit_union (be_union *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Retrieve the union_branch node.
-  be_union_branch *f =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+  be_union_branch *f = this->ctx_->be_node_as_union_branch ();
 
-  if (f == 0)
+  if (!f)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_cdr_op_ci::"
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/private_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/private_ch.cpp
index fb72b0ece4c..1ee945e8433 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/private_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/private_ch.cpp
@@ -1,18 +1,27 @@
-
-//=============================================================================
-/**
- *  @file    private_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Union branch for the private part of the
- *  class.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    private_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Union branch for the private part of the
+//    class.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_union_branch,
+           private_ch,
+           "$Id$")
 
 // **********************************************
 //  visitor for union_branch in the client header generating the private information
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp
index 2eeedf81b7c..b2c29d4029a 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_assign_cs.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    public_assign_cs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Union Branch for the assignment operator
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    public_assign_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Union Branch for the assignment operator
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_union_branch,
+           public_assign_cs,
+           "$Id$")
 
 // **********************************************
 //  visitor for union_branch in the client stubs file generating the code for
@@ -100,9 +109,9 @@ int
 be_visitor_union_branch_public_assign_cs::visit_array (be_array *node)
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    this->ctx_->be_node_as_union_branch (); // get union branch
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
+    this->ctx_->be_scope_as_union ();  // get the enclosing union backend
   be_type *bt = 0;
 
   // Check if we are visiting this node via a visit to a typedef node.
@@ -172,11 +181,11 @@ int
 be_visitor_union_branch_public_assign_cs::visit_enum (be_enum *)
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    this->ctx_->be_node_as_union_branch (); // get union branch
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
+    this->ctx_->be_scope_as_union ();  // get the enclosing union backend
 
-  if (ub == 0 || bu == 0)
+  if (!ub || !bu)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_public_assign_cs::"
@@ -200,9 +209,9 @@ int
 be_visitor_union_branch_public_assign_cs::visit_interface (be_interface *node)
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    this->ctx_->be_node_as_union_branch (); // get union branch
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
+    this->ctx_->be_scope_as_union ();  // get the enclosing union backend
   be_type *bt = 0;
 
   // Check if we are visiting this node via a visit to a typedef node.
@@ -297,9 +306,9 @@ be_visitor_union_branch_public_assign_cs::visit_interface_fwd (
   )
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    this->ctx_->be_node_as_union_branch (); // get union branch
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
+    this->ctx_->be_scope_as_union ();  // get the enclosing union backend
   be_type *bt = 0;
 
   // Check if we are visiting this node via a visit to a typedef node.
@@ -412,9 +421,9 @@ int
 be_visitor_union_branch_public_assign_cs::emit_valuetype_common (be_type *node)
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    this->ctx_->be_node_as_union_branch (); // get union branch
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
+    this->ctx_->be_scope_as_union ();  // get the enclosing union backend
   be_type *bt = 0;
 
   // Check if we are visiting this node via a visit to a typedef node.
@@ -482,9 +491,9 @@ be_visitor_union_branch_public_assign_cs::visit_predefined_type (
   )
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    this->ctx_->be_node_as_union_branch (); // get union branch
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
+    this->ctx_->be_scope_as_union ();  // get the enclosing union backend
   be_type *bt = 0;
 
   // Check if we are visiting this node via a visit to a typedef node.
@@ -594,9 +603,9 @@ int
 be_visitor_union_branch_public_assign_cs::visit_sequence (be_sequence *node)
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    this->ctx_->be_node_as_union_branch (); // get union branch
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
+    this->ctx_->be_scope_as_union ();  // get the enclosing union backend
   be_type *bt = 0;
 
   // Check if we are visiting this node via a visit to a typedef node.
@@ -659,11 +668,11 @@ int
 be_visitor_union_branch_public_assign_cs::visit_string (be_string *node)
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    this->ctx_->be_node_as_union_branch (); // get union branch
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
+    this->ctx_->be_scope_as_union ();  // get the enclosing union backend
 
-  if (ub == 0 || bu == 0)
+  if (!ub || !bu)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_public_assign_cs::"
@@ -695,9 +704,9 @@ int
 be_visitor_union_branch_public_assign_cs::visit_structure (be_structure *node)
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    this->ctx_->be_node_as_union_branch (); // get union branch
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
+    this->ctx_->be_scope_as_union ();  // get the enclosing union backend
   be_type *bt = 0;
 
   // Check if we are visiting this node via a visit to a typedef node.
@@ -790,9 +799,9 @@ int
 be_visitor_union_branch_public_assign_cs::visit_union (be_union *node)
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    this->ctx_->be_node_as_union_branch (); // get union branch
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
+    this->ctx_->be_scope_as_union ();  // get the enclosing union backend
   be_type *bt = 0;
 
   // Check if we are visiting this node via a visit to a typedef node.
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp
index 57eb0548932..dcf1c10d539 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    public_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Union_branch in the public part.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    public_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Union_branch in the public part.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_union_branch,
+           public_ch,
+           "$Id$")
 
 // **********************************************
 //  Visitor for union_branch in the client header file.
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp
index 7b7a0d0c473..4f34840fb76 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    public_ci.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Union Branch in the client inline file.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    public_ci.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Union Branch in the client inline file.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_union_branch,
+           public_ci,
+           "$Id$")
 
 // *****************************************************
 //  Visitor for union_branch in the client inline file.
@@ -64,10 +73,8 @@ be_visitor_union_branch_public_ci::visit_union_branch (be_union_branch *node)
 int
 be_visitor_union_branch_public_ci::visit_array (be_array *node)
 {
-  be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
-  be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
+  be_union_branch *ub = this->ctx_->be_node_as_union_branch ();
+  be_union *bu = this->ctx_->be_scope_as_union ();
   be_type *bt = 0;
 
   // Check if we are visiting this node via a visit to a typedef node.
@@ -199,10 +206,8 @@ be_visitor_union_branch_public_ci::visit_array (be_array *node)
 int
 be_visitor_union_branch_public_ci::visit_enum (be_enum *node)
 {
-  be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
-  be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
+  be_union_branch *ub = this->ctx_->be_node_as_union_branch ();
+  be_union *bu = this->ctx_->be_scope_as_union ();
   be_type *bt = 0;
 
   // heck if we are visiting this node via a visit to a typedef node.
@@ -270,10 +275,8 @@ be_visitor_union_branch_public_ci::visit_enum (be_enum *node)
 int
 be_visitor_union_branch_public_ci::visit_interface (be_interface *node)
 {
-  be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
-  be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
+  be_union_branch *ub = this->ctx_->be_node_as_union_branch ();
+  be_union *bu = this->ctx_->be_scope_as_union ();
   be_type *bt = 0;
 
   // Check if we are visiting this node via a visit to a typedef node.
@@ -360,10 +363,8 @@ be_visitor_union_branch_public_ci::visit_interface (be_interface *node)
 int
 be_visitor_union_branch_public_ci::visit_interface_fwd (be_interface_fwd *node)
 {
-  be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
-  be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
+  be_union_branch *ub = this->ctx_->be_node_as_union_branch ();
+  be_union *bu = this->ctx_->be_scope_as_union ();
   be_type *bt = 0;
 
   // Check if we are visiting this node via a visit to a typedef node.
@@ -468,10 +469,8 @@ be_visitor_union_branch_public_ci::visit_valuetype_fwd (be_valuetype_fwd *node)
 int
 be_visitor_union_branch_public_ci::emit_valuetype_common  (be_type *node)
 {
-  be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
-  be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
+  be_union_branch *ub = this->ctx_->be_node_as_union_branch ();
+  be_union *bu = this->ctx_->be_scope_as_union ();
   be_type *bt = 0;
 
   // Check if we are visiting this node via a visit to a typedef node.
@@ -547,10 +546,8 @@ be_visitor_union_branch_public_ci::visit_predefined_type (
     be_predefined_type *node
   )
 {
-  be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
-  be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
+  be_union_branch *ub = this->ctx_->be_node_as_union_branch ();
+  be_union *bu = this->ctx_->be_scope_as_union ();
   be_type *bt = 0;
 
   // Check if we are visiting this node via a visit to a typedef node.
@@ -759,10 +756,8 @@ be_visitor_union_branch_public_ci::visit_predefined_type (
 int
 be_visitor_union_branch_public_ci::visit_sequence (be_sequence *node)
 {
-  be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
-  be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
+  be_union_branch *ub = this->ctx_->be_node_as_union_branch ();
+  be_union *bu = this->ctx_->be_scope_as_union ();
   be_type *bt = 0;
 
   // Check if we are visiting this node via a visit to a typedef node.
@@ -841,12 +836,10 @@ be_visitor_union_branch_public_ci::visit_sequence (be_sequence *node)
 int
 be_visitor_union_branch_public_ci::visit_string (be_string *node)
 {
-  be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
-  be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
+  be_union_branch *ub = this->ctx_->be_node_as_union_branch ();
+  be_union *bu = this->ctx_->be_scope_as_union ();
 
-  if (ub == 0 || bu == 0)
+  if (!ub || !bu)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_public_ci::"
@@ -1012,10 +1005,8 @@ be_visitor_union_branch_public_ci::visit_string (be_string *node)
 int
 be_visitor_union_branch_public_ci::visit_structure (be_structure *node)
 {
-  be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
-  be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
+  be_union_branch *ub = this->ctx_->be_node_as_union_branch ();
+  be_union *bu = this->ctx_->be_scope_as_union ();
   be_type *bt = 0;
 
   // Check if we are visiting this node via a visit to a typedef node.
@@ -1170,10 +1161,8 @@ be_visitor_union_branch_public_ci::visit_typedef (be_typedef *node)
 int
 be_visitor_union_branch_public_ci::visit_union (be_union *node)
 {
-  be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
-  be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
+  be_union_branch *ub = this->ctx_->be_node_as_union_branch ();
+  be_union *bu = this->ctx_->be_scope_as_union ();
   be_type *bt = 0;
 
   // Check if we are visiting this node via a visit to a typedef node.
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_constructor_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_constructor_cs.cpp
index 3cb2aed8740..ba09ab2867a 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_constructor_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_constructor_cs.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    public_constructor_cs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Union Branch for the constructor operator
- *
- *
- *  @author Johnny Willemsen
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    public_constructor_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Union Branch for the constructor operator
+//
+// = AUTHOR
+//    Johnny Willemsen
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_union_branch,
+           public_constructor_cs,
+           "$Id$")
 
 // **********************************************
 //  visitor for union_branch in the client stubs file generating the code for
@@ -68,9 +77,9 @@ int
 be_visitor_union_branch_public_constructor_cs::visit_array (be_array *node)
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    this->ctx_->be_node_as_union_branch (); // get union branch
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
+    this->ctx_->be_scope_as_union ();  // get the enclosing union backend
   be_type *bt = 0;
 
   // Check if we are visiting this node via a visit to a typedef node.
@@ -140,9 +149,9 @@ be_visitor_union_branch_public_constructor_cs::visit_predefined_type (
   )
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    this->ctx_->be_node_as_union_branch (); // get union branch
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
+    this->ctx_->be_scope_as_union ();  // get the enclosing union backend
   be_type *bt = 0;
 
   // Check if we are visiting this node via a visit to a typedef node.
@@ -186,9 +195,9 @@ int
 be_visitor_union_branch_public_constructor_cs::visit_sequence (be_sequence *node)
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    this->ctx_->be_node_as_union_branch (); // get union branch
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
+    this->ctx_->be_scope_as_union ();  // get the enclosing union backend
   be_type *bt = 0;
 
   // Check if we are visiting this node via a visit to a typedef node.
@@ -223,9 +232,9 @@ int
 be_visitor_union_branch_public_constructor_cs::visit_structure (be_structure *node)
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    this->ctx_->be_node_as_union_branch (); // get union branch
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
+    this->ctx_->be_scope_as_union ();  // get the enclosing union backend
   be_type *bt = 0;
 
   // Check if we are visiting this node via a visit to a typedef node.
@@ -285,9 +294,9 @@ int
 be_visitor_union_branch_public_constructor_cs::visit_union (be_union *node)
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    this->ctx_->be_node_as_union_branch (); // get union branch
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
+    this->ctx_->be_scope_as_union ();  // get the enclosing union backend
   be_type *bt = 0;
 
   // Check if we are visiting this node via a visit to a typedef node.
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_cs.cpp
index 974257ed7ee..03b2f21402d 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_cs.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    public_cs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Union Branch in the client stubs
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    public_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Union Branch in the client stubs
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_union_branch, 
+           public_cs, 
+           "$Id$")
 
 // **********************************************
 //  Visitor for union_branch in the client stubs file.
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp
index 3b50fa9265e..c29b1a933ac 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_reset_cs.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    public_reset_cs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Union Branch in the client inline file.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    public_reset_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Union Branch in the client inline file.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_union_branch,
+           public_reset_cs,
+           "$Id$")
 
 // *****************************************************
 //  visitor for union_branch in the client
@@ -85,9 +94,9 @@ int
 be_visitor_union_branch_public_reset_cs::visit_array (be_array *node)
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    this->ctx_->be_node_as_union_branch ();
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
+    this->ctx_->be_scope_as_union ();
   be_type *bt = 0;
 
   if (this->ctx_->alias ())
@@ -99,7 +108,7 @@ be_visitor_union_branch_public_reset_cs::visit_array (be_array *node)
       bt = node;
     }
 
-  if (ub == 0 || bu == 0)
+  if (!ub || !bu)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_public_reset_cs::"
@@ -155,11 +164,11 @@ int
 be_visitor_union_branch_public_reset_cs::visit_enum (be_enum *)
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    this->ctx_->be_node_as_union_branch ();
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
+    this->ctx_->be_scope_as_union ();
 
-  if (ub == 0 || bu == 0)
+  if (!ub || !bu)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_public_reset_cs::"
@@ -178,11 +187,11 @@ int
 be_visitor_union_branch_public_reset_cs::visit_interface (be_interface *)
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    this->ctx_->be_node_as_union_branch ();
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
+    this->ctx_->be_scope_as_union ();
 
-  if (ub == 0 || bu == 0)
+  if (!ub || !bu)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_public_reset_cs::"
@@ -206,11 +215,11 @@ int
 be_visitor_union_branch_public_reset_cs::visit_interface_fwd (be_interface_fwd *)
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    this->ctx_->be_node_as_union_branch ();
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
+    this->ctx_->be_scope_as_union ();
 
-  if (ub == 0 || bu == 0)
+  if (!ub || !bu)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_public_reset_cs::"
@@ -231,15 +240,14 @@ be_visitor_union_branch_public_reset_cs::visit_interface_fwd (be_interface_fwd *
 }
 
 int
-be_visitor_union_branch_public_reset_cs::visit_valuebox (
-  be_valuebox *)
+be_visitor_union_branch_public_reset_cs::visit_valuebox (be_valuebox *)
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    this->ctx_->be_node_as_union_branch ();
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
+    this->ctx_->be_scope_as_union ();
 
-  if (ub == 0 || bu == 0)
+  if (!ub || !bu)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_public_reset_cs::"
@@ -260,15 +268,14 @@ be_visitor_union_branch_public_reset_cs::visit_valuebox (
 }
 
 int
-be_visitor_union_branch_public_reset_cs::visit_valuetype (
-  be_valuetype *)
+be_visitor_union_branch_public_reset_cs::visit_valuetype (be_valuetype *)
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    this->ctx_->be_node_as_union_branch ();
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
+    this->ctx_->be_scope_as_union ();
 
-  if (ub == 0 || bu == 0)
+  if (!ub || !bu)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_public_reset_cs::"
@@ -289,15 +296,14 @@ be_visitor_union_branch_public_reset_cs::visit_valuetype (
 }
 
 int
-be_visitor_union_branch_public_reset_cs::visit_valuetype_fwd (
-  be_valuetype_fwd *)
+be_visitor_union_branch_public_reset_cs::visit_valuetype_fwd (be_valuetype_fwd *)
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    this->ctx_->be_node_as_union_branch ();
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
+    this->ctx_->be_scope_as_union ();
 
-  if (ub == 0 || bu == 0)
+  if (!ub || !bu)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_public_reset_cs::"
@@ -323,11 +329,11 @@ be_visitor_union_branch_public_reset_cs::visit_predefined_type (
   )
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    this->ctx_->be_node_as_union_branch ();
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
+    this->ctx_->be_scope_as_union ();
 
-  if (ub == 0 || bu == 0)
+  if (!ub || !bu)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_public_reset_cs::"
@@ -376,15 +382,14 @@ be_visitor_union_branch_public_reset_cs::visit_predefined_type (
 }
 
 int
-be_visitor_union_branch_public_reset_cs::visit_sequence (
-  be_sequence *)
+be_visitor_union_branch_public_reset_cs::visit_sequence (be_sequence *)
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    this->ctx_->be_node_as_union_branch ();
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
+    this->ctx_->be_scope_as_union ();
 
-  if (ub == 0 || bu == 0)
+  if (!ub || !bu)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_public_reset_cs::"
@@ -406,15 +411,14 @@ be_visitor_union_branch_public_reset_cs::visit_sequence (
 }
 
 int
-be_visitor_union_branch_public_reset_cs::visit_string (
-  be_string *node)
+be_visitor_union_branch_public_reset_cs::visit_string (be_string *node)
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    this->ctx_->be_node_as_union_branch ();
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
+    this->ctx_->be_scope_as_union ();
 
-  if (ub == 0 || bu == 0)
+  if (!ub || !bu)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_public_reset_cs::"
@@ -444,13 +448,12 @@ be_visitor_union_branch_public_reset_cs::visit_string (
 }
 
 int
-be_visitor_union_branch_public_reset_cs::visit_structure (
-  be_structure *node)
+be_visitor_union_branch_public_reset_cs::visit_structure (be_structure *node)
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    this->ctx_->be_node_as_union_branch ();
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
+    this->ctx_->be_scope_as_union ();
   be_type *bt = 0;
 
   if (this->ctx_->alias ())
@@ -462,7 +465,7 @@ be_visitor_union_branch_public_reset_cs::visit_structure (
       bt = node;
     }
 
-  if (ub == 0 || bu == 0)
+  if (!ub || !bu)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_public_reset_cs::"
@@ -510,15 +513,14 @@ be_visitor_union_branch_public_reset_cs::visit_typedef (be_typedef *node)
 }
 
 int
-be_visitor_union_branch_public_reset_cs::visit_union (
-  be_union *)
+be_visitor_union_branch_public_reset_cs::visit_union (be_union *)
 {
   be_union_branch *ub =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+    this->ctx_->be_node_as_union_branch ();
   be_union *bu =
-    be_union::narrow_from_scope (this->ctx_->scope ());
+    this->ctx_->be_scope_as_union ();
 
-  if (ub == 0 || bu == 0)
+  if (!ub || !bu)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_public_reset_cs::"
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/serializer_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/serializer_op_ch.cpp
index c84240fb34a..7e4b2cd0929 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/serializer_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/serializer_op_ch.cpp
@@ -1,19 +1,28 @@
 
-
-//=============================================================================
-/**
- *  @file    serializer_op_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating Serializer operator declarator for union_branch 
- *  in the client header
- *
- *
- *  @author Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    serializer_op_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating Serializer operator declarator for union_branch 
+//    in the client header
+//
+// = AUTHOR
+//    Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_union_branch, 
+           serializer_op_ch, 
+           "$Id$")
 
 // **********************************************
 //  Visitor for union_branch in the client header file.
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/serializer_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/serializer_op_cs.cpp
index ba3ba3525e0..c07b2b5b8e9 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/serializer_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/serializer_op_cs.cpp
@@ -18,6 +18,10 @@
 //
 // ============================================================================
 
+ACE_RCSID (be_visitor_union_branch,
+           serializer_op_cs,
+           "$Id$")
+
 // **********************************************
 //  Visitor for union_branch in the client stubs file.
 // **********************************************
@@ -85,10 +89,9 @@ be_visitor_union_branch_serializer_op_cs::visit_array (be_array *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Retrieve the union_branch node.
-  be_union_branch *f =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+  be_union_branch *f = this->ctx_->be_node_as_union_branch ();
 
-  if (f == 0)
+  if (!f)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_serializer_op_cs::"
@@ -226,10 +229,9 @@ be_visitor_union_branch_serializer_op_cs::visit_enum (be_enum *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Retrieve the union_branch node
-  be_union_branch *f =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+  be_union_branch *f = this->ctx_->be_node_as_union_branch ();
 
-  if (f == 0)
+  if (!f)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_serializer_op_cs::"
@@ -326,10 +328,9 @@ be_visitor_union_branch_serializer_op_cs::visit_interface (be_interface *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Retrieve the union_branch node.
-  be_union_branch *f =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+  be_union_branch *f = this->ctx_->be_node_as_union_branch ();
 
-  if (f == 0)
+  if (!f)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_serializer_op_cs::"
@@ -412,10 +413,9 @@ be_visitor_union_branch_serializer_op_cs::visit_interface_fwd (be_interface_fwd
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Retrieve the union_branch node.
-  be_union_branch *f =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+  be_union_branch *f = this->ctx_->be_node_as_union_branch ();
 
-  if (f == 0)
+  if (!f)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_serializer_op_cs::"
@@ -475,10 +475,9 @@ be_visitor_union_branch_serializer_op_cs::visit_valuetype (be_valuetype *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Retrieve the union_branch node.
-  be_union_branch *f =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+  be_union_branch *f = this->ctx_->be_node_as_union_branch ();
 
-  if (f == 0)
+  if (!f)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_serializer_op_cs::"
@@ -531,10 +530,9 @@ be_visitor_union_branch_serializer_op_cs::visit_valuetype_fwd (be_valuetype_fwd
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Retrieve the union_branch node.
-  be_union_branch *f =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+  be_union_branch *f = this->ctx_->be_node_as_union_branch ();
 
-  if (f == 0)
+  if (!f)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_serializer_op_cs::"
@@ -587,10 +585,9 @@ be_visitor_union_branch_serializer_op_cs::visit_predefined_type (be_predefined_t
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Retrieve the union_branch node.
-  be_union_branch *f =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+  be_union_branch *f = this->ctx_->be_node_as_union_branch ();
 
-  if (f == 0)
+  if (!f)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_serializer_op_cs::"
@@ -894,10 +891,8 @@ be_visitor_union_branch_serializer_op_cs::visit_sequence (be_sequence *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Retrieve the union_branch node.
-  be_union_branch *f =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
-    
-  if (f == 0)
+  be_union_branch *f = this->ctx_->be_node_as_union_branch ();
+  if (!f)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_serializer_op_cs::"
@@ -1001,10 +996,9 @@ be_visitor_union_branch_serializer_op_cs::visit_string (be_string *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Retrieve the union_branch node.
-  be_union_branch *f =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+  be_union_branch *f = this->ctx_->be_node_as_union_branch ();
 
-  if (f == 0)
+  if (!f)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_serializer_op_cs::"
@@ -1112,10 +1106,9 @@ be_visitor_union_branch_serializer_op_cs::visit_structure (be_structure *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Retrieve the union_branch node.
-  be_union_branch *f =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+  be_union_branch *f = this->ctx_->be_node_as_union_branch ();
 
-  if (f == 0)
+  if (!f)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_serializer_op_cs::"
@@ -1246,10 +1239,9 @@ be_visitor_union_branch_serializer_op_cs::visit_union (be_union *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Retrieve the union_branch node.
-  be_union_branch *f =
-    be_union_branch::narrow_from_decl (this->ctx_->node ());
+  be_union_branch *f = this->ctx_->be_node_as_union_branch ();
 
-  if (f == 0)
+  if (!f)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_branch_serializer_op_cs::"
diff --git a/TAO/TAO_IDL/be/be_visitor_union_fwd.cpp b/TAO/TAO_IDL/be/be_visitor_union_fwd.cpp
index bb59747b821..e50944b28e9 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_fwd.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_fwd.cpp
@@ -1,17 +1,22 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    be_visitor_union_fwd.cpp
- *
- *  $Id$
- *
- *  Visitors for generation of code for be_union_fwd
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_union_fwd.cpp
+//
+// = DESCRIPTION
+//    Visitors for generation of code for be_union_fwd
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #include "be_union_fwd.h"
 #include "be_union.h"
@@ -22,3 +27,6 @@
 
 #include "be_visitor_union_fwd/union_fwd_ch.cpp"
 
+ACE_RCSID (be, 
+           be_visitor_union_fwd, 
+           "$Id$")
diff --git a/TAO/TAO_IDL/be/be_visitor_union_fwd/union_fwd_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union_fwd/union_fwd_ch.cpp
index c1a4c59c270..a589e8eb0c4 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_fwd/union_fwd_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_fwd/union_fwd_ch.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    union_fwd_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for be_union_fwd node in the client header.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    union_fwd_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for be_union_fwd node in the client header.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_union_fwd, 
+           union_fwd_ch, 
+           "$Id$")
 
 be_visitor_union_fwd_ch::be_visitor_union_fwd_ch (
     be_visitor_context *ctx
diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox.cpp
index e044797c0d1..c6d4bb2eaed 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox.cpp
@@ -1,18 +1,22 @@
 
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    be_visitor_valuebox.cpp
- *
- *  $Id$
- *
- *  Concrete visitor for the Valuebox class
- *
- *
- *  @author Gary Maxey
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_valuebox.cpp
+//
+// = DESCRIPTION
+//    Concrete visitor for the Valuebox class
+//
+// = AUTHOR
+//    Gary Maxey
+//
+// ============================================================================
 
 #include "be_array.h"
 #include "be_enum.h"
diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp
index 2087964c6b0..e763f9917c9 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp
@@ -1,18 +1,27 @@
-
-//=============================================================================
-/**
- *  @file    any_op_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Any operators for a valuebox in the client
- *  header.
- *
- *
- *  @author Gary Maxey
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    any_op_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Any operators for a valuebox in the client
+//    header.
+//
+// = AUTHOR
+//    Gary Maxey
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_valuebox,
+           any_op_ch,
+           "$Id$")
 
 // ***************************************************************************
 // Valuebox visitor for generating Any operator declarations.
diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp
index cf182b56b76..640572ba84c 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_cs.cpp
@@ -1,17 +1,25 @@
-
-//=============================================================================
-/**
- *  @file    any_op_cs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Any operators for valueboxes in the stubs
- *  file.
- *
- *
- *  @author Gary Maxey
- */
-//=============================================================================
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    any_op_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Any operators for valueboxes in the stubs
+//    file.
+//
+// = AUTHOR
+//    Gary Maxey
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_valuebox,
+           any_op_cs,
+           "$Id$")
 
 
 // ***************************************************************************
diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_ch.cpp
index d6b8d913fae..cd35ccf737b 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_ch.cpp
@@ -1,18 +1,27 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    cdr_op_ch.cpp
- *
- *  $Id$
- *
- *  Concrete visitor for valueboxes.
- *  This one provides code generation for the CDR operators.
- *
- *
- *  @author Gary Maxey
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_ch.cpp
+//
+// = DESCRIPTION
+//    Concrete visitor for valueboxes.
+//    This one provides code generation for the CDR operators.
+//
+// = AUTHOR
+//    Gary Maxey
+//
+// ============================================================================
 
+ACE_RCSID (be_visitor_valuebox,
+           cdr_op_ch,
+           "$Id$")
 
 be_visitor_valuebox_cdr_op_ch::be_visitor_valuebox_cdr_op_ch (
     be_visitor_context *ctx
diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_cs.cpp
index e062b8d7e7b..42b42489d69 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox/cdr_op_cs.cpp
@@ -1,18 +1,27 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    cdr_op_cs.cpp
- *
- *  $Id$
- *
- *  Concrete visitor for valueboxes.
- *  This one provides code generation for the CDR operators.
- *
- *
- *  @author Gary Maxey
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_cs.cpp
+//
+// = DESCRIPTION
+//    Concrete visitor for valueboxes.
+//    This one provides code generation for the CDR operators.
+//
+// = AUTHOR
+//    Gary Maxey
+//
+// ============================================================================
 
+ACE_RCSID (be_visitor_valuebox,
+           cdr_op_cs,
+           "$Id$")
 
 be_visitor_valuebox_cdr_op_cs::be_visitor_valuebox_cdr_op_cs (
     be_visitor_context *ctx
diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/field_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/field_ch.cpp
index 3f7777665ad..cf6aff77ea0 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox/field_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox/field_ch.cpp
@@ -1,23 +1,33 @@
-
-//=============================================================================
-/**
- *  @file    field_ch.cpp
- *
- *  $Id$
- *
- *   Visitor for the structure fields in valuebox class.
- *   This one generates code for access to strucuture members
- *   in the client header.
- *
- *   Based on be_visitor_union_branch/public_ch.  In general we
- *   generate the same method signatures as that visitor but cannot
- *   use it directly because a valuebox is not a scope and because
- *   the structure is visited prior to visiting the valuebox.
- *
- *
- *  @author Gary Maxey
- */
-//=============================================================================
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    field_ch.cpp
+//
+// = DESCRIPTION
+//     Visitor for the structure fields in valuebox class.
+//     This one generates code for access to strucuture members
+//     in the client header.
+//
+//     Based on be_visitor_union_branch/public_ch.  In general we
+//     generate the same method signatures as that visitor but cannot
+//     use it directly because a valuebox is not a scope and because
+//     the structure is visited prior to visiting the valuebox.
+//
+// = AUTHOR
+//    Gary Maxey
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_valuebox,
+           field_ch,
+           "$Id$")
 
 
 be_visitor_valuebox_field_ch::be_visitor_valuebox_field_ch (
diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp
index 5e3a895d68b..a293b311af7 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp
@@ -1,19 +1,24 @@
-
-//=============================================================================
-/**
- *  @file    field_ci.cpp
- *
- *  $Id$
- *
- *   Visitor for the Valuebox class.
- *   This one generates code for accessor and modifier functions of
- *  for valuebox struct members.
- *
- *
- *  @author Gary Maxey
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    field_ci.cpp
+//
+// = DESCRIPTION
+//     Visitor for the Valuebox class.
+//     This one generates code for accessor and modifier functions of
+//    for valuebox struct members.
+//
+// = AUTHOR
+//    Gary Maxey
+//
+// ============================================================================
 be_visitor_valuebox_field_ci::be_visitor_valuebox_field_ci (
     be_visitor_context *ctx
   )
diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp
index efa1d618333..d2459a9e862 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp
@@ -1,19 +1,24 @@
-
-//=============================================================================
-/**
- *  @file    union_member_ci.cpp
- *
- *  $Id$
- *
- *   Visitor for the Valuebox class.
- *   This one generates code for accessor and modifier functions of
- *   for valuebox union members.
- *
- *
- *  @author Gary Maxey
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    union_member_ci.cpp
+//
+// = DESCRIPTION
+//     Visitor for the Valuebox class.
+//     This one generates code for accessor and modifier functions of
+//     for valuebox union members.
+//
+// = AUTHOR
+//    Gary Maxey
+//
+// ============================================================================
 be_visitor_valuebox_union_member_ci::be_visitor_valuebox_union_member_ci (
     be_visitor_context *ctx
   )
diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox.cpp
index e2e746743fd..e114bb204e2 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox.cpp
@@ -1,17 +1,26 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    valuebox.cpp
- *
- *  $Id$
- *
- *  Visitor for generation of code for valuebox
- *
- *
- *  @author Gary Maxey
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuebox.cpp
+//
+// = DESCRIPTION
+//    Visitor for generation of code for valuebox
+//
+// = AUTHOR
+//    Gary Maxey
+//
+// ============================================================================
 
+ACE_RCSID (be_visitor_valuebox,
+           valuebox,
+           "$Id$")
 
 be_visitor_valuebox::be_visitor_valuebox (be_visitor_context *ctx)
   : be_visitor_decl (ctx)
diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp
index 1586c34fd95..9ddf2dc2fd2 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    valuebox_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for valueboxes in the client header
- *
- *
- *  @author Gary Maxey
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuebox_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for valueboxes in the client header
+//
+// = AUTHOR
+//    Gary Maxey
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_valuebox,
+           valuebox_ch,
+           "$Id: valuebox_ch.cpp Exp")
 
 // ******************************************************
 // Valuebox visitor for client header
diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp
index f2940c3c9a3..3dac932e255 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    valuebox_ci.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for valueboxes in the client inline file
- *
- *
- *  @author Gary Maxey
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuebox_ci.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for valueboxes in the client inline file
+//
+// = AUTHOR
+//    Gary Maxey
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_valuebox,
+           valuebox_ci,
+           "$Id: valuebox_ci.cpp Exp")
 
 be_visitor_valuebox_ci::be_visitor_valuebox_ci (be_visitor_context *ctx)
   : be_visitor_valuebox (ctx)
diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp
index 721e6a2780c..40e6920fc84 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    valuebox_cs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for valueboxes in the client stub file
- *
- *
- *  @author Gary Maxey
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuebox_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for valueboxes in the client stub file
+//
+// = AUTHOR
+//    Gary Maxey
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_valuebox,
+           valuebox_cs,
+           "$Id: valuebox_cs.cpp Exp")
 
 be_visitor_valuebox_cs::be_visitor_valuebox_cs (be_visitor_context *ctx)
   : be_visitor_valuebox (ctx)
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype.cpp
index cadb05fb39e..2db4462bc35 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype.cpp
@@ -1,18 +1,22 @@
 
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    be_visitor_valuetype.cpp
- *
- *  $Id$
- *
- *  Concrete visitor for the Valuetype class
- *
- *
- *  @author Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_valuetype.cpp
+//
+// = DESCRIPTION
+//    Concrete visitor for the Valuetype class
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//
+// ============================================================================
 
 #include "be_argument.h"
 #include "be_array.h"
@@ -95,3 +99,6 @@
 #include "be_visitor_valuetype/valuetype_init_cs.cpp"
 #include "be_visitor_valuetype/valuetype_init_arglist_ch.cpp"
 
+ACE_RCSID (be,
+           be_visitor_valuetype,
+          "$Id$")
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/ami_exception_holder_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/ami_exception_holder_ch.cpp
index 9927d3078cd..84d1bd214c5 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/ami_exception_holder_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/ami_exception_holder_ch.cpp
@@ -1,17 +1,26 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    ami_exception_holder_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating exception holders for the AMI callback model.
- *
- *
- *  @author Michael Kircher <Michael.Kircher@mchp.siemens.de>
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    ami_exception_holder_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating exception holders for the AMI callback model.
+//
+// = AUTHOR
+//    Michael Kircher <Michael.Kircher@mchp.siemens.de>
+//
+// ============================================================================
 
+ACE_RCSID (be_visitor_valuetype,
+           ami_exception_holder_ch,
+           "$Id$")
 
 // ******************************************************
 // Interface visitor for client header.
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/ami_exception_holder_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/ami_exception_holder_cs.cpp
index 0bb35388746..726706a8ff1 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/ami_exception_holder_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/ami_exception_holder_cs.cpp
@@ -1,17 +1,26 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    ami_exception_holder_cs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for excpetion holders.
- *
- *
- *  @author Michael Kircher
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    ami_exception_holder_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for excpetion holders.
+//
+// = AUTHOR
+//    Michael Kircher
+//
+// ============================================================================
 
+ACE_RCSID (be_visitor_valuetype,
+           ami_exception_holder_cs,
+           "$Id$")
 
 // ************************************************************
 // Interface visitor for client stubs
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp
index f3bb37ca9c8..4d3b75db1e8 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp
@@ -1,18 +1,28 @@
-
-//=============================================================================
-/**
- *  @file    any_op_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Any operators for a valuetype in the client
- *  header.
- *
- *
- *  @author Jeff Parsons <parsons@cs.wustl.edu> Boris Kolpackov <bosk@ipmce.ru>
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    any_op_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Any operators for a valuetype in the client
+//    header.
+//
+// = AUTHOR
+//    Jeff Parsons <parsons@cs.wustl.edu>
+//    Boris Kolpackov <bosk@ipmce.ru>
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_valuetype,
+           any_op_ch,
+           "$Id$")
 
 // ***************************************************************************
 // Valuetype visitor for generating Any operator declarations.
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp
index d002fdca4d1..b4b74e060fa 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_cs.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    any_op_cs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Any operators for valuetypes in the stubs
- *  file.
- *
- *
- *  @author Jeff Parsons <parsons@cs.wustl.edu> Boris Kolpackov <bosk@ipmce.ru>
- */
-//=============================================================================
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    any_op_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Any operators for valuetypes in the stubs
+//    file.
+//
+// = AUTHOR
+//    Jeff Parsons <parsons@cs.wustl.edu>
+//    Boris Kolpackov <bosk@ipmce.ru>
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_valuetype,
+           any_op_cs,
+           "$Id$")
 
 
 // ***************************************************************************
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp
index 04a380e5d87..e9f799fa90c 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp
@@ -1,18 +1,28 @@
-
-//=============================================================================
-/**
- *  @file    arglist.cpp
- *
- *  $Id$
- *
- *  Visitor generating the parameter list of operations
- *  in the Valuetype class.
- *
- *
- *  @author Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de> based on code from Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    arglist.cpp
+//
+// = DESCRIPTION
+//    Visitor generating the parameter list of operations
+//    in the Valuetype class.
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//    based on code from Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_valuetype,
+           arglist,
+           "$Id$")
 
 // ************************************************************
 //   Operation visitor to generate the argument list.
@@ -122,17 +132,9 @@ be_visitor_obv_operation_arglist::visit_argument (be_argument *node)
   // defined. We need this since argument types may very well be declared
   // inside the scope of the interface node. In such cases, we would like to
   // generate the appropriate relative scoped names.
-  be_operation *op =
-    be_operation::narrow_from_decl (this->ctx_->node ());
+  be_operation *op = this->ctx_->be_scope_as_operation ();
 
-  // Sometimes the operation is stored in the context scope instead.
-  if (op == 0)
-    {
-      op =
-        be_operation::narrow_from_scope (this->ctx_->scope ());
-    }
-        
-  if (op == 0)
+  if (!op)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_arglist::"
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp
index 0af487a7841..9aa4141c06e 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_ch.cpp
@@ -1,18 +1,28 @@
-
-//=============================================================================
-/**
- *  @file    cdr_op_ch.cpp
- *
- *  $Id$
- *
- *  Concrete visitor for valuetypes.
- *  This one provides code generation for the CDR operators.
- *
- *
- *  @author Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de> based on code from Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_ch.cpp
+//
+// = DESCRIPTION
+//    Concrete visitor for valuetypes.
+//    This one provides code generation for the CDR operators.
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//    based on code from Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_valuetype,
+           cdr_op_ch,
+           "$Id$")
 
 be_visitor_valuetype_cdr_op_ch::be_visitor_valuetype_cdr_op_ch (
     be_visitor_context *ctx
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp
index df5adfef359..74596766acf 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/cdr_op_cs.cpp
@@ -1,18 +1,29 @@
-
-//=============================================================================
-/**
- *  @file    cdr_op_cs.cpp
- *
- *  $Id$
- *
- *  Concrete visitor for valuetypes.
- *  This one provides code generation for the CDR operators.
- *
- *
- *  @author Boris Kolpackov <bosk@ipmce.ru> based on code from Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de> based on code from Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_cs.cpp
+//
+// = DESCRIPTION
+//    Concrete visitor for valuetypes.
+//    This one provides code generation for the CDR operators.
+//
+// = AUTHOR
+//    Boris Kolpackov <bosk@ipmce.ru>
+//    based on code from Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//    based on code from Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_valuetype,
+           valuetype_cdr_op_cs,
+           "$Id$")
 
 be_visitor_valuetype_cdr_op_cs::be_visitor_valuetype_cdr_op_cs (
     be_visitor_context *ctx
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_ch.cpp
index f6596ae982f..e9e8b301630 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_ch.cpp
@@ -1,17 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    field_cdr_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Field in the client header file.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    field_cdr_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Field in the client header file.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_valuetype, 
+           field_cdr_op_ch, 
+           "$Id$")
 
 // **********************************************
 //  Visitor for field in the client header file.
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_cs.cpp
index 3e977050961..7bd08a81d7a 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_cs.cpp
@@ -1,17 +1,27 @@
-
-//=============================================================================
-/**
- *  @file    field_cdr_cs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Field in the client stubs file.
- *
- *
- *  @author Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de> derived from be_visitor_field/cdr_op_cs.cpp
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    field_cdr_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Field in the client stubs file.
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//    derived from be_visitor_field/cdr_op_cs.cpp
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_valuetype,
+           field_cdr_op_cs,
+           "$Id$")
 
 // **********************************************
 //  Visitor for field in the client inline file.
@@ -64,10 +74,9 @@ be_visitor_valuetype_field_cdr_cs::visit_array (be_array *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Retrieve the field node.
-  be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+  be_field *f = this->ctx_->be_node_as_field ();
 
-  if (f == 0)
+  if (!f)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuetype_field_cdr_cs::"
@@ -169,10 +178,9 @@ be_visitor_valuetype_field_cdr_cs::visit_enum (be_enum *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Retrieve the field node.
-  be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+  be_field *f = this->ctx_->be_node_as_field ();
 
-  if (f == 0)
+  if (!f)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuetype_field_cdr_cs::"
@@ -231,10 +239,9 @@ be_visitor_valuetype_field_cdr_cs::visit_interface (be_interface *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Retrieve the field node.
-  be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+  be_field *f = this->ctx_->be_node_as_field ();
 
-  if (f == 0)
+  if (!f)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuetype_field_cdr_cs::"
@@ -281,10 +288,9 @@ be_visitor_valuetype_field_cdr_cs::visit_interface_fwd (be_interface_fwd *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Retrieve the field node.
-  be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+  be_field *f = this->ctx_->be_node_as_field ();
 
-  if (f == 0)
+  if (!f)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuetype_field_cdr_cs::"
@@ -337,10 +343,9 @@ be_visitor_valuetype_field_cdr_cs::valuetype_common (be_type *)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Retrieve the field node.
-  be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+  be_field *f = this->ctx_->be_node_as_field ();
 
-  if (f == 0)
+  if (!f)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuetype_field_cdr_cs::"
@@ -389,10 +394,9 @@ be_visitor_valuetype_field_cdr_cs::visit_valuetype_fwd (be_valuetype_fwd *)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Retrieve the field node.
-  be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+  be_field *f = this->ctx_->be_node_as_field ();
 
-  if (f == 0)
+  if (!f)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuetype_field_cdr_cs::"
@@ -459,10 +463,9 @@ be_visitor_valuetype_field_cdr_cs::visit_predefined_type (be_predefined_type *no
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Retrieve the field node.
-  be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+  be_field *f = this->ctx_->be_node_as_field ();
 
-  if (f == 0)
+  if (!f)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuetype_field_cdr_cs::"
@@ -564,10 +567,9 @@ be_visitor_valuetype_field_cdr_cs::visit_sequence (be_sequence *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Retrieve the field node.
-  be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+  be_field *f = this->ctx_->be_node_as_field ();
 
-  if (f == 0)
+  if (!f)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuetype_field_cdr_cs::"
@@ -629,10 +631,9 @@ be_visitor_valuetype_field_cdr_cs::visit_string (be_string *str)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Retrieve the field node.
-  be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+  be_field *f = this->ctx_->be_node_as_field ();
 
-  if (f == 0)
+  if (!f)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuetype_field_cdr_cs::"
@@ -705,16 +706,14 @@ be_visitor_valuetype_field_cdr_cs::visit_string (be_string *str)
 }
 
 int
-be_visitor_valuetype_field_cdr_cs::visit_structure (
-  be_structure *node)
+be_visitor_valuetype_field_cdr_cs::visit_structure (be_structure *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Retrieve the field node.
-  be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+  be_field *f = this->ctx_->be_node_as_field ();
 
-  if (f == 0)
+  if (!f)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuetype_field_cdr_cs::"
@@ -794,10 +793,9 @@ be_visitor_valuetype_field_cdr_cs::visit_union (be_union *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Retrieve the field node.
-  be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+  be_field *f = this->ctx_->be_node_as_field ();
 
-  if (f == 0)
+  if (!f)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuetype_field_cdr_cs::"
@@ -903,10 +901,9 @@ be_visitor_valuetype_field_cdr_decl::visit_array (be_array *node)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Retrieve the field node.
-  be_field *f =
-    be_field::narrow_from_decl (this->ctx_->node ());
+  be_field *f = this->ctx_->be_node_as_field ();
 
-  if (f == 0)
+  if (!f)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuetype_field_cdr_decl::"
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp
index d153538c37f..a19f09c6660 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp
@@ -1,18 +1,28 @@
-
-//=============================================================================
-/**
- *  @file    field_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating the accessor and modifier declarations
- *  for valuetype fields in the valuetype class (header).
- *
- *
- *  @author Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de> derived from be_visitor_union_branch/public_ch.cpp
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    field_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating the accessor and modifier declarations
+//    for valuetype fields in the valuetype class (header).
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//    derived from be_visitor_union_branch/public_ch.cpp
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_valuetype,
+           field_ch,
+           "$Id$")
 
 be_visitor_valuetype_field_ch::be_visitor_valuetype_field_ch (
     be_visitor_context *ctx
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/field_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/field_ci.cpp
index da32b4f1ac6..b03f2f2b3f0 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_ci.cpp
@@ -1,19 +1,28 @@
-
-//=============================================================================
-/**
- *  @file    field_ci.cpp
- *
- *  $Id$
- *
- *   Visitor for the Valuetype class.
- *   This one generates code for accessor and modifier functions of
- *   valuetype state members (in the inline file).
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    field_ci.cpp
+//
+// = DESCRIPTION
+//     Visitor for the Valuetype class.
+//     This one generates code for accessor and modifier functions of
+//     valuetype state members (in the inline file).
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_valuetype,
+           field_ci,
+           "$Id$")
 
 be_visitor_valuetype_field_ci::be_visitor_valuetype_field_ci (
     be_visitor_context *ctx
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 a00b41e4e54..1f2a7442c8b 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp
@@ -1,19 +1,28 @@
-
-//=============================================================================
-/**
- *  @file    field_cs.cpp
- *
- *  $Id$
- *
- *   Visitor for the Valuetype class.
- *   This one generates code for accessor and modifier functions of
- *   valuetype state members (in the stub file).
- *
- *
- *  @author Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de> derived from be_visitor_union_branch/public_ci.cpp
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    field_cs.cpp
+//
+// = DESCRIPTION
+//     Visitor for the Valuetype class.
+//     This one generates code for accessor and modifier functions of
+//     valuetype state members (in the stub file).
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//    derived from be_visitor_union_branch/public_ci.cpp
+//
+// ============================================================================
+ACE_RCSID (be_visitor_valuetype,
+           field_cs,
+           "$Id$")
 
 be_visitor_valuetype_field_cs::be_visitor_valuetype_field_cs (
     be_visitor_context *ctx
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_ch.cpp
index 1cf859456d5..55aec2de444 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_ch.cpp
@@ -1,18 +1,28 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    marshal_ch.cpp
- *
- *  $Id$
- *
- *  Concrete visitor for valuetypes.
- *  This one provides code generation for marshalling.
- *
- *
- *  @author Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de> based on code from Aniruddha Gokhale
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    marshal_ch.cpp
+//
+// = DESCRIPTION
+//    Concrete visitor for valuetypes.
+//    This one provides code generation for marshalling.
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//    based on code from Aniruddha Gokhale
+//
+// ============================================================================
 
+ACE_RCSID (be_visitor_valuetype, 
+           marshal_ch, 
+           "$Id$")
 
 // ***************************************************************************
 // Structure visitor for generating  declarations
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp
index 8a6e3c08018..a317e67f4c4 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp
@@ -1,18 +1,27 @@
-
-//=============================================================================
-/**
- *  @file    marshal_cs.cpp
- *
- *  $Id$
- *
- *  Concrete visitor for valuetypes.
- *  This one provides code generation for marshalling.
- *
- *
- *  @author Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    marshal_cs.cpp
+//
+// = DESCRIPTION
+//    Concrete visitor for valuetypes.
+//    This one provides code generation for marshalling.
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_valuetype,
+           marshal_cs,
+           "$Id$")
 
 be_visitor_valuetype_marshal_cs::be_visitor_valuetype_marshal_cs (
     be_visitor_context *ctx
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/obv_module.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/obv_module.cpp
index c3570ea8559..c69154e3dce 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/obv_module.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/obv_module.cpp
@@ -1,19 +1,28 @@
-
-//=============================================================================
-/**
- *  @file    obv_module.cpp
- *
- *  $Id$
- *
- *  Concrete visitor for the Module class
- *  This provides code generation for the module in the header
- *  for the OBV_ namespace (see C++ mapping OMG 20.17)
- *
- *
- *  @author Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    obv_module.cpp
+//
+// = DESCRIPTION
+//    Concrete visitor for the Module class
+//    This provides code generation for the module in the header
+//    for the OBV_ namespace (see C++ mapping OMG 20.17)
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_obv_module, 
+           obv_module, 
+           "$Id$")
 
 // ************************************************************
 // OBV module visitor for server header.
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp
index 6a5bba2c805..cf58fc14366 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp
@@ -1,17 +1,23 @@
-
-//=============================================================================
-/**
- *  @file    valuetype.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Valuetypes. This is a generic visitor.
- *
- *
- *  @author Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de> based on interface.cpp from Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuetype.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Valuetypes. This is a generic visitor.
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//    based on interface.cpp from Aniruddha Gokhale
+//
+// ============================================================================
 
 be_visitor_valuetype::be_visitor_valuetype (be_visitor_context *ctx)
   : be_visitor_scope (ctx)
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp
index 97ee7d343fe..3c87b11f6f6 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp
@@ -1,19 +1,28 @@
-
-//=============================================================================
-/**
- *  @file    valuetype_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Valuetypes in the client header
- *  (see C++ mapping OMG 20.17)
- *
- *
- *  @author Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
- *  @author based on interface_ch.cpp from Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuetype_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Valuetypes in the client header
+//    (see C++ mapping OMG 20.17)
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>,
+//    based on interface_ch.cpp from Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_valuetype,
+           valuetype_ch,
+           "$Id$")
 
 // ******************************************************
 // Valuetype visitor for client header
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp
index 42588cdc747..eed0287f2ff 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp
@@ -1,17 +1,27 @@
-
-//=============================================================================
-/**
- *  @file    valuetype_ci.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Valuetypes in the client inline file
- *
- *
- *  @author Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de> based on code from Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuetype_ci.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Valuetypes in the client inline file
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//    based on code from Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_valuetype,
+           valuetype_ci,
+           "$Id$")
 
 // **************************************************
 // Valuetype visitor for client inline.
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
index 89ccc543ffe..e72f7fe5669 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
@@ -1,17 +1,27 @@
-
-//=============================================================================
-/**
- *  @file    valuetype_cs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Valuetypes in the client stubs file.
- *
- *
- *  @author Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de> based on code from Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuetype_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Valuetypes in the client stubs file.
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//    based on code from Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_valuetype,
+           valuetype_cs,
+           "$Id$")
 
 // ************************************************************
 // Valuetype visitor for client stubs.
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init.cpp
index 06ee061c141..d3960dd2c0b 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init.cpp
@@ -1,18 +1,24 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    valuetype_init.cpp
- *
- *  $Id$
- *
- *  Coomon visitor for valuetypes factory construct
- *  (see IDL to C++ mapping). Based on ptc/00-01-02.
- *
- *
- *  @author Boris Kolpackov <bosk@ipmce.ru>
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuetype_init.cpp
+//
+// = DESCRIPTION
+//    Coomon visitor for valuetypes factory construct
+//    (see IDL to C++ mapping). Based on ptc/00-01-02.
+//
+// = AUTHOR
+//   Boris Kolpackov <bosk@ipmce.ru>
+//
+//
+// ============================================================================
 
 be_visitor_valuetype_init::be_visitor_valuetype_init (
     be_visitor_context *ctx
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_arglist_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_arglist_ch.cpp
index a29cda22a6d..b998b83f19a 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_arglist_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_arglist_ch.cpp
@@ -1,18 +1,27 @@
-
-//=============================================================================
-/**
- *  @file    valuetype_init_arglist_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for the parameter list of the OBV factory
- *  signature.
- *
- *
- *  @author Boris Kolpackov <bosk@ipmce.ru>
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuetype_init_arglist_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for the parameter list of the OBV factory
+//    signature.
+//
+// = AUTHOR
+//    Boris Kolpackov <bosk@ipmce.ru>
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_valuetype_init,
+           arglist_ch,
+           "$Id$")
 
 be_visitor_valuetype_init_arglist_ch::be_visitor_valuetype_init_arglist_ch (
     be_visitor_context *ctx
@@ -35,7 +44,7 @@ be_visitor_valuetype_init_arglist_ch::visit_factory (be_factory *node)
 
   if (node->nmembers () > 0)
     {
-      os << be_idt_nl;
+      os << be_idt << be_idt_nl;
 
       // All we do is hand over code generation to our scope.
       if (this->visit_scope (node) == -1)
@@ -47,7 +56,8 @@ be_visitor_valuetype_init_arglist_ch::visit_factory (be_factory *node)
                             -1);
         }
 
-      os << ")" << be_uidt;
+      os << be_uidt_nl
+         << ")";
     }
   else
     {
@@ -84,7 +94,7 @@ be_visitor_valuetype_init_arglist_ch::post_process (be_decl *bd)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // If we are not the last node in the list of arguments, generate a comma.
-  if (! this->last_node (bd))
+  if (!this->last_node (bd))
     {
       *os << "," << be_nl;
     }
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp
index 3a917287957..ab31fc33cef 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp
@@ -1,18 +1,24 @@
-
-//=============================================================================
-/**
- *  @file    valuetype_init_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Valuetypes factory in the client header
- *  (see IDL to C++ mapping). Based on ptc/00-01-02.
- *
- *
- *  @author Boris Kolpackov <bosk@ipmce.ru>
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuetype_init_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Valuetypes factory in the client header
+//    (see IDL to C++ mapping). Based on ptc/00-01-02.
+//
+// = AUTHOR
+//   Boris Kolpackov <bosk@ipmce.ru>
+//
+//
+// ============================================================================
 
 be_visitor_valuetype_init_ch::be_visitor_valuetype_init_ch (
     be_visitor_context *ctx
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ci.cpp
index bc04cfe6256..68e9b6f3bb1 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ci.cpp
@@ -1,18 +1,28 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    valuetype_init_ci.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Valuetypes factory in the client header
- *  (see IDL to C++ mapping)
- *
- *
- *  @author Boris Kolpackov <bosk@ipmce.ru>
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuetype_init_ci.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Valuetypes factory in the client header
+//    (see IDL to C++ mapping)
+//
+// = AUTHOR
+//   Boris Kolpackov <bosk@ipmce.ru>
+//
+//
+// ============================================================================
 
+ACE_RCSID (be_visitor_valuetype,
+           valuetype_init_ci,
+           "$Id$")
 
 be_visitor_valuetype_init_ci::be_visitor_valuetype_init_ci (
     be_visitor_context *ctx
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp
index 3e2360aa06a..638abe1c108 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp
@@ -1,18 +1,28 @@
-
-//=============================================================================
-/**
- *  @file    valuetype_init_cs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Valuetypes factory in the client header
- *  (see IDL to C++ mapping)
- *
- *
- *  @author Boris Kolpackov <bosk@ipmce.ru>
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuetype_init_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Valuetypes factory in the client header
+//    (see IDL to C++ mapping)
+//
+// = AUTHOR
+//   Boris Kolpackov <bosk@ipmce.ru>
+//
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_valuetype,
+           valuetype_init_cs,
+           "$Id$")
 
 be_visitor_valuetype_init_cs::be_visitor_valuetype_init_cs (
     be_visitor_context *ctx
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp
index 7d96840e76c..0e5874a0399 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp
@@ -1,21 +1,30 @@
 
-
-//=============================================================================
-/**
- *  @file    valuetype_obv_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Valuetypes in the client header
- *  OBV_ class
- *  (see C++ mapping OMG 20.17)
- *
- *
- *  @author Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
- *  @author based on interface_ch.cpp from Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuetype_obv__ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Valuetypes in the client header
+//    OBV_ class
+//    (see C++ mapping OMG 20.17)
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>,
+//    based on interface_ch.cpp from Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_valuetype,
+           valuetype_obv_ch,
+           "$Id$")
 
 // ******************************************************
 // Valuetype visitor for client header
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ci.cpp
index fe64d7da139..66750c54136 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ci.cpp
@@ -1,21 +1,30 @@
 
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    valuetype_obv_ci.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Valuetypes
- *  OBV_ class implementation
- *  (see C++ mapping OMG 20.17)
- *
- *
- *  @author Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
- *  @author based on interface_ch.cpp from Aniruddha Gokhale
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuetype_obv_ci.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Valuetypes
+//    OBV_ class implementation
+//    (see C++ mapping OMG 20.17)
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>,
+//    based on interface_ch.cpp from Aniruddha Gokhale
+//
+// ============================================================================
 
+ACE_RCSID (be_visitor_valuetype, 
+           valuetype_obv_ci, 
+           "$Id$")
 
 // ******************************************************
 // Valuetype visitor for OBV_ class implementation
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 2b73ceb76fb..30dae918bea 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
@@ -1,21 +1,30 @@
 
-
-//=============================================================================
-/**
- *  @file    valuetype_obv_cs.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Valuetypes
- *  OBV_ class implementation
- *  (see C++ mapping OMG 20.17)
- *
- *
- *  @author Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
- *  @author derived from interface_ch.cpp from Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuetype_obv_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Valuetypes
+//    OBV_ class implementation
+//    (see C++ mapping OMG 20.17)
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>,
+//    derived from interface_ch.cpp from Aniruddha Gokhale
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_valuetype,
+           valuetype_obv_cs,
+           "$Id$")
 
 // ******************************************************
 // Valuetype visitor for OBV_ class implementation
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_sh.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_sh.cpp
index 247650ef5d6..23c10dc317b 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_sh.cpp
@@ -1,16 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    valuetype_sh.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for value types in the server header
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuetype_sh.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for value types in the server header
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_valuetype,
+           valuetype_sh,
+           "$Id$")
 
 
 // ************************************************************
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_si.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_si.cpp
index 7b49825afb5..34cd0b2f248 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_si.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_si.cpp
@@ -1,16 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    valuetype_si.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Interfaces in the server inline file
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuetype_si.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Interfaces in the server inline file
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_valuetype,
+           valuetype_si,
+           "$Id$")
 
 
 // ************************************************************************
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp
index ba1d45cf100..f7b12702aad 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp
@@ -1,19 +1,29 @@
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuetype_ss.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Interfaces in the server skeletons file.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
-//=============================================================================
-/**
- *  @file    valuetype_ss.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Interfaces in the server skeletons file.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
+#include "nr_extern.h"
 
+ACE_RCSID (be_visitor_valuetype,
+           valuetype_ss,
+           "$Id$")
 
-#include "nr_extern.h"
 
 // ************************************************************
 // Interface visitor for server skeletons.
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd.cpp
index 275108aa886..2de72859f6d 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd.cpp
@@ -1,17 +1,22 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    be_visitor_valuetype_fwd.cpp
- *
- *  $Id$
- *
- *  Visitors for generation of code for Valuetype_Fwd
- *
- *
- *  @author Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_valuetype_fwd.cpp
+//
+// = DESCRIPTION
+//    Visitors for generation of code for Valuetype_Fwd
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//
+// ============================================================================
 
 #include "be_valuetype.h"
 #include "be_valuetype_fwd.h"
@@ -30,3 +35,7 @@
 #include "be_visitor_valuetype_fwd/any_op_ch.cpp"
 #include "be_visitor_valuetype_fwd/cdr_op_ch.cpp"
 
+ACE_RCSID (be, 
+           be_visitor_valuetype_fwd, 
+           "$Id$")
+
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp
index 37dff4bef99..ff1c24cacc4 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp
@@ -1,18 +1,27 @@
-
-//=============================================================================
-/**
- *  @file    any_op_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for Any operators for a forward declared
- *  valuetype in the client header.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    any_op_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Any operators for a forward declared
+//    valuetype in the client header.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
+
+ACE_RCSID (be_visitor_valuetype_fwd,
+           any_op_ch,
+           "$Id$")
 
 // ***************************************************************************
 // Generates Any operator declarations in the client header
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ch.cpp
index 1d2939f23de..8c19388a325 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ch.cpp
@@ -1,18 +1,29 @@
-
-//=============================================================================
-/**
- *  @file    cdr_op_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for CDR operators for forward
- *  declarations of valuetypes. This uses compiled marshaling.
- *
- *
- *  @author Boris Kolpackov <bosk@ipmce.ru> base on code from Torsten Kuepper based on code from  Aniruddha Gokhale & Carlos O'Ryan (cdr_op_ci.cpp)
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuetype_fwd_cdr_op_ci.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for CDR operators for forward
+//    declarations of valuetypes. This uses compiled marshaling.
+//
+// = AUTHOR
+//    Boris Kolpackov <bosk@ipmce.ru>
+//    base on code from Torsten Kuepper
+//    based on code from  Aniruddha Gokhale & Carlos O'Ryan (cdr_op_ci.cpp)
+//
+// ================================================================
+
+ACE_RCSID (be_visitor_valuetype_fwd,
+           cdr_op_ch,
+           "$Id$")
 
 be_visitor_valuetype_fwd_cdr_op_ch::be_visitor_valuetype_fwd_cdr_op_ch (
     be_visitor_context *ctx
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ci.cpp
index fe495eac0ae..2b1638de626 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/cdr_op_ci.cpp
@@ -1,18 +1,28 @@
-
-//=============================================================================
-/**
- *  @file    cdr_op_ci.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for CDR operators for forward
- *  declarations of valuetypes. This uses compiled marshaling.
- *
- *
- *  @author Torsten Kuepper based on code from Aniruddha Gokhale & Carlos O'Ryan (cdr_op_ci.cpp)
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_ci.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for CDR operators for forward
+//    declarations of valuetypes. This uses compiled marshaling.
+//
+// = AUTHOR
+//    Torsten Kuepper based on code from
+//    Aniruddha Gokhale & Carlos O'Ryan (cdr_op_ci.cpp)
+//
+// ================================================================
+
+ACE_RCSID (be_visitor_valuetype_fwd, 
+           cdr_op_ci, 
+           "$Id$")
 
 // ****************************************************************
 // Interface visitor for generating CDR operator declarations in the
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/valuetype_fwd_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/valuetype_fwd_ch.cpp
index 55588667915..d5c8ecd8e5c 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/valuetype_fwd_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/valuetype_fwd_ch.cpp
@@ -1,17 +1,28 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    valuetype_fwd_ch.cpp
- *
- *  $Id$
- *
- *  Visitor generating code for ValueTypeFwd node in the client header.
- *
- *
- *  @author Boris Kolpackov <bosk@ipmce.ru> based on code from  Torsten Kuepper based on code from Aniruddha Gokhale (interface_fwd_ch.cpp)
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuetype_fwd_ch.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for ValueTypeFwd node in the client header.
+//
+// = AUTHOR
+//    Boris Kolpackov <bosk@ipmce.ru>
+//    based on code from  Torsten Kuepper
+//    based on code from Aniruddha Gokhale (interface_fwd_ch.cpp)
+//
+// ============================================================================
 
+ACE_RCSID (be_visitor_valuetype_fwd, 
+           valuetype_fwd_ch, 
+           "$Id$")
 
 be_visitor_valuetype_fwd_ch::be_visitor_valuetype_fwd_ch (
     be_visitor_context *ctx
diff --git a/TAO/TAO_IDL/be/be_visitor_xplicit_pre_proc.cpp b/TAO/TAO_IDL/be/be_visitor_xplicit_pre_proc.cpp
deleted file mode 100644
index 371d63fc4a7..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_xplicit_pre_proc.cpp
+++ /dev/null
@@ -1,966 +0,0 @@
-/**
- *  @file   be_visitor_xplicit_pre_proc.cpp
- *
- *  $Id$
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
-#include "be_visitor_xplicit_pre_proc.h"
-#include "be_home.h"
-#include "be_component.h"
-#include "be_interface.h"
-#include "be_operation.h"
-#include "be_argument.h"
-#include "be_finder.h"
-#include "be_exception.h"
-#include "be_field.h"
-#include "be_valuebox.h"
-#include "be_eventtype.h"
-#include "be_typedef.h"
-#include "be_predefined_type.h"
-#include "be_enum.h"
-#include "be_enum_val.h"
-#include "be_union.h"
-#include "be_union_fwd.h"
-#include "be_union_branch.h"
-#include "be_attribute.h"
-#include "be_constant.h"
-#include "be_array.h"
-#include "be_sequence.h"
-#include "be_string.h"
-#include "be_native.h"
-
-#include "ast_module.h"
-
-#include "utl_namelist.h"
-#include "utl_labellist.h"
-#include "utl_exprlist.h"
-
-#include "fe_obv_header.h"
-#include "nr_extern.h"
-#include "global_extern.h"
-
-be_visitor_xplicit_pre_proc::be_visitor_xplicit_pre_proc (
-      be_visitor_context *ctx)
-  : be_visitor_ccm_pre_proc (ctx),
-    xplicit_ (0),
-    type_holder_ (0),
-    ref_type_ (false)
-{
-}
-
-be_visitor_xplicit_pre_proc::~be_visitor_xplicit_pre_proc (void)
-{
-}
-
-int
-be_visitor_xplicit_pre_proc::visit_home (be_home *node)
-{
-  UTL_NameList *parent_list = this->compute_inheritance (node);
-
-  FE_InterfaceHeader header (0,
-                             parent_list,
-                             false,
-                             false,
-                             true);
-
-  // We're at global scope here so we need to fool the scope stack
-  // for a minute so the correct repo id can be calculated at
-  // interface construction time.
-  AST_Module *m =
-    AST_Module::narrow_from_scope (node->defined_in ());
-
-  idl_global->scopes ().push (m);
-
-  UTL_ScopedName *explicit_name =
-    this->create_scoped_name (
-      "",
-      node->original_local_name ()->get_string (),
-      "Explicit",
-      m);
-
-  be_interface *i = 0;
-  ACE_NEW_RETURN (i,
-                  be_interface (explicit_name,
-                                header.inherits (),
-                                header.n_inherits (),
-                                header.inherits_flat (),
-                                header.n_inherits_flat (),
-                                false,
-                                false),
-                  0);
-
-  (void) m->be_add_interface (i);
-
-  i->original_interface (node);
-
-  idl_global->scopes ().push (i);
-
-  if (this->visit_scope (node) != 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("be_visitor_xplicit_pre_proc::")
-                         ACE_TEXT ("visit_home - code generation ")
-                         ACE_TEXT ("for home scope failed\n")),
-                        0);
-    }
-
-  // Through with the explicit interface scope
-  idl_global->scopes ().pop ();
-
-  explicit_name->destroy ();
-  delete explicit_name;
-  explicit_name = 0;
-
-  header.destroy ();
-
-  parent_list->destroy ();
-  delete parent_list;
-  parent_list = 0;
-
-  // Through with the scope containing the home.
-  idl_global->scopes ().pop ();
-
-  this->xplicit_ = i;
-
-  return 0;
-}
-
-int
-be_visitor_xplicit_pre_proc::visit_operation (be_operation *node)
-{
-  UTL_ScopedName sn (node->local_name (), 0);
-
-  be_operation *home_op = 0;
-  ACE_NEW_RETURN (home_op,
-                  be_operation (node->return_type (),
-                                node->flags (),
-                                &sn,
-                                false,
-                                false),
-                  -1);
-
-  home_op->be_add_exceptions (node->exceptions ());
-
-  idl_global->scopes ().top ()->add_to_scope (home_op);
-  idl_global->scopes ().push (home_op);
-
-  if (this->visit_scope (node) != 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("be_visitor_xplicit_pre_proc::")
-                         ACE_TEXT ("visit_operation - code generation ")
-                         ACE_TEXT ("for scope failed\n")),
-                        -1);
-    }
-
-  idl_global->scopes ().pop ();
-
-  return 0;
-}
-
-int
-be_visitor_xplicit_pre_proc::visit_argument (be_argument *node)
-{
-  UTL_ScopedName sn (node->local_name (), 0);
-
-  this->ref_type_ = true;
-
-  be_type *ft =
-    be_type::narrow_from_decl (node->field_type ());
-
-  if (ft->accept (this) != 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("be_visitor_xplicit_pre_proc::")
-                         ACE_TEXT ("visit_argument - code generation ")
-                         ACE_TEXT ("for arg type failed\n")),
-                        -1);
-    }
-
-  this->ref_type_ = false;
-
-  AST_Type *arg_type =
-    AST_Type::narrow_from_decl (this->type_holder_);
-
-  be_argument *added_arg = 0;
-  ACE_NEW_RETURN (added_arg,
-                  be_argument (node->direction (),
-                               arg_type,
-                               &sn),
-                  -1);
-
-  idl_global->scopes ().top ()->add_to_scope (added_arg);
-
-  return 0;
-}
-
-int
-be_visitor_xplicit_pre_proc::visit_factory (be_factory *node)
-{
-  UTL_ScopedName sn (node->local_name (), 0);
-
-  AST_Home *f_home =
-    AST_Home::narrow_from_scope (node->defined_in ());
-
-  be_operation *added_factory = 0;
-  ACE_NEW_RETURN (added_factory,
-                  be_operation (f_home->managed_component (),
-                                AST_Operation::OP_noflags,
-                                &sn,
-                                false,
-                                false),
-                  -1);
-
-  idl_global->scopes ().top ()->add_to_scope (added_factory);
-  idl_global->scopes ().push (added_factory);
-
-  if (this->visit_scope (node) != 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("be_visitor_xplicit_pre_proc::")
-                         ACE_TEXT ("visit_factory - code generation ")
-                         ACE_TEXT ("for scope failed\n")),
-                        -1);
-    }
-
-  idl_global->scopes ().pop ();
-
-  return 0;
-}
-
-int
-be_visitor_xplicit_pre_proc::visit_finder (be_finder *node)
-{
-  UTL_ScopedName sn (node->local_name (), 0);
-
-  AST_Home *f_home =
-    AST_Home::narrow_from_scope (node->defined_in ());
-
-  be_operation *added_finder = 0;
-  ACE_NEW_RETURN (added_finder,
-                  be_operation (f_home->managed_component (),
-                                AST_Operation::OP_noflags,
-                                &sn,
-                                false,
-                                false),
-                  -1);
-
-  idl_global->scopes ().top ()->add_to_scope (added_finder);
-  idl_global->scopes ().push (added_finder);
-
-  if (this->visit_scope (node) != 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("be_visitor_xplicit_pre_proc::")
-                         ACE_TEXT ("visit_finder - code generation ")
-                         ACE_TEXT ("for scope failed\n")),
-                        -1);
-    }
-
-  idl_global->scopes ().pop ();
-
-  return 0;
-}
-
-int
-be_visitor_xplicit_pre_proc::visit_interface (be_interface *node)
-{
-  // Interface can't be declared inside a home, no need to call
-  // check_and_store().
-  this->type_holder_ = node;
-
-  return 0;
-}
-
-int
-be_visitor_xplicit_pre_proc::visit_valuebox (be_valuebox *node)
-{
-  // Valuebox can't be declared inside a home, no need to call
-  // check_and_store().
-  this->type_holder_ = node;
-
-  return 0;
-}
-
-int
-be_visitor_xplicit_pre_proc::visit_valuetype (be_valuetype *node)
-{
-  // Valuetype can't be declared inside a home, no need to call
-  // check_and_store().
-  this->type_holder_ = node;
-
-  return 0;
-}
-
-int
-be_visitor_xplicit_pre_proc::visit_eventtype (be_eventtype *node)
-{
-  // Eventtype can't be declared inside a home, no need to call
-  // check_and_store().
-  this->type_holder_ = node;
-
-  return 0;
-}
-
-int
-be_visitor_xplicit_pre_proc::visit_structure (be_structure *node)
-{
-  if (this->ref_type_)
-    {
-      this->check_and_store (node);
-      return 0;
-    }
-
-  UTL_ScopedName sn (node->local_name (), 0);
-
-  be_structure *added_struct = 0;
-  ACE_NEW_RETURN (added_struct,
-                  be_structure (&sn,
-                                false,
-                                false),
-                  -1);
-
-  idl_global->scopes ().top ()->add_to_scope (added_struct);
-  idl_global->scopes ().push (added_struct);
-
-  if (this->visit_scope (node) != 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("be_visitor_xplicit_pre_proc::")
-                         ACE_TEXT ("visit_structure - code generation ")
-                         ACE_TEXT ("for scope failed\n")),
-                        -1);
-    }
-
-  return 0;
-}
-
-int
-be_visitor_xplicit_pre_proc::visit_structure_fwd (
-  be_structure_fwd *node)
-{
-  UTL_ScopedName sn (node->local_name (), 0);
-
-  be_structure *dummy = 0;
-  ACE_NEW_RETURN (dummy,
-                  be_structure (&sn,
-                                false,
-                                false),
-                  -1);
-
-  be_structure_fwd *added_struct_fwd = 0;
-  ACE_NEW_RETURN (added_struct_fwd,
-                  be_structure_fwd (dummy,
-                                    &sn),
-                  -1);
-
-  dummy->fwd_decl (added_struct_fwd);
-
-  idl_global->scopes ().top ()->add_to_scope (added_struct_fwd);
-
-  return 0;
-}
-
-int
-be_visitor_xplicit_pre_proc::visit_exception (be_exception *node)
-{
-  UTL_ScopedName sn (node->local_name (), 0);
-
-  be_exception *added_excep = 0;
-  ACE_NEW_RETURN (added_excep,
-                  be_exception (&sn,
-                                false,
-                                false),
-                  -1);
-
-  idl_global->scopes ().top ()->add_to_scope (added_excep);
-  idl_global->scopes ().push (added_excep);
-
-  if (this->visit_scope (node) != 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("be_visitor_xplicit_pre_proc::")
-                         ACE_TEXT ("visit_exception - code generation ")
-                         ACE_TEXT ("for scope failed\n")),
-                        -1);
-    }
-
-  idl_global->scopes ().pop ();
-
-  return 0;
-}
-
-int
-be_visitor_xplicit_pre_proc::visit_enum (be_enum *node)
-{
-  if (this->ref_type_)
-    {
-      this->check_and_store (node);
-      return 0;
-    }
-
-  UTL_ScopedName sn (node->local_name (), 0);
-
-  be_enum *added_enum = 0;
-  ACE_NEW_RETURN (added_enum,
-                  be_enum (&sn,
-                           false,
-                           false),
-                  -1);
-
-  idl_global->scopes ().top ()->add_to_scope (added_enum);
-  idl_global->scopes ().push (added_enum);
-
-  if (this->visit_scope (node) != 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("be_visitor_xplicit_pre_proc::")
-                         ACE_TEXT ("visit_enum - code generation ")
-                         ACE_TEXT ("for scope failed\n")),
-                        -1);
-    }
-
-  return 0;
-}
-
-int
-be_visitor_xplicit_pre_proc::visit_field (be_field *node)
-{
-  this->ref_type_ = true;
-
-  be_type *ft =
-    be_type::narrow_from_decl (node->field_type ());
-
-  if (ft->accept (this) != 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("be_visitor_xplicit_pre_proc::")
-                         ACE_TEXT ("visit_field - code generation ")
-                         ACE_TEXT ("for field type failed\n")),
-                        -1);
-    }
-
-  this->ref_type_ = false;
-
-  UTL_ScopedName sn (node->local_name (), 0);
-  AST_Type *field_type =
-    AST_Type::narrow_from_decl (this->type_holder_);
-
-  be_field *added_field = 0;
-  ACE_NEW_RETURN (added_field,
-                  be_field (field_type,
-                            &sn,
-                            node->visibility ()),
-                  -1);
-
-  idl_global->scopes ().top ()->add_to_scope (added_field);
-
-  return 0;
-}
-
-int
-be_visitor_xplicit_pre_proc::visit_attribute (be_attribute *node)
-{
-  be_type *ft =
-    be_type::narrow_from_decl (node->field_type ());
-
-  this->ref_type_ = true;
-
-  if (ft->accept (this) != 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("be_visitor_xplicit_pre_proc::")
-                         ACE_TEXT ("visit_attribute - code generation ")
-                         ACE_TEXT ("for attribute type failed\n")),
-                        -1);
-    }
-
-  this->ref_type_ = false;
-
-  AST_Type *attr_type =
-    AST_Type::narrow_from_decl (this->type_holder_);
-
-  UTL_ScopedName sn (node->local_name (), 0);
-
-  be_attribute *added_attr = 0;
-  ACE_NEW_RETURN (added_attr,
-                  be_attribute (node->readonly (),
-                                attr_type,
-                                &sn,
-                                false,
-                                false),
-                  -1);
-
-  idl_global->scopes ().top ()->add_to_scope (added_attr);
-
-  return 0;
-}
-
-int
-be_visitor_xplicit_pre_proc::visit_union (be_union *node)
-{
-  if (this->ref_type_)
-    {
-      this->check_and_store (node);
-      return 0;
-    }
-
-  be_type *ud =
-    be_type::narrow_from_decl (node->disc_type ());
-
-  this->ref_type_ = true;
-
-  if (ud->accept (this) != 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("be_visitor_xplicit_pre_proc::")
-                         ACE_TEXT ("visit_union - code generation ")
-                         ACE_TEXT ("for discriminator type failed\n")),
-                        -1);
-    }
-
-  this->ref_type_ = false;
-
-  AST_ConcreteType *disc =
-    AST_ConcreteType::narrow_from_decl (this->type_holder_);
-
-  UTL_ScopedName sn (node->local_name (), 0);
-
-  be_union *added_union = 0;
-  ACE_NEW_RETURN (added_union,
-                  be_union (disc,
-                            &sn,
-                            false,
-                            false),
-                  -1);
-
-  idl_global->scopes ().top ()->add_to_scope (added_union);
-  idl_global->scopes ().push (added_union);
-
-  if (this->visit_scope (node) != 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("be_visitor_xplicit_pre_proc::")
-                         ACE_TEXT ("visit_union - code generation ")
-                         ACE_TEXT ("for scope failed\n")),
-                        -1);
-    }
-
-  return 0;
-}
-
-int
-be_visitor_xplicit_pre_proc::visit_union_fwd (be_union_fwd *node)
-{
-  UTL_ScopedName sn (node->local_name (), 0);
-
-  be_union *dummy = 0;
-  ACE_NEW_RETURN (dummy,
-                  be_union (0,
-                            &sn,
-                            false,
-                            false),
-                  -1);
-
-  be_union_fwd *added_union_fwd = 0;
-  ACE_NEW_RETURN (added_union_fwd,
-                  be_union_fwd (dummy,
-                                &sn),
-                  -1);
-
-  dummy->fwd_decl (added_union_fwd);
-
-  idl_global->scopes ().top ()->add_to_scope (added_union_fwd);
-
-  return 0;
-}
-
-int
-be_visitor_xplicit_pre_proc::visit_union_branch (
-  be_union_branch *node)
-{
-  be_type *ft =
-    be_type::narrow_from_decl (node->field_type ());
-
-  this->ref_type_ = true;
-
-  if (ft->accept (this) != 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("be_visitor_xplicit_pre_proc::")
-                         ACE_TEXT ("visit_union_branch - code generation ")
-                         ACE_TEXT ("for branch type failed\n")),
-                        -1);
-    }
-
-  this->ref_type_ = false;
-
-  AST_Type *bt =
-    AST_Type::narrow_from_decl (this->type_holder_);
-
-  UTL_ScopedName sn (node->local_name (), 0);
-
-  // The union branch owns its label list so we have to copy it.
-  UTL_LabelList *ll = node->labels ()->copy ();
-
-  be_union_branch *added_branch = 0;
-  ACE_NEW_RETURN (added_branch,
-                  be_union_branch (ll, bt, &sn),
-                  -1);
-
-  // fe_add_union_branch() does necessary things besides calling
-  // add_to_scope() so we need to reuse it.
-
-  be_union *u =
-    be_union::narrow_from_scope (idl_global->scopes ().top ());
-
-  u->be_add_union_branch (added_branch);
-
-  return 0;
-}
-
-int
-be_visitor_xplicit_pre_proc::visit_union_label (be_union_label *)
-{
-  return 0;
-}
-
-int
-be_visitor_xplicit_pre_proc::visit_constant (be_constant *node)
-{
-  if (this->ref_type_)
-    {
-      this->check_and_store (node);
-      return 0;
-    }
-
-  AST_Expression *new_v = 0;
-  ACE_NEW_RETURN (new_v,
-                  AST_Expression (node->constant_value (),
-                                  node->et ()),
-                  -1);
-
-  UTL_ScopedName sn (node->local_name (), 0);
-
-  be_constant *added_const = 0;
-  ACE_NEW_RETURN (added_const,
-                  be_constant (node->et (),
-                               new_v,
-                               &sn),
-                  -1);
-
-  idl_global->scopes ().top ()->add_to_scope (added_const);
-
-  return 0;
-}
-
-int
-be_visitor_xplicit_pre_proc::visit_enum_val (be_enum_val *node)
-{
-  if (this->ref_type_)
-    {
-      this->type_holder_ = node;
-      return 0;
-    }
-
-  UTL_ScopedName sn (node->local_name (), 0);
-
-  be_enum_val *added_enum_val = 0;
-  ACE_NEW_RETURN (added_enum_val,
-                  be_enum_val (node->constant_value ()->ev ()->u.ulval,
-                               &sn),
-                  -1);
-
-  idl_global->scopes ().top ()->add_to_scope (added_enum_val);
-
-  return 0;
-}
-
-int
-be_visitor_xplicit_pre_proc::visit_array (be_array *node)
-{
-  be_type *bt =
-    be_type::narrow_from_decl (node->base_type ());
-
-  bool tmp = this->ref_type_;
-  this->ref_type_ = true;
-
-  if (bt->accept (this) != 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("be_visitor_xplicit_pre_proc::")
-                         ACE_TEXT ("visit_array - code generation ")
-                         ACE_TEXT ("for base type failed\n")),
-                        -1);
-    }
-
-  this->ref_type_ = tmp;
-
-  AST_Expression *v = 0;
-  UTL_ExprList *v_list = 0;
-
-  for (ACE_CDR::ULong i = 0; i < node->n_dims (); ++i)
-    {
-      ACE_NEW_RETURN (v,
-                      AST_Expression (node->dims ()[i],
-                                      AST_Expression::EV_ulong),
-                      -1);
-
-      UTL_ExprList *el = 0;
-      ACE_NEW_RETURN (el,
-                      UTL_ExprList (v, 0),
-                      -1);
-
-      if (v_list == 0)
-        {
-          v_list = el;
-        }
-      else
-        {
-          v_list->nconc (el);
-        }
-    }
-
-  UTL_ScopedName sn (node->local_name (), 0);
-
-  be_array *added_array = 0;
-  ACE_NEW_RETURN (added_array,
-                  be_array (&sn,
-                            node->n_dims (),
-                            v_list,
-                            false,
-                            false),
-                  -1);
-
-  // No need to add this new node to any scope - it's anonymous
-  // and owned by the node that references it.
-
-  v_list->destroy ();
-  delete v_list;
-  v_list = 0;
-
-  AST_Type *base_type =
-    AST_Type::narrow_from_decl (this->type_holder_);
-
-  added_array->set_base_type (base_type);
-
-  this->type_holder_ = added_array;
-
-  return 0;
-}
-
-int
-be_visitor_xplicit_pre_proc::visit_sequence (be_sequence *node)
-{
-  be_type *bt =
-    be_type::narrow_from_decl (node->base_type ());
-
-  bool tmp = this->ref_type_;
-  this->ref_type_ = true;
-
-  if (bt->accept (this) != 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("be_visitor_xplicit_pre_proc::")
-                         ACE_TEXT ("visit_sequence - code generation ")
-                         ACE_TEXT ("for element type failed\n")),
-                        -1);
-    }
-
-  this->ref_type_ = tmp;
-
-  AST_Expression *v = node->max_size ();
-
-  AST_Expression *bound = 0;
-  ACE_NEW_RETURN (bound,
-                  AST_Expression (v,
-                                  AST_Expression::EV_ulong),
-                  -1);
-
-  Identifier id ("sequence");
-  UTL_ScopedName sn (&id, 0);
-
-  AST_Type *ft =
-    AST_Type::narrow_from_decl (this->type_holder_);
-
-  ACE_NEW_RETURN (this->type_holder_,
-                  be_sequence (bound,
-                               ft,
-                               &sn,
-                               false,
-                               false),
-                  -1);
-
-  // No need to add this new node to any scope - it's anonymous
-  // and owned by the node that references it.
-
-  return 0;
-}
-
-int
-be_visitor_xplicit_pre_proc::visit_string (be_string *node)
-{
-  if (this->ref_type_)
-    {
-      this->check_and_store (node);
-      return 0;
-    }
-
-  AST_Expression *b = node->max_size ();
-
-  if (b->ev ()->u.ulval == 0)
-    {
-      this->type_holder_ = node;
-      return 0;
-    }
-
-  AST_Expression *bound = 0;
-  ACE_NEW_RETURN (bound,
-                  AST_Expression (b,
-                                  AST_Expression::EV_ulong),
-                  -1);
-
-  Identifier id ("string");
-  UTL_ScopedName sn (&id, 0);
-
-  ACE_NEW_RETURN (this->type_holder_,
-                  be_string (AST_Decl::NT_string,
-                             &sn,
-                             bound,
-                             node->width ()),
-                  -1);
-
-  return 0;
-}
-
-int
-be_visitor_xplicit_pre_proc::visit_typedef (be_typedef *node)
-{
-  if (this->ref_type_)
-    {
-      this->check_and_store (node);
-      return 0;
-    }
-
-  be_type *t =
-    be_type::narrow_from_decl (node->field_type ());
-
-  this->ref_type_ = true;
-
-  if (t->accept (this) != 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("be_visitor_xplicit_pre_proc::")
-                         ACE_TEXT ("visit_typedef - code generation ")
-                         ACE_TEXT ("for base type failed\n")),
-                        -1);
-    }
-
-  this->ref_type_ = false;
-
-  UTL_ScopedName sn (node->local_name (), 0);
-  AST_Type *bt =
-    AST_Type::narrow_from_decl (this->type_holder_);
-
-  be_typedef *added_typedef = 0;
-  ACE_NEW_RETURN (added_typedef,
-                  be_typedef (bt,
-                              &sn,
-                              false,
-                              false),
-                  -1);
-
-  idl_global->scopes ().top ()->add_to_scope (added_typedef);
-
-  return 0;
-}
-
-int
-be_visitor_xplicit_pre_proc::visit_native (be_native *node)
-{
-  if (this->ref_type_)
-    {
-      this->check_and_store (node);
-      return 0;
-    }
-
-  UTL_ScopedName sn (node->local_name (), 0);
-
-  be_native *added_native = 0;
-  ACE_NEW_RETURN (added_native,
-                  be_native (&sn),
-                  -1);
-
-  idl_global->scopes ().top ()->add_to_scope (added_native);
-
-  return 0;
-}
-
-int
-be_visitor_xplicit_pre_proc::visit_predefined_type (
-  be_predefined_type *node)
-{
-  this->type_holder_ = node;
-
-  return 0;
-}
-
-be_interface *
-be_visitor_xplicit_pre_proc::xplicit (void) const
-{
-  return this->xplicit_;
-}
-
-void
-be_visitor_xplicit_pre_proc::check_and_store (AST_Decl *node)
-{
-  UTL_ScopedName *tmpl_tail =
-    this->xplicit_iface_rel_name (node);
-
-  if (tmpl_tail != 0)
-    {
-      AST_Decl *d =
-        idl_global->scopes ().top ()->lookup_by_name (
-          tmpl_tail,
-          true);
-
-      this->type_holder_ = d;
-
-      tmpl_tail->destroy ();
-      delete tmpl_tail;
-      tmpl_tail = 0;
-    }
-  else
-    {
-      this->type_holder_ = node;
-    }
-}
-
-UTL_ScopedName *
-be_visitor_xplicit_pre_proc::xplicit_iface_rel_name (AST_Decl *d)
-{
-  AST_Decl *tmp = d;
-  ACE_CString name (d->full_name ());
-
-  while (tmp != 0)
-    {
-      if (be_home::narrow_from_decl (tmp) != 0)
-        {
-          ACE_CString head (tmp->local_name ()->get_string ());
-
-          ACE_CString::size_type start = name.find (head) + 2;
-
-          ACE_CString tail (name.substr (start + head.length ()));
-
-          return idl_global->string_to_scoped_name (tail.c_str ());
-        }
-
-      tmp = ScopeAsDecl (tmp->defined_in ());
-    }
-
-  return 0;
-}
-
diff --git a/TAO/TAO_IDL/be_include/be_argument.h b/TAO/TAO_IDL/be_include/be_argument.h
index 369b6fc3587..ccfe3e72d72 100644
--- a/TAO/TAO_IDL/be_include/be_argument.h
+++ b/TAO/TAO_IDL/be_include/be_argument.h
@@ -1,18 +1,23 @@
-
-//=============================================================================
-/**
- *  @file    be_argument.h
- *
- *  $Id$
- *
- *  Extension of class AST_Argument that provides additional means for C++
- *  mapping.
- *
- *
- *  @author Copyright 1994-1995 by Sun Microsystems
- *  @author Inc. and Aniruddha Gokhale
- */
-//=============================================================================
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_argument.h
+//
+// = DESCRIPTION
+//    Extension of class AST_Argument that provides additional means for C++
+//    mapping.
+//
+// = AUTHOR
+//    Copyright 1994-1995 by Sun Microsystems, Inc.
+//    and
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef BE_ARGUMENT_H
 #define BE_ARGUMENT_H
@@ -27,6 +32,10 @@ class be_argument : public virtual AST_Argument,
                     public virtual be_decl
 {
 public:
+  // Default constructor.
+  be_argument (void);
+
+  // Constructor.
   be_argument (AST_Argument::Direction d,
                AST_Type *ft,
                UTL_ScopedName *n);
@@ -38,6 +47,7 @@ public:
   virtual void destroy (void);
 
   // Narrowing.
+
   DEF_NARROW_FROM_DECL (be_argument);
 };
 
diff --git a/TAO/TAO_IDL/be_include/be_array.h b/TAO/TAO_IDL/be_include/be_array.h
index 4850ebe3a7f..333019a7d7d 100644
--- a/TAO/TAO_IDL/be_include/be_array.h
+++ b/TAO/TAO_IDL/be_include/be_array.h
@@ -1,19 +1,23 @@
+// $Id$
 
-//=============================================================================
-/**
- *  @file    be_array.h
- *
- *  $Id$
- *
- *  Extension of class AST_Array that provides additional means for C++
- *  mapping.
- *
- *
- *  @author Copyright 1994-1995 by Sun Microsystems
- *  @author Inc. and Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_array.h
+//
+// = DESCRIPTION
+//    Extension of class AST_Array that provides additional means for C++
+//    mapping.
+//
+// = AUTHOR
+//    Copyright 1994-1995 by Sun Microsystems, Inc.
+//    and
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef BE_ARRAY_H
 #define BE_ARRAY_H
@@ -29,6 +33,8 @@ class be_array : public virtual AST_Array,
                  public virtual be_type
 {
 public:
+  be_array (void);
+
   be_array (UTL_ScopedName *n,
             unsigned long ndims,
             UTL_ExprList *dims,
@@ -37,18 +43,18 @@ public:
 
   ~be_array (void);
 
-  /// Generate dimensions. If slice == 1, generate dimensions for the slice
-  /// definition.
   int gen_dimensions (TAO_OutStream *os,
                       unsigned short slice = 0);
+  // Generate dimensions. If slice == 1, generate dimensions for the slice
+  // definition.
   
-  /// Overridden from class be_type.
   virtual void gen_ostream_operator (TAO_OutStream *os,
                                      bool use_underscore);
   virtual void gen_member_ostream_operator (TAO_OutStream *os,
                                             const char *instance_name,
                                             bool use_underscore,
                                             bool accessor);
+  // Overridden from class be_type.
 
   // Visiting.
   virtual int accept (be_visitor *visitor);
@@ -61,8 +67,8 @@ public:
   DEF_NARROW_FROM_DECL (be_array);
 
 protected:
-  /// Create a name for us.
   virtual int create_name (void);
+  // Create a name for us.
 
   virtual void compute_tc_name (void);
 };
diff --git a/TAO/TAO_IDL/be_include/be_attribute.h b/TAO/TAO_IDL/be_include/be_attribute.h
index 9fbbe54956d..07273471dc5 100644
--- a/TAO/TAO_IDL/be_include/be_attribute.h
+++ b/TAO/TAO_IDL/be_include/be_attribute.h
@@ -1,18 +1,23 @@
-
-//=============================================================================
-/**
- *  @file    be_attribute.h
- *
- *  $Id$
- *
- *  Extension of class AST_Attribute that provides additional means for C++
- *  mapping.
- *
- *
- *  @author Copyright 1994-1995 by Sun Microsystems
- *  @author Inc. and Aniruddha Gokhale
- */
-//=============================================================================
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_attribute.h
+//
+// = DESCRIPTION
+//    Extension of class AST_Attribute that provides additional means for C++
+//    mapping.
+//
+// = AUTHOR
+//    Copyright 1994-1995 by Sun Microsystems, Inc.
+//    and
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef BE_ATTRIBUTE_H
 #define BE_ATTRIBUTE_H
@@ -28,6 +33,8 @@ class be_attribute : public virtual AST_Attribute,
                      public virtual be_decl
 {
 public:
+  be_attribute (void);
+
   be_attribute (bool ro,
                 AST_Type *ft,
                 UTL_ScopedName *n,
@@ -40,40 +47,36 @@ public:
   // Visiting.
   virtual int accept (be_visitor *visitor);
 
-  /**
-   * Set the get operation strategy.
-   * Note, that it is not actually used, the operation
-   * made out of the attribute is going to copy it.
-   */
   be_operation_strategy *set_get_strategy (
       be_operation_strategy *new_strategy
     );
+  // Set the get operation strategy.
+  // Note, that it is not actually used, the operation
+  // made out of the attribute is going to copy it.
 
-  /**
-   * Set the set operation strategy.
-   * Note, that it is not actually used, the operation
-   * made out of the attribute is going to copy it.
-   */
   be_operation_strategy *set_set_strategy (
       be_operation_strategy *new_strategy
     );
+  // Set the set operation strategy.
+  // Note, that it is not actually used, the operation
+  // made out of the attribute is going to copy it.
 
-  /// Retrieve the underlying get_operation strategy.
   be_operation_strategy *get_get_strategy (void);
+  // Retrieve the underlying get_operation strategy.
 
-  /// Retrieve the underlying set_operation strategy.
   be_operation_strategy *get_set_strategy (void);
+  // Retrieve the underlying set_operation strategy.
 
-  /// Cleanup.
   virtual void destroy (void);
+  // Cleanup.
 
-  /// Sets the original attribute from which this one was created,
-  /// applies only to implied IDL.
   void original_attribute (be_attribute *original_attribute);
+  // Sets the original attribute from which this one was created,
+  // applies only to implied IDL.
 
-  /// Returns the original attribute from which this one was created,
-  /// applies only to implied IDL
   be_attribute *original_attribute ();
+  // Returns the original attribute from which this one was created,
+  // applies only to implied IDL
 
   // Narrowing
 
@@ -82,12 +85,10 @@ public:
 private:
   be_operation_strategy *get_strategy_;
 
-  /**
-   * Member for holding the strategy for covering
-   * differences between various operations, e.g. sendc_, raise_
-   * operations in the AMI spec.
-   */
   be_operation_strategy *set_strategy_;
+  // Member for holding the strategy for covering
+  // differences between various operations, e.g. sendc_, raise_
+  // operations in the AMI spec.
 
   be_attribute *original_attribute_;
 };
diff --git a/TAO/TAO_IDL/be_include/be_codegen.h b/TAO/TAO_IDL/be_include/be_codegen.h
index fc8cb68c16c..f939a1763ad 100644
--- a/TAO/TAO_IDL/be_include/be_codegen.h
+++ b/TAO/TAO_IDL/be_include/be_codegen.h
@@ -1,18 +1,22 @@
 // -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    be_codegen.h
- *
- *  $Id$
- *
- * The Code generator class
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+
+// ================================================================
+//
+// = LIBRARY
+//    TAO_IDL_BE
+//
+// = FILENAME
+//    be_codegen.h
+//
+// = DESCRIPTION
+//   The Code generator class
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ================================================================
 
 #ifndef TAO_BE_CODEGEN_H
 #define TAO_BE_CODEGEN_H
@@ -27,16 +31,15 @@ class be_visitor_context;
 class be_visitor;
 class be_decl;
 
-/**
- * @class TAO_CodeGen
- *
- * @brief TAO_CodeGen
- *
- * Holds global parameters for the Back End and
- * generates the C++ mapping.
- */
 class TAO_IDL_BE_Export TAO_CodeGen
 {
+  // = TITLE
+  //    TAO_CodeGen
+  //
+  // = DESCRIPTION
+  //    Holds global parameters for the Back End and
+  //    generates the C++ mapping.
+  //
 public:
 
   // Define all the code generation states.
@@ -144,8 +147,6 @@ public:
       TAO_ROOT_SVS,
       TAO_ROOT_EXH,
       TAO_ROOT_EXS,
-      TAO_ROOT_CNH,
-      TAO_ROOT_CNS,
       TAO_ROOT_EX_IDL,
       TAO_ROOT_ANY_OP_CH,
       TAO_ROOT_ANY_OP_CS,
@@ -222,66 +223,64 @@ public:
       TAO_SUB_STATE_UNKNOWN
     };
 
-  /// Constructor
   TAO_CodeGen (void);
+  // Constructor
 
-  /// Destructor
   ~TAO_CodeGen (void);
+  // Destructor
 
-  /// Factory that makes the right visitor based on the contex. This
-  /// delegates the task to its factory data member.
   be_visitor *make_visitor (be_visitor_context *);
+  // Factory that makes the right visitor based on the contex. This
+  // delegates the task to its factory data member.
 
-  /// Generate the C++ mapping for CORBA IDL.
   int gen_cplusplus_mapping (void);
+  // Generate the C++ mapping for CORBA IDL.
 
-  /// Set the client header stream.
   int start_client_header (const char *fname);
+  // Set the client header stream.
 
-  /// Set the client inline stream.
   int start_client_inline (const char *fname);
+  // Set the client inline stream.
 
-  /// Set the client stub stream.
   int start_client_stubs (const char *fname);
+  // Set the client stub stream.
 
-  /// Set the server header stream.
   int start_server_header (const char *fname);
+  // Set the server header stream.
 
-  /// Set the implementation header stream.
   int start_implementation_header (const char *fname);
+  // Set the implementation header stream.
 
-  /// Set the implementation skeleton stream.
   int start_implementation_skeleton (const char *fname);
+  // Set the implementation skeleton stream.
 
-  /// Set the server template header stream.
   int start_server_template_header (const char *fname);
+  // Set the server template header stream.
 
-  /// Set the server inline stream.
   int start_server_inline (const char *fname);
+  // Set the server inline stream.
 
-  /// Set the server skeletons stream.
   int start_server_skeletons (const char *fname);
+  // Set the server skeletons stream.
 
-  /// Set the server template skeletons stream.
   int start_server_template_skeletons (const char *fname);
+  // Set the server template skeletons stream.
 
-  /// Set the anyop header stream.
   int start_anyop_header (const char *fname);
+  // Set the anyop header stream.
 
-  /// Set the anyop source stream.
   int start_anyop_source (const char *fname);
+  // Set the anyop source stream.
   
   int start_ciao_svnt_header (const char *fname);
   int start_ciao_svnt_source (const char *fname);
   int start_ciao_exec_header (const char *fname);
   int start_ciao_exec_source (const char *fname);
   int start_ciao_exec_idl (const char *fname);
-  int start_ciao_conn_header (const char *fname);
-  int start_ciao_conn_source (const char *fname);
 
-  /// Generate code at the end such as the <<= and >>= operators along
-  /// with the ending #endif statement.
   int end_client_header (void);
+  // Generate code at the end such as the <<= and >>= operators along
+  // with the ending #endif statement.
 
   /// Generate necessary code at end of client inline file.
   void end_client_inline (void);
@@ -289,154 +288,142 @@ public:
   /// Generate necessary code at end of client stub file.
   void end_client_stubs (void);
 
-  /// Put a last #endif in the server header.
   int end_server_header (void);
+  // Put a last #endif in the server header.
 
   /// Generate necessary code at end of server inline file.
   void end_server_inline (void);
 
-  /// Put a last #endif in the server header.
   int end_implementation_header (const char *fname);
+  // Put a last #endif in the server header.
 
-  /// Put a last #endif in the server header.
   int end_implementation_skeleton (const char *fname);
+  // Put a last #endif in the server header.
 
-  /// Put a last #endif in the server template header.
   int end_server_template_header (void);
+  // Put a last #endif in the server template header.
 
-  /// Put a last #endif in the server skeletons.
   int end_server_template_skeletons (void);
+  // Put a last #endif in the server skeletons.
 
-  /// Put a last #endif in the server skeletons.
   int end_server_skeletons (void);
+  // Put a last #endif in the server skeletons.
 
-  /// Put a last #endif in the anyop header.
   int end_anyop_header (void);
+  // Put a last #endif in the anyop header.
 
-  /// Make sure we end with a newline.
   int end_anyop_source (void);
+  // Make sure we end with a newline.
   
   int end_ciao_svnt_header (void);
   int end_ciao_svnt_source (void);
   int end_ciao_exec_header (void);
   int end_ciao_exec_source (void);
   int end_ciao_exec_idl (void);
-  int end_ciao_conn_header (void);
-  int end_ciao_conn_source (void);
 
-  /// Get the client header stream.
   TAO_OutStream *client_header (void);
+  // Get the client header stream.
 
-  /// Get the client stubs stream.
   TAO_OutStream *client_stubs (void);
+  // Get the client stubs stream.
 
-  /// Get the client inline stream.
   TAO_OutStream *client_inline (void);
+  // Get the client inline stream.
 
-  /// get the server header stream.
   TAO_OutStream *server_header (void);
+  // get the server header stream.
 
-  /// Get the implementation header stream.
   TAO_OutStream *implementation_header (void);
+  // Get the implementation header stream.
 
-  /// Get the implementation skeleton stream.
   TAO_OutStream *implementation_skeleton (void);
+  // Get the implementation skeleton stream.
 
-  /// Get the server header template stream.
   TAO_OutStream *server_template_header (void);
+  // Get the server header template stream.
 
-  /// Get the server skeletons stream.
   TAO_OutStream *server_skeletons (void);
+  // Get the server skeletons stream.
 
-  /// Get the server template skeletons stream.
   TAO_OutStream *server_template_skeletons (void);
+  // Get the server template skeletons stream.
 
-  /// Get the server inline stream.
   TAO_OutStream *server_inline (void);
+  // Get the server inline stream.
 
-  /// Get the server template inline stream.
   TAO_OutStream *server_template_inline (void);
+  // Get the server template inline stream.
 
-  /// Get the anyop header stream.
   TAO_OutStream *anyop_header (void);
+  // Get the anyop header stream.
 
-  /// Get the anyop source stream.
   TAO_OutStream *anyop_source (void);
+  // Get the anyop source stream.
 
-  /// Get the CIAO servant header stream.
   TAO_OutStream *ciao_svnt_header (void);
+  // Get the CIAO servant header stream.
 
-  /// Get the CIAO servant source stream.
   TAO_OutStream *ciao_svnt_source (void);
+  // Get the CIAO servant source stream.
 
-  /// Get the CIAO executor impl header stream.
   TAO_OutStream *ciao_exec_header (void);
+  // Get the CIAO executor impl header stream.
 
-  /// Get the CIAO executor impl source stream.
   TAO_OutStream *ciao_exec_source (void);
+  // Get the CIAO executor impl source stream.
 
-  /// Get the CIAO executor IDL source stream.
   TAO_OutStream *ciao_exec_idl (void);
+  // Get the CIAO executor impl source stream.
 
-  /// Get the CIAO connector impl header stream.
-  TAO_OutStream *ciao_conn_header (void);
-
-  /// Get the CIAO connector impl source stream.
-  TAO_OutStream *ciao_conn_source (void);
-
-  /// Set the gperf input file stream.
   void gperf_input_stream (TAO_OutStream *gperf_input);
+  // Set the gperf input file stream.
 
-  /// Retrieve the gperf input stream being used.
   TAO_OutStream *gperf_input_stream (void);
+  // Retrieve the gperf input stream being used.
 
-  /// Set the gperf input file name.
   void gperf_input_filename (char *filename);
+  // Set the gperf input file name.
 
-  /**
-   * Retrieve the gperf input file name being used.
-   * Name of the temp file used to collect the input for gperf
-   * program. This is needed coz I do ACE_OS::open on this when I need
-   * ACE_HANDLE for the file instead FILE*.
-   */
   char *gperf_input_filename (void);
+  // Retrieve the gperf input file name being used.
+  // Name of the temp file used to collect the input for gperf
+  // program. This is needed coz I do ACE_OS::open on this when I need
+  // ACE_HANDLE for the file instead FILE*.
 
-  /// Set current out stream.
   void outstream (TAO_OutStream *os);
+  // Set current out stream.
 
-  /// Retrieve current out stream being used.
   TAO_OutStream *outstream (void);
+  // Retrieve current out stream being used.
 
-  /**
-   * Set the visitor factory  object. In this respect, this behaves as the
-   * "strategy" pattern in which the TAO_CodeGen object is the context and the
-   * visitor_factory is the strategy object.
-   */
   void config_visitor_factory (void);
+  // Set the visitor factory  object. In this respect, this behaves as the
+  // "strategy" pattern in which the TAO_CodeGen object is the context and the
+  // visitor_factory is the strategy object.
 
-  /// Pass info.
   void node (be_decl *n);
+  // Pass info.
 
-  /// Retrieve passed info.
   be_decl *node (void);
+  // Retrieve passed info.
 
-  /// Convert input string to all upcase.
   const char *upcase (const char *str);
+  // Convert input string to all upcase.
 
-  /// Pass along the #ident string, if any, from the IDL file.
   void gen_ident_string (TAO_OutStream *stream) const;
+  // Pass along the #ident string, if any, from the IDL file.
   
-  /// Generates the export files selected on the command line.
   void gen_export_files (void);
+  // Generates the export files selected on the command line.
 
-  /// Generate file include, with optional empty comment to 
-  /// short-circuit DOxygen.
   void gen_standard_include (TAO_OutStream *stream,
                              const char *included_file,
                              bool add_comment = false);
+  // Generate file include, with optional empty comment to 
+  // short-circuit DOxygen.
 
-  /// Cleanup.
   void destroy (void);
+  // Cleanup.
 
 private:
   void gen_ifndef_string (const char *fname,
@@ -464,95 +451,83 @@ private:
   void gen_exec_hdr_includes (void);
   void gen_exec_src_includes (void);
   void gen_exec_idl_includes (void);
-  void gen_conn_hdr_includes (void);
-  void gen_conn_src_includes (void);
   
   void gen_export_file (const char *filename,
                         const char *macro,
                         const char *msg,
                         bool for_skel = false);
-                        
-  void make_rand_extension (char * const t);
 
 private:
-  /// Client header stream.
   TAO_OutStream *client_header_;
+  // Client header stream.
 
-  /// Client stub file stream
   TAO_OutStream *client_stubs_;
+  // Client stub file stream
 
-  /// Client side inline definitions.
   TAO_OutStream *client_inline_;
+  // Client side inline definitions.
 
-  /// Server header stream.
   TAO_OutStream *server_header_;
+  // Server header stream.
 
-  /// Implementation header stream.
   TAO_OutStream *implementation_header_;
+  // Implementation header stream.
 
-  /// Implementation skeleton stream.
   TAO_OutStream *implementation_skeleton_;
+  // Implementation skeleton stream.
 
-  /// Server header template stream.
   TAO_OutStream *server_template_header_;
+  // Server header template stream.
 
-  /// Server skeleton stream.
   TAO_OutStream *server_skeletons_;
+  // Server skeleton stream.
 
-  /// Server skeleton template stream.
   TAO_OutStream *server_template_skeletons_;
+  // Server skeleton template stream.
 
-  /// Server side inline file.
   TAO_OutStream *server_inline_;
+  // Server side inline file.
 
-  /// Anyop header file.
   TAO_OutStream *anyop_header_;
+  // Anyop header file.
 
-  /// Anyop source file.
   TAO_OutStream *anyop_source_;
+  // Anyop source file.
 
-  /// TAO_OutStream to collect the input for gperf program.
   TAO_OutStream *gperf_input_stream_;
+  // TAO_OutStream to collect the input for gperf program.
 
-  /// Component servant header file.
   TAO_OutStream *ciao_svnt_header_;
+  // Component servant header file.
 
-  /// Component servant source file.
   TAO_OutStream *ciao_svnt_source_;
+  // Component servant source file.
 
-  /// Component executor impl header file.
   TAO_OutStream *ciao_exec_header_;
+  // Component executor impl header file.
 
-  /// Component executor impl source file.
   TAO_OutStream *ciao_exec_source_;
+  // Component executor impl source file.
 
-  /// Component executor impl source file.
   TAO_OutStream *ciao_exec_idl_;
+  // Component executor impl source file.
 
-  /// Component connector impl header file.
-  TAO_OutStream *ciao_conn_header_;
-
-  /// Component connector impl source file.
-  TAO_OutStream *ciao_conn_source_;
-
-  /// Currently used out stream.
   TAO_OutStream *curr_os_;
+  // Currently used out stream.
 
-  /**
-   * Name of the temp file used to collect the input for gperf
-   * program. This is needed coz I do ACE_OS::open on this when I need
-   * ACE_HANDLE for the file instead FILE*.
-   */
   char *gperf_input_filename_;
+  // Name of the temp file used to collect the input for gperf
+  // program. This is needed coz I do ACE_OS::open on this when I need
+  // ACE_HANDLE for the file instead FILE*.
 
-  /// Save current node in this.
   be_decl *node_;
+  // Save current node in this.
 
-  /// Visitor factory object.
   TAO_Visitor_Factory *visitor_factory_;
+  // Visitor factory object.
 
-  /// The enumerated value indicating the lookup strategy.
   LOOKUP_STRATEGY strategy_;
+  // The enumerated value indicating the lookup strategy.
 };
 
 typedef ACE_Singleton<TAO_CodeGen, ACE_SYNCH_RECURSIVE_MUTEX> TAO_CODEGEN;
diff --git a/TAO/TAO_IDL/be_include/be_component.h b/TAO/TAO_IDL/be_include/be_component.h
index 35f22413299..06c4a5d766d 100644
--- a/TAO/TAO_IDL/be_include/be_component.h
+++ b/TAO/TAO_IDL/be_include/be_component.h
@@ -1,19 +1,22 @@
 /* -*- c++ -*- */
+// $Id$
 
-//=============================================================================
-/**
- *  @file    be_component.h
- *
- *  $Id$
- *
- *  Extension of class AST_Component that provides additional means for C++
- *  mapping of an interface.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_component.h
+//
+// = DESCRIPTION
+//    Extension of class AST_Component that provides additional means for C++
+//    mapping of an interface.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef TAO_BE_COMPONENT_H
 #define TAO_BE_COMPONENT_H
@@ -30,6 +33,8 @@ class be_component : public virtual AST_Component,
   // = DESCRIPTION
   //
 public:
+  be_component (void);
+
   be_component (UTL_ScopedName *n,
                 AST_Component *base_component,
                 AST_Type **supports,
@@ -39,12 +44,12 @@ public:
 
   ~be_component (void);
   
-  /// Override of the AST method to eliminate narrowing of
-  /// the return value. Non-virtual.
   be_component *base_component (void) const;
+  // Override of the AST method to eliminate narrowing of
+  // the return value. Non-virtual.
 
-  /// Catch BE-specific members before delegating to the base class.
   virtual void redefine (AST_Interface *from);
+  // Catch BE-specific members before delegating to the base class.
 
   // Cleanup function.
   virtual void destroy (void);
diff --git a/TAO/TAO_IDL/be_include/be_component_fwd.h b/TAO/TAO_IDL/be_include/be_component_fwd.h
index 084f6ea574c..d2b81faf18f 100644
--- a/TAO/TAO_IDL/be_include/be_component_fwd.h
+++ b/TAO/TAO_IDL/be_include/be_component_fwd.h
@@ -1,18 +1,22 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    be_component_fwd.h
- *
- *  $Id$
- *
- *  Extension of class AST_ComponentFwd that provides additional
- *  means for C++ mapping of a forward declared component.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_component_fwd.h
+//
+// = DESCRIPTION
+//    Extension of class AST_ComponentFwd that provides additional
+//    means for C++ mapping of a forward declared component.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef BE_COMPONENT_FWD_H
 #define BE_COMPONENT_FWD_H
@@ -29,6 +33,8 @@ class be_component_fwd : public virtual AST_ComponentFwd,
   // =DESCRIPTION
   //   Extensions to the AST_ComponentFwd class
 public:
+  be_component_fwd (void);
+
   be_component_fwd (AST_Interface *dummy,
                     UTL_ScopedName *n);
 
diff --git a/TAO/TAO_IDL/be_include/be_constant.h b/TAO/TAO_IDL/be_include/be_constant.h
index acbe89e5095..ba0f3bec6f1 100644
--- a/TAO/TAO_IDL/be_include/be_constant.h
+++ b/TAO/TAO_IDL/be_include/be_constant.h
@@ -1,20 +1,24 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    be_constant.h
- *
- *  $Id$
- *
- *  Extension of class AST_Constant that provides additional means for C++
- *  mapping.
- *
- *
- *  @author Copyright 1994-1995 by Sun Microsystems
- *  @author Inc. and Aniruddha Gokhale
- */
-//=============================================================================
-
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_constant.h
+//
+// = DESCRIPTION
+//    Extension of class AST_Constant that provides additional means for C++
+//    mapping.
+//
+// = AUTHOR
+//    Copyright 1994-1995 by Sun Microsystems, Inc.
+//    and
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef BE_CONSTANT_H
 #define BE_CONSTANT_H
@@ -28,9 +32,13 @@ class be_constant : public virtual AST_Constant,
                     public virtual be_decl
 {
 public:
+  be_constant (void);
+  // Constructor.
+
   be_constant (AST_Expression::ExprType et,
                AST_Expression *v,
                UTL_ScopedName *n);
+  // Constructor.
 
   // Visiting.
   virtual int accept (be_visitor *visitor);
@@ -39,7 +47,9 @@ public:
   virtual void destroy (void);
 
   // Narrowing.
+
   DEF_NARROW_FROM_DECL (be_constant);
+
 };
 
 #endif // if !defined
diff --git a/TAO/TAO_IDL/be_include/be_decl.h b/TAO/TAO_IDL/be_include/be_decl.h
index 68a6bbf0442..ddf1063d235 100644
--- a/TAO/TAO_IDL/be_include/be_decl.h
+++ b/TAO/TAO_IDL/be_include/be_decl.h
@@ -1,18 +1,23 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    be_decl.h
- *
- *  $Id$
- *
- *  Extension of the AST_Decl class.
- *
- *
- *  @author Copyright 1994-1995 by Sun Microsystems
- *  @author Inc. and Aniruddha Gokhale
- */
-//=============================================================================
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_decl.h
+//
+// = DESCRIPTION
+//    Extension of the AST_Decl class.
+//
+// = AUTHOR
+//    Copyright 1994-1995 by Sun Microsystems, Inc.
+//    and
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef TAO_BE_DECL_H
 #define TAO_BE_DECL_H
@@ -23,48 +28,51 @@ class be_scope;
 class be_visitor;
 class be_type;
 
-/**
- * @class be_decl
- *
- * @brief be_decl
- *
- * The back end extension of the AST_Decl class. Provides an abstract
- * interface.
- */
 class be_decl : public virtual AST_Decl
 {
+  // = TITLE
+  //    be_decl
+  // = DESCRIPTION
+  //    The back end extension of the AST_Decl class. Provides an abstract
+  //    interface.
+  //
 public:
+  be_decl (void);
+  // Default constructor.
+
   be_decl (AST_Decl::NodeType type,
            UTL_ScopedName *n);
+  // Constructor that sets the node type.
 
   ~be_decl (void);
+  // Destructor.
 
   // Methods used by the interface type strategy.
-  /// Both the arguments should be non-null!!!. Applies prefix and
-  /// suffix to the local name and makes a flat name.
   void compute_full_name  (const char *prefix,
                            const char *suffix,
                            char *&name);
+  // Both the arguments should be non-null!!!. Applies prefix and
+  // suffix to the local name and makes a flat name.
 
-  /// Both the arguments should be non-null!!!. Applies prefix and
-  /// suffix to the local name and makes a flat name.
   void compute_flat_name (const char *prefix,
                           const char *suffix,
                           char *& name);
+  // Both the arguments should be non-null!!!. Applies prefix and
+  // suffix to the local name and makes a flat name.
 
   // End of Methods use by the interface type strategy.
 
-  /// Return the scope created by this node (if one exists).
   virtual be_scope *scope (void);
+  // Return the scope created by this node (if one exists).
 
   // Visiting
   virtual int accept (be_visitor *visitor);
 
-  /// Cleanup function.
   virtual void destroy (void);
+  // Cleanup function.
 
-  /// Temporarily set this node's is_local_ flag.
   void set_local (bool val);
+  // Temporarily set this node's is_local_ flag.
 
   // Boolean methods to test if code was already generated.
   bool cli_hdr_gen (void);
diff --git a/TAO/TAO_IDL/be_include/be_enum.h b/TAO/TAO_IDL/be_include/be_enum.h
index 95eeb8217d1..0e551833e96 100644
--- a/TAO/TAO_IDL/be_include/be_enum.h
+++ b/TAO/TAO_IDL/be_include/be_enum.h
@@ -1,19 +1,24 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    be_enum.h
- *
- *  $Id$
- *
- *  Extension of class AST_Enum that provides additional means for C++
- *  mapping.
- *
- *
- *  @author Copyright 1994-1995 by Sun Microsystems
- *  @author Inc. and Aniruddha Gokhale
- */
-//=============================================================================
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_enum.h
+//
+// = DESCRIPTION
+//    Extension of class AST_Enum that provides additional means for C++
+//    mapping.
+//
+// = AUTHOR
+//    Copyright 1994-1995 by Sun Microsystems, Inc.
+//    and
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef BE_ENUM_H
 #define BE_ENUM_H
@@ -29,21 +34,26 @@ class be_enum : public virtual AST_Enum,
                 public virtual be_type
 {
 public:
+  be_enum (void);
+  // Default constructor.
+
   be_enum (UTL_ScopedName *n,
            bool local,
            bool abstract);
+  // Constructor.
   
-  /// Overridden from class be_type.
   virtual void gen_ostream_operator (TAO_OutStream *os,
                                      bool use_underscore);
+  // Overridden from class be_type.
 
-  /// Cleanup method.
   virtual void destroy (void);
+  // Cleanup method.
 
   // Visiting.
   virtual int accept (be_visitor *visitor);
 
   // Narrowing.
+
   DEF_NARROW_FROM_DECL (be_enum);
   DEF_NARROW_FROM_SCOPE (be_enum);
 };
diff --git a/TAO/TAO_IDL/be_include/be_enum_val.h b/TAO/TAO_IDL/be_include/be_enum_val.h
index e757c2a6699..cdd0d66c8ea 100644
--- a/TAO/TAO_IDL/be_include/be_enum_val.h
+++ b/TAO/TAO_IDL/be_include/be_enum_val.h
@@ -1,19 +1,24 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    be_enum_val.h
- *
- *  $Id$
- *
- *  Extension of class AST_EnumVal that provides additional means for C++
- *  mapping.
- *
- *
- *  @author Copyright 1994-1995 by Sun Microsystems
- *  @author Inc. and Aniruddha Gokhale
- */
-//=============================================================================
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_enum_val.h
+//
+// = DESCRIPTION
+//    Extension of class AST_EnumVal that provides additional means for C++
+//    mapping.
+//
+// = AUTHOR
+//    Copyright 1994-1995 by Sun Microsystems, Inc.
+//    and
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef BE_ENUM_VAL_H
 #define BE_ENUM_VAL_H
@@ -27,8 +32,12 @@ class be_enum_val : public virtual AST_EnumVal,
                     public virtual be_decl
 {
 public:
+  be_enum_val (void);
+  // Default constructor.
+
   be_enum_val (ACE_CDR::ULong v,
                UTL_ScopedName *n);
+  // Constructor.
 
   // Visiting
   virtual int accept (be_visitor *visitor);
@@ -37,6 +46,7 @@ public:
   virtual void destroy (void);
 
   // Narrowing
+
   DEF_NARROW_FROM_DECL (be_enum_val);
 };
 
diff --git a/TAO/TAO_IDL/be_include/be_eventtype.h b/TAO/TAO_IDL/be_include/be_eventtype.h
index 1a4a4582c6d..254d4cf90b5 100644
--- a/TAO/TAO_IDL/be_include/be_eventtype.h
+++ b/TAO/TAO_IDL/be_include/be_eventtype.h
@@ -1,17 +1,19 @@
 /* -*- c++ -*- */
+// $Id$
 
-//=============================================================================
-/**
- *  @file    be_eventtype.h
- *
- *  $Id$
- *
- *  Extension of class AST_EventType and be_valuetype that provides
- *  additional means for C++ mapping of an valuetype.
- *
- *
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_eventtype.h
+//
+// = DESCRIPTION
+//    Extension of class AST_EventType and be_valuetype that provides
+//    additional means for C++ mapping of an valuetype.
+//
+// ============================================================================
 
 #ifndef TAO_BE_EVENTTYPE_H
 #define TAO_BE_EVENTTYPE_H
@@ -29,6 +31,9 @@ class be_eventtype : public virtual be_valuetype,
   //    Extends be_valuetype.
   //
 public:
+  be_eventtype (void);
+  // Default constructor.
+
   be_eventtype (UTL_ScopedName *n,
                 AST_Type **inherits,
                 long n_inherits,
@@ -41,8 +46,11 @@ public:
                 bool abstract,
                 bool truncatable,
                 bool custom);
+  // Constructor that sets its scoped name <n>, a list of inherited valuetypes
+  // and supported interfaces <ih>, and the number of inherited interfaces <nih>
 
   ~be_eventtype (void);
+  // Destructor.
 
   // Visiting.
   virtual int accept (be_visitor *visitor);
@@ -50,7 +58,8 @@ public:
   // Cleanup.
   virtual void destroy (void);
 
-  // Narrowing.
+ // Narrowing.
+
   DEF_NARROW_FROM_DECL (be_eventtype);
   DEF_NARROW_FROM_SCOPE (be_eventtype);
 };
diff --git a/TAO/TAO_IDL/be_include/be_eventtype_fwd.h b/TAO/TAO_IDL/be_include/be_eventtype_fwd.h
index e43fd9ff48c..fceb00e736d 100644
--- a/TAO/TAO_IDL/be_include/be_eventtype_fwd.h
+++ b/TAO/TAO_IDL/be_include/be_eventtype_fwd.h
@@ -1,18 +1,22 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    be_eventtype_fwd.h
- *
- *  $Id$
- *
- *  Extension of class AST_EventType_Fwd that provides additional
- *  means for C++ mapping of an eventtype.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_eventtype_fwd.h
+//
+// = DESCRIPTION
+//    Extension of class AST_EventType_Fwd that provides additional
+//    means for C++ mapping of an eventtype.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef BE_EVENTTYPE_FWD_H
 #define BE_EVENTTYPE_FWD_H
@@ -29,10 +33,15 @@ class be_eventtype_fwd : public virtual be_valuetype_fwd,
   // =DESCRIPTION
   //   Extensions to the be_interface_fwd class
 public:
+  be_eventtype_fwd (void);
+  // Default constructor.
+
   be_eventtype_fwd (AST_Interface *dummy,
                     UTL_ScopedName *n);
+  // Constructor.
 
   virtual ~be_eventtype_fwd (void);
+  // Destructor.
 
   // Visiting.
   virtual int accept (be_visitor* visitor);
@@ -41,6 +50,7 @@ public:
   virtual void destroy (void);
 
   // Narrowing.
+
   DEF_NARROW_FROM_DECL (be_eventtype_fwd);
 };
 
diff --git a/TAO/TAO_IDL/be_include/be_exception.h b/TAO/TAO_IDL/be_include/be_exception.h
index 97e0fb8b5d0..47b9a66a9e6 100644
--- a/TAO/TAO_IDL/be_include/be_exception.h
+++ b/TAO/TAO_IDL/be_include/be_exception.h
@@ -13,6 +13,8 @@ class be_exception : public virtual AST_Exception,
 
 {
 public:
+  be_exception (void);
+
   be_exception (UTL_ScopedName *n,
                 bool local,
                 bool abstract);
@@ -24,6 +26,7 @@ public:
   virtual int accept (be_visitor *visitor);
 
   // Narrowing.
+
   DEF_NARROW_FROM_DECL (be_exception);
   DEF_NARROW_FROM_SCOPE (be_exception);
 };
diff --git a/TAO/TAO_IDL/be_include/be_expression.h b/TAO/TAO_IDL/be_include/be_expression.h
index 2888fbaaa7d..c3b25021fb4 100644
--- a/TAO/TAO_IDL/be_include/be_expression.h
+++ b/TAO/TAO_IDL/be_include/be_expression.h
@@ -1,19 +1,23 @@
-
-//=============================================================================
-/**
- *  @file    be_expression.h
- *
- *  $Id$
- *
- *  Extension of class AST_Expression that provides additional means for C++
- *  mapping.
- *
- *
- *  @author Copyright 1994-1995 by Sun Microsystems
- *  @author Inc. and Aniruddha Gokhale
- */
-//=============================================================================
-
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_expression.h
+//
+// = DESCRIPTION
+//    Extension of class AST_Expression that provides additional means for C++
+//    mapping.
+//
+// = AUTHOR
+//    Copyright 1994-1995 by Sun Microsystems, Inc.
+//    and
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef BE_EXPRESSION_H
 #define BE_EXPRESSION_H
diff --git a/TAO/TAO_IDL/be_include/be_extended_port.h b/TAO/TAO_IDL/be_include/be_extended_port.h
index 1b7951db43f..66a4461f1cd 100644
--- a/TAO/TAO_IDL/be_include/be_extended_port.h
+++ b/TAO/TAO_IDL/be_include/be_extended_port.h
@@ -1,18 +1,23 @@
+//
+// $Id$
+//
 
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    be_extended_port.h
- *
- *  $Id$
- *
- *  Extension of class AST_Extended_Port for C++ code generation.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO_IDL_BE
+//
+// = FILENAME
+//    be_extended_port.h
+//
+// = DESCRIPTION
+//    Extension of class AST_Extended_Port for C++ code generation.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef BE_EXTENDED_PORT_H
 #define BE_EXTENDED_PORT_H
diff --git a/TAO/TAO_IDL/be_include/be_factory.h b/TAO/TAO_IDL/be_include/be_factory.h
index 3a04d9f38aa..08c9b61e7ee 100644
--- a/TAO/TAO_IDL/be_include/be_factory.h
+++ b/TAO/TAO_IDL/be_include/be_factory.h
@@ -1,18 +1,23 @@
-
-//=============================================================================
-/**
- *  @file    be_factory.h
- *
- *  $Id$
- *
- *  Extension of class AST_Factory that provides additional means for C++
- *  mapping.
- *
- *
- *  @author Copyright 1994-1995 by Sun Microsystems
- *  @author Inc. and Boris Kolpackov <bosk@ipmce.ru>
- */
-//=============================================================================
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_factory.h
+//
+// = DESCRIPTION
+//    Extension of class AST_Factory that provides additional means for C++
+//    mapping.
+//
+// = AUTHOR
+//    Copyright 1994-1995 by Sun Microsystems, Inc.
+//    and
+//    Boris Kolpackov <bosk@ipmce.ru>
+//
+// ============================================================================
 
 #ifndef BE_FACTORY_H
 #define BE_FACTORY_H
@@ -31,12 +36,17 @@ class be_factory : public virtual AST_Factory,
                    public virtual be_decl
 {
 public:
+  be_factory (void);
+  // Default constructor.
+
   be_factory (UTL_ScopedName *n);
+  // Constructor
 
   ~be_factory (void);
+  // Destructor.
 
-  /// Cleanup method.
   virtual void destroy (void);
+  // Cleanup method.
 
   // Visiting.
   virtual int accept (be_visitor *visitor);
@@ -45,8 +55,9 @@ public:
   virtual AST_Argument *be_add_argument (AST_Argument *arg);
 
   // Narrowing
+
   DEF_NARROW_FROM_DECL (be_factory);
   DEF_NARROW_FROM_SCOPE (be_factory);
 };
 
-#endif // BE_FACTORY_H
+#endif
diff --git a/TAO/TAO_IDL/be_include/be_field.h b/TAO/TAO_IDL/be_include/be_field.h
index a2654588c19..321292d8d4d 100644
--- a/TAO/TAO_IDL/be_include/be_field.h
+++ b/TAO/TAO_IDL/be_include/be_field.h
@@ -1,18 +1,23 @@
+// $Id$
 
-//=============================================================================
-/**
- *  @file    be_field.h
- *
- *  $Id$
- *
- *  Extension of class AST_Field that provides additional means for C++
- *  mapping.
- *
- *
- *  @author Copyright 1994-1995 by Sun Microsystems
- *  @author Inc. and Aniruddha Gokhale
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_field.h
+//
+// = DESCRIPTION
+//    Extension of class AST_Field that provides additional means for C++
+//    mapping.
+//
+// = AUTHOR
+//    Copyright 1994-1995 by Sun Microsystems, Inc.
+//    and
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef BE_FIELD_H
 #define BE_FIELD_H
@@ -27,6 +32,8 @@ class be_field : public virtual AST_Field,
                  public virtual be_decl
 {
 public:
+  be_field (void);
+
   be_field (AST_Type *ft,
             UTL_ScopedName *n,
             Visibility vis = vis_NA);
diff --git a/TAO/TAO_IDL/be_include/be_finder.h b/TAO/TAO_IDL/be_include/be_finder.h
deleted file mode 100644
index 705a86424e1..00000000000
--- a/TAO/TAO_IDL/be_include/be_finder.h
+++ /dev/null
@@ -1,43 +0,0 @@
-
-//=============================================================================
-/**
- *  @file    be_finder.h
- *
- *  $Id$
- *
- *  Extension of class AST_Finder that provides additional means for C++
- *  mapping.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
-
-#ifndef BE_FINDER_H
-#define BE_FINDER_H
-
-#include "be_factory.h"
-
-#include "ast_finder.h"
-
-class be_finder : public virtual AST_Finder,
-                  public virtual be_factory
-{
-public:
-  be_finder (UTL_ScopedName *n);
-
-  ~be_finder (void);
-
-  /// Cleanup method.
-  virtual void destroy (void);
-
-  // Visiting.
-  virtual int accept (be_visitor *visitor);
-
-  // Narrowing
-  DEF_NARROW_FROM_DECL (be_finder);
-  DEF_NARROW_FROM_SCOPE (be_finder);
-};
-
-#endif // BE_FINDER_H
diff --git a/TAO/TAO_IDL/be_include/be_generator.h b/TAO/TAO_IDL/be_include/be_generator.h
index 6146a363bd1..4bd349c2673 100644
--- a/TAO/TAO_IDL/be_include/be_generator.h
+++ b/TAO/TAO_IDL/be_include/be_generator.h
@@ -262,12 +262,9 @@ public:
   // Create a node representing a native
   virtual AST_Native *create_native (UTL_ScopedName *n);
 
-  // Create a node representing a OBV or home factory construct
+  // Create a node representing a OBV factory construct
   virtual AST_Factory *create_factory (UTL_ScopedName *n);
 
-  // Create a node representing an home finder construct.
-  virtual AST_Finder *create_finder (UTL_ScopedName *n);
-
   virtual
   AST_PortType *create_porttype (UTL_ScopedName *n);
     
diff --git a/TAO/TAO_IDL/be_include/be_global.h b/TAO/TAO_IDL/be_include/be_global.h
index 6daa7003290..082a2b1194d 100644
--- a/TAO/TAO_IDL/be_include/be_global.h
+++ b/TAO/TAO_IDL/be_include/be_global.h
@@ -1,19 +1,22 @@
 // -*- C++ -*-
 
-
-//=============================================================================
-/**
- *  @file    be_global.h
- *
- *  $Id$
- *
- *  Header file for class containing compiler back end global data.
- *
- *
- *  @author Jeff Parsons <parsons@cs.wustl.edu>
- */
-//=============================================================================
-
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_global.h
+//
+// = DESCRIPTION
+//    Header file for class containing compiler back end global data.
+//
+// = AUTHOR
+//    Jeff Parsons <parsons@cs.wustl.edu>
+//
+// ============================================================================
 
 #ifndef _BE_GLOBAL_H
 #define _BE_GLOBAL_H
@@ -53,8 +56,8 @@ public:
   };
 
   // Constructor
-  /// Destructor
   BE_GlobalData (void);
+  // Destructor
   virtual ~BE_GlobalData (void);
 
   // To switch between changing or non-changing standard include
@@ -122,12 +125,6 @@ public:
   static const char *be_get_ciao_exec_idl_fname (
       bool base_name_only = false);
 
-  static const char *be_get_ciao_conn_hdr_fname (
-      bool base_name_only = false);
-
-  static const char *be_get_ciao_conn_src_fname (
-      bool base_name_only = false);
-
   // Helper functions: obtain the names of each generated file given
   // the IDL file name.
   // The parameter <base_name_only> set to 0 (no base name, but full
@@ -203,154 +200,130 @@ public:
     UTL_String *idl_file_name,
     bool base_name_only = false);
 
-  static const char *be_get_ciao_conn_header (
-    UTL_String *idl_file_name,
-    bool base_name_only = false);
-
-  static const char *be_get_ciao_conn_source (
-    UTL_String *idl_file_name,
-    bool base_name_only = false);
-
   static const char *be_get_dds_typesupport_header (
     UTL_String *idl_file_name,
     bool base_name_only = false);
 
-  //// Returns the macro name for exporting server side classes in Win32
-  //// DLL.
   const char* skel_export_macro (void) const;
+  /// Returns the macro name for exporting server side classes in Win32
+  /// DLL.
 
-  //// Set the macro name for export server side classes in Win32 DLL.
   void skel_export_macro (const char* s);
+  /// Set the macro name for export server side classes in Win32 DLL.
 
-  //// Returns the name of the include file that contains the server
-  //// side export macro definition.
   const char* skel_export_include (void) const;
+  /// Returns the name of the include file that contains the server
+  /// side export macro definition.
 
-  //// Set the name of the include file that contains the server side
-  //// export macro definition.
   void skel_export_include (const char* s);
+  /// Set the name of the include file that contains the server side
+  /// export macro definition.
 
-  //// Returns the macro name for exporting client side classes in Win32
-  //// DLL.
   const char* stub_export_macro (void) const;
+  /// Returns the macro name for exporting client side classes in Win32
+  /// DLL.
 
-  //// Set the macro name for export client side classes in Win32 DLL.
   void stub_export_macro (const char* s);
+  /// Set the macro name for export client side classes in Win32 DLL.
 
-  //// Returns the name of the include file that contains the client
-  //// side export macro definition.
   const char* stub_export_include (void) const;
+  /// Returns the name of the include file that contains the client
+  /// side export macro definition.
 
-  //// Set the name of the include file that contains the client side
-  //// export macro definition.
   void stub_export_include (const char* s);
+  /// Set the name of the include file that contains the client side
+  /// export macro definition.
 
-  //// Returns the macro name for exporting *A.h file classes in Win32
-  //// DLL.
   const char* anyop_export_macro (void) const;
+  /// Returns the macro name for exporting *A.h file classes in Win32
+  /// DLL.
 
-  //// Set the macro name for export *A.h file classes in Win32 DLL.
   void anyop_export_macro (const char* s);
+  /// Set the macro name for export *A.h file classes in Win32 DLL.
 
-  //// Returns the name of the include file that contains the *A.h
-  //// file export macro definition.
   const char* anyop_export_include (void) const;
+  /// Returns the name of the include file that contains the *A.h
+  /// file export macro definition.
 
-  //// Set the name of the include file that contains the *A.h file
-  //// export macro definition.
   void anyop_export_include (const char* s);
+  /// Set the name of the include file that contains the *A.h file
+  /// export macro definition.
 
-  //// Returns the macro name for exporting exec impl classes in Win32
-  //// DLL.
   const char* exec_export_macro (void) const;
+  /// Returns the macro name for exporting exec impl classes in Win32
+  /// DLL.
 
-  //// Set the macro name for export exec impl classes in Win32 DLL.
   void exec_export_macro (const char* s);
+  /// Set the macro name for export exec impl classes in Win32 DLL.
 
-  //// Returns the name of the include file that contains the exec
-  //// impl export macro definition.
   const char* exec_export_include (void) const;
+  /// Returns the name of the include file that contains the exec
+  /// impl export macro definition.
 
-  //// Set the name of the include file that contains the exec impl
-  //// export macro definition.
   void exec_export_include (const char* s);
+  /// Set the name of the include file that contains the exec impl
+  /// export macro definition.
 
-  //// Returns the macro name for exporting CIAO svnt classes in Win32
-  //// DLL.
   const char* svnt_export_macro (void) const;
+  /// Returns the macro name for exporting CIAO svnt classes in Win32
+  /// DLL.
 
-  //// Set the macro name for export CIAO svnt classes in Win32 DLL.
   void svnt_export_macro (const char* s);
+  /// Set the macro name for export CIAO svnt classes in Win32 DLL.
 
-  //// Returns the name of the include file that contains the CIAO
-  //// svnt export macro definition.
   const char* svnt_export_include (void) const;
+  /// Returns the name of the include file that contains the CIAO
+  /// svnt export macro definition.
 
-  //// Set the name of the include file that contains the CIAO svnt
-  //// export macro definition.
   void svnt_export_include (const char* s);
+  /// Set the name of the include file that contains the CIAO svnt
+  /// export macro definition.
 
-  //// Returns the macro name for exporting CIAO connector
-  //// classes in Win32 DLL.
-  const char* conn_export_macro (void) const;
-
-  //// Set the macro name for export CIAO connector
-  //// classes in Win32 DLL.
-  void conn_export_macro (const char* s);
-
-  //// Returns the name of the include file that contains the CIAO
-  //// connector export macro definition.
-  const char* conn_export_include (void) const;
-
-  //// Set the name of the include file that contains the CIAO
-  //// connector export macro definition.
-  void conn_export_include (const char* s);
-
-  //// Returns the name of the include file to be used for precompiled
-  //// header support.
   const char* pch_include (void) const;
+  /// Returns the name of the include file to be used for precompiled
+  /// header support.
 
-  //// Set the name of the include file to be used for precompiled
-  //// header support.
   void pch_include (const char* s);
+  /// Set the name of the include file to be used for precompiled
+  /// header support.
 
-  //// Returns the name of the include file to be put at the top of
-  //// every header file.
   const char* pre_include (void) const;
+  /// Returns the name of the include file to be put at the top of
+  /// every header file.
 
-  //// Set the name of the include file to be put at the top of every
-  //// header file.
   void pre_include (const char* s);
+  /// Set the name of the include file to be put at the top of every
+  /// header file.
 
-  //// Returns the name of the include file to be put at the bottom of
-  //// every header file.
   const char* post_include (void) const;
+  /// Returns the name of the include file to be put at the bottom of
+  /// every header file.
 
-  //// Set the name of the include file to be put at the bottom of every
-  //// header file.
   void post_include (const char* s);
+  /// Set the name of the include file to be put at the bottom of every
+  /// header file.
 
-  //// Returns the guard that is placed in the client header file
   const char* include_guard (void) const;
+  /// Returns the guard that is placed in the client header file
 
-  //// Set the guard that is placed in the client header file
   void include_guard (const char* s);
+  /// Set the guard that is placed in the client header file
 
-  //// Returns the name of the include file that is used instead of the own
-  //// generated client header file
   const char* safe_include (void) const;
+  /// Returns the name of the include file that is used instead of the own
+  /// generated client header file
 
-  //// set the name of the include file that is used instead of the own
-  //// generated client header file
   void safe_include (const char* s);
+  /// set the name of the include file that is used instead of the own
+  /// generated client header file
 
-  //// Returns the name of the include file that should on get
-  //// generated in the client header file
   const char* unique_include (void) const;
-
-  /// Set the name of the include file that should on get
+  /// Returns the name of the include file that should on get
   /// generated in the client header file
+
   void unique_include (const char* s);
+  // Set the name of the include file that should on get
+  // generated in the client header file
 
   /// Set text that opens a "versioned" namespace.
   void versioning_begin (const char* s);
@@ -374,92 +347,90 @@ public:
 
   // = Set and get methods for different file name endings.
 
-  /// Set the client_hdr_ending.
   void client_hdr_ending (const char* s);
+  // Set the client_hdr_ending.
 
-  /// Get the client_hdr_ending.
   const char* client_hdr_ending (void) const;
+  // Get the client_hdr_ending.
 
-  /// Set the client_inline_ending.
   void client_inline_ending (const char* s);
+  // Set the client_inline_ending.
 
-  /// Get the client_inline_ending.
   const char* client_inline_ending (void) const;
+  // Get the client_inline_ending.
 
-  /// Set the client_stub_ending.
   void  client_stub_ending (const char* s);
+  // Set the client_stub_ending.
 
-  /// Get the client_stub_ending.
   const char* client_stub_ending (void) const;
+  // Get the client_stub_ending.
 
-  /// Set the server_hdr_ending.
   void server_hdr_ending (const char* s);
+  // Set the server_hdr_ending.
 
-  /// Get the server_hdr_ending.
   const char* server_hdr_ending (void) const;
+  // Get the server_hdr_ending.
 
-  /// Set the implementation_hdr_ending.
   void implementation_hdr_ending (const char* s);
+  // Set the implementation_hdr_ending.
 
-  /// Set the implementation class prefix.
   void impl_class_prefix (const char* s);
+  // Set the implementation class prefix.
 
-  /// Set the implementation class suffix.
   void impl_class_suffix (const char* s);
+  // Set the implementation class suffix.
 
-  /// Set the implementation_skel_ending.
   void implementation_skel_ending (const char* s);
+  // Set the implementation_skel_ending.
 
-  /// Get the implementation_hdr_ending.
   const char* implementation_hdr_ending (void) const;
+  // Get the implementation_hdr_ending.
 
-  ///Get implementation class prefix
   const char* impl_class_prefix (void) const;
+  //Get implementation class prefix
 
-  ///Get implementation class suffix
   const char* impl_class_suffix (void) const;
+  //Get implementation class suffix
 
-  /// Get the implementation_skel_ending.
   const char* implementation_skel_ending (void) const;
+  // Get the implementation_skel_ending.
 
-  /// Set the server_template_hdr_ending.
   void server_template_hdr_ending (const char* s);
+  // Set the server_template_hdr_ending.
 
-  /// Get the server_template_hdr_ending.
   const char* server_template_hdr_ending (void) const;
+  // Get the server_template_hdr_ending.
 
-  /// Set the server_skeleton_ending.
   void server_skeleton_ending (const char* s);
+  // Set the server_skeleton_ending.
 
-  /// Get the server_skeleton_ending.
   const char* server_skeleton_ending (void) const;
+  // Get the server_skeleton_ending.
 
-  /// Set the server_template_skeleton_ending.
   void server_template_skeleton_ending (const char* s);
+  // Set the server_template_skeleton_ending.
 
-  /// Get the server_template_skeleton_ending.
   const char* server_template_skeleton_ending (void) const;
+  // Get the server_template_skeleton_ending.
 
-  /// Set the server_inline_ending.
   void server_inline_ending (const char* s);
+  // Set the server_inline_ending.
 
-  /// Get the server_inline_ending.
   const char* server_inline_ending (void) const;
+  // Get the server_inline_ending.
 
-  /// Set the anyop_header_ending.
   void anyop_header_ending (const char* s);
+  // Set the anyop_header_ending.
 
-  /// Get the anyop_header_ending.
   const char* anyop_header_ending (void) const;
+  // Get the anyop_header_ending.
 
-  /// Set the anyop_source_ending.
   void anyop_source_ending (const char* s);
+  // Set the anyop_source_ending.
 
-  /// Get the anyop_source_ending.
   const char* anyop_source_ending (void) const;
+  // Get the anyop_source_ending.
 
-  /// Similar to above, but for CIAO servant and executor
-  /// impl and executor IDL files, if generated.
   void ciao_svnt_header_ending (const char* s);
   const char* ciao_svnt_header_ending (void) const;
   void ciao_svnt_source_ending (const char* s);
@@ -472,287 +443,280 @@ public:
   const char* ciao_exec_stub_header_ending (void) const;
   void ciao_exec_idl_ending (const char* s);
   const char* ciao_exec_idl_ending (void) const;
-  void ciao_conn_header_ending (const char* s);
-  const char* ciao_conn_header_ending (void) const;
-  void ciao_conn_source_ending (const char* s);
-  const char* ciao_conn_source_ending (void) const;
+  // Similar to above, but for CIAO servant and executor
+  // impl and executor IDL files, if generated.
 
-  /// For generating TypeSupport header file includes.
   void dds_typesupport_hdr_ending (const char* s);
   const char* dds_typesupport_hdr_ending (void) const;
+  // For generating TypeSupport header file includes.
 
-  /// Set the clonable_in_args.
   void use_clonable_in_args (bool clonable);
+  // Set the clonable_in_args.
 
-  /// Get the clonable_in_args setting.
   bool use_clonable_in_args (void) const;
+  // Get the clonable_in_args setting.
 
-  /// Get the gen_seq_template_export_ member.
   bool gen_template_export (void) const;
+  // Get the gen_seq_template_export_ member.
 
-  /// Set the gen_seq_template_export_ member.
   void gen_template_export (bool val);
+  // Set the gen_seq_template_export_ member.
 
-  /// Get the gen_ostream_operators_ member.
   bool gen_ostream_operators (void) const;
+  // Get the gen_ostream_operators_ member.
 
-  /// Set the gen_ostream_operators_ member.
   void gen_ostream_operators (bool val);
+  // Set the gen_ostream_operators_ member.
 
-  /**
-   * Set the directory where all the IDL-Compiler-Generated files are
-   * to be kept. Default is current directory from which the
-   * <tao_idl> is called.
-   */
   void output_dir (const char* s);
+  // Set the directory where all the IDL-Compiler-Generated files are
+  // to be kept. Default is current directory from which the
+  // <tao_idl> is called.
 
-  /**
-   * Get the directory where all the IDL-Compiler-Generated files are
-   * to be kept. Default is current directory from which the
-   * <tao_idl> is called.
-   */
   const char* output_dir (void) const;
+  // Get the directory where all the IDL-Compiler-Generated files are
+  // to be kept. Default is current directory from which the
+  // <tao_idl> is called.
 
-  /// Set the directory where all the *S.* files are
-  /// to be kept. Default is output_dir_.
   void skel_output_dir (const char* s);
+  // Set the directory where all the *S.* files are
+  // to be kept. Default is output_dir_.
 
-  /// Get the directory where all the *S.* files are
-  /// to be kept. Default is output_dir_.
   const char* skel_output_dir (void) const;
+  // Get the directory where all the *S.* files are
+  // to be kept. Default is output_dir_.
 
-  /// Set the directory where all the *A.* files are
-  /// to be kept. Default is output_dir_.
   void anyop_output_dir (const char* s);
+  // Set the directory where all the *A.* files are
+  // to be kept. Default is output_dir_.
 
-  /// Get the directory where all the *A.* files are
-  /// to be kept. Default is output_dir_.
   const char* anyop_output_dir (void) const;
+  // Get the directory where all the *A.* files are
+  // to be kept. Default is output_dir_.
 
-  /// Set any support.
   void any_support (bool);
+  // Set any support.
 
-  /// Check Any support.
   bool any_support (void) const;
+  // Check Any support.
 
-  /// Set TypeCode support.
   void tc_support (bool);
+  // Set TypeCode support.
 
-  /// Check TypeCode support
   bool tc_support (void) const;
+  // Check TypeCode support
 
-  /// Set optimized valuetype member accessor generation.
   void obv_opt_accessor (bool);
+  // Set optimized valuetype member accessor generation.
 
-  /// Check optimized valuetype member accessor generation.
   bool obv_opt_accessor (void) const;
+  // Check optimized valuetype member accessor generation.
 
-  /// Set generation of implementation files.
   void gen_impl_files (bool);
+  // Set generation of implementation files.
 
-  /// Check if we want to generate implementation files.
   bool gen_impl_files (void) const;
+  // Check if we want to generate implementation files.
 
-  /// Set generation of source file and line number for implementation files.
   void gen_impl_debug_info (bool);
+  // Set generation of source file and line number for implementation files.
 
-  /// Check generation of source file and line number implementation files.
   bool gen_impl_debug_info (void) const;
+  // Check generation of source file and line number implementation files.
 
-  /// Set generation of copy constructor.
   void gen_copy_ctor (bool);
+  // Set generation of copy constructor.
 
-  /// Check if we want to generate the copy constructor.
   bool gen_copy_ctor (void) const;
+  // Check if we want to generate the copy constructor.
 
-  /// Set the generation of the assignment operator.
   void gen_assign_op (bool);
+  // Set the generation of the assignment operator.
 
-  /// Check if we want to generate the assignment operator.
   bool gen_assign_op (void) const;
+  // Check if we want to generate the assignment operator.
 
-  /// Set whether we want to generate Thru_POA collocation stubs.
   void gen_thru_poa_collocation (bool);
+  // Set whether we want to generate Thru_POA collocation stubs.
 
-  /// Check if we want to generate Thru_POA collocation stubs.
   bool gen_thru_poa_collocation (void) const;
+  // Check if we want to generate Thru_POA collocation stubs.
 
-  /// Set whether we want to generate Direct collocation stubs.
   void gen_direct_collocation (bool);
+  // Set whether we want to generate Direct collocation stubs.
 
-  /// Check if we want to generate Direct collocation stubs.
   bool gen_direct_collocation (void) const;
+  // Check if we want to generate Direct collocation stubs.
 
-  /// Set whether we want to generate for CORBA/e
   void gen_corba_e (bool);
+  // Set whether we want to generate for CORBA/e
 
-  /// Check if we want to generate for CORBA/e
   bool gen_corba_e (void) const;
+  // Check if we want to generate for CORBA/e
 
-  /// Set whether we want to generate for Minimum CORBA
   void gen_minimum_corba (bool);
+  // Set whether we want to generate for Minimum CORBA
 
-  /// Check if we want to generate for Minimum CORBA
   bool gen_minimum_corba (void) const;
+  // Check if we want to generate for Minimum CORBA
 
-  /// Set optimized typecodes.
   void opt_tc (bool);
+  // Set optimized typecodes.
 
-  /// Check if TypeCodes are optimized.
   bool opt_tc (void) const;
+  // Check if TypeCodes are optimized.
 
-  /// To enable or disable AMI4CCM call back feature
   void ami4ccm_call_back (bool value);
+  // To enable or disable AMI4CCM call back feature
 
-  /// Return the flag.
   bool ami4ccm_call_back (void) const;
+  // Return the flag.
 
-  /// To enable or disable AMI call back feature of the Messaging
-  /// specification in the generated code.
   void ami_call_back (bool value);
+  // To enable or disable AMI call back feature of the Messaging
+  // specification in the generated code.
 
-  /// Return the flag.
   bool ami_call_back (void) const;
+  // Return the flag.
 
-  /// To enable or disable AMH in the generated code.
   void gen_amh_classes (bool value);
+  // To enable or disable AMH in the generated code.
 
-  /// Return the flag.
   bool gen_amh_classes (void) const;
+  // Return the flag.
 
-  /// Set the generation of tie classes and files.
   void gen_tie_classes (bool value);
+  // Set the generation of tie classes and files.
 
-  /// Return the flag.
   bool gen_tie_classes (void) const;
+  // Return the flag.
 
-  /// To enable or disable AMI call back feature of the Messaging
-  /// specification in the generated code.
   void gen_smart_proxies (bool value);
+  // To enable or disable AMI call back feature of the Messaging
+  // specification in the generated code.
 
-  /// Return the flag.
   bool gen_smart_proxies (void) const;
+  // Return the flag.
 
-  /// Set the flag.
   void gen_inline_constants (bool value);
+  // Set the flag.
 
-  /// Return the flag.
   bool gen_inline_constants (void) const;
+  // Return the flag.
 
-  /// Set the flag.
   void gen_dcps_type_support (bool value);
+  // Set the flag.
 
-  /// Return the flag.
   bool gen_dcps_type_support (void) const;
+  // Return the flag.
 
-  /// Set the flag.
   void gen_dcps_type_support_only (bool value);
+  // Set the flag.
 
-  /// Return the flag.
   bool gen_dcps_type_support_only (void) const;
+  // Return the flag.
 
-  /// Set the flag.
   void gen_orb_h_include (bool value);
+  // Set the flag.
 
-  /// Return the flag.
   bool gen_orb_h_include (void) const;
+  // Return the flag.
 
-  /// Generate an empty anyop header (A.h)
   bool gen_empty_anyop_header (void) const;
+  // Generate an empty anyop header (A.h)
 
-  /// Generate an empty anyop header (A.h)
   void gen_empty_anyop_header (bool value);
+  // Generate an empty anyop header (A.h)
 
-  /// Set the lookup strategy.
   void lookup_strategy (LOOKUP_STRATEGY s);
+  // Set the lookup strategy.
 
-  /// Return the enumerated value for the lookup strategy. Default is
-  /// perfect hashing.
   BE_GlobalData::LOOKUP_STRATEGY lookup_strategy (void) const;
+  // Return the enumerated value for the lookup strategy. Default is
+  // perfect hashing.
 
-  /// Cleanup function.
   void destroy (void);
+  // Cleanup function.
 
-  /// Used in the generation of declarations for
-  /// xxx_Proxy_Broker_Factory_function_pointer.
   ACE_Unbounded_Queue<be_interface *> non_local_interfaces;
+  // Used in the generation of declarations for
+  // xxx_Proxy_Broker_Factory_function_pointer.
 
-  /// Used in the generation of extern function declarations so we
-  /// can use non-defined interfaces as members and parameters.
   ACE_Unbounded_Queue<be_interface_fwd *> non_defined_interfaces;
+  // Used in the generation of extern function declarations so we
+  // can use non-defined interfaces as members and parameters.
 
-  /**
-   * Used in the generation of overrides for CORBA::release and
-   * CORBA::is_nil, needed when the interface inherits versions from
-   * both CORBA::Object and CORBA::AbstractBase.
-   */
   ACE_Unbounded_Queue<be_interface *> mixed_parentage_interfaces;
+  // Used in the generation of overrides for CORBA::release and
+  // CORBA::is_nil, needed when the interface inherits versions from
+  // both CORBA::Object and CORBA::AbstractBase.
 
-  /// Accessor for the member, sets it on the first call.
   AST_PredefinedType *void_type (void);
+  // Accessor for the member, sets it on the first call.
 
-  /// Accessor for the member, sets it on the first call.
   be_interface *ccmobject (void);
+  // Accessor for the member, sets it on the first call.
 
-  /// Accessor for the member, sets it on the first call.
   be_module *messaging (void);
+  // Accessor for the member, sets it on the first call.
 
-  /// Accessor for the member, sets it on the first call.
   be_module *ami4ccm (void);
+  // Accessor for the member, sets it on the first call.
 
-  /// Accessor for the member, sets it on the first call.
   be_valuetype *messaging_exceptionholder (void);
+  // Accessor for the member, sets it on the first call.
 
-  /// Accessor for the member, sets it on the first call.
   be_valuetype *ami4ccm_exceptionholder (void);
+  // Accessor for the member, sets it on the first call.
 
-  /// Accessor for the member, sets it on the first call.
   be_interface *messaging_replyhandler (void);
+  // Accessor for the member, sets it on the first call.
 
-  /// Accessor for the member, sets it on the first call.
   be_interface *ami4ccm_replyhandler (void);
+  // Accessor for the member, sets it on the first call.
 
-  /// Accessors for the member.
   bool gen_anyop_files (void) const;
   void gen_anyop_files (bool val);
+  // Accessors for the member.
 
-  /// Accessors for the member gen_skel_files_.
   bool gen_skel_files (void) const;
   void gen_skel_files (bool val);
+  // Accessors for the member gen_skel_files_.
 
-  /// Accessors for the member gen_client_inline_.
   bool gen_client_inline (void) const;
   void gen_client_inline (bool val);
+  // Accessors for the member gen_client_inline_.
 
-  /// Accessors for the member gen_server_inline_.
   bool gen_server_inline (void) const;
   void gen_server_inline (bool val);
+  // Accessors for the member gen_server_inline_.
 
-  /// Accessors for the member gen_client_stub_.
   bool gen_client_stub (void) const;
   void gen_client_stub (bool val);
+  // Accessors for the member gen_client_stub_.
 
-  /// Accessors for the member gen_server_skeleton_.
   bool gen_server_skeleton (void) const;
   void gen_server_skeleton (bool val);
+  // Accessors for the member gen_server_skeleton_.
 
-  /// Accessors for the member gen_local_iface_anyops_.
   bool gen_local_iface_anyops (void) const;
   void gen_local_iface_anyops (bool val);
+  // Accessors for the member gen_local_iface_anyops_.
 
-  /// Accessors for the member gen_custom_ending_.
   bool gen_custom_ending (void) const;
   void gen_custom_ending (bool val);
+  // Accessors for the member gen_custom_ending_.
 
-  /// Accessors for the corresponding members.
   bool gen_ciao_svnt (void) const;
   void gen_ciao_svnt (bool val);
   bool gen_ciao_exec_idl (void) const;
   void gen_ciao_exec_idl (bool val);
   bool gen_ciao_exec_impl (void) const;
   void gen_ciao_exec_impl (bool val);
-  bool gen_ciao_conn_impl (void) const;
-  void gen_ciao_conn_impl (bool val);
+  // Accessors for the corresponding members.
+
+  bool gen_component_swapping (void) const;
+  void gen_component_swapping (bool val);
 
   bool gen_ciao_static_config (void) const;
   void gen_ciao_static_config (bool val);
@@ -772,42 +736,37 @@ public:
   bool gen_exec_export_hdr_file (void) const;
   void gen_exec_export_hdr_file (bool val);
 
-  bool gen_conn_export_hdr_file (void) const;
-  void gen_conn_export_hdr_file (bool val);
-
   bool gen_lem_force_all (void) const;
   void gen_lem_force_all (bool val);
 
-  /// Command line passed to ACE_Process::spawn. Different
-  /// implementations in IDL and IFR backends.
   ACE_CString spawn_options (void);
+  // Command line passed to ACE_Process::spawn. Different
+  // implementations in IDL and IFR backends.
 
-  /// Parse args that affect the backend.
   void parse_args (long &i, char **av);
+  // Parse args that affect the backend.
 
-  /// Special BE arg call factored out of DRV_args.
   void prep_be_arg (char *s);
+  // Special BE arg call factored out of DRV_args.
 
-  /// Checks made after parsing args.
   void arg_post_proc (void);
+  // Checks made after parsing args.
 
-  /// Display usage of BE-specific options.
   void usage (void) const;
+  // Display usage of BE-specific options.
 
-  /// Create an AST node generator.
   AST_Generator *generator_init (void);
+  // Create an AST node generator.
 
-  /// Called from various places.
   const char *get_output_path (bool for_anyop,
                                bool for_skel);
+  // Called from various places.
 
 private:
-  /**
-   * To switch between changing or non-changing standard include
-   * files (e.g. tao/corba.h)  so that #include statements can be
-   * generated with ""s or <>s respectively.
-   */
   size_t changing_standard_include_files_;
+  // To switch between changing or non-changing standard include
+  // files (e.g. tao/corba.h)  so that #include statements can be
+  // generated with ""s or <>s respectively.
 
   // Macros and includes used to export classes from generated code.
   char* skel_export_macro_;
@@ -824,8 +783,6 @@ private:
   char* exec_export_include_;
   char* svnt_export_macro_;
   char* svnt_export_include_;
-  char* conn_export_macro_;
-  char* conn_export_include_;
 
   char* pch_include_;
   char* pre_include_;
@@ -909,212 +866,194 @@ private:
   // CIAO executor IDL file name ending. Default is "E.idl".
   char* ciao_exec_idl_ending_;
 
-  // CIAO connector impl header file name ending. Default is "_conn.h".
-  char* ciao_conn_hdr_ending_;
-
-  // CIAO connector impl source file name ending. Default is "_conn.cpp".
-  char* ciao_conn_src_ending_;
-
   // DDS TypeSupport header file name ending. Default is "Support.h".
   char* dds_typesupport_hdr_ending_;
 
-  /**
-   * Directory where all the IDL-Compiler-Generated files are to be
-   * kept. Default value is 0 for this string which means the current
-   * directory from which the <tao_idl> is called.
-   */
   char* output_dir_;
+  // Directory where all the IDL-Compiler-Generated files are to be
+  // kept. Default value is 0 for this string which means the current
+  // directory from which the <tao_idl> is called.
 
-  /**
-   * Directory where all the *S.* files are to be
-   * kept. Default value is 0 for this string which means the
-   * value for output_dir_ is used.
-   */
   char* skel_output_dir_;
+  // Directory where all the *S.* files are to be
+  // kept. Default value is 0 for this string which means the
+  // value for output_dir_ is used.
 
-  /**
-   * Directory where all the *A.* files are to be
-   * kept. Default value is 0 for this string which means the
-   * value for output_dir_ is used.
-   */
   char* anyop_output_dir_;
+  // Directory where all the *A.* files are to be
+  // kept. Default value is 0 for this string which means the
+  // value for output_dir_ is used.
 
-  /// do we support Any operators?
   bool any_support_;
+  // do we support Any operators?
 
-  /// do we support typecodes?
   bool tc_support_;
+  // do we support typecodes?
 
-  /// do we optimize valuetype accessors?
   bool obv_opt_accessor_;
+  // do we optimize valuetype accessors?
 
-  /// are we generating implementation files?
   bool gen_impl_files_;
+  // are we generating implementation files?
 
-  /// are we generating source file and line numbers for implementation files?
   bool gen_impl_debug_info_;
+  // are we generating source file and line numbers for implementation files?
 
-  /// are we generating the copy constructor?
   bool gen_copy_ctor_;
+  // are we generating the copy constructor?
 
-  /// are we generating the assignment operator?
   bool gen_assign_op_;
+  // are we generating the assignment operator?
 
-  /// are we generating Thru_POA collocated stubs?
   bool gen_thru_poa_collocation_;
+  // are we generating Thru_POA collocated stubs?
 
-  /// are we generating Direct collocated stubs?
   bool gen_direct_collocation_;
+  // are we generating Direct collocated stubs?
 
-  /// are we generating for CORBA/e
   bool gen_corba_e_;
+  // are we generating for CORBA/e
 
-  /// are we generating for Minimum CORBA
   bool gen_minimum_corba_;
+  // are we generating for Minimum CORBA
 
-  /// do we generate optimized typecodes?
   bool opt_tc_;
+  // do we generate optimized typecodes?
 
-  /// Flag to indicate whether the AMI4ccm Call back feature should be enabled
-  /// for the generated files or not.
   bool ami4ccm_call_back_;
+  // Flag to indicate whether the AMI4ccm Call back feature should be enabled
+  // for the generated files or not.
 
-  /**
-   * Flag to indicate whether the AMI Call back feature of the
-   * Messaging specification should be enabled for the generated files
-   * or not.
-   */
   bool ami_call_back_;
+  // Flag to indicate whether the AMI Call back feature of the
+  // Messaging specification should be enabled for the generated files
+  // or not.
 
-  /// Flag for generating AMH classes.
   bool gen_amh_classes_;
+  // Flag for generating AMH classes.
 
-  /// Flag to indicate whether we generate the tie classes and
-  /// files or not.
   bool gen_tie_classes_;
+  // Flag to indicate whether we generate the tie classes and
+  // files or not.
 
-  /// Flag to indicate whether smart proxies classes will be generated
-  /// or not.
   bool gen_smart_proxies_;
+  // Flag to indicate whether smart proxies classes will be generated
+  // or not.
 
-  /// Flag to indicate whether we are using an inline form of constant
-  /// generation that pleases the C++ compiler better on some platforms.
   bool gen_inline_constants_;
+  // Flag to indicate whether we are using an inline form of constant
+  // generation that pleases the C++ compiler better on some platforms.
 
-  /// Flag to indicate whether we are supporting DDS DCPS type definitions.
-  /// Includes Serializer operators (like TAO_Input/OutuptCDR).
   bool gen_dcps_type_support_;
+  // Flag to indicate whether we are supporting DDS DCPS type definitions.
+  // Includes Serializer operators (like TAO_Input/OutuptCDR).
 
-  /// Flag to indicate whether we are supporting DDS DCPS type only definitions.
-  /// Only generate DDS Serializer operators for tao/*Seq.pidl.
   bool gen_dcps_type_support_only_;
+  // Flag to indicate whether we are supporting DDS DCPS type only definitions.
+  // Only generate DDS Serializer operators for tao/*Seq.pidl.
 
-  /// Flag to indicate whether ORB.h include should be generated, needed for
-  /// regenerating the pidl files.
   bool gen_orb_h_include_;
+  // Flag to indicate whether ORB.h include should be generated, needed for
+  // regenerating the pidl files.
 
-  /// Flag to indicate whether an empty A.h should be generated
   bool gen_empty_anyop_header_;
+  // Flag to indicate whether an empty A.h should be generated
 
-  /// The enumerated value indicating the lookup strategy.
   LOOKUP_STRATEGY lookup_strategy_;
+  // The enumerated value indicating the lookup strategy.
 
-  /// Used for void operation return types.
   AST_PredefinedType *void_type_;
+  // Used for void operation return types.
 
-  /// Reference holder for component skeleton visitors.
   be_interface *ccmobject_;
+  // Reference holder for component skeleton visitors.
 
-  /// Storage for the messaging exceptions holder's virtual scope.
   be_module *messaging_;
+  // Storage for the messaging exceptions holder's virtual scope.
 
-  /// Storage for the ami4ccm exceptions holder's virtual scope.
   be_module *ami4ccm_;
+  // Storage for the ami4ccm exceptions holder's virtual scope.
 
-  /// Storage for exception holders' base class node.
   be_valuetype *messaging_exceptionholder_;
+  // Storage for exception holders' base class node.
 
-  /// Storage for exception holders' base class node.
   be_valuetype *ami4ccm_exceptionholder_;
+  // Storage for exception holders' base class node.
 
-  /// Storage for the reply handlers' base class node.
   be_interface *messaging_replyhandler_;
+  // Storage for the reply handlers' base class node.
 
-  /// Storage for the reply handlers' base class node.
   be_interface *ami4ccm_replyhandler_;
+  // Storage for the reply handlers' base class node.
 
-  /// Separate files for generated Any operators?
   bool gen_anyop_files_;
+  // Separate files for generated Any operators?
 
-  /// True by default, but a command line option can turn this off so
-  /// we generate only an empty *S.h file on the skeleton side.
   bool gen_skel_files_;
+  // True by default, but a command line option can turn this off so
+  // we generate only an empty *S.h file on the skeleton side.
 
-  /// True by default, but a command line option can turn this off so
-  /// that we don't generate a client inline file
   bool gen_client_inline_;
+  // True by default, but a command line option can turn this off so
+  // that we don't generate a client inline file
 
-  /// True by default, but a command line option can turn this off so
-  /// that we don't generate a server inline file
   bool gen_server_inline_;
+  // True by default, but a command line option can turn this off so
+  // that we don't generate a server inline file
 
-  /// True by default, but a command line option can turn this off so
-  /// that we don't generate a client stub file
   bool gen_client_stub_;
+  // True by default, but a command line option can turn this off so
+  // that we don't generate a client stub file
 
-  /// True by default, but a command line option can turn this off so
-  /// that we don't generate a server skeleton file
   bool gen_server_skeleton_;
+  // True by default, but a command line option can turn this off so
+  // that we don't generate a server skeleton file
 
-  /// True by default, can be turned off by a command line option
-  /// for regenerating internal ORB files.
   bool gen_local_iface_anyops_;
+  // True by default, can be turned off by a command line option
+  // for regenerating internal ORB files.
 
-  /// Use in_clonable_arg_val instead of in_arg_val?
   bool use_clonable_in_args_;
+  // Use in_clonable_arg_val instead of in_arg_val?
 
-  /// Generate explicit export for Visual Studio bug workaround,
-  /// needed only in TAO basic sequence *C.h files.
   bool gen_template_export_;
+  // Generate explicit export for Visual Studio bug workaround,
+  // needed only in TAO basic sequence *C.h files.
 
-  /// Generate ostream operators for each type declaration, for
-  /// debugging or logging.
   bool gen_ostream_operators_;
+  // Generate ostream operators for each type declaration, for
+  // debugging or logging.
 
-  /**
-   * True by default, but a command line option can turn this off so
-   * custom ending will not be applied to files in $TAO_ROOT/,
-   * $TAO_ROOT/tao, $TAO_ROOT/orbsvcs, $TAO_ROOT/CIAO, $TAO_ROOT/CIAO/ciao.
-   */
   bool gen_custom_ending_;
+  // True by default, but a command line option can turn this off so
+  // custom ending will not be applied to files in $TAO_ROOT/,
+  // $TAO_ROOT/tao, $TAO_ROOT/orbsvcs, $TAO_ROOT/CIAO, $TAO_ROOT/CIAO/ciao.
 
-  /// False by default, these flags trigger code generation
-  /// formerly done by the CIAO CIDL compiler.
   bool gen_ciao_svnt_;
   bool gen_ciao_exec_idl_;
   bool gen_ciao_exec_impl_;
+  // False by default, these flags trigger code generation
+  // formerly done by the CIAO CIDL compiler.
 
-  /// False by default, this flag triggers code generation
-  /// for CCM connector implementations.
-  bool gen_ciao_conn_impl_;
+  bool gen_component_swapping_;
+  // Different container #includes, modified servant code.
 
-  /// Suppresses generation of table guards in CIAO servants.
   bool gen_ciao_static_config_;
+  // Suppresses generation of table guards in CIAO servants.
 
-  /// Generate automatic valuetype factory registration in
-  /// CIAO servants.
   bool gen_ciao_valuefactory_reg_;
+  // Generate automatic valuetype factory registration in
+  // CIAO servants.
 
-  /// Flags toggling export header file generation.
   bool gen_stub_export_hdr_file_;
   bool gen_skel_export_hdr_file_;
   bool gen_svnt_export_hdr_file_;
   bool gen_exec_export_hdr_file_;
-  bool gen_conn_export_hdr_file_;
+  // Flags toggling export header file generation.
 
-  /// Toggles generation of exec IDL for facets with imported
-  /// interface types (not in main IDL file).
   bool gen_lem_force_all_;
+  // Toggles generation of exec IDL for facets with imported
+  // interface types (not in main IDL file).
 };
 
 #endif /* _BE_GLOBAL_H */
diff --git a/TAO/TAO_IDL/be_include/be_helper.h b/TAO/TAO_IDL/be_include/be_helper.h
index a80c8045ae2..d919d9fb049 100644
--- a/TAO/TAO_IDL/be_include/be_helper.h
+++ b/TAO/TAO_IDL/be_include/be_helper.h
@@ -1,19 +1,24 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    be_helper.h
- *
- *  $Id$
- *
- *  Defines the abstract class for outputting the C++ mapping. This is a
- *  helper class to the singleton TAO_CodeGen class
- *
- *
- *  @author Aniruddha Gokhale Improvements by Carlos O'Ryan
- */
-//=============================================================================
-
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_helper.h
+//
+// = DESCRIPTION
+//    Defines the abstract class for outputting the C++ mapping. This is a
+//    helper class to the singleton TAO_CodeGen class
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+//    Improvements by Carlos O'Ryan
+//
+// ============================================================================
 
 #ifndef TAO_BE_OUTSTRM_H
 #define TAO_BE_OUTSTRM_H
@@ -76,19 +81,17 @@ struct TAO_ACE_CHECK
   bool do_return_;
 };
 
-/**
- * @class TAO_OutStream
- =TITLE
- * TAO_OutStream
- * =DESCRIPTION
- * Defines an interface by which the backend code generator can
- * print its output to the underlying I/O handle. This is a
- * helper class that will be used by the TAO_CodeGen
- * class. However, this is an abstract class and classes that
- * understand specific front ends must derive from this class.
- */
 class TAO_OutStream
 {
+  // =TITLE
+  //   TAO_OutStream
+  //
+  // =DESCRIPTION
+  //    Defines an interface by which the backend code generator can
+  //    print its output to the underlying I/O handle. This is a
+  //    helper class that will be used by the TAO_CodeGen
+  //    class. However, this is an abstract class and classes that
+  //    understand specific front ends must derive from this class.
 public:
 
   // Enumerated type to indicate the stream type
@@ -110,57 +113,55 @@ public:
       CIAO_SVNT_IMPL,
       CIAO_EXEC_HDR,
       CIAO_EXEC_IMPL,
-      CIAO_EXEC_IDL,
-      CIAO_CONN_HDR,
-      CIAO_CONN_IMPL
+      CIAO_EXEC_IDL
     };
 
-  /// constructor.
   TAO_OutStream (void);
+  // constructor.
 
-  /// destructor.
   virtual ~TAO_OutStream (void);
+  // destructor.
 
-  /// open the underlying low-level handle for output.
   int open (const char *fname,
             TAO_OutStream::STREAM_TYPE st = TAO_OutStream::TAO_CLI_HDR);
+  // open the underlying low-level handle for output.
 
-  /// set the stream type
   void stream_type (TAO_OutStream::STREAM_TYPE);
+  // set the stream type
 
-  /// return the stream type
   TAO_OutStream::STREAM_TYPE stream_type (void);
+  // return the stream type
 
-  /// Return the underlying lowlevel file pointer.
   FILE *&file (void);
+  // Return the underlying lowlevel file pointer.
 
-  /// increment the indentation level and by default actually indent the output
-  /// accordingly
   int incr_indent (unsigned short flag = 1);
+  // increment the indentation level and by default actually indent the output
+  // accordingly
 
-  /// decrease the indentation level and by default actually indent the output
-  /// accordingly
   int decr_indent (unsigned short flag = 1);
+  // decrease the indentation level and by default actually indent the output
+  // accordingly
 
-  /// reset indentation level to 0
   int reset (void);
+  // reset indentation level to 0
 
-  /// indent starting next line
   int indent (void);
+  // indent starting next line
 
-  /// put a newline and indent on the next line
   int nl (void);
+  // put a newline and indent on the next line
 
-  /// "printf" style variable argument print
   int print (const char *format, ...);
+  // "printf" style variable argument print
 
-  /// generate a #if !defined, #defined macro
   int gen_ifdef_macro (const char *flat_name,
                        const char *suffix = 0,
                        bool add_stream_type_suffix = true);
+  // generate a #if !defined, #defined macro
 
-  /// generate an endif statement
   int gen_endif (void);
+  // generate an endif statement
 
   // =overloaded operators
 
@@ -180,14 +181,14 @@ public:
 
   // The following will be provided by specialized classes
 
-  /// output an Identifier node
   TAO_OutStream &operator<< (Identifier *id);
+  // output an Identifier node
 
-  /// output a scoped name
   TAO_OutStream &operator<< (UTL_IdList *idl);
+  // output a scoped name
 
-  /// output an AST_Expression node
   TAO_OutStream &operator<< (AST_Expression *expr);
+  // output an AST_Expression node
 
   TAO_OutStream &print (Identifier *id);
 
@@ -196,14 +197,14 @@ public:
   TAO_OutStream &print (AST_Expression *idl);
 
 protected:
-  /// the underlying low-level I/O handle
   FILE *fp_;
+  // the underlying low-level I/O handle
 
-  /// stream type
   TAO_OutStream::STREAM_TYPE st_;
+  // stream type
 
-  /// indentation level
   int indent_level_;
+  // indentation level
 };
 
 #endif // if !defined
diff --git a/TAO/TAO_IDL/be_include/be_home.h b/TAO/TAO_IDL/be_include/be_home.h
index 381dee6bb32..c64d42d8a8b 100644
--- a/TAO/TAO_IDL/be_include/be_home.h
+++ b/TAO/TAO_IDL/be_include/be_home.h
@@ -1,18 +1,22 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    be_home.h
- *
- *  $Id$
- *
- *  Extension of class AST_Home that provides additional
- *  means for C++ mapping of a component home.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_home.h
+//
+// = DESCRIPTION
+//    Extension of class AST_Home that provides additional
+//    means for C++ mapping of a component home.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef TAO_BE_HOME_H
 #define TAO_BE_HOME_H
@@ -29,6 +33,8 @@ class be_home : public virtual AST_Home,
   // =DESCRIPTION
   //   Extensions to the AST_Home class
 public:
+  be_home (void);
+
   be_home (UTL_ScopedName *n,
            AST_Home *base_home,
            AST_Component *managed_component,
diff --git a/TAO/TAO_IDL/be_include/be_identifier_helper.h b/TAO/TAO_IDL/be_include/be_identifier_helper.h
index c0d20a5718e..171071f1026 100644
--- a/TAO/TAO_IDL/be_include/be_identifier_helper.h
+++ b/TAO/TAO_IDL/be_include/be_identifier_helper.h
@@ -1,18 +1,21 @@
+// $Id$
 
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    be_identifier_helper.h
- *
- *  $Id$
- *
- *  Utilities associated with UTL_Identifier.
- *
- *
- *  @author Jeff Parsons <j.parsons@vanderbilt.edu>
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO_IDL_BE_DLL
+//
+// = FILENAME
+//    be_identifier_helper.h
+//
+// = DESCRIPTION
+//    Utilities associated with UTL_Identifier.
+//
+// = AUTHOR
+//    Jeff Parsons <j.parsons@vanderbilt.edu>
+//
+// ============================================================================
 
 #ifndef BE_IDENTIFIER_HELPER_H
 #define BE_IDENTIFIER_HELPER_H
diff --git a/TAO/TAO_IDL/be_include/be_interface.h b/TAO/TAO_IDL/be_include/be_interface.h
index 4319edece05..c7b3c94b4af 100644
--- a/TAO/TAO_IDL/be_include/be_interface.h
+++ b/TAO/TAO_IDL/be_include/be_interface.h
@@ -1,20 +1,26 @@
 // -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    be_interface.h
- *
- *  $Id$
- *
- *  Extension of class AST_Interface that provides additional means for C++
- *  mapping of an interface.
- *
- *
- *  @author Copyright 1994-1995 by Sun Microsystems
- *  @author Inc. and Aniruddha Gokhale
- *  @author Michael Kircher
- */
-//=============================================================================
+//
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO_IDL_BE
+//
+// = FILENAME
+//    be_interface.h
+//
+// = DESCRIPTION
+//    Extension of class AST_Interface that provides additional means for C++
+//    mapping of an interface.
+//
+// = AUTHOR
+//    Copyright 1994-1995 by Sun Microsystems, Inc.
+//    and
+//    Aniruddha Gokhale,
+//    Michael Kircher
+//
+// ============================================================================
 
 #ifndef TAO_BE_INTERFACE_H
 #define TAO_BE_INTERFACE_H
@@ -52,6 +58,9 @@ public:
                                    be_interface *,
                                    TAO_OutStream *);
 
+  be_interface (void);
+  // Default constructor.
+
   be_interface (UTL_ScopedName *n,
                 AST_Type **ih,
                 long nih,
@@ -59,107 +68,109 @@ public:
                 long nih_flat,
                 bool local,
                 bool abstract);
+  // Constructor that sets its scoped name <n>, a list of inherited interfaces
+  // <ih>, the number of inherited interfaces <nih>, and any prgmas <p>.
 
-  /// Destructor.
   ~be_interface (void);
+  // Destructor.
 
-  /// Set the strategy to generate the names.
   be_interface_strategy *set_strategy (be_interface_strategy *new_strategy);
+  // Set the strategy to generate the names.
 
   // Methods, which access the strategy.
 
-  /// Return the local name.
   const char *local_name (void) const;
+  // Return the local name.
 
-  /// Return the stringified full name.
   virtual const char *full_name (void);
+  // Return the stringified full name.
 
-  /// Return the flattened full scoped name.
   virtual const char *flat_name (void);
+  // Return the flattened full scoped name.
 
-  /// Retrieve the repository ID.
   virtual const char *repoID (void) const;
+  // Retrieve the repository ID.
 
-  /// Retrieve the fully scoped skel class name.
   const char *full_skel_name (void) const;
+  // Retrieve the fully scoped skel class name.
 
-  /// Retrieve the fully qualified collocated class name.
   const char *full_coll_name (int) const;
+  // Retrieve the fully qualified collocated class name.
 
-  /// Retrieve the fully qualified collocated class name.
   const char *local_coll_name (int) const;
+  // Retrieve the fully qualified collocated class name.
 
-  /// retrieve the name of the base proxy implementation.
   virtual const char *base_proxy_impl_name (void);
+  // retrieve the name of the base proxy implementation.
 
-  /// retrieve the fully qualified name of the base proxy
-  /// implementation.
   virtual const char *full_base_proxy_impl_name (void);
+  // retrieve the fully qualified name of the base proxy
+  // implementation.
 
-  /// retrieve the name of the remote  proxy implementation.
   virtual const char *remote_proxy_impl_name (void);
+  // retrieve the name of the remote  proxy implementation.
 
-  /// retrieve the fully qualified name of the remote
-  /// proxy implementation.
   virtual const char *full_remote_proxy_impl_name (void);
+  // retrieve the fully qualified name of the remote
+  // proxy implementation.
 
-  /// retrieve the name of the Directx  proxy implementation.
   virtual const char *direct_proxy_impl_name (void);
+  // retrieve the name of the Directx  proxy implementation.
 
-  /// retrieve the fully qualified name of the Directx  proxy
-  /// implementation.
   virtual const char *full_direct_proxy_impl_name (void);
+  // retrieve the fully qualified name of the Directx  proxy
+  // implementation.
 
-  /// retrieve the name of the base proxy broker.
   virtual const char *base_proxy_broker_name (void);
+  // retrieve the name of the base proxy broker.
 
-  /// retrieve the fully qualified name of the base proxy broker.
   virtual const char *full_base_proxy_broker_name (void);
+  // retrieve the fully qualified name of the base proxy broker.
 
-  /// retrieve the name of the remote  proxy broker implementation.
   virtual const char *remote_proxy_broker_name (void);
+  // retrieve the name of the remote  proxy broker implementation.
 
-  /// retrieve the fully qualified name of the remote  proxy broker
-  /// implementation.
   virtual const char *full_remote_proxy_broker_name (void);
+  // retrieve the fully qualified name of the remote  proxy broker
+  // implementation.
 
-  /// retrieve the name of the strategized proxy broker implementation.
   virtual const char *strategized_proxy_broker_name (void);
+  // retrieve the name of the strategized proxy broker implementation.
 
-  /// retrieve the fully qualified name of the strategized proxy broker
-  /// implementation.
   virtual const char *full_strategized_proxy_broker_name (void);
+  // retrieve the fully qualified name of the strategized proxy broker
+  // implementation.
 
-  /// Return the client scope that encloses the interface.
   virtual const char *client_enclosing_scope (void);
+  // Return the client scope that encloses the interface.
 
-  /// Return the "flattened" scope that encloses
-  /// the interface.
   virtual const char *flat_client_enclosing_scope (void);
+  // Return the "flattened" scope that encloses
+  // the interface.
 
-  /// Return the server scope that encloses the interface.
   virtual const char *server_enclosing_scope (void);
+  // Return the server scope that encloses the interface.
 
-  /// Retrieve skeleton name.
   const char *relative_skel_name (const char *skel_name);
+  // Retrieve skeleton name.
 
-  /// Build up the skeleton name.
   void compute_full_skel_name (const char *prefix,
                                char *&skel_name);
+  // Build up the skeleton name.
 
   static const char *relative_name (const char *localname,
                                     const char *othername);
 
-  /// Call the default constructors of all the base classes.
   virtual void gen_def_ctors (TAO_OutStream* os);
+  // Call the default constructors of all the base classes.
 
-  /// Generated the global hooks used for non-defined forward
-  /// declared interfaces, and the contructor from stub object.
   virtual void gen_stub_ctor (TAO_OutStream* os);
+  // Generated the global hooks used for non-defined forward
+  // declared interfaces, and the contructor from stub object.
 
-  /// Generate the declarations used by the template _var, _out
-  /// classes for interfaces, and by sequence template classes.
   void gen_var_out_seq_decls (void);
+  // Generate the declarations used by the template _var, _out
+  // classes for interfaces, and by sequence template classes.
 
   // Each interface (to fix names "T") also defines two help classes,
   // the "collocated" class inherits from T, but delegates on the
@@ -194,22 +205,20 @@ public:
     bool abstract_paths_only = false,
     bool add_ccm_object = true);
 
-  /**
-   * Am I in some form of multiple inheritance
-   * -1 => error
-   * 0 => no
-   * 1 => yes
-   */
   int in_mult_inheritance (void);
+  // Am I in some form of multiple inheritance
+  // -1 => error
+  // 0 => no
+  // 1 => yes
 
-  /// Set a new value.
   void in_mult_inheritance (int mi);
+  // Set a new value.
 
-  /// Pass along BE-specific member values when redefining a fwd decl.
   virtual void redefine (AST_Interface *from);
+  // Pass along BE-specific member values when redefining a fwd decl.
 
-  /// Cleanup function.
   virtual void destroy (void);
+  // Cleanup function.
 
   // Visiting.
   virtual int accept (be_visitor *visitor);
@@ -219,47 +228,47 @@ public:
   DEF_NARROW_FROM_DECL (be_interface);
   DEF_NARROW_FROM_SCOPE (be_interface);
 
-  /// Helper method passed to the template method that generates code for the
-  /// is_a method.
   static int is_a_helper (be_interface *,
                           be_interface *,
                           TAO_OutStream *os);
+  // Helper method passed to the template method that generates code for the
+  // is_a method.
 
-  /// Helper method passed to the template method to generate code for the
-  /// operation table.
   static int ami_handler_gen_optable_helper (be_interface *,
                                              be_interface *,
                                              TAO_OutStream *os);
+  // Helper method passed to the template method to generate code for the
+  // operation table.
 
-  /// Helper method passed to the template method to generate code for the
-  /// skeletons in the header and inline files.
   static int gen_skel_helper (be_interface *,
                               be_interface *,
                               TAO_OutStream *);
+  // Helper method passed to the template method to generate code for the
+  // skeletons in the header and inline files.
 
-  /// Helper method passed to the template method to generate code for the
-  /// collocated functions in the header file.
   static int gen_colloc_op_decl_helper (be_interface *derived,
                                         be_interface *ancestor,
                                         TAO_OutStream *os);
+  // Helper method passed to the template method to generate code for the
+  // collocated functions in the header file.
 
-  /// Helper method passed to the template method to generate code for the
-  /// collocated functions in the source file.
   static int gen_colloc_op_defn_helper (be_interface *derived,
                                         be_interface *ancestor,
                                         TAO_OutStream *os);
+  // Helper method passed to the template method to generate code for the
+  // collocated functions in the source file.
 
-  /// Helper method passed to the template method to invoke ctors of all the
-  /// base classes.
   static int copy_ctor_helper (be_interface *,
                                be_interface *,
                                TAO_OutStream *os);
+  // Helper method passed to the template method to invoke ctors of all the
+  // base classes.
 
-  /// Helper method to determine if the interface node is involved in some kind
-  /// of multiple inheritance or not. Required on the skeleton side.
   static int in_mult_inheritance_helper (be_interface *,
                                          be_interface *,
                                          TAO_OutStream *os);
+  // Helper method to determine if the interface node is involved in some kind
+  // of multiple inheritance or not. Required on the skeleton side.
 
   static int gen_def_ctors_helper (be_interface *node,
                                    be_interface *base,
@@ -268,11 +277,11 @@ public:
   // Helper method to generate a call to the default
   // constructors of all the base classes.
 
-  /// Helper method to initialize the obj_ member of each generated abstract
-  /// base class.
   static int gen_abstract_init_helper (be_interface *node,
                                        be_interface *base,
                                        TAO_OutStream *os);
+  // Helper method to initialize the obj_ member of each generated abstract
+  // base class.
 
   /// Helper method passed to traverse_inheritance_graph(),
   /// collects supported operations and attributes.
@@ -280,20 +289,19 @@ public:
                                   be_interface *base,
                                   TAO_OutStream *os);
 
-  /// Generate the operation table including entries for inherited interfaces.
   int gen_operation_table (const char *flat_name,
                            const char *skeleton_class_name);
+  // Generate the operation table including entries for inherited interfaces.
 
-  /// generate the operation table entries.
   int gen_optable_entries (be_interface *derived_interface,
                            const char *full_skeleton_name,
                            TAO_OutStream *os);
+  // generate the operation table entries.
 
-  /// If we are local, regenerate non-local base class operations as
-  /// pure virtual.
   int convert_parent_ops (be_visitor *visitor);
+  // If we are local, regenerate non-local base class operations as
+  // pure virtual.
 
-  /// Common code called from gen_colloc_op_defn_helper().
   static void gen_collocated_skel_body (be_interface *derived,
                                         be_interface *ancestor,
                                         AST_Decl *d,
@@ -301,137 +309,132 @@ public:
                                         bool direct,
                                         UTL_ExceptList *list,
                                         TAO_OutStream *os);
+  // Common code called from gen_colloc_op_defn_helper().
 
-  /// Overridden from class be_type.
   virtual void gen_ostream_operator (TAO_OutStream *os,
                                      bool use_underscore);
+  // Overridden from class be_type.
 
-  /// Overridden from class be_type.
   virtual void gen_member_ostream_operator (TAO_OutStream *os,
                                             const char *instance_name,
                                             bool use_underscore,
                                             bool accessor = false);
+  // Overridden from class be_type.
 
-  /// Compute whether or not we have both abstract and concrete parents,
-  /// and make a list of the abstract parents, if any.
   void analyze_parentage (void);
+  // Compute whether or not we have both abstract and concrete parents,
+  // and make a list of the abstract parents, if any.
 
-  /// Find the next state, used to hide differences between variants of
-  /// interfaces.
   TAO_CodeGen::CG_STATE next_state (TAO_CodeGen::CG_STATE current_state,
                                     int is_extra_state = 0);
+  // Find the next state, used to hide differences between variants of
+  // interfaces.
 
-  /// Returns 1 if additional code needs to be generated, the behavior
-  /// is driven by the strategy connected with this interface.
   int has_extra_code_generation (TAO_CodeGen::CG_STATE current_state);
+  // Returns 1 if additional code needs to be generated, the behavior
+  // is driven by the strategy connected with this interface.
 
-  /// Sets the original interface from which this one was created,
-  /// applies only to implied IDL.
   void original_interface (be_interface *original_interface);
+  // Sets the original interface from which this one was created,
+  // applies only to implied IDL.
 
-  /// Returns the original interface from which this one was created,
-  /// applies only to implied IDL
   be_interface *original_interface ();
+  // Returns the original interface from which this one was created,
+  // applies only to implied IDL
 
-  /// Returns an interface, which can be used instead.
-  /// Needs to get set by the strategy.
   be_interface *replacement ();
+  // Returns an interface, which can be used instead.
+  // Needs to get set by the strategy.
 
-  /// Do we have both abstract and concrete parents?
   int has_mixed_parentage (void);
+  // Do we have both abstract and concrete parents?
 
-  /// Is Components::SessionComponent an immediate parent?
   int session_component_child (void);
+  // Is Components::SessionComponent an immediate parent?
 
-  /// Is EventConsumerBase our parent?
   bool is_event_consumer (void);
+  // Is EventConsumerBase our parent?
 
-  /**
-   * Common code for facet generation, whether we are
-   * navigating from the component port or forcing
-   * facet generation for all interfaces.
-   */
   void gen_facet_idl (TAO_OutStream &os);
   int gen_facet_svnt_hdr (be_visitor *visitor,
                           TAO_OutStream &os);
   int gen_facet_svnt_src (be_visitor *visitor,
                           TAO_OutStream &os);
+  // Common code for facet generation, whether we are
+  // navigating from the component port or forcing
+  // facet generation for all interfaces.
 
-  /// Helper function called from visitors and used internally.
   void gen_nesting_open (TAO_OutStream &os);
   void gen_nesting_close (TAO_OutStream &os);
+  // Helper function called from visitors and used internally.
 
 private:
-  /// Output the header (type declaration and %%) to the gperf's input
-  /// file.
   void gen_gperf_input_header (TAO_OutStream *ss);
+  // Output the header (type declaration and %%) to the gperf's input
+  // file.
 
-  /**
-   * Run GPERF and get the correct lookup and other operations
-   * depending on which strategy we are using. Returns 0 on sucess, -1
-   * on error.
-   */
   int gen_gperf_things (const char *flat_name);
+  // Run GPERF and get the correct lookup and other operations
+  // depending on which strategy we are using. Returns 0 on sucess, -1
+  // on error.
 
-  /// Outputs the class definition for the perfect hashing. This class
-  /// will inherit from the TAO_Perfect_Hash_OpTable.
   void gen_perfect_hash_class_definition (const char *flat_name);
+  // Outputs the class definition for the perfect hashing. This class
+  // will inherit from the TAO_Perfect_Hash_OpTable.
 
-  /// Outputs the class definition for the binary search . This class
-  /// will inherit from the TAO_Binary_Search_OpTable.
   void gen_binary_search_class_definition (const char *flat_name);
+  // Outputs the class definition for the binary search . This class
+  // will inherit from the TAO_Binary_Search_OpTable.
 
-  /// Outputs the class defintion for the linear search. This class
-  /// will inherit from the TAO_Linear_Search.
   void gen_linear_search_class_definition (const char *flat_name);
+  // Outputs the class defintion for the linear search. This class
+  // will inherit from the TAO_Linear_Search.
 
-  /// This calls the GPERF program and gets the correct operation
-  /// lookup methods for the current OpLookup strategy.
   int gen_gperf_lookup_methods (const char *flat_name);
+  // This calls the GPERF program and gets the correct operation
+  // lookup methods for the current OpLookup strategy.
 
-  /// Create an instance of this perfect hash table.
   void gen_perfect_hash_instance (const char *flat_name);
+  // Create an instance of this perfect hash table.
 
-  /// Create an instance of the binary search optable.
   void gen_binary_search_instance (const char *flat_name);
+  // Create an instance of the binary search optable.
 
-  /// Create an instance of the linear search optable.
   void gen_linear_search_instance (const char *flat_name);
+  // Create an instance of the linear search optable.
 
-  /**
-   * Called from traverse_inheritance_graph(), since base
-   * components and base homes are inserted before the actual
-   * traversal, it must be done tail-recursively to get the
-   * chain of parents in the correct order when generating
-   * copy constructors etc.
-   */
   void enqueue_base_component_r (AST_Component *node);
   void enqueue_base_home_r (AST_Home *node);
+  // Called from traverse_inheritance_graph(), since base
+  // components and base homes are inserted before the actual
+  // traversal, it must be done tail-recursively to get the
+  // chain of parents in the correct order when generating
+  // copy constructors etc.
 
 protected:
-  /// Have these been done already?
   int var_out_seq_decls_gen_;
+  // Have these been done already?
 
 protected:
-  /// Number of static skeletons in the operation table.
   int skel_count_;
+  // Number of static skeletons in the operation table.
 
-  /// Am I directly or indirectly involved in a multiple inheritance. If the
-  /// value is -1 => not computed yet.
   int in_mult_inheritance_;
+  // Am I directly or indirectly involved in a multiple inheritance. If the
+  // value is -1 => not computed yet.
 
-  /// Member for holding the strategy for generating names.
   be_interface_strategy *strategy_;
+  // Member for holding the strategy for generating names.
 
-  /// The original interface from which this one was created,
-  /// applies only to implied IDL
   be_interface *original_interface_;
+  // The original interface from which this one was created,
+  // applies only to implied IDL
 
-  /// Do we have both abstract and concrete parents?
   int has_mixed_parentage_;
+  // Do we have both abstract and concrete parents?
 
-  /// Are we a direct child of Components::SessionComponent?
   int session_component_child_;
+  // Are we a direct child of Components::SessionComponent?
 };
 
 /**
diff --git a/TAO/TAO_IDL/be_include/be_interface_fwd.h b/TAO/TAO_IDL/be_include/be_interface_fwd.h
index 831e825b14f..23f6f1860f6 100644
--- a/TAO/TAO_IDL/be_include/be_interface_fwd.h
+++ b/TAO/TAO_IDL/be_include/be_interface_fwd.h
@@ -1,19 +1,24 @@
 /* -*- c++ -*- */
+// $Id$
 
-//=============================================================================
-/**
- *  @file    be_interface_fwd.h
- *
- *  $Id$
- *
- *  Extension of class AST_InterfaceFwd that provides additional
- *  means for C++ mapping of a forward declared interface.
- *
- *
- *  @author Copyright 1994-1995 by Sun Microsystems
- *  @author Inc. and Aniruddha Gokhale
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_interface_fwd.h
+//
+// = DESCRIPTION
+//    Extension of class AST_InterfaceFwd that provides additional
+//    means for C++ mapping of a forward declared interface.
+//
+// = AUTHOR
+//    Copyright 1994-1995 by Sun Microsystems, Inc.
+//    and
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef BE_INTERFACE_FWD_H
 #define BE_INTERFACE_FWD_H
@@ -33,23 +38,29 @@ class be_interface_fwd : public virtual AST_InterfaceFwd,
   // =DESCRIPTION
   //   Extensions to the AST_InterfaceFwd class
 public:
+  be_interface_fwd (void);
+  // Default constructor.
+
   be_interface_fwd (AST_Interface *dummy,
                     UTL_ScopedName *n);
+  // Constructor.
 
   virtual ~be_interface_fwd (void);
+  // Destructor.
 
-  /// Mutator overrides for be_type members. If we have been
-  /// defined, we want the full definition to be set as well.
   virtual void seen_in_sequence (bool val);
   virtual void seen_in_operation (bool val);
+  // Mutator overrides for be_type members. If we have been
+  // defined, we want the full definition to be set as well.
 
-  /// Cleanup function.
   virtual void destroy (void);
+  // Cleanup function.
 
   // Visiting.
   virtual int accept (be_visitor* visitor);
 
   // Narrowing.
+
   DEF_NARROW_FROM_DECL (be_interface_fwd);
 };
 
diff --git a/TAO/TAO_IDL/be_include/be_interface_strategy.h b/TAO/TAO_IDL/be_include/be_interface_strategy.h
index df49a408580..90a21d7776d 100644
--- a/TAO/TAO_IDL/be_include/be_interface_strategy.h
+++ b/TAO/TAO_IDL/be_include/be_interface_strategy.h
@@ -1,19 +1,22 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    be_interface_strategy.h
- *
- *  $Id$
- *
- *  Strategy to cover differences between operations, e.g.
- *  the sendc_ and raise_ operations in the AMI spec.
- *
- *
- *  @author Michael Kircher
- */
-//=============================================================================
-
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_interface_strategy.h
+//
+// = DESCRIPTION
+//    Strategy to cover differences between operations, e.g.
+//    the sendc_ and raise_ operations in the AMI spec.
+//
+// = AUTHOR
+//    Michael Kircher
+//
+// ============================================================================
 
 #ifndef TAO_BE_INTERFACE_STRATEGY_H
 #define TAO_BE_INTERFACE_STRATEGY_H
@@ -40,133 +43,129 @@ public:
 
   virtual ~be_interface_strategy (void);
 
-  /// return the local name
   virtual const char *local_name (void) = 0;
+  // return the local name
 
-  /// return the stringified full name
   virtual const char *full_name (void) = 0;
+  // return the stringified full name
 
-  /// return the flattened full scoped name.
   virtual const char *flat_name (void) = 0;
+  // return the flattened full scoped name.
 
-  /// retrieve the repository ID.
   virtual const char *repoID (void) = 0;
+  // retrieve the repository ID.
 
-  /// retrieve the fully scoped skel class name.
   virtual const char *full_skel_name (void) = 0;
+  // retrieve the fully scoped skel class name.
 
-  /// retrieve the fully qualified collocated class name
   virtual const char *full_coll_name (int) = 0;
+  // retrieve the fully qualified collocated class name
 
-  /// retrieve the fully qualified collocated class name.
   virtual const char *local_coll_name (int) = 0;
+  // retrieve the fully qualified collocated class name.
 
-  /// retrieve the name of the base proxy implementation.
   virtual const char *base_proxy_impl_name (void) = 0;
+  // retrieve the name of the base proxy implementation.
 
-  /// retrieve the fully qualified name of the base proxy
-  /// implementation.
   virtual const char *full_base_proxy_impl_name (void) = 0;
+  // retrieve the fully qualified name of the base proxy
+  // implementation.
 
-  /// retrieve the name of the remote  proxy implementation.
   virtual const char *remote_proxy_impl_name (void) = 0;
+  // retrieve the name of the remote  proxy implementation.
 
-  /// retrieve the fully qualified name of the remote
-  /// proxy implementation.
   virtual const char *full_remote_proxy_impl_name (void) = 0;
+  // retrieve the fully qualified name of the remote
+  // proxy implementation.
 
-  /// retrieve the name of the Directx  proxy implementation.
   virtual const char *direct_proxy_impl_name (void) =0;
+  // retrieve the name of the Directx  proxy implementation.
 
-  /// retrieve the fully qualified name of the Directx  proxy
-  /// implementation.
   virtual const char *full_direct_proxy_impl_name (void) =0;
+  // retrieve the fully qualified name of the Directx  proxy
+  // implementation.
 
-  /// retrieve the name of the base proxy broker.
   virtual const char *base_proxy_broker_name (void) = 0;
+  // retrieve the name of the base proxy broker.
 
-  /// retrieve the fully qualified name of the base proxy broker.
   virtual const char *full_base_proxy_broker_name (void) = 0;
+  // retrieve the fully qualified name of the base proxy broker.
 
-  /// retrieve the name of the remote  proxy broker implementation.
   virtual const char *remote_proxy_broker_name (void) = 0;
+  // retrieve the name of the remote  proxy broker implementation.
 
-  /// retrieve the fully qualified name of the remote  proxy broker
-  /// implementation.
   virtual const char *full_remote_proxy_broker_name (void) = 0;
+  // retrieve the fully qualified name of the remote  proxy broker
+  // implementation.
 
-  /// retrieve the name of the strategized proxy broker implementation.
   virtual const char *strategized_proxy_broker_name (void) = 0;
+  // retrieve the name of the strategized proxy broker implementation.
 
-  /// retrieve the fully qualified name of the strategized proxy broker
-  /// implementation.
   virtual const char *full_strategized_proxy_broker_name (void) = 0;
+  // retrieve the fully qualified name of the strategized proxy broker
+  // implementation.
 
-  /// Return the scope that encloses the client related
-  /// interface.
   virtual const char *client_scope (void) = 0;
+  // Return the scope that encloses the client related
+  // interface.
 
-  /// Return the "flat" version of the scope
-  ///that encloses the interface.
   virtual const char *flat_client_scope (void) = 0;
+  // Return the "flat" version of the scope
+  //that encloses the interface.
 
-  /// Return the scope that encloses the server related
-  /// interface.
   virtual const char *server_scope (void) = 0;
+  // Return the scope that encloses the server related
+  // interface.
 
-  /// Return the "flat" version of the scope
-  ///that encloses the interface.
   virtual const char *flat_server_scope (void) = 0;
+  // Return the "flat" version of the scope
+  //that encloses the interface.
 
-  /// relative skeleton name
   const char *relative_skel_name (const char *skel_name);
+  // relative skeleton name
 
   const char* relative_name (const char *localname,
                              const char *othername);
 
-  /// compute the names using the local prefix and suffix
   void compute_names (const char* name,
                      const char* prefix,
                      const char* suffix,
                      char *&new_name);
+  // compute the names using the local prefix and suffix
 
-  /// compute the collocation names
   void compute_coll_names (int type,
                            const char *prefix,
                            const char *suffix);
+  // compute the collocation names
 
-  /**
-   * return the out stream depending on the strategy
-   * @@ Michael: Right now every strategy behaves
-   * the same way, but it might be in the future that we
-   * have to differentiate.
-   */
   virtual TAO_OutStream *get_out_stream (void);
+  // return the out stream depending on the strategy
+  // @@ Michael: Right now every strategy behaves
+  // the same way, but it might be in the future that we
+  // have to differentiate.
 
-  /**
-   * return the file name of the output stream.
-   * @@ Michael: Right now every strategy behaves the
-   * same way.
-   */
   virtual const char *get_out_stream_fname (void);
+  // return the file name of the output stream.
+  // @@ Michael: Right now every strategy behaves the
+  // same way.
 
-  /// Return the type of the strategy.
   int strategy_type (void);
+  // Return the type of the strategy.
 
-  /// Change the sate if necessary
   virtual TAO_CodeGen::CG_STATE next_state (
       TAO_CodeGen::CG_STATE current_state,
       int is_extra_state = 0);
+  // Change the sate if necessary
 
   virtual int has_extra_code_generation (
       TAO_CodeGen::CG_STATE current_state);
 
-  /// Returns the node, which is used instead of the original node,
-  /// e.g. the reply handler to the actual node.
   virtual be_interface *replacement (void);
+  // Returns the node, which is used instead of the original node,
+  // e.g. the reply handler to the actual node.
   
-  /// Cleanup.
   virtual void destroy (void);
+  // Cleanup.
 
 protected:
   char *local_name_;
@@ -185,14 +184,14 @@ protected:
 
   char *relative_skel_name_;
 
-  /// The node we strategize
   be_interface *node_;
+  // The node we strategize
 
-  /// Current cached collocated name.
   int cached_type_;
+  // Current cached collocated name.
 
-  /// The type of strategy
   Strategy_Kind strategy_type_;
+  // The type of strategy
 };
 
 class be_interface_default_strategy
@@ -205,100 +204,98 @@ public:
 
   virtual ~be_interface_default_strategy (void);
 
-  /// return the local name
   const char * local_name (void);
+  // return the local name
 
-  /// return the stringified full name
   virtual const char *full_name (void);
+  // return the stringified full name
 
-  /// return the flattened full scoped name.
   virtual const char *flat_name (void);
+  // return the flattened full scoped name.
 
-  /// retrieve the repository ID.
   virtual const char *repoID (void);
+  // retrieve the repository ID.
 
-  /// retrieve the fully scoped skel class name.
   virtual const char *full_skel_name (void);
+  // retrieve the fully scoped skel class name.
 
-  /// retrieve the fully qualified collocated class name
   virtual const char *full_coll_name (int);
+  // retrieve the fully qualified collocated class name
 
-  /// retrieve the fully qualified collocated class name.
   virtual const char *local_coll_name (int);
+  // retrieve the fully qualified collocated class name.
 
-  /// retrieve the name of the base proxy implementation.
   virtual const char *base_proxy_impl_name (void);
+  // retrieve the name of the base proxy implementation.
 
-  /// retrieve the fully qualified name of the base proxy
-  /// implementation.
   virtual const char *full_base_proxy_impl_name (void);
+  // retrieve the fully qualified name of the base proxy
+  // implementation.
 
-  /// retrieve the name of the remote  proxy implementation.
   virtual const char *remote_proxy_impl_name (void);
+  // retrieve the name of the remote  proxy implementation.
 
-  /// retrieve the fully qualified name of the remote
-  /// proxy implementation.
   virtual const char *full_remote_proxy_impl_name (void);
+  // retrieve the fully qualified name of the remote
+  // proxy implementation.
 
-  /// retrieve the name of the Directx  proxy implementation.
   virtual const char *direct_proxy_impl_name (void);
+  // retrieve the name of the Directx  proxy implementation.
 
-  /// retrieve the fully qualified name of the Directx  proxy
-  /// implementation.
   virtual const char *full_direct_proxy_impl_name (void);
+  // retrieve the fully qualified name of the Directx  proxy
+  // implementation.
 
-  /// retrieve the name of the base proxy broker.
   virtual const char *base_proxy_broker_name (void);
+  // retrieve the name of the base proxy broker.
 
-  /// retrieve the fully qualified name of the base proxy broker.
   virtual const char *full_base_proxy_broker_name (void);
+  // retrieve the fully qualified name of the base proxy broker.
 
-  /// retrieve the name of the remote  proxy broker implementation.
   virtual const char *remote_proxy_broker_name (void);
+  // retrieve the name of the remote  proxy broker implementation.
 
-  /// retrieve the fully qualified name of the remote  proxy broker
-  /// implementation.
   virtual const char *full_remote_proxy_broker_name (void);
+  // retrieve the fully qualified name of the remote  proxy broker
+  // implementation.
 
-  /// retrieve the name of the strategized proxy broker implementation.
   virtual const char *strategized_proxy_broker_name (void);
+  // retrieve the name of the strategized proxy broker implementation.
 
-  /// retrieve the fully qualified name of the strategized proxy broker
-  /// implementation.
   virtual const char *full_strategized_proxy_broker_name (void);
+  // retrieve the fully qualified name of the strategized proxy broker
+  // implementation.
 
-  /// Return the scope that encloses the client related
-  /// interface.
   virtual const char *client_scope (void);
+  // Return the scope that encloses the client related
+  // interface.
 
-  /// Return the "flat" version of the scope
-  ///that encloses the interface.
   virtual const char *flat_client_scope (void);
+  // Return the "flat" version of the scope
+  //that encloses the interface.
 
-  /// Return the scope that encloses the server related
-  /// interface.
   virtual const char *server_scope (void);
+  // Return the scope that encloses the server related
+  // interface.
 
-  /// Return the "flat" version of the scope
-  ///that encloses the interface.
   virtual const char *flat_server_scope (void);
+  // Return the "flat" version of the scope
+  //that encloses the interface.
   
-  /// Cleanup.
   virtual void destroy (void);
+  // Cleanup.
 
   // end of overridden methods
 
 protected:
 
-  /**
-   * create a new string made by the concatenation
-   * of "str" and "suffix" and using the
-   * "separator" to concatenate the two.
-   */
   char *create_with_prefix_suffix (const char *prefix,
                                    const char *str,
                                    const char *suffix,
                                    const char *separator = "");
+  // create a new string made by the concatenation
+  // of "str" and "suffix" and using the
+  // "separator" to concatenate the two.
 
 protected:
 
diff --git a/TAO/TAO_IDL/be_include/be_mirror_port.h b/TAO/TAO_IDL/be_include/be_mirror_port.h
index cbfedd91d42..60ecb7d55be 100644
--- a/TAO/TAO_IDL/be_include/be_mirror_port.h
+++ b/TAO/TAO_IDL/be_include/be_mirror_port.h
@@ -1,18 +1,23 @@
+//
+// $Id$
+//
 
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    be_mirror_port.h
- *
- *  $Id$
- *
- *  Extension of class AST_Mirror_Port for C++ code generation.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO_IDL_BE
+//
+// = FILENAME
+//    be_mirror_port.h
+//
+// = DESCRIPTION
+//    Extension of class AST_Mirror_Port for C++ code generation.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef BE_MIRROR_PORT_H
 #define BE_MIRROR_PORT_H
diff --git a/TAO/TAO_IDL/be_include/be_module.h b/TAO/TAO_IDL/be_include/be_module.h
index 7a78fa4cfe2..57de2c23cb6 100644
--- a/TAO/TAO_IDL/be_include/be_module.h
+++ b/TAO/TAO_IDL/be_include/be_module.h
@@ -1,19 +1,24 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    be_module.h
- *
- *  $Id$
- *
- *  Extension of class AST_Module that provides additional means for C++
- *  mapping.
- *
- *
- *  @author Copyright 1994-1995 by Sun Microsystems
- *  @author Inc. and Aniruddha Gokhale
- */
-//=============================================================================
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_module.h
+//
+// = DESCRIPTION
+//    Extension of class AST_Module that provides additional means for C++
+//    mapping.
+//
+// = AUTHOR
+//    Copyright 1994-1995 by Sun Microsystems, Inc.
+//    and
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_MODULE_H
 #define _BE_MODULE_H
@@ -29,15 +34,20 @@ class be_module : public virtual AST_Module,
                   public virtual be_decl
 {
 public:
+  be_module (void);
+  // Default constructor.
+
   be_module (UTL_ScopedName *n);
+  // Constructor.
 
-  /// Cleanup method.
   virtual void destroy (void);
+  // Cleanup method.
 
   // Visiting
   virtual int accept (be_visitor *visitor);
 
   // Narrowing.
+
   DEF_NARROW_FROM_DECL (be_module);
   DEF_NARROW_FROM_SCOPE (be_module);
 };
diff --git a/TAO/TAO_IDL/be_include/be_native.h b/TAO/TAO_IDL/be_include/be_native.h
index f3b032f5187..f5aacafdd20 100644
--- a/TAO/TAO_IDL/be_include/be_native.h
+++ b/TAO/TAO_IDL/be_include/be_native.h
@@ -1,16 +1,22 @@
+// $Id$
+
+// Id
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_native.h
+//
+// = DESCRIPTION
+//    The native IDL type
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
-//=============================================================================
-/**
- *  @file    be_native.h
- *
- *  $Id$
- *
- *  The native IDL type
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
 
 #ifndef BE_NATIVE_H
 #define BE_NATIVE_H
@@ -31,23 +37,29 @@ class be_native : public virtual AST_Native,
                   public virtual be_exception
 {
 public:
+  be_native (void);
+  // Default constructor.
+
   be_native (UTL_ScopedName *n);
+  // Constructor that initializes its scoped name.
 
   virtual ~be_native (void) {}
+  // Destructor
 
-  /// Generate the typecode description.
   virtual int gen_typecode (void);
+  // Generate the typecode description.
 
-  /// Return typecode size.
   virtual long tc_size (void);
+  // Return typecode size.
   
-  /// Cleanup.
   virtual void destroy (void);
+  // Cleanup.
 
   // Visiting.
   virtual int accept (be_visitor *visitor);
 
   // Narrowing.
+
   DEF_NARROW_FROM_DECL(be_native);
 };
 
diff --git a/TAO/TAO_IDL/be_include/be_null_return_emitter.h b/TAO/TAO_IDL/be_include/be_null_return_emitter.h
index ecdc9ff019d..47bd41a96c6 100644
--- a/TAO/TAO_IDL/be_include/be_null_return_emitter.h
+++ b/TAO/TAO_IDL/be_include/be_null_return_emitter.h
@@ -1,19 +1,22 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    be_null_return_emitter.h
- *
- *  $Id$
- *
- *  Emits 'return x;' for all CORBA types and ACE-supported
- *  platforms.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO_IDL_BE
+//
+// = FILENAME
+//    be_null_return_emitter.h
+//
+// = DESCRIPTION
+//    Emits 'return x;' for all CORBA types and ACE-supported
+//    platforms.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef TAO_BE_NULL_RETURN_EMITTER_H
 #define TAO_BE_NULL_RETURN_EMITTER_H
diff --git a/TAO/TAO_IDL/be_include/be_operation.h b/TAO/TAO_IDL/be_include/be_operation.h
index 9520ad89411..291a0c5b866 100644
--- a/TAO/TAO_IDL/be_include/be_operation.h
+++ b/TAO/TAO_IDL/be_include/be_operation.h
@@ -1,18 +1,23 @@
-
-//=============================================================================
-/**
- *  @file    be_operation.h
- *
- *  $Id$
- *
- *  Extension of class AST_Operation that provides additional means for C++
- *  mapping.
- *
- *
- *  @author Copyright 1994-1995 by Sun Microsystems
- *  @author Inc. and Aniruddha Gokhale
- */
-//=============================================================================
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_operation.h
+//
+// = DESCRIPTION
+//    Extension of class AST_Operation that provides additional means for C++
+//    mapping.
+//
+// = AUTHOR
+//    Copyright 1994-1995 by Sun Microsystems, Inc.
+//    and
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef BE_OPERATION_H
 #define BE_OPERATION_H
@@ -32,16 +37,21 @@ class be_operation : public virtual AST_Operation,
                      public virtual be_decl
 {
 public:
+  be_operation (void);
+  // Default constructor.
+
   be_operation (AST_Type *rt,
                 AST_Operation::Flags fl,
                 UTL_ScopedName *n,
                 bool local,
                 bool abstract);
+  // Constructor
 
   ~be_operation (void);
+  // Destructor.
 
-  /// Cleanup method.
   virtual void destroy (void);
+  // Cleanup method.
 
   // Visiting.
   virtual int accept (be_visitor *visitor);
@@ -54,34 +64,30 @@ public:
 
   be_operation_strategy *set_strategy (be_operation_strategy *new_strategy);
 
-  /// Decide on the next state.
   TAO_CodeGen::CG_STATE next_state (TAO_CodeGen::CG_STATE current_state,
                                     int is_extra_state = 0);
+  // Decide on the next state.
 
-  /// Returns true if we have to generate extra code.
   int has_extra_code_generation (TAO_CodeGen::CG_STATE current_state);
+  // Returns true if we have to generate extra code.
 
-  /**
-   * returns the operation containing special marshaling information,
-   * this makes sense if not all arguments get marshaled, e.g. AMI
-   * sendc_ operations.
-   */
   be_operation *marshaling (void);
+  // returns the operation containing special marshaling information,
+  // this makes sense if not all arguments get marshaled, e.g. AMI
+  // sendc_ operations.
 
-  /**
-   * Returns a customized arguments list, e.g. AMI sendc_ operations
-   * only use the in and inout arguments but not the out arguments,
-   * also the first argument is the reply handler.
-   */
   be_operation *arguments (void);
+  // Returns a customized arguments list, e.g. AMI sendc_ operations
+  // only use the in and inout arguments but not the out arguments,
+  // also the first argument is the reply handler.
 
-  /// Sets the original operation from which this one was created,
-  /// applies only to implied IDL.
   void original_operation (be_operation *original_operation);
+  // Sets the original operation from which this one was created,
+  // applies only to implied IDL.
 
-  /// Returns the original operation from which this one was created,
-  /// applies only to implied IDL
   be_operation *original_operation ();
+  // Returns the original operation from which this one was created,
+  // applies only to implied IDL
 
   // Narrowing
 
@@ -89,12 +95,10 @@ public:
   DEF_NARROW_FROM_SCOPE (be_operation);
 
 protected:
-  /**
-   * Member for holding the strategy for covering
-   * differences between various operations, e.g. sendc_, raise_
-   * operations in the AMI spec.
-   */
   be_operation_strategy *strategy_;
+  // Member for holding the strategy for covering
+  // differences between various operations, e.g. sendc_, raise_
+  // operations in the AMI spec.
   
   be_operation *original_operation_;
 };
diff --git a/TAO/TAO_IDL/be_include/be_operation_strategy.h b/TAO/TAO_IDL/be_include/be_operation_strategy.h
index fd789120e45..388feb5b927 100644
--- a/TAO/TAO_IDL/be_include/be_operation_strategy.h
+++ b/TAO/TAO_IDL/be_include/be_operation_strategy.h
@@ -1,19 +1,22 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    be_operation_strategy.h
- *
- *  $Id$
- *
- *  Strategy to cover differences between operations, e.g.
- *  the sendc_ and raise_ operations in the AMI spec.
- *
- *
- *  @author Michael Kircher
- */
-//=============================================================================
-
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_operation_strategy.h
+//
+// = DESCRIPTION
+//    Strategy to cover differences between operations, e.g.
+//    the sendc_ and raise_ operations in the AMI spec.
+//
+// = AUTHOR
+//    Michael Kircher
+//
+// ============================================================================
 
 #ifndef TAO_BE_OPERATION_STRATEGY_H
 #define TAO_BE_OPERATION_STRATEGY_H
@@ -39,44 +42,40 @@ public:
 
   virtual ~be_operation_strategy (void);
 
-  /// Return the type of the strategy.
   int strategy_type (void);
+  // Return the type of the strategy.
 
-  /// Change the state if necessary.
   virtual TAO_CodeGen::CG_STATE next_state (
       TAO_CodeGen::CG_STATE current_state,
       int is_extra_state = 0
     ) = 0;
+  // Change the state if necessary.
 
-  /// Returns true if we have to generate extra code.
   virtual int has_extra_code_generation (TAO_CodeGen::CG_STATE current_state);
+  // Returns true if we have to generate extra code.
 
-  /**
-   * Returns the operation containing special marshaling information,
-   * this makes sense if not all arguments get marshaled, e.g. AMI
-   * sendc_ operations.
-   */
   virtual be_operation *marshaling (void);
+  // Returns the operation containing special marshaling information,
+  // this makes sense if not all arguments get marshaled, e.g. AMI
+  // sendc_ operations.
 
-  /**
-   * Returns a customized arguments list, e.g. AMI sendc_ operations
-   * only use the in and inout arguments but not the out arguments,
-   * also the first argument is the reply handler.
-   */
   virtual be_operation *arguments (void);
+  // Returns a customized arguments list, e.g. AMI sendc_ operations
+  // only use the in and inout arguments but not the out arguments,
+  // also the first argument is the reply handler.
 
-  /// Overrides return a deep copy.
   virtual be_operation_strategy *copy (void);
+  // Overrides return a deep copy.
 
-  /// Cleanup.
   virtual void destroy (void);
+  // Cleanup.
 
 protected:
-  /// The node we strategize.
   be_operation *node_;
+  // The node we strategize.
 
-  /// The type of strategy.
   Strategy_Kind strategy_type_;
+  // The type of strategy.
 };
 
 
@@ -94,8 +93,8 @@ public:
   TAO_CodeGen::CG_STATE next_state (TAO_CodeGen::CG_STATE current_state,
                                     int is_extra_state = 0);
 
-  /// Returns a deep copy.
   virtual be_operation_strategy *copy (void);
+  // Returns a deep copy.
 };
 
 
@@ -114,11 +113,11 @@ public:
   TAO_CodeGen::CG_STATE next_state (TAO_CodeGen::CG_STATE current_state,
                                     int is_extra_state = 0);
 
-  /// Returns true if we have to generate extra code.
   virtual int has_extra_code_generation (TAO_CodeGen::CG_STATE current_state);
+  // Returns true if we have to generate extra code.
 
-  /// Returns a deep copy.
   virtual be_operation_strategy *copy (void);
+  // Returns a deep copy.
 };
 
 
@@ -137,28 +136,24 @@ public:
   TAO_CodeGen::CG_STATE next_state (TAO_CodeGen::CG_STATE current_state,
                                     int is_extra_state = 0);
 
-  /// Returns true if we have to generate extra code.
   virtual int has_extra_code_generation (TAO_CodeGen::CG_STATE current_state);
+  // Returns true if we have to generate extra code.
 
-  /**
-   * Returns the operation containing special marshaling information,
-   * this makes sense if not all arguments get marshaled, e.g. AMI
-   * sendc_ operations
-   */
   virtual be_operation *marshaling (void);
+  // Returns the operation containing special marshaling information,
+  // this makes sense if not all arguments get marshaled, e.g. AMI
+  // sendc_ operations
 
-  /**
-   * Returns a customized arguments list, e.g. AMI sendc_ operations
-   * only use the in and inout arguments but not the out arguments,
-   * also the first argument is the reply handler.
-   */
   virtual be_operation *arguments (void);
+  // Returns a customized arguments list, e.g. AMI sendc_ operations
+  // only use the in and inout arguments but not the out arguments,
+  // also the first argument is the reply handler.
 
-  /// Returns a deep copy.
   virtual be_operation_strategy *copy (void);
+  // Returns a deep copy.
 
-  /// Cleanup.
   virtual void destroy (void);
+  // Cleanup.
 
 private:
   be_operation *marshaling_;
@@ -183,8 +178,8 @@ public:
       int is_extra_state = 0
     );
 
-  /// Returns a deep copy.
   virtual be_operation_strategy *copy (void);
+  // Returns a deep copy.
 };
 
 
@@ -205,8 +200,8 @@ public:
 
   virtual be_operation *arguments (void);
 
-  /// Returns a deep copy.
   virtual be_operation_strategy *copy (void);
+  // Returns a deep copy.
 
 private:
   be_operation *arguments_;
diff --git a/TAO/TAO_IDL/be_include/be_param_holder.h b/TAO/TAO_IDL/be_include/be_param_holder.h
index 9065dbecb3f..3090f00a347 100644
--- a/TAO/TAO_IDL/be_include/be_param_holder.h
+++ b/TAO/TAO_IDL/be_include/be_param_holder.h
@@ -1,19 +1,22 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    be_param_holder.h
- *
- *  $Id$
- *
- *  Place holder referenced by AST_Field (or subclass) 
- *  representing a corresponding template parameter in IDL.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_param_holder.h
+//
+// = DESCRIPTION
+//    Place holder referenced by AST_Field (or subclass) 
+//    representing a corresponding template parameter in IDL.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef TAO_BE_PARAM_HOLDER_H
 #define TAO_BE_PARAM_HOLDER_H
diff --git a/TAO/TAO_IDL/be_include/be_porttype.h b/TAO/TAO_IDL/be_include/be_porttype.h
index aabdda78772..36698b94765 100644
--- a/TAO/TAO_IDL/be_include/be_porttype.h
+++ b/TAO/TAO_IDL/be_include/be_porttype.h
@@ -1,18 +1,23 @@
+//
+// $Id$
+//
 
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    be_porttype.h
- *
- *  $Id$
- *
- *  Extension of class AST_PortType for C++ code generation.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO_IDL_BE
+//
+// = FILENAME
+//    be_porttype.h
+//
+// = DESCRIPTION
+//    Extension of class AST_PortType for C++ code generation.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef BE_PORTTYPE_H
 #define BE_PORTTYPE_H
diff --git a/TAO/TAO_IDL/be_include/be_predefined_type.h b/TAO/TAO_IDL/be_include/be_predefined_type.h
index a99a423e2d5..84c0f856fb8 100644
--- a/TAO/TAO_IDL/be_include/be_predefined_type.h
+++ b/TAO/TAO_IDL/be_include/be_predefined_type.h
@@ -1,19 +1,24 @@
 /* -*- c++ -*- */
+// $Id$
 
-//=============================================================================
-/**
- *  @file    be_predefined_type.h
- *
- *  $Id$
- *
- *  Extension of class AST_PredefinedType that provides additional means for C++
- *  mapping.
- *
- *
- *  @author Copyright 1994-1995 by Sun Microsystems
- *  @author Inc. and Aniruddha Gokhale
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_predefined_type.h
+//
+// = DESCRIPTION
+//    Extension of class AST_PredefinedType that provides additional means for C++
+//    mapping.
+//
+// = AUTHOR
+//    Copyright 1994-1995 by Sun Microsystems, Inc.
+//    and
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_PREDEFINED_TYPE_H
 #define _BE_PREDEFINED_TYPE_H
@@ -27,6 +32,8 @@ class be_predefined_type : public virtual AST_PredefinedType,
                            public virtual be_type
 {
 public:
+  be_predefined_type (void);
+
   be_predefined_type (AST_PredefinedType::PredefinedType t,
                       UTL_ScopedName *n);
                       
@@ -43,20 +50,19 @@ public:
   virtual void destroy (void);
 
   // Narrowing.
+
   DEF_NARROW_FROM_DECL (be_predefined_type);
 
 protected:
-  /// Overridden method.
   virtual void compute_tc_name (void);
+  // Overridden method.
 
   // Compute and return the value.
 
-  /**
-   * The object and TypeCode repository IDs have a mandatory omg.org
-   * prefix, but the default compute_repoID() uses the #pragma's to
-   * obtain prefixes.
-   */
   virtual void compute_repoID (void);
+  // The object and TypeCode repository IDs have a mandatory omg.org
+  // prefix, but the default compute_repoID() uses the #pragma's to
+  // obtain prefixes.
 };
 
 #endif
diff --git a/TAO/TAO_IDL/be_include/be_root.h b/TAO/TAO_IDL/be_include/be_root.h
index e14d0d36e2e..93a5f66b157 100644
--- a/TAO/TAO_IDL/be_include/be_root.h
+++ b/TAO/TAO_IDL/be_include/be_root.h
@@ -1,18 +1,23 @@
 /* -*- c++ -*- */
+// $Id$
 
-//=============================================================================
-/**
- *  @file    be_root.h
- *
- *  $Id$
- *
- *  Extension of class AST_Root that provides the backend
- *
- *
- *  @author Copyright 1994-1995 by Sun Microsystems
- *  @author Inc. and Aniruddha Gokhale
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_root.h
+//
+// = DESCRIPTION
+//    Extension of class AST_Root that provides the backend
+//
+// = AUTHOR
+//    Copyright 1994-1995 by Sun Microsystems, Inc.
+//    and
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef TAO_BE_ROOT_H
 #define TAO_BE_ROOT_H
@@ -33,17 +38,29 @@ class be_root : public virtual AST_Root,
   // = DESCRIPTION
   //
 public:
+  be_root (void);
+  // Default constructor.
+
   be_root (UTL_ScopedName *n);
+  // Constructor that sets its scoped name <n>, and any pragmas <p>.
   
   virtual ~be_root (void);
 
-  /// Cleanup method.
+  // Scope management functions that override the AST scope management methods
+  // since the AST methods set the names of the sequences, strings, and arrays
+  // to a fixed value which interferes with our back-end code generation.
+  AST_Sequence *fe_add_sequence (AST_Sequence *);
+  AST_String *fe_add_string (AST_String *);
+  AST_Array *fe_add_array (AST_Array *);
+
   virtual void destroy (void);
+  // Cleanup method.
 
   // Visiting.
   virtual int accept (be_visitor *visitor);
 
   // Narrowing.
+
   DEF_NARROW_FROM_DECL (be_root);
   DEF_NARROW_FROM_SCOPE (be_root);
 };
diff --git a/TAO/TAO_IDL/be_include/be_scope.h b/TAO/TAO_IDL/be_include/be_scope.h
index 3d0bb0451a6..d3df558666d 100644
--- a/TAO/TAO_IDL/be_include/be_scope.h
+++ b/TAO/TAO_IDL/be_include/be_scope.h
@@ -1,18 +1,23 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    be_scope.h
- *
- *  $Id$
- *
- *  Extension of the UTL_Scope CFE class
- *
- *  @author Copyright 1994-1995 by Sun Microsystems Int.
- *  @author and Aniruddha Gokhale
- */
-//=============================================================================
-
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_scope.h
+//
+// = DESCRIPTION
+//    Extension of the UTL_Scope CFE class
+//
+// = AUTHOR
+//    Copyright 1994-1995 by Sun Microsystems, Inc.
+//    and
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef TAO_BE_SCOPE_H
 #define TAO_BE_SCOPE_H
@@ -24,44 +29,43 @@ class be_decl;
 class be_visitor;
 class UTL_ExceptList;
 
-/**
- * @class be_scope
- *
- * @brief be_scope
- *
- * The back end extension of the UTL_Scope class
- */
 class be_scope : public virtual UTL_Scope
 {
+  // = TITLE
+  //    be_scope
+  //
+  // = DESCRIPTION
+  //    The back end extension of the UTL_Scope class
+  //
 public:
-  /// Default constructor.
   be_scope (void);
+  // Default constructor.
 
-  /// Constructor that sets the node type.
   be_scope (AST_Decl::NodeType nt);
+  // Constructor that sets the node type.
 
-  /// Destructor.
   virtual ~be_scope (void);
+  // Destructor.
 
-  /// To access the protected base class method fe_add_field.
   AST_Field *be_add_field (AST_Field *f);
+  // To access the protected base class method fe_add_field.
 
-  /// Overridden in be_operation and be_factory.
   virtual AST_Argument *be_add_argument (AST_Argument *arg);
+  // Overridden in be_operation and be_factory.
 
-  /// Set the comma producing state.
   virtual void comma (unsigned short set);
+  // Set the comma producing state.
 
-  /// Get the comma producing state.
   int comma (void) const;
+  // Get the comma producing state.
 
-  /// Return the be_decl node corresponding to this scope node.
   virtual be_decl *decl (void);
+  // Return the be_decl node corresponding to this scope node.
 
-  /// Recursively clean up scope members.
   virtual void destroy (void);
+  // Recursively clean up scope members.
 
-  /// Visiting.
+  // Visiting.
   virtual int accept (be_visitor *visitor);
 
   // Narrowing.
@@ -69,8 +73,8 @@ public:
   DEF_NARROW_FROM_SCOPE (be_scope);
 
 private:
-  /// If set, generate a comma after every element is handled.
   unsigned short comma_;
+  // If set, generate a comma after every element is handled.
 };
 
 #endif // if !defined
diff --git a/TAO/TAO_IDL/be_include/be_sequence.h b/TAO/TAO_IDL/be_include/be_sequence.h
index 7fb1e13588e..2d9b4e021a1 100644
--- a/TAO/TAO_IDL/be_include/be_sequence.h
+++ b/TAO/TAO_IDL/be_include/be_sequence.h
@@ -1,20 +1,25 @@
 // -*- C++ -*-
 
-
-//=============================================================================
-/**
- *  @file    be_sequence.h
- *
- *  $Id$
- *
- *  Extension of class AST_Sequence that provides additional means for C++
- *  mapping.
- *
- *
- *  @author Copyright 1994-1995 by Sun Microsystems
- *  @author Inc. and Aniruddha Gokhale
- */
-//=============================================================================
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_sequence.h
+//
+// = DESCRIPTION
+//    Extension of class AST_Sequence that provides additional means for C++
+//    mapping.
+//
+// = AUTHOR
+//    Copyright 1994-1995 by Sun Microsystems, Inc.
+//    and
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef BE_SEQUENCE_H
 #define BE_SEQUENCE_H
@@ -50,6 +55,8 @@ public:
     MNG_PSEUDO
   };
 
+  be_sequence (void);
+
   be_sequence (AST_Expression *v,
                AST_Type *bt,
                UTL_ScopedName *n,
@@ -59,25 +66,25 @@ public:
     // Non-virtual override of frontend method.
   be_type *base_type (void) const;
   
-  /// Create a name for ourselves. If we are typedefed, then we get the name of
-  /// the typedef node, else we generate a name for ourselves.
   virtual int create_name (be_typedef *node);
+  // Create a name for ourselves. If we are typedefed, then we get the name of
+  // the typedef node, else we generate a name for ourselves.
 
-  /// Return the managed type.
   virtual MANAGED_TYPE managed_type (void);
+  // Return the managed type.
 
   // Scope management functions.
   virtual AST_Sequence *fe_add_sequence (AST_Sequence *);
 
-  /// Overridden method on the be_scope class.
   virtual be_decl *decl (void);
+  // Overridden method on the be_scope class.
   
-  /// Overridden from class be_type.
   virtual void gen_ostream_operator (TAO_OutStream *os,
                                      bool use_underscore);
+  // Overridden from class be_type.
 
-  /// Cleanup method.
   virtual void destroy (void);
+  // Cleanup method.
 
   // Visiting.
   virtual int accept (be_visitor *visitor);
@@ -86,37 +93,37 @@ public:
 
   DEF_NARROW_FROM_DECL (be_sequence);
 
-  /// Report the instance name for instantiation.
   const char *instance_name (void);
+  // Report the instance name for instantiation.
 
-  /// Common code for generating the name and parameters of our
-  /// template sequence base class.
   int gen_base_class_name (TAO_OutStream *os,
                            const char * linebreak,
                            AST_Decl *elem_scope);
+  // Common code for generating the name and parameters of our
+  // template sequence base class.
 
-  /// Accessors for the member.
   be_field *field_node (void) const;
   void field_node (be_field *node);
+  // Accessors for the member.
 
-  /// Helper to create_name, also used by the traits visitor.
   virtual char *gen_name (void);
+  // Helper to create_name, also used by the traits visitor.
 
 protected:
 
-  /// Computes the fully scoped typecode name.
   virtual void compute_tc_name (void);
+  // Computes the fully scoped typecode name.
 
 private:
   const char *smart_fwd_helper_name (AST_Decl *elem_scope,
                                      be_type *elem);
 
 private:
-  /// Our managed type.
   MANAGED_TYPE mt_;
+  // Our managed type.
 
-  /// Used if we are an anonymous member, to help generate a unique name.
   be_field *field_node_;
+  // Used if we are an anonymous member, to help generate a unique name.
 };
 
 #endif
diff --git a/TAO/TAO_IDL/be_include/be_string.h b/TAO/TAO_IDL/be_include/be_string.h
index 3cb7fd6ef8b..6c5235ebc04 100644
--- a/TAO/TAO_IDL/be_include/be_string.h
+++ b/TAO/TAO_IDL/be_include/be_string.h
@@ -1,18 +1,23 @@
-
-//=============================================================================
-/**
- *  @file    be_string.h
- *
- *  $Id$
- *
- *  Extension of class AST_String that provides additional means for C++
- *  mapping.
- *
- *
- *  @author Copyright 1994-1995 by Sun Microsystems
- *  @author Inc. and Aniruddha Gokhale
- */
-//=============================================================================
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_string.h
+//
+// = DESCRIPTION
+//    Extension of class AST_String that provides additional means for C++
+//    mapping.
+//
+// = AUTHOR
+//    Copyright 1994-1995 by Sun Microsystems, Inc.
+//    and
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef BE_STRING_H
 #define BE_STRING_H
@@ -27,6 +32,8 @@ class be_string : public virtual AST_String,
                   public virtual be_type
 {
 public:
+  be_string (void);
+
   be_string (AST_Decl::NodeType nt,
              UTL_ScopedName *n,
              AST_Expression *v,
@@ -49,8 +56,8 @@ public:
   DEF_NARROW_FROM_DECL (be_string);
 
 protected:
-  /// Overridden method to compute typecode name.
   virtual void compute_tc_name (void);
+  // Overridden method to compute typecode name.
 };
 
 #endif
diff --git a/TAO/TAO_IDL/be_include/be_structure.h b/TAO/TAO_IDL/be_include/be_structure.h
index 4a36b7e63a5..f78f8b6762a 100644
--- a/TAO/TAO_IDL/be_include/be_structure.h
+++ b/TAO/TAO_IDL/be_include/be_structure.h
@@ -1,19 +1,24 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    be_structure.h
- *
- *  $Id$
- *
- *  Extension of class AST_Structure that provides additional means for C++
- *  mapping.
- *
- *
- *  @author Copyright 1994-1995 by Sun Microsystems
- *  @author Inc. and Aniruddha Gokhale
- */
-//=============================================================================
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_structure.h
+//
+// = DESCRIPTION
+//    Extension of class AST_Structure that provides additional means for C++
+//    mapping.
+//
+// = AUTHOR
+//    Copyright 1994-1995 by Sun Microsystems, Inc.
+//    and
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef BE_STRUCTURE_H
 #define BE_STRUCTURE_H
@@ -29,28 +34,25 @@ class be_structure : public virtual AST_Structure,
                      public virtual be_type
 {
 public:
+  be_structure (void);
+
   be_structure (UTL_ScopedName *n,
                 bool local,
                 bool abstract);
 
-  be_structure (AST_Decl::NodeType nt,
-                UTL_ScopedName *n,
-                bool local,
-                bool abstract);
-                
-  /// Copy BE-specific values when redefining struct or union
-  /// from a forward declaration.
   virtual void redefine (AST_Structure *from);
+  // Copy BE-specific values when redefining struct or union
+  // from a forward declaration.
   
-  /// Overridden from class be_type.
   virtual void gen_ostream_operator (TAO_OutStream *os,
                                      bool use_underscore);
+  // Overridden from class be_type.
 
-  /// Cleanup method.
   virtual void destroy (void);
+  // Cleanup method.
 
-  /// Visiting.
   virtual int accept (be_visitor *visitor);
+  // Visiting.
 
  // Narrowing.
 
diff --git a/TAO/TAO_IDL/be_include/be_structure_fwd.h b/TAO/TAO_IDL/be_include/be_structure_fwd.h
index 501c0e61bb4..c50b04b45b8 100644
--- a/TAO/TAO_IDL/be_include/be_structure_fwd.h
+++ b/TAO/TAO_IDL/be_include/be_structure_fwd.h
@@ -1,18 +1,22 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    be_structure_fwd.h
- *
- *  $Id$
- *
- *  Extension of class AST_StructureFwd that provides additional
- *  means for C++ mapping of a struct.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_structure_fwd.h
+//
+// = DESCRIPTION
+//    Extension of class AST_StructureFwd that provides additional
+//    means for C++ mapping of a struct.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef BE_STRUCTURE_FWD_H
 #define BE_STRUCTURE_FWD_H
@@ -32,18 +36,24 @@ class be_structure_fwd : public virtual AST_StructureFwd,
   // =DESCRIPTION
   //   Extensions to the AST_StructureFwd class
 public:
+  be_structure_fwd (void);
+  // Default constructor.
+
   be_structure_fwd (AST_Structure *dummy,
                     UTL_ScopedName *n);
+  // Constructor.
 
   virtual ~be_structure_fwd (void);
+  // Destructor.
 
-  /// Cleanup function.
   virtual void destroy (void);
+  // Cleanup function.
 
   // Visiting.
   virtual int accept (be_visitor* visitor);
 
   // Narrowing.
+
   DEF_NARROW_FROM_DECL (be_structure_fwd);
 };
 
diff --git a/TAO/TAO_IDL/be_include/be_template_module.h b/TAO/TAO_IDL/be_include/be_template_module.h
index 787a04ba555..d797c23208a 100644
--- a/TAO/TAO_IDL/be_include/be_template_module.h
+++ b/TAO/TAO_IDL/be_include/be_template_module.h
@@ -1,19 +1,23 @@
 // -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    be_template_module.h
- *
- *  $Id$
- *
- *  Extension of class AST_Template_Module that provides additional means for C++
- *  mapping of a module.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+//
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO_IDL_BE
+//
+// = FILENAME
+//    be_template_module.h
+//
+// = DESCRIPTION
+//    Extension of class AST_Template_Module that provides additional means for C++
+//    mapping of a module.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef TAO_BE_TEMPLATE_MODULE_H
 #define TAO_BE_TEMPLATE_MODULE_H
diff --git a/TAO/TAO_IDL/be_include/be_type.h b/TAO/TAO_IDL/be_include/be_type.h
index b32615904ca..af0f3025215 100644
--- a/TAO/TAO_IDL/be_include/be_type.h
+++ b/TAO/TAO_IDL/be_include/be_type.h
@@ -1,18 +1,23 @@
-
-//=============================================================================
-/**
- *  @file    be_type.h
- *
- *  $Id$
- *
- *  Extension of class AST_Type that provides additional means for C++
- *  mapping.
- *
- *
- *  @author Copyright 1994-1995 by Sun Microsystems
- *  @author Inc. and Aniruddha Gokhale
- */
-//=============================================================================
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_type.h
+//
+// = DESCRIPTION
+//    Extension of class AST_Type that provides additional means for C++
+//    mapping.
+//
+// = AUTHOR
+//    Copyright 1994-1995 by Sun Microsystems, Inc.
+//    and
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef BE_TYPE_H
 #define BE_TYPE_H
@@ -28,62 +33,63 @@ class be_type : public virtual AST_Type,
                 public virtual be_decl
 {
 public:
+  be_type (void);
+  // Default constructor.
+
   be_type (AST_Decl::NodeType nt,
            UTL_ScopedName *n);
+  // Constructor.
 
   virtual ~be_type (void);
+  // Destructor.
 
-  /**
-   * Return the typecode name. When both, the prefix and the suffix
-   * are non null, it computes and returns a tc name. Else, it also
-   * stores the result in a member variable.
-   */
   UTL_ScopedName *tc_name (void);
+  // Return the typecode name. When both, the prefix and the suffix
+  // are non null, it computes and returns a tc name. Else, it also
+  // stores the result in a member variable.
 
-  /// Type name of a node used when generating declarations for smart
-  /// proxies.
   virtual const char *nested_sp_type_name (be_decl *use_scope,
                                            const char *suffix = 0,
                                            const char *prefix = 0);
+  // Type name of a node used when generating declarations for smart
+  // proxies.
 
-  /// Compute the value of the member.
   void gen_fwd_helper_name (void);
+  // Compute the value of the member.
   
-  /// No-op, overridden in derived classes.
   virtual void gen_ostream_operator (TAO_OutStream *os,
                                      bool use_underscore);
+  // No-op, overridden in derived classes.
 
-  /// Generic implementation here, overridden for some types.
   virtual void gen_member_ostream_operator (TAO_OutStream *os,
                                             const char *instance_name,
                                             bool use_underscore,
                                             bool accessor = false);
+  // Generic implementation here, overridden for some types.
 
-  /// Accessor to the member.
   const char *fwd_helper_name (void) const;
   void fwd_helper_name (const char *name);
+  // Accessor to the member.
 
-  /// Generate _var and _out typedefs for structs and unions.
   void gen_common_varout (TAO_OutStream *os);
+  // Generate _var and _out typedefs for structs and unions.
 
-  /// Accessors for the member.
   bool seen_in_sequence (void) const;
   virtual void seen_in_sequence (bool val);
+  // Accessors for the member.
 
-  /// Accessors for the member.
   bool seen_in_operation (void) const;
   virtual void seen_in_operation (bool val);
+  // Accessors for the member.
 
-  /**
-   * Typedefs are tricky to handle, in many points their mapping
-   * depend on base type they are aliasing.  Since typedefs can be
-   * recursive simply using "base_type->node_type()" will not work, so
-   * the most "unaliased" type is needed.
-   */
   virtual AST_Decl::NodeType base_node_type (void) const;
+  // Typedefs are tricky to handle, in many points their mapping
+  // depend on base type they are aliasing.  Since typedefs can be
+  // recursive simply using "base_type->node_type()" will not work, so
+  // the most "unaliased" type is needed.
 
-  /// Clean up allocated members.
   virtual void destroy (void);
+  // Clean up allocated members.
 
   // Visiting.
   virtual int accept (be_visitor* visitor);
@@ -93,23 +99,23 @@ public:
   DEF_NARROW_FROM_DECL (be_type);
 
 protected:
-  /// Computes the fully scoped typecode name.
   virtual void compute_tc_name (void);
+  // Computes the fully scoped typecode name.
 
-  /// Typecode name.
   UTL_ScopedName *tc_name_;
+  // Typecode name.
 
-  /// Used by interfaces, valuetypes and arrays to name helper structs.
   ACE_CString fwd_helper_name_;
+  // Used by interfaces, valuetypes and arrays to name helper structs.
 
-  /// Have we generated our _var and _out class typedefs yet?
   bool common_varout_gen_;
+  // Have we generated our _var and _out class typedefs yet?
 
-  /// Has this declaration been used as a sequence element?
   bool seen_in_sequence_;
+  // Has this declaration been used as a sequence element?
 
-  /// Has this declaration been used as a return type or parameter?
   bool seen_in_operation_;
+  // Has this declaration been used as a return type or parameter?
 };
 
 #endif // end of if !defined
diff --git a/TAO/TAO_IDL/be_include/be_typedef.h b/TAO/TAO_IDL/be_include/be_typedef.h
index 7bbf18737c7..8958edb9f49 100644
--- a/TAO/TAO_IDL/be_include/be_typedef.h
+++ b/TAO/TAO_IDL/be_include/be_typedef.h
@@ -1,18 +1,23 @@
+// $Id$
 
-//=============================================================================
-/**
- *  @file    be_typedef.h
- *
- *  $Id$
- *
- *  Extension of class AST_typedef that provides additional means for C++
- *  mapping.
- *
- *
- *  @author Copyright 1994-1995 by Sun Microsystems
- *  @author Inc. and Aniruddha Gokhale
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_typedef.h
+//
+// = DESCRIPTION
+//    Extension of class AST_typedef that provides additional means for C++
+//    mapping.
+//
+// = AUTHOR
+//    Copyright 1994-1995 by Sun Microsystems, Inc.
+//    and
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef BE_TYPEDEF_H
 #define BE_TYPEDEF_H
@@ -30,29 +35,30 @@ public:
               UTL_ScopedName *n,
               bool l,
               bool a);
+  // Constructor.
 
-  /// Overrides for be_type members. If we have been
-  /// defined, we want the underlying type to be set as well.
   virtual void seen_in_sequence (bool val);
   virtual bool seen_in_operation (void) const;
   virtual void seen_in_operation (bool val);
+  // Overrides for be_type members. If we have been
+  // defined, we want the underlying type to be set as well.
 
-  /// Return the most primitive base type by traversing the chain of typedefed
-  /// base types.
   be_type *primitive_base_type (void);
+  // Return the most primitive base type by traversing the chain of typedefed
+  // base types.
 
-  /// Return the most "unaliased" type node for the base type (see
-  /// be_type.h).
   virtual AST_Decl::NodeType base_node_type (void) const;
+  // Return the most "unaliased" type node for the base type (see
+  // be_type.h).
 
-  /// Overridden from class be_type.
   virtual void gen_member_ostream_operator (TAO_OutStream *os,
                                             const char *instance_name,
                                             bool use_underscore,
                                             bool accessor = false);
+  // Overridden from class be_type.
 
-  /// Cleanup function.
   virtual void destroy (void);
+  // Cleanup function.
 
   // Visiting.
   virtual int accept (be_visitor *visitor);
diff --git a/TAO/TAO_IDL/be_include/be_union.h b/TAO/TAO_IDL/be_include/be_union.h
index dc844990c4d..08f24c5c2f9 100644
--- a/TAO/TAO_IDL/be_include/be_union.h
+++ b/TAO/TAO_IDL/be_include/be_union.h
@@ -1,18 +1,23 @@
-
-//=============================================================================
-/**
- *  @file    be_union.h
- *
- *  $Id$
- *
- *  Extension of class AST_Union that provides additional means for C++
- *  mapping.
- *
- *
- *  @author Copyright 1994-1995 by Sun Microsystems
- *  @author Inc. and Aniruddha Gokhale
- */
-//=============================================================================
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_union.h
+//
+// = DESCRIPTION
+//    Extension of class AST_Union that provides additional means for C++
+//    mapping.
+//
+// = AUTHOR
+//    Copyright 1994-1995 by Sun Microsystems, Inc.
+//    and
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef BE_UNION_H
 #define BE_UNION_H
@@ -29,37 +34,36 @@ class be_union : public virtual AST_Union,
                  public virtual be_type
 {
 public:
+  be_union (void);
+
   be_union (AST_ConcreteType *dt,
             UTL_ScopedName *n,
             bool local,
             bool abstract);
 
-  /// Catch BE-specific member values before delegating to the base class.
   virtual void redefine (AST_Structure *from);
+  // Catch BE-specific member values before delegating to the base class.
 
-  /// Do we have at least one member with multiple case labels?
   virtual bool has_duplicate_case_labels (void);
+  // Do we have at least one member with multiple case labels?
 
-  /// Overridden from class be_type.
   virtual void gen_ostream_operator (TAO_OutStream *os,
                                      bool use_underscore);
+  // Overridden from class be_type.
 
-  /// Cleanup function.
   virtual void destroy (void);
+  // Cleanup function.
 
-  /// Visiting.
   virtual int accept (be_visitor *visitor);
+  // Visiting.
 
-  /// Decides whether a default switch case label in the generated copy
-  /// constructor, assignment operator, etc. is needed.
   bool gen_empty_default_label (void);
+  // Decides whether a default switch case label in the generated copy
+  // constructor, assignment operator, etc. is needed.
 
-  /// Just a way to get at fe_add_union_branch() from the backend.
-  AST_UnionBranch *be_add_union_branch (AST_UnionBranch *b);
-
-  /// Returns total number of labels, useful when the union has
-  /// multiple case labels.
-  ACE_UINT64 nlabels (void);
+  unsigned long nlabels (void);
+  // Returns total number of labels, useful when the union has
+  // multiple case labels.
 
   // Narrowing.
 
diff --git a/TAO/TAO_IDL/be_include/be_union_branch.h b/TAO/TAO_IDL/be_include/be_union_branch.h
index 33341ef8d22..3eb204db783 100644
--- a/TAO/TAO_IDL/be_include/be_union_branch.h
+++ b/TAO/TAO_IDL/be_include/be_union_branch.h
@@ -1,18 +1,23 @@
+// $Id$
 
-//=============================================================================
-/**
- *  @file    be_union_branch.h
- *
- *  $Id$
- *
- *  Extension of class AST_UnionBranch that provides additional means for C++
- *  mapping.
- *
- *
- *  @author Copyright 1994-1995 by Sun Microsystems
- *  @author Inc. and Aniruddha Gokhale
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_union_branch.h
+//
+// = DESCRIPTION
+//    Extension of class AST_UnionBranch that provides additional means for C++
+//    mapping.
+//
+// = AUTHOR
+//    Copyright 1994-1995 by Sun Microsystems, Inc.
+//    and
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef BE_UNION_BRANCH_H
 #define BE_UNION_BRANCH_H
@@ -30,17 +35,21 @@ class be_union_branch : public virtual AST_UnionBranch,
                         public virtual be_field
 {
 public:
+  be_union_branch (void);
+  // default constructor.
+
   be_union_branch (UTL_LabelList *ll,
                    AST_Type *ft,
                    UTL_ScopedName *n);
+  // Constructor.
 
-  /// Generate the label value (as in a switch/case statement).
   int gen_label_value (TAO_OutStream *os,
                        unsigned long index = 0);
+  // Generate the label value (as in a switch/case statement).
 
-  /// Generate the default label value (as in a switch/case statement).
   int gen_default_label_value (TAO_OutStream *os,
                                be_union *bu);
+  // Generate the default label value (as in a switch/case statement).
 
   // Visiting.
   virtual int accept (be_visitor *visitor);
@@ -49,6 +58,7 @@ public:
   virtual void destroy (void);
 
   // Narrowing.
+
   DEF_NARROW_FROM_DECL (be_union_branch);
 };
 
diff --git a/TAO/TAO_IDL/be_include/be_union_fwd.h b/TAO/TAO_IDL/be_include/be_union_fwd.h
index a820d394582..c760b11d2a8 100644
--- a/TAO/TAO_IDL/be_include/be_union_fwd.h
+++ b/TAO/TAO_IDL/be_include/be_union_fwd.h
@@ -1,18 +1,22 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    be_union_fwd.h
- *
- *  $Id$
- *
- *  Extension of class AST_UnionFwd that provides additional
- *  means for C++ mapping of a union.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_union_fwd.h
+//
+// = DESCRIPTION
+//    Extension of class AST_UnionFwd that provides additional
+//    means for C++ mapping of a union.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef BE_UNION_FWD_H
 #define BE_UNION_FWD_H
@@ -31,18 +35,24 @@ class be_union_fwd : public virtual AST_UnionFwd,
   // =DESCRIPTION
   //   Extensions to the AST_UnionFwd class
 public:
+  be_union_fwd (void);
+  // Default constructor.
+
   be_union_fwd (AST_Union *dummy,
                 UTL_ScopedName *n);
+  // Constructor.
 
   virtual ~be_union_fwd (void);
+  // Destructor.
 
-  /// Cleanup function.
   virtual void destroy (void);
+  // Cleanup function.
 
   // Visiting.
   virtual int accept (be_visitor* visitor);
 
   // Narrowing.
+
   DEF_NARROW_FROM_DECL (be_union_fwd);
 };
 
diff --git a/TAO/TAO_IDL/be_include/be_union_label.h b/TAO/TAO_IDL/be_include/be_union_label.h
index 1c5c6855398..f115041e10e 100644
--- a/TAO/TAO_IDL/be_include/be_union_label.h
+++ b/TAO/TAO_IDL/be_include/be_union_label.h
@@ -10,8 +10,12 @@ class be_visitor;
 class be_union_label : public virtual AST_UnionLabel
 {
 public:
+  be_union_label (void);
+  // Default constructor.
+
   be_union_label (AST_UnionLabel::UnionLabel ul,
                   AST_Expression *v);
+  // Constructor.
 
   // Visiting.
   virtual int accept (be_visitor *visitor);
diff --git a/TAO/TAO_IDL/be_include/be_util.h b/TAO/TAO_IDL/be_include/be_util.h
index 6aed201c565..a9d8de6906d 100644
--- a/TAO/TAO_IDL/be_include/be_util.h
+++ b/TAO/TAO_IDL/be_include/be_util.h
@@ -1,19 +1,21 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    be_util.h
- *
- *  $Id$
- *
- *  Static helper methods used by multiple visitors.
- *
- *
- *  @author Gary Maxey
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO_IDL_BE
+//
+// = FILENAME
+//    be_util.h
+//
+// = DESCRIPTION
+//    Static helper methods used by multiple visitors.
+//
+// = AUTHOR
+//    Gary Maxey, Jeff Parsons
+//
+// ============================================================================
 
 #ifndef TAO_BE_UTIL_H
 #define TAO_BE_UTIL_H
diff --git a/TAO/TAO_IDL/be_include/be_valuebox.h b/TAO/TAO_IDL/be_include/be_valuebox.h
index 4679b4ee117..d0bca2254dd 100644
--- a/TAO/TAO_IDL/be_include/be_valuebox.h
+++ b/TAO/TAO_IDL/be_include/be_valuebox.h
@@ -1,17 +1,21 @@
-
-//=============================================================================
-/**
- *  @file    be_valuebox.h
- *
- *  $Id$
- *
- *  Extension of class AST_Valuebox that provides additional means for C++
- *  mapping.
- *
- *
- *  @author Gary Maxey
- */
-//=============================================================================
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_valuebox.h
+//
+// = DESCRIPTION
+//    Extension of class AST_Valuebox that provides additional means for C++
+//    mapping.
+//
+// = AUTHOR
+//    Gary Maxey
+//
+// ============================================================================
 
 #ifndef TAO_BE_VALUEBOX_H
 #define TAO_BE_VALUEBOX_H
@@ -26,8 +30,12 @@ class be_valuebox : public virtual AST_ValueBox,
                     public virtual be_type
 {
 public:
+  be_valuebox (void);
+  // Default constructor.
+
   be_valuebox ( AST_Type *boxed_type,
                 UTL_ScopedName *n );
+  // Constructor.
 
   // Visiting.
   virtual int accept (be_visitor *visitor);
@@ -36,6 +44,7 @@ public:
   virtual void destroy (void);
 
   // Narrowing
+
   DEF_NARROW_FROM_DECL (be_valuebox);
 };
 
diff --git a/TAO/TAO_IDL/be_include/be_valuetype.h b/TAO/TAO_IDL/be_include/be_valuetype.h
index 20dbe690da0..7e21d8ba284 100644
--- a/TAO/TAO_IDL/be_include/be_valuetype.h
+++ b/TAO/TAO_IDL/be_include/be_valuetype.h
@@ -1,17 +1,19 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    be_valuetype.h
- *
- *  $Id$
- *
- *  Extension of class AST_Interface and be_interface that provides
- *  additional means for C++ mapping of an valuetype.
- *
- *
- */
-//=============================================================================
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_valuetype.h
+//
+// = DESCRIPTION
+//    Extension of class AST_Interface and be_interface that provides
+//    additional means for C++ mapping of an valuetype.
+//
+// ============================================================================
 
 #ifndef TAO_BE_VALUETYPE_H
 #define TAO_BE_VALUETYPE_H
@@ -33,6 +35,9 @@ class be_valuetype : public virtual be_interface,
   //    mapping.
   //
 public:
+  be_valuetype (void);
+  // Default constructor.
+
   be_valuetype (UTL_ScopedName *n,
                 AST_Type **inherits,
                 long n_inherits,
@@ -45,36 +50,39 @@ public:
                 bool abstract,
                 bool truncatable,
                 bool custom);
+  // Constructor that sets its scoped name <n>, a list of inherited valuetypes
+  // and supported interfaces <ih>, and the number of inherited interfaces <nih>
 
   ~be_valuetype (void);
+  // Destructor.
 
   virtual void redefine (AST_Interface *from);
 
-  /// Should generate optimized form?
   bool opt_accessor (void);
+  // Should generate optimized form?
 
-  /// Generate the helper functions definition.
   virtual int gen_helper_header (char *local_name = 0,
                                  char *full_name = 0);
+  // Generate the helper functions definition.
 
-  /// Generate the helper functions inline implementation.
   virtual int gen_helper_inline (char *local_name = 0,
                                  char *full_name = 0);
+  // Generate the helper functions inline implementation.
 
-  /// Generate the helper functions implementation.
   virtual int gen_helper_stubs (char *local_name = 0,
                                 char *full_name = 0);
+  // Generate the helper functions implementation.
 
-  /// Overridden from class be_type.
   virtual void gen_ostream_operator (TAO_OutStream *os,
                                      bool use_underscore);
+  // Overridden from class be_type.
 
-  /// Generate the declarations used by the template _var, _out
-  /// classes for valuetypes, and by sequence template classes.
   void gen_var_out_seq_decls (void);
+  // Generate the declarations used by the template _var, _out
+  // classes for valuetypes, and by sequence template classes.
 
-  /// Retrieve the fully scoped skel class name.
   const char *full_obv_skel_name (void);
+  // Retrieve the fully scoped skel class name.
 
   const char *field_pd_prefix (void);
 
@@ -99,8 +107,8 @@ public:
       TAO_OutStream *os
     );
 
-  /// Do we support at least one abstract interface?
   bool supports_abstract (void) const;
+  // Do we support at least one abstract interface?
 
   // Visiting.
   virtual int accept (be_visitor *visitor);
@@ -113,28 +121,28 @@ public:
   DEF_NARROW_FROM_DECL (be_valuetype);
   DEF_NARROW_FROM_SCOPE (be_valuetype);
 
-  /// Compute the fully scoped skel class name.
   void compute_fullobvskelname (void);
+  // Compute the fully scoped skel class name.
 
-  /// Compute the count of private/public/all data members.
   ACE_CDR::ULong data_members_count (
       AST_Field::Visibility vis = AST_Field::vis_NA
     );
+  // Compute the count of private/public/all data members.
 
-  /// Helper method passed to the template method to generate code for
-  /// adding abstract supported interfaces to the inheritance list.
   static int abstract_supports_helper (be_interface *node,
                                        be_interface *base,
                                        TAO_OutStream *os);
+  // Helper method passed to the template method to generate code for
+  // adding abstract supported interfaces to the inheritance list.
 
-  /// Helper method to generate *_skel operations for the concrete
-  /// interface that we support (if any) and those of its base classes.
   static int gen_skel_helper (be_interface *node,
                               be_interface *base,
                               TAO_OutStream *os);
+  // Helper method to generate *_skel operations for the concrete
+  // interface that we support (if any) and those of its base classes.
 
-  /// Accessor to the member.
   const char *fwd_helper_name (void) const;
+  // Accessor to the member.
 
   // There are three possible situations.
   // (1) If there is no initializers but at least one operation.
@@ -156,31 +164,31 @@ public:
     FS_ABSTRACT_FACTORY
   };
 
-  /// Determine what kind of factory needed.
   FactoryStyle determine_factory_style (void);
+  // Determine what kind of factory needed.
 
-  /// Recurse down the inheritance tree to determine
-  /// if valuetype has at least one operation/attribute.
   bool have_operation (void);
+  // Recurse down the inheritance tree to determine
+  // if valuetype has at least one operation/attribute.
 
-  /// Check if VT supports an interface with at least 1 operation.
   static bool have_supported_op (be_interface *node);
+  // Check if VT supports an interface with at least 1 operation.
 
-  /// Use the above enum and methods to determine this after the
-  /// node's scope is visited but before code generation.
   virtual bool will_have_factory (void);
+  // Use the above enum and methods to determine this after the
+  // node's scope is visited but before code generation.
 
-  /// Decides whether to generate the initializing contstructor or not.
   bool has_member (void);
+  // Decides whether to generate the initializing contstructor or not.
 
 private:
   char *full_obv_skel_name_;
 
-  /// Do we support at least one abstract interface?
   bool supports_abstract_;
+  // Do we support at least one abstract interface?
 
-  /// Have these been done already?
   int var_out_seq_decls_gen_;
+  // Have these been done already?
 };
 
 #endif  // if !defined
diff --git a/TAO/TAO_IDL/be_include/be_valuetype_fwd.h b/TAO/TAO_IDL/be_include/be_valuetype_fwd.h
index 5f14bd11834..6535c3c6c26 100644
--- a/TAO/TAO_IDL/be_include/be_valuetype_fwd.h
+++ b/TAO/TAO_IDL/be_include/be_valuetype_fwd.h
@@ -1,20 +1,25 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    be_valuetype_fwd.h
- *
- *  $Id$
- *
- *  Extension of class AST_Interface_Fwd that provides additional
- *  means for C++ mapping of a valuetype.
- *
- *
- *  @author Copyright 1994-1995 by Sun Microsystems Inc.
- *  @author Aniruddha Gokhale
- *  @author Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
- */
-//=============================================================================
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_valuetype_fwd.h
+//
+// = DESCRIPTION
+//    Extension of class AST_Interface_Fwd that provides additional
+//    means for C++ mapping of a valuetype.
+//
+// = AUTHOR
+//    Copyright 1994-1995 by Sun Microsystems, Inc.
+//    and
+//    Aniruddha Gokhale,
+//    changed for valuetypes from Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//
+// ============================================================================
 
 #ifndef BE_VALUETYPE_FWD_H
 #define BE_VALUETYPE_FWD_H
@@ -31,10 +36,15 @@ class be_valuetype_fwd : public virtual be_interface_fwd,
   // =DESCRIPTION
   //   Extensions to the be_interface_fwd class
 public:
+  be_valuetype_fwd (void);
+  // Default constructor.
+
   be_valuetype_fwd (AST_Interface *dummy,
                     UTL_ScopedName *n);
+  // Constructor.
 
   virtual ~be_valuetype_fwd (void);
+  // Destructor.
 
   // Visiting.
   virtual int accept (be_visitor* visitor);
@@ -43,6 +53,7 @@ public:
   virtual void destroy (void);
 
   // Narrowing.
+
   DEF_NARROW_FROM_DECL (be_valuetype_fwd);
 };
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor.h b/TAO/TAO_IDL/be_include/be_visitor.h
index 6e6c6f5eeac..3348f593e7a 100644
--- a/TAO/TAO_IDL/be_include/be_visitor.h
+++ b/TAO/TAO_IDL/be_include/be_visitor.h
@@ -1,21 +1,26 @@
+//
+// $Id$
+//
 
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    be_visitor.h
- *
- *  $Id$
- *
- *  The abstract visitor class. The concrete classes are responsible for code
- *  generation.
- *
- *
- *  @author Copyright 1994-1995 by Sun Microsystems
- *  @author Inc. and Carlos O'Ryan
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO_IDL_BE
+//
+// = FILENAME
+//    be_visitor.h
+//
+// = DESCRIPTION
+//    The abstract visitor class. The concrete classes are responsible for code
+//    generation.
+//
+// = AUTHOR
+//    Copyright 1994-1995 by Sun Microsystems, Inc.
+//    and
+//    Carlos O'Ryan, Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef TAO_BE_VISITOR_H
 #define TAO_BE_VISITOR_H
@@ -48,7 +53,6 @@ class be_mirror_port;
 class be_connector;
 class be_home;
 class be_factory;
-class be_finder;
 class be_structure;
 class be_structure_fwd;
 class be_exception;
@@ -75,18 +79,18 @@ class be_param_holder;
 class be_visitor_context;
 class TAO_OutStream;
 
-/**
- * @class be_visitor
- *
- * @brief Base class for visitors.
- *
- * To implement code generation we use the "Visitor Pattern", this
- * is the abstract "Visitor".
- * The "visit" methods are not pure virtual to facilitate the
- * implementation of simple visitors that only override a few.
- */
 class be_visitor
 {
+  //
+  // = TITLE
+  //   Base class for visitors.
+  //
+  // = DESCRIPTION
+  //   To implement code generation we use the "Visitor Pattern", this
+  //   is the abstract "Visitor".
+  //   The "visit" methods are not pure virtual to facilitate the
+  //   implementation of simple visitors that only override a few.
+  //
 public:
   virtual ~be_visitor (void);
 
@@ -119,7 +123,6 @@ public:
   virtual int visit_connector (be_connector *node);
   virtual int visit_home (be_home *node);
   virtual int visit_factory (be_factory *node);
-  virtual int visit_finder (be_finder *node);
   virtual int visit_structure (be_structure *node);
   virtual int visit_structure_fwd (be_structure_fwd *node);
   virtual int visit_exception (be_exception *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_ami4ccm_pre_proc.h b/TAO/TAO_IDL/be_include/be_visitor_ami4ccm_pre_proc.h
index d014fd427dc..20dd56fda77 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_ami4ccm_pre_proc.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_ami4ccm_pre_proc.h
@@ -1,21 +1,26 @@
+//
+// $Id$
+//
 
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    be_visitor_ami4ccm_pre_proc.h
- *
- *  $Id$
- *
- *  This visitor creates for AMI4CCM implied IDL constructs
- *  the appropriate AST (Abstract Syntax Tree) node,
- *  sets the corresponding interface or operation strategy
- *  on it and enteres the nodes into the AST.
- *
- *
- *  @author Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_ami4ccm_pre_proc.h
+//
+// = DESCRIPTION
+//    This visitor creates for AMI4CCM implied IDL constructs
+//    the appropriate AST (Abstract Syntax Tree) node,
+//    sets the corresponding interface or operation strategy
+//    on it and enteres the nodes into the AST.
+//
+// = AUTHOR
+//    Johnny Willemsen  <jwillemsen@remedy.nl>
+//
+// ============================================================================
 
 #ifndef TAO_BE_VISITOR_AMI4CCM_PRE_PROC_H
 #define TAO_BE_VISITOR_AMI4CCM_PRE_PROC_H
@@ -25,15 +30,15 @@
 
 class AST_Type;
 
-/**
- * @class be_visitor_ami4ccm_pre_proc
- *
- * @brief AMI4CCM pre processor
- *
- * Adds AMI4CCM implied IDL code to the AST
- */
 class be_visitor_ami4ccm_pre_proc : public be_visitor_scope
 {
+  //
+  // = TITLE
+  //   AMI4CCM pre processor
+  //
+  // = DESCRIPTION
+  //   Adds AMI4CCM implied IDL code to the AST
+  //
 private:
  typedef enum
  {
@@ -47,84 +52,80 @@ public:
 
   virtual ~be_visitor_ami4ccm_pre_proc (void);
 
-  /// visit a root
   virtual int visit_root (be_root *node);
+  // visit a root
 
-  /// visit module
   virtual int visit_module (be_module *node);
+  // visit module
 
-  /// visit component
   virtual int visit_component (be_component *node);
+  // visit component
 
-  /// visit interface
   virtual int visit_interface (be_interface *node);
+  // visit interface
 
-  /// visit an operation
   virtual int visit_operation (be_operation *node);
+  // visit an operation
 
-  /// visit an attribute
   virtual int visit_attribute (be_attribute *node);
+  // visit an attribute
 
-  /// visit an uses
   virtual int visit_uses (be_uses *node);
+  // visit an uses
 
 private:
-  /**
-   * Creates a raise operation from node and inserts it in
-   * excep_holder, while obeying if it is a normal operation
-   * or a set or get attribute.
-   */
   int create_raise_operation (be_decl *node,
                               Operation_Kind operation_kind);
+  // Creates a raise operation from node and inserts it in
+  // excep_holder, while obeying if it is a normal operation
+  // or a set or get attribute.
 
-  /// create the reply handler interface
   be_interface *create_reply_handler (be_interface *node);
+  // create the reply handler interface
 
-  /// create the ami4ccm sendc interface
   be_interface *create_ami_sendc_interface (be_interface *node);
+  // create the ami4ccm sendc interface
 
-  /// create the sendc interface
   be_interface *create_sendc_interface (be_interface *node);
+  // create the sendc interface
   
-  /// specialized visit_scope
   int visit_scope (be_scope *node);
+  // specialized visit_scope
 
-  /**
-   * create a method with "sendc_" prepended, if for_arguments
-   * equals one the sendc operation contains also the
-   * object reference to the reply handler as the first argument,
-   * but this should not be marhaled, therefor we need the switch
-   */
   be_operation *create_sendc_operation (be_operation *node,
                                         bool for_arguments);
+  // create a method with "sendc_" prepended, if for_arguments
+  // equals one the sendc operation contains also the
+  // object reference to the reply handler as the first argument,
+  // but this should not be marhaled, therefor we need the switch
 
-  /// create a method with "_excep" appended
   int create_excep_operation (be_operation *node,
                               be_interface *reply_handler);
+  // create a method with "_excep" appended
 
-  /// create an operation with only the OUT and INOUT arguments
   int create_reply_handler_operation (be_operation *node,
                                       be_interface *reply_handler);
+  // create an operation with only the OUT and INOUT arguments
 
   //int visit_scope (be_scope *node);
   // specialized visit_scope
 
-  /// concatenate the prefix, middle_name and suffix
-  /// and store the result in desination.
   int generate_name (ACE_CString &desintation,
                      const char *prefix,
                      const char *middle_name,
                      const char *suffix);
+  // concatenate the prefix, middle_name and suffix
+  // and store the result in desination.
 
-  /// generate a get operation out of the attribute.
   be_operation *generate_get_operation (be_attribute *node);
+  // generate a get operation out of the attribute.
 
-  /// generate a set operation out of the attribute.
   be_operation *generate_set_operation (be_attribute *node);
+  // generate a set operation out of the attribute.
 
-  /// Create an inheritance list for the reply handler.
   AST_Type **create_inheritance_list (be_interface *node,
                                       long &n_parents);
+  // Create an inheritance list for the reply handler.
 
   be_uses * create_sendc_uses (be_uses *node);
 };
diff --git a/TAO/TAO_IDL/be_include/be_visitor_ami_pre_proc.h b/TAO/TAO_IDL/be_include/be_visitor_ami_pre_proc.h
index 79574323200..67c560f4e29 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_ami_pre_proc.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_ami_pre_proc.h
@@ -1,21 +1,26 @@
+//
+// $Id$
+//
 
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    be_visitor_ami_pre_proc.h
- *
- *  $Id$
- *
- *  This visitor creates for AMI implied IDL constructs
- *  the appropriate AST (Abstract Syntax Tree) node,
- *  sets the corresponding interface or operation strategy
- *  on it and enteres the nodes into the AST.
- *
- *
- *  @author Michael Kircher <Michael.Kircher@mchp.siemens.de>
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_ami_pre_proc.h
+//
+// = DESCRIPTION
+//    This visitor creates for AMI implied IDL constructs
+//    the appropriate AST (Abstract Syntax Tree) node,
+//    sets the corresponding interface or operation strategy
+//    on it and enteres the nodes into the AST.
+//
+// = AUTHOR
+//    Michael Kircher <Michael.Kircher@mchp.siemens.de>
+//
+// ============================================================================
 
 #ifndef TAO_BE_VISITOR_AMI_PRE_PROC_H
 #define TAO_BE_VISITOR_AMI_PRE_PROC_H
@@ -25,15 +30,15 @@
 
 class AST_Type;
 
-/**
- * @class be_visitor_ami_pre_proc
- *
- * @brief AMI pre processor
- *
- * Adds AMI implied IDL code to the AST
- */
 class be_visitor_ami_pre_proc : public be_visitor_scope
 {
+  //
+  // = TITLE
+  //   AMI pre processor
+  //
+  // = DESCRIPTION
+  //   Adds AMI implied IDL code to the AST
+  //
 private:
  typedef enum 
  {
@@ -47,69 +52,65 @@ public:
 
   virtual ~be_visitor_ami_pre_proc (void);
 
-  /// visit a root
   virtual int visit_root (be_root *node);
+  // visit a root
 
-  /// visit module
   virtual int visit_module (be_module *node);
+  // visit module
 
-  /// visit interface
   virtual int visit_interface (be_interface *node);
+  // visit interface
 
-  /// visit an operation
   virtual int visit_operation (be_operation *node);
+  // visit an operation
 
-  /// visit an attribute
   virtual int visit_attribute (be_attribute *node);
+  // visit an attribute
 
 private:
-  /**
-   * Creates a raise operation from node and inserts it in
-   * excep_holder, while obeying if it is a normal operation
-   * or a set or get attribute.
-   */
   int create_raise_operation (be_decl *node,
                               Operation_Kind operation_kind);
+  // Creates a raise operation from node and inserts it in
+  // excep_holder, while obeying if it is a normal operation
+  // or a set or get attribute.
 
-  /// create the reply handler interface
   be_interface *create_reply_handler (be_interface *node);
+  // create the reply handler interface
 
-  /**
-   * create a method with "sendc_" prepended, if for_arguments
-   * equals one the sendc operation contains also the
-   * object reference to the reply handler as the first argument,
-   * but this should not be marhaled, therefor we need the switch
-   */
   be_operation *create_sendc_operation (be_operation *node,
                                         int for_arguments);
+  // create a method with "sendc_" prepended, if for_arguments
+  // equals one the sendc operation contains also the
+  // object reference to the reply handler as the first argument,
+  // but this should not be marhaled, therefor we need the switch
 
-  /// create a method with "_excep" appended
   int create_excep_operation (be_operation *node,
                               be_interface *reply_handler);
+  // create a method with "_excep" appended
 
-  /// create an operation with only the OUT and INOUT arguments
   int create_reply_handler_operation (be_operation *node,
                                       be_interface *reply_handler);
+  // create an operation with only the OUT and INOUT arguments
 
-  /// specialized visit_scope
   int visit_scope (be_scope *node);
+  // specialized visit_scope
 
-  /// concatenate the prefix, middle_name and suffix
-  /// and store the result in desination.
   int generate_name (ACE_CString &desintation,
                      const char *prefix,
                      const char *middle_name,
                      const char *suffix);
+  // concatenate the prefix, middle_name and suffix
+  // and store the result in desination.
 
-  /// generate a get operation out of the attribute.
   be_operation *generate_get_operation (be_attribute *node);
+  // generate a get operation out of the attribute.
 
-  /// generate a set operation out of the attribute.
   be_operation *generate_set_operation (be_attribute *node);
+  // generate a set operation out of the attribute.
 
-  /// Create an inheritance list for the reply handler.
   AST_Type **create_inheritance_list (be_interface *node,
                                       long &n_parents);
+  // Create an inheritance list for the reply handler.
 };
 
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_any_extracted_type_decl.h b/TAO/TAO_IDL/be_include/be_visitor_any_extracted_type_decl.h
index ff779a649e5..d7028dfc6d6 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_any_extracted_type_decl.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_any_extracted_type_decl.h
@@ -1,18 +1,23 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    be_visitor_any_extracted_type_decl.h
- *
- *  $Id$
- *
- *  Encapsulation of rules for declaring variables
- *  for Any extraction
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO_IDL_BE
+//
+// = FILENAME
+//    be_visitor_any_extracted_type_decl.h
+//
+// = DESCRIPTION
+//    Encapsulation of rules for declaring variables
+//    for Any extraction
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef BE_VISITOR_ANY_EXTRACTED_TYPE_DECL_H
 #define BE_VISITOR_ANY_EXTRACTED_TYPE_DECL_H
@@ -21,16 +26,17 @@
 
 class TAO_OutStream;
 
-/**
- * @class be_visitor_any_extracted_type_decl
- *
- * @brief be_visitor_any_extracted_type_decl
- *
- * Contains overloaded methods that generate declarations of
- * CORBA typenames for Any extraction
- */
 class be_visitor_any_extracted_type_decl : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //   be_visitor_any_extracted_type_decl
+  //
+  // = DESCRIPTION
+  //   Contains overloaded methods that generate declarations of
+  //   CORBA typenames for Any extraction
+  //
+  //
 public:
   be_visitor_any_extracted_type_decl (be_visitor_context *ctx);
   virtual ~be_visitor_any_extracted_type_decl (void);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_arg_traits.h b/TAO/TAO_IDL/be_include/be_visitor_arg_traits.h
index 8d88b3281bd..8246fc5d7c4 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_arg_traits.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_arg_traits.h
@@ -9,7 +9,6 @@
 *  @author Jeff Parsons <j.parsons@vanderbilt.edu>
 */
 //=============================================================================
-
 #ifndef TAO_BE_VISITOR_ARG_TRAITS_H
 #define TAO_BE_VISITOR_ARG_TRAITS_H
 
@@ -29,29 +28,51 @@ public:
   virtual ~be_visitor_arg_traits (void);
 
   virtual int visit_root (be_root *node);
+
   virtual int visit_module (be_module *node);
+
   virtual int visit_array (be_array *node);
+
   virtual int visit_enum (be_enum *node);
+
   virtual int visit_interface (be_interface *node);
+
   virtual int visit_interface_fwd (be_interface_fwd *node);
+
   virtual int visit_valuetype (be_valuetype *node);
+
   virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+
   virtual int visit_eventtype (be_eventtype *node);
+
   virtual int visit_eventtype_fwd (be_eventtype_fwd *node);
+
   virtual int visit_operation (be_operation *node);
+
   virtual int visit_attribute (be_attribute *node);
+
   virtual int visit_argument (be_argument *node);
+
   virtual int visit_sequence (be_sequence *node);
+
   virtual int visit_string (be_string *node);
+
   virtual int visit_structure (be_structure *node);
+
   virtual int visit_field (be_field *node);
+
   virtual int visit_union (be_union *node);
+
   virtual int visit_union_branch (be_union_branch *node);
+
   virtual int visit_typedef (be_typedef *node);
+
   virtual int visit_component (be_component *node);
+
   virtual int visit_component_fwd (be_component_fwd *node);
-  virtual int visit_connector (be_connector *node);
+
   virtual int visit_home (be_home *node);
+
   virtual int visit_valuebox (be_valuebox *node);
 
 private:
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument.h b/TAO/TAO_IDL/be_include/be_visitor_argument.h
index 3b8ac67e5ab..e379754d28d 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_argument.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument.h
@@ -1,19 +1,23 @@
 // -*- C++ -*-
+//
+// $Id$
 
-//=============================================================================
-/**
- *  @file    be_visitor_argument.h
- *
- *  $Id$
- *
- *  Visitors for generation of code for Arguments. These are used for the
- *  interpretive styled stubs and skeletons
- *
- *
- *  @author Aniruddha Gokhale and Carlos O'Ryan
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_args.h
+//
+// = DESCRIPTION
+//    Visitors for generation of code for Arguments. These are used for the
+//    interpretive styled stubs and skeletons
+//
+// = AUTHOR
+//    Aniruddha Gokhale and Carlos O'Ryan
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_ARGUMENT_H
 #define _BE_VISITOR_ARGUMENT_H
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/arglist.h b/TAO/TAO_IDL/be_include/be_visitor_argument/arglist.h
index d14caa1c84c..9bedb11fc1b 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_argument/arglist.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument/arglist.h
@@ -1,109 +1,114 @@
-
-//=============================================================================
-/**
- *  @file    arglist.h
- *
- *  $Id$
- *
- *  Visitors for generation of code for Arguments as parameter lists in the
- *  operation signature
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    arglist.h
+//
+// = DESCRIPTION
+//    Visitors for generation of code for Arguments as parameter lists in the
+//    operation signature
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_ARGUMENT_ARGLIST_H_
 #define _BE_VISITOR_ARGUMENT_ARGLIST_H_
 
-/**
- * @class be_visitor_args_arglist
- *
- * @brief Generates the code for arguments output.
- *
- * At several stages in the code generation a node of type
- * "be_operation" is visited, and the code for its arguments must
- * be generated.
- * Sometimes the argument declarations must be generated (such as
- * in the class declaration), other the arguments names (such as
- * in method invocations).
- * This class implements the declaration output, in other words,
- * it outputs both the arguments and their types.
- */
 class be_visitor_args_arglist : public be_visitor_args
 {
+  //
+  // = TITLE
+  //   Generates the code for arguments output.
+  //
+  // = DESCRIPTION
+  //   At several stages in the code generation a node of type
+  //   "be_operation" is visited, and the code for its arguments must
+  //   be generated.
+  //   Sometimes the argument declarations must be generated (such as
+  //   in the class declaration), other the arguments names (such as
+  //   in method invocations).
+  //   This class implements the declaration output, in other words,
+  //   it outputs both the arguments and their types.
+  //
 public:
-  /// constructor
   be_visitor_args_arglist (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   virtual ~be_visitor_args_arglist (void);
+  // destructor
 
-  /// visit the argument node
   virtual int visit_argument (be_argument *node);
+  // visit the argument node
 
   // =visit all the nodes that can be the types for the argument
 
-  /// visit array type
   virtual int visit_array (be_array *node);
+  // visit array type
 
-  /// visit the enum node
   virtual int visit_enum (be_enum *node);
+  // visit the enum node
 
-  /// visit interface
   virtual int visit_interface (be_interface *node);
+  // visit interface
 
-  /// visit interface forward
   virtual int visit_interface_fwd (be_interface_fwd *node);
+  // visit interface forward
 
-  /// visit component
   virtual int visit_component (be_component *node);
+  // visit component
 
-  /// visit component forward
   virtual int visit_component_fwd (be_component_fwd *node);
+  // visit component forward
 
-  /// visit native node
   virtual int visit_native (be_native *node);
+  // visit native node
 
-  /// visit predefined type
   virtual int visit_predefined_type (be_predefined_type *node);
+  // visit predefined type
 
-  /// visit sequence type
   virtual int visit_sequence (be_sequence *node);
+  // visit sequence type
 
-  /// visit string type
   virtual int visit_string (be_string *node);
+  // visit string type
 
-  /// visit structure type
   virtual int visit_structure (be_structure *node);
+  // visit structure type
 
-  /// visit union type
   virtual int visit_union (be_union *node);
+  // visit union type
 
-  /// visit the typedef type
   virtual int visit_typedef (be_typedef *node);
+  // visit the typedef type
 
-  /// visit valuetype
   virtual int visit_valuetype (be_valuetype *node);
+  // visit valuetype
 
-  /// visit valuetype_fwd
   virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+  // visit valuetype_fwd
 
-  /// visit eventtype
   virtual int visit_eventtype (be_eventtype *node);
+  // visit eventtype
 
-  /// visit eventtype_fwd
   virtual int visit_eventtype_fwd (be_eventtype_fwd *node);
+  // visit eventtype_fwd
 
-  /// visit home
   virtual int visit_home (be_home *node);
+  // visit home
 
-  /// visit valuebox
   virtual int visit_valuebox (be_valuebox *node);
+  // visit valuebox
   
-  /// Set the member.
   void unused (bool val);
+  // Set the member.
 
 private:
   int emit_common (be_type *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/argument.h b/TAO/TAO_IDL/be_include/be_visitor_argument/argument.h
index 171816a914d..c5d61e09a04 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_argument/argument.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument/argument.h
@@ -1,57 +1,62 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    argument.h
- *
- *  $Id$
- *
- *  Visitors for generation of code for Arguments
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    argument.h
+//
+// = DESCRIPTION
+//    Visitors for generation of code for Arguments
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_ARGUMENT_ARGUMENT_H_
 #define _BE_VISITOR_ARGUMENT_ARGUMENT_H_
 
 #include "ast_argument.h"
 
-/**
- * @class be_visitor_args
- *
- * @brief Generates the code for arguments output.
- *
- * At several stages in the code generation a node of type
- * "be_operation" is visited, and the code for its arguments must
- * be generated.
- * Sometimes the argument declarations must be generated (such as
- * in the class declaration), other the arguments names (such as
- * in method invocations).
- * This class implements some common functionality required across all
- * argument visitors
- */
 class be_visitor_args : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //   Generates the code for arguments output.
+  //
+  // = DESCRIPTION
+  //   At several stages in the code generation a node of type
+  //   "be_operation" is visited, and the code for its arguments must
+  //   be generated.
+  //   Sometimes the argument declarations must be generated (such as
+  //   in the class declaration), other the arguments names (such as
+  //   in method invocations).
+  //   This class implements some common functionality required across all
+  //   argument visitors
+  //
 public:
-  /// constructor
   be_visitor_args (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   virtual ~be_visitor_args (void);
+  // destructor
 
   //= helper
-  /// helper that produces either a nested name for header files or full name
-  /// for others
   virtual const char *type_name (be_type *type, 
                                  const char *suffix = 0);
+  // helper that produces either a nested name for header files or full name
+  // for others
 
-  /// return the direction of the argument node
   virtual AST_Argument::Direction direction (void);
+  // return the direction of the argument node
 
-  /// must be overridden by derived classes
   virtual int visit_argument (be_argument *node);
+  // must be overridden by derived classes
 
   void set_fixed_direction (AST_Argument::Direction direction);
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/marshal_ss.h b/TAO/TAO_IDL/be_include/be_visitor_argument/marshal_ss.h
index 06c5a7e42ab..80d2b051a08 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_argument/marshal_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument/marshal_ss.h
@@ -1,18 +1,23 @@
-
-//=============================================================================
-/**
- *  @file    marshal_ss.h
- *
- *  $Id$
- *
- *  Visitors for generation of code for Arguments. This generates the
- *  code to pass the arguments to the call to the marshaler/demarshaler
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    marshal_ss.h
+//
+// = DESCRIPTION
+//    Visitors for generation of code for Arguments. This generates the
+//    code to pass the arguments to the call to the marshaler/demarshaler
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_ARGUMENT_MARSHAL_SS_H_
 #define _BE_VISITOR_ARGUMENT_MARSHAL_SS_H_
@@ -21,80 +26,80 @@
 // class be_visitor_args_marshal_ss
 // ************************************************************
 
-/**
- * @class be_visitor_args_marshal_ss
- *
- * @brief be_visitor_args_marshal_ss
- *
- * Code to be generated when making the invocation
- */
 class be_visitor_args_marshal_ss : public be_visitor_args
 {
+  //
+  // = TITLE
+  //   be_visitor_args_marshal_ss
+  //
+  // = DESCRIPTION
+  //   Code to be generated when making the invocation
+  //
 public:
-  /// constructor
   be_visitor_args_marshal_ss (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   virtual ~be_visitor_args_marshal_ss (void);
+  // destructor
 
-  /// visit the argument node
   virtual int visit_argument (be_argument *node);
+  // visit the argument node
 
   // =visit all the nodes that can be the types for the argument
 
-  /// visit array type
   virtual int visit_array (be_array *node);
+  // visit array type
 
-  /// visit the enum node
   virtual int visit_enum (be_enum *node);
+  // visit the enum node
 
-  /// visit interface
   virtual int visit_interface (be_interface *node);
+  // visit interface
 
-  /// visit interface forward
   virtual int visit_interface_fwd (be_interface_fwd *node);
+  // visit interface forward
 
-  /// visit valuebox
   virtual int visit_valuebox (be_valuebox *node);
+  // visit valuebox
 
-  /// visit valuetype
   virtual int visit_valuetype (be_valuetype *node);
+  // visit valuetype
 
-  /// visit valuetype forward
   virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+  // visit valuetype forward
 
-  /// visit predefined type
   virtual int visit_predefined_type (be_predefined_type *node);
+  // visit predefined type
 
-  /// visit sequence type
   virtual int visit_sequence (be_sequence *node);
+  // visit sequence type
 
-  /// visit string type
   virtual int visit_string (be_string *node);
+  // visit string type
 
-  /// visit structure type
   virtual int visit_structure (be_structure *node);
+  // visit structure type
 
-  /// visit union type
   virtual int visit_union (be_union *node);
+  // visit union type
 
-  /// visit the typedef type
   virtual int visit_typedef (be_typedef *node);
+  // visit the typedef type
 
-  /// visit a component node
   virtual int visit_component (be_component *node);
+  // visit a component node
 
-  /// visit a forward declared component node
   virtual int visit_component_fwd (be_component_fwd *node);
+  // visit a forward declared component node
 
-  /// visit an eventtype node
   virtual int visit_eventtype (be_eventtype *node);
+  // visit an eventtype node
 
-  /// visit a forward declared eventtype node
   virtual int visit_eventtype_fwd (be_eventtype_fwd *node);
+  // visit a forward declared eventtype node
 
-  /// visit home
   virtual int visit_home (be_home *node);
+  // visit home
 
  private:
   int emit_common (void);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/paramlist.h b/TAO/TAO_IDL/be_include/be_visitor_argument/paramlist.h
index a464bd08d7d..a41505d781c 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_argument/paramlist.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument/paramlist.h
@@ -1,49 +1,53 @@
-
-//=============================================================================
-/**
- *  @file    paramlist.h
- *
- *  $Id$
- *
- *  Visitors for generation of code for building Dynamic::ParamList
- *
- *
- *  @author Kirthika Parameswaran  <kirthika@cs.wustl.edu>
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    paramlist.h
+//
+// = DESCRIPTION
+//    Visitors for generation of code for building Dynamic::ParamList
+//
+// = AUTHOR
+//    Kirthika Parameswaran  <kirthika@cs.wustl.edu>
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_ARGUMENT_PARAMLIST_H_
 #define _BE_VISITOR_ARGUMENT_PARAMLIST_H_
 
-/**
- * @class be_visitor_args_paramlist
- *
- * @brief Generates the code for arguments output.
- *
- * At several stages in the code generation a node of type
- * "be_operation" is visited, and the code for its arguments must
- * be generated. Here the generationis to build the ParameterList
- * on demand.
- */
 class be_visitor_args_paramlist : public be_visitor_args
 {
+  //
+  // = TITLE
+  //   Generates the code for arguments output.
+  //
+  // = DESCRIPTION
+  //   At several stages in the code generation a node of type
+  //   "be_operation" is visited, and the code for its arguments must
+  //   be generated. Here the generationis to build the ParameterList
+  //   on demand.
 
 public:
-  /// constructor
   be_visitor_args_paramlist (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   virtual ~be_visitor_args_paramlist (void);
+  // destructor
 
-  /// visit the argument node
   virtual int visit_argument (be_argument *node);
+  // visit the argument node
 
-  /// visit predefined types like boolean, char, octet, wchar.
   virtual int visit_predefined_type (be_predefined_type *node);
+  // visit predefined types like boolean, char, octet, wchar.
 
-  /// visit the string since insertion of string and w_string is special.
   virtual int visit_string (be_string *node);
+  // visit the string since insertion of string and w_string is special.
 };
 
 #endif /* _BE_VISITOR_ARGUMENT_PARAMLIST_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/post_upcall_ss.h b/TAO/TAO_IDL/be_include/be_visitor_argument/post_upcall_ss.h
index f1c5a7fcb0f..32ff63812a7 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_argument/post_upcall_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument/post_upcall_ss.h
@@ -1,18 +1,23 @@
-
-//=============================================================================
-/**
- *  @file    post_upcall_ss.h
- *
- *  $Id$
- *
- *  Visitors for generation of code for Arguments. This generates the
- *  code for post upcall processing of the arguments
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    post_upcall_ss.h
+//
+// = DESCRIPTION
+//    Visitors for generation of code for Arguments. This generates the
+//    code for post upcall processing of the arguments
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 
 #ifndef _BE_VISITOR_ARGUMENT_POST_UPCALL_SS_H_
@@ -22,33 +27,33 @@
 // class be_visitor_args_post_upcall_ss
 // ************************************************************
 
-/**
- * @class be_visitor_args_post_upcall_ss
- *
- * @brief be_visitor_compiled_args_post_upcall
- *
- * Visitor for post processing after upcall
- */
 class be_visitor_args_post_upcall_ss : public be_visitor_scope
 {
+  //
+  // = TITLE
+  //   be_visitor_compiled_args_post_upcall
+  //
+  // = DESCRIPTION
+  //   Visitor for post processing after upcall
+  //
 public:
-  /// constructor
   be_visitor_args_post_upcall_ss (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   virtual ~be_visitor_args_post_upcall_ss (void);
+  // destructor
 
-  /// visit the argument node
   virtual int visit_argument (be_argument *node);
+  // visit the argument node
 
-  /// visit operation node
   virtual int visit_operation (be_operation *node);
+  // visit operation node
 
-  /// visit array type
   virtual int visit_array (be_array *node);
+  // visit array type
 
-  /// visit the typedef type
   virtual int visit_typedef (be_typedef *node);
+  // visit the typedef type
 };
 
 #endif  /* _BE_VISITOR_ARGUMENT_POST_UPCALL_SS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/upcall_ss.h b/TAO/TAO_IDL/be_include/be_visitor_argument/upcall_ss.h
index f4c647741d4..be2c2bf1515 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_argument/upcall_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument/upcall_ss.h
@@ -1,18 +1,23 @@
-
-//=============================================================================
-/**
- *  @file    upcall_ss.h
- *
- *  $Id$
- *
- *  Visitors for generation of code for Arguments. This generates the
- *  passing of arguments to the upcall.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    upcall_ss.h
+//
+// = DESCRIPTION
+//    Visitors for generation of code for Arguments. This generates the
+//    passing of arguments to the upcall.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_ARGUMENT_UPCALL_SS_H_
 #define _BE_VISITOR_ARGUMENT_UPCALL_SS_H_
@@ -21,77 +26,77 @@
 // class be_visitor_args_upcall_ss
 // ************************************************************
 
-/**
- * @class be_visitor_args_upcall_ss
- *
- * @brief be_visitor_args_upcall_ss
- *
- * Visitor for passing argument to the upcall
- */
 class be_visitor_args_upcall_ss : public be_visitor_args
 {
+  //
+  // = TITLE
+  //   be_visitor_args_upcall_ss
+  //
+  // = DESCRIPTION
+  //   Visitor for passing argument to the upcall
+  //
 public:
-  /// constructor
   be_visitor_args_upcall_ss (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   virtual ~be_visitor_args_upcall_ss (void);
+  // destructor
 
-  /// visit the argument node
   virtual int visit_argument (be_argument *node);
+  // visit the argument node
 
   // =visit all the nodes that can be the types for the argument
 
-  /// visit array type
   virtual int visit_array (be_array *node);
+  // visit array type
 
-  /// visit the enum node
   virtual int visit_enum (be_enum *node);
+  // visit the enum node
 
-  /// visit interface
   virtual int visit_interface (be_interface *node);
+  // visit interface
 
-  /// visit interface forward
   virtual int visit_interface_fwd (be_interface_fwd *node);
+  // visit interface forward
 
-  /// visit valuebox
   virtual int visit_valuebox (be_valuebox *node);
+  // visit valuebox
 
-  /// visit valuetype
   virtual int visit_valuetype (be_valuetype *node);
+  // visit valuetype
 
-  /// visit valuetype forward
   virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+  // visit valuetype forward
 
-  /// visit predefined type
   virtual int visit_predefined_type (be_predefined_type *node);
+  // visit predefined type
 
-  /// visit sequence type
   virtual int visit_sequence (be_sequence *node);
+  // visit sequence type
 
-  /// visit string type
   virtual int visit_string (be_string *node);
+  // visit string type
 
-  /// visit structure type
   virtual int visit_structure (be_structure *node);
+  // visit structure type
 
-  /// visit union type
   virtual int visit_union (be_union *node);
+  // visit union type
 
-  /// visit the typedef type
   virtual int visit_typedef (be_typedef *node);
+  // visit the typedef type
 
-  /// visit a component node
   virtual int visit_component (be_component *node);
+  // visit a component node
 
-  /// visit a forward declared component node
   virtual int visit_component_fwd (be_component_fwd *node);
+  // visit a forward declared component node
 
-  /// visit an eventtype node
   virtual int visit_eventtype (be_eventtype *node);
+  // visit an eventtype node
 
-  /// visit a forward declared eventtype node
   virtual int visit_eventtype_fwd (be_eventtype_fwd *node);
+  // visit a forward declared eventtype node
 
  private:
   int emit_common (void);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/vardecl_ss.h b/TAO/TAO_IDL/be_include/be_visitor_argument/vardecl_ss.h
index 0e7293f7a31..afb6f9e2f78 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_argument/vardecl_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_argument/vardecl_ss.h
@@ -1,18 +1,23 @@
-
-//=============================================================================
-/**
- *  @file    vardecl_ss.h
- *
- *  $Id$
- *
- *  Visitors for generation of code for Arguments. This generates the
- *  variable declartion for the argument in the server-sde skeleton
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    vardecl_ss.h
+//
+// = DESCRIPTION
+//    Visitors for generation of code for Arguments. This generates the
+//    variable declartion for the argument in the server-sde skeleton
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_ARGUMENT_VARDECL_SS_H_
 #define _BE_VISITOR_ARGUMENT_VARDECL_SS_H_
@@ -21,77 +26,77 @@
 // class be_visitor_args_vardecl_ss
 // ************************************************************
 
-/**
- * @class be_visitor_args_vardecl_ss
- *
- * @brief be_visitor_args_vardecl_ss
- *
- * Visitor for variable declaration for argument
- */
 class be_visitor_args_vardecl_ss : public be_visitor_args
 {
+  //
+  // = TITLE
+  //   be_visitor_args_vardecl_ss
+  //
+  // = DESCRIPTION
+  //   Visitor for variable declaration for argument
+  //
 public:
-  /// constructor
   be_visitor_args_vardecl_ss (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   virtual ~be_visitor_args_vardecl_ss (void);
+  // destructor
 
-  /// visit the argument node
   virtual int visit_argument (be_argument *node);
+  // visit the argument node
 
   // =visit all the nodes that can be the types for the argument
 
-  /// visit array type
   virtual int visit_array (be_array *node);
+  // visit array type
 
-  /// visit the enum node
   virtual int visit_enum (be_enum *node);
+  // visit the enum node
 
-  /// visit interface
   virtual int visit_interface (be_interface *node);
+  // visit interface
 
-  /// visit interface forward
   virtual int visit_interface_fwd (be_interface_fwd *node);
+  // visit interface forward
 
-  /// visit valuebox
   virtual int visit_valuebox (be_valuebox *node);
+  // visit valuebox
 
-  /// visit valuetype
   virtual int visit_valuetype (be_valuetype *node);
+  // visit valuetype
 
-  /// visit valuetype forward
   virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+  // visit valuetype forward
 
-  /// visit predefined type
   virtual int visit_predefined_type (be_predefined_type *node);
+  // visit predefined type
 
-  /// visit sequence type
   virtual int visit_sequence (be_sequence *node);
+  // visit sequence type
 
-  /// visit string type
   virtual int visit_string (be_string *node);
+  // visit string type
 
-  /// visit structure type
   virtual int visit_structure (be_structure *node);
+  // visit structure type
 
-  /// visit union type
   virtual int visit_union (be_union *node);
+  // visit union type
 
-  /// visit the typedef type
   virtual int visit_typedef (be_typedef *node);
+  // visit the typedef type
 
-  /// visit a component node
   virtual int visit_component (be_component *node);
+  // visit a component node
 
-  /// visit a forward declared component node
   virtual int visit_component_fwd (be_component_fwd *node);
+  // visit a forward declared component node
 
-  /// visit an eventtype node
   virtual int visit_eventtype (be_eventtype *node);
+  // visit an eventtype node
 
-  /// visit a forward declared eventtype node
   virtual int visit_eventtype_fwd (be_eventtype_fwd *node);
+  // visit a forward declared eventtype node
 
  private:
   int emit_common (be_type *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_array.h b/TAO/TAO_IDL/be_include/be_visitor_array.h
index 7ed6fb67c1e..a5a4b92773a 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_array.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_array.h
@@ -1,17 +1,22 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    be_visitor_array.h
- *
- *  $Id$
- *
- *  Visitors for generation of code for Arrays
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_array.h
+//
+// = DESCRIPTION
+//    Visitors for generation of code for Arrays
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef TAO_BE_VISITOR_ARRAY_H
 #define TAO_BE_VISITOR_ARRAY_H
diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_array/any_op_ch.h
index 3b84fff40b7..8030e83f6cc 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_array/any_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_array/any_op_ch.h
@@ -1,18 +1,23 @@
-
-//=============================================================================
-/**
- *  @file    any_op_ch.h
- *
- *  $Id$
- *
- *  Visitors for generation of code for Arrays in client header. This one
- *  generates the Any operators.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    any_op_ch.h
+//
+// = DESCRIPTION
+//    Visitors for generation of code for Arrays in client header. This one
+//    generates the Any operators.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_ARRAY_ANY_OP_CH_H_
 #define _BE_VISITOR_ARRAY_ANY_OP_CH_H_
@@ -21,26 +26,26 @@
 // class be_visitor_array_any_op_ch
 // ************************************************************
 
-/**
- * @class be_visitor_array_any_op_ch
- *
- * @brief be_visitor_array_any_op_ch
- *
- * This is a concrete visitor for array that generates the Any operator
- * declarations
- */
 class be_visitor_array_any_op_ch : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //   be_visitor_array_any_op_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for array that generates the Any operator
+  //   declarations
+  //
 
 public:
-  /// constructor
   be_visitor_array_any_op_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_array_any_op_ch (void);
+  // destructor
 
-  /// visit array
   virtual int visit_array (be_array *node);
+  // visit array
 
 };
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_array/any_op_cs.h
index 7cc89e05a59..58b310587e2 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_array/any_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_array/any_op_cs.h
@@ -1,18 +1,23 @@
-
-//=============================================================================
-/**
- *  @file    any_op_cs.h
- *
- *  $Id$
- *
- *  Visitors for generation of code for Arrays in client stubs. This one
- *  generates the Any operators.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    any_op_cs.h
+//
+// = DESCRIPTION
+//    Visitors for generation of code for Arrays in client stubs. This one
+//    generates the Any operators.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_ARRAY_ANY_OP_CS_H_
 #define _BE_VISITOR_ARRAY_ANY_OP_CS_H_
@@ -21,26 +26,26 @@
 // class be_visitor_array_cs
 // ************************************************************
 
-/**
- * @class be_visitor_array_any_op_cs
- *
- * @brief be_visitor_array_any_op_cs
- *
- * This is a concrete visitor for array that generates the Any operator
- * implementations
- */
 class be_visitor_array_any_op_cs : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //   be_visitor_array_any_op_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for array that generates the Any operator
+  //   implementations
+  //
 
 public:
-  /// constructor
   be_visitor_array_any_op_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_array_any_op_cs (void);
+  // destructor
 
-  /// visit array
   virtual int visit_array (be_array *node);
+  // visit array
 
 };
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/array.h b/TAO/TAO_IDL/be_include/be_visitor_array/array.h
index d688d7ca4b1..f106b205128 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_array/array.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_array/array.h
@@ -1,17 +1,22 @@
-
-//=============================================================================
-/**
- *  @file    array.h
- *
- *  $Id$
- *
- *  Visitors for generation of code for Arrays.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    array.h
+//
+// = DESCRIPTION
+//    Visitors for generation of code for Arrays.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_ARRAY_ARRAY_H_
 #define _BE_VISITOR_ARRAY_ARRAY_H_
@@ -20,70 +25,71 @@
 // class be_visitor_array
 // ************************************************************
 
-/**
- * @class be_visitor_array
- *
- * @brief be_visitor_array
- *
- * This is a generic visitor for arrays
- */
 class be_visitor_array : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //    be_visitor_array
+  //
+  // = DESCRIPTION
+  //   This is a generic visitor for arrays
+  //
+  //
 public:
-  /// Constructor
   be_visitor_array (be_visitor_context *ctx);
+  // Constructor
 
-  /// destructor
   ~be_visitor_array (void);
+  // destructor
 
-  /// visit the array node
   virtual int visit_array (be_array *);
+  // visit the array node
 
   // = Visitor methods on array types
 
-  /// visit an enum
   virtual int visit_enum (be_enum *node);
+  // visit an enum
 
-  /// visit an interface
   virtual int visit_interface (be_interface *node);
+  // visit an interface
 
-  /// visit an interface forward node
   virtual int visit_interface_fwd (be_interface_fwd *node);
+  // visit an interface forward node
 
-  /// visit a valuebox
   virtual int visit_valuebox (be_valuebox *node);
+  // visit a valuebox
 
-  /// visit a valuetype
   virtual int visit_valuetype (be_valuetype *node);
+  // visit a valuetype
 
-  /// visit a valuetype forward node
   virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+  // visit a valuetype forward node
 
-  /// visit a predefined type node
   virtual int visit_predefined_type (be_predefined_type *node);
+  // visit a predefined type node
 
-  /// visit sequence
   virtual int visit_sequence (be_sequence *node);
+  // visit sequence
 
-  /// visit string
   virtual int visit_string (be_string *node);
+  // visit string
 
-  /// visit structure
   virtual int visit_structure (be_structure *node);
+  // visit structure
 
-  /// visit typedef
   virtual int visit_typedef (be_typedef *node);
+  // visit typedef
 
-  /// visit union
   virtual int visit_union (be_union *node);
+  // visit union
 
 protected:
 
-  /// helper that does the common job
   int visit_node (be_type *);
+  // helper that does the common job
 
-  /// helper that does the common job
   int emit_common (be_type *node);
+  // helper that does the common job
 
 };
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/array_ch.h b/TAO/TAO_IDL/be_include/be_visitor_array/array_ch.h
index d07206a5763..0d54e4efe0a 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_array/array_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_array/array_ch.h
@@ -1,17 +1,22 @@
-
-//=============================================================================
-/**
- *  @file    array_ch.h
- *
- *  $Id$
- *
- *  Visitors for generation of code for Arrays in client header.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    array_ch.h
+//
+// = DESCRIPTION
+//    Visitors for generation of code for Arrays in client header.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_ARRAY_CH_H_
 #define _BE_VISITOR_ARRAY_CH_H_
@@ -20,24 +25,24 @@
 // class be_visitor_array_ch
 // ************************************************************
 
-/**
- * @class be_visitor_array_ch
- *
- * @brief be_visitor_array_ch
- *
- * Code to be generated for arrays in the client header file
- */
 class be_visitor_array_ch : public be_visitor_array
 {
+  //
+  // = TITLE
+  //   be_visitor_array_ch
+  //
+  // = DESCRIPTION
+  //   Code to be generated for arrays in the client header file
+  //
 public:
-  /// constructor
   be_visitor_array_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   virtual ~be_visitor_array_ch (void);
+  // destructor
 
-  /// visit the array node
   virtual int visit_array (be_array *node);
+  // visit the array node
 };
 
 #endif /* _BE_VISITOR_ARRAY_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/array_ci.h b/TAO/TAO_IDL/be_include/be_visitor_array/array_ci.h
index 71eab1bdf3a..b9f9e7c589d 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_array/array_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_array/array_ci.h
@@ -1,17 +1,22 @@
-
-//=============================================================================
-/**
- *  @file    array_ci.h
- *
- *  $Id$
- *
- *  Visitors for generation of code for Arrays in client inline.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    array_ci.h
+//
+// = DESCRIPTION
+//    Visitors for generation of code for Arrays in client inline.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_ARRAY_CI_H_
 #define _BE_VISITOR_ARRAY_CI_H_
@@ -20,24 +25,24 @@
 // class be_visitor_array_ci
 // ************************************************************
 
-/**
- * @class be_visitor_array_ci
- *
- * @brief be_visitor_array_ci
- *
- * Code to be generated for arrays in the client inline file
- */
 class be_visitor_array_ci : public be_visitor_array
 {
+  //
+  // = TITLE
+  //   be_visitor_array_ci
+  //
+  // = DESCRIPTION
+  //   Code to be generated for arrays in the client inline file
+  //
 public:
-  /// constructor
   be_visitor_array_ci (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   virtual ~be_visitor_array_ci (void);
+  // destructor
 
-  /// visit the array node
   virtual int visit_array (be_array *node);
+  // visit the array node
 };
 
 #endif /* _BE_VISITOR_ARRAY_CI_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/array_cs.h b/TAO/TAO_IDL/be_include/be_visitor_array/array_cs.h
index 45064043821..1a6509e579b 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_array/array_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_array/array_cs.h
@@ -1,17 +1,22 @@
-
-//=============================================================================
-/**
- *  @file    array_cs.h
- *
- *  $Id$
- *
- *  Visitors for generation of code for Arrays in client stubs.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    array_cs.h
+//
+// = DESCRIPTION
+//    Visitors for generation of code for Arrays in client stubs.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_ARRAY_CS_H_
 #define _BE_VISITOR_ARRAY_CS_H_
@@ -20,24 +25,24 @@
 // class be_visitor_array_cs
 // ************************************************************
 
-/**
- * @class be_visitor_array_cs
- *
- * @brief be_visitor_array_cs
- *
- * Code to be generated for arrays in the client stub file
- */
 class be_visitor_array_cs : public be_visitor_array
 {
+  //
+  // = TITLE
+  //   be_visitor_array_cs
+  //
+  // = DESCRIPTION
+  //   Code to be generated for arrays in the client stub file
+  //
 public:
-  /// constructor
   be_visitor_array_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   virtual ~be_visitor_array_cs (void);
+  // destructor
 
-  /// visit the array node
   virtual int visit_array (be_array *node);
+  // visit the array node
 };
 
 #endif /* _BE_VISITOR_ARRAY_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ch.h
index cee4b05d19f..2a0d889efe5 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ch.h
@@ -1,18 +1,23 @@
-
-//=============================================================================
-/**
- *  @file    cdr_op_ch.h
- *
- *  $Id$
- *
- *  Visitors for generation of code for Arrays in client header. This one
- *  generates the CDR operators.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_ch.h
+//
+// = DESCRIPTION
+//    Visitors for generation of code for Arrays in client header. This one
+//    generates the CDR operators.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_ARRAY_CDR_OP_CH_H_
 #define _BE_VISITOR_ARRAY_CDR_OP_CH_H_
@@ -21,26 +26,26 @@
 // class be_visitor_array_cdr_op_ch
 // ************************************************************
 
-/**
- * @class be_visitor_array_cdr_op_ch
- *
- * @brief be_visitor_array_cdr_op_ch
- *
- * This is a concrete visitor for array that generates the CDR operator
- * declarations
- */
 class be_visitor_array_cdr_op_ch : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //   be_visitor_array_cdr_op_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for array that generates the CDR operator
+  //   declarations
+  //
 
 public:
-  /// constructor
   be_visitor_array_cdr_op_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_array_cdr_op_ch (void);
+  // destructor
 
-  /// visit array
   virtual int visit_array (be_array *node);
+  // visit array
 };
 
 #endif /* _BE_VISITOR_ARRAY_CDR_OP_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ci.h b/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ci.h
index d192ff0949d..437fbf15255 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ci.h
@@ -1,18 +1,23 @@
-
-//=============================================================================
-/**
- *  @file    cdr_op_ci.h
- *
- *  $Id$
- *
- *  Visitors for generation of code for Arrays in client stubs. This one
- *  generates the CDR operators.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_ci.h
+//
+// = DESCRIPTION
+//    Visitors for generation of code for Arrays in client stubs. This one
+//    generates the CDR operators.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_ARRAY_CDR_OP_CI_H_
 #define _BE_VISITOR_ARRAY_CDR_OP_CI_H_
@@ -21,65 +26,65 @@
 // class be_visitor_array_cdr_op_ci
 // ************************************************************
 
-/**
- * @class be_visitor_array_cdr_op_ci
- *
- * @brief be_visitor_array_cdr_op_ci
- *
- * This is a concrete visitor for array that generates the CDR operator
- * implementations
- */
 class be_visitor_array_cdr_op_ci : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //   be_visitor_array_cdr_op_ci
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for array that generates the CDR operator
+  //   implementations
+  //
 
 public:
-  /// constructor
   be_visitor_array_cdr_op_ci (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_array_cdr_op_ci (void);
+  // destructor
 
-  /// visit array
   virtual int visit_array (be_array *node);
+  // visit array
 
   // = Visitor methods on array types
 
-  /// visit an enum
   virtual int visit_enum (be_enum *node);
+  // visit an enum
 
-  /// visit an interface
   virtual int visit_interface (be_interface *node);
+  // visit an interface
 
-  /// visit an interface forward node
   virtual int visit_interface_fwd (be_interface_fwd *node);
+  // visit an interface forward node
 
-  /// visit a valuetype
   virtual int visit_valuetype (be_valuetype *node);
+  // visit a valuetype
 
-  /// visit a valuetype forward node
   virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+  // visit a valuetype forward node
 
-  /// visit a predefined type node
   virtual int visit_predefined_type (be_predefined_type *node);
+  // visit a predefined type node
 
-  /// visit sequence
   virtual int visit_sequence (be_sequence *node);
+  // visit sequence
 
-  /// visit string
   virtual int visit_string (be_string *node);
+  // visit string
 
-  /// visit structure
   virtual int visit_structure (be_structure *node);
+  // visit structure
 
-  /// visit typedef
   virtual int visit_typedef (be_typedef *node);
+  // visit typedef
 
-  /// visit union
   virtual int visit_union (be_union *node);
+  // visit union
 
 protected:
-  /// helper that does the common job
   int visit_node (be_type *);
+  // helper that does the common job
 };
 
 #endif /* _BE_VISITOR_ARRAY_CDR_OP_CI_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_cs.h
index f4b44690ce1..85d597071ec 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_cs.h
@@ -1,21 +1,26 @@
-
-//=============================================================================
-/**
- *  @file    cdr_op_cs.h
- *
- *  $Id$
- *
- *  The array's own CDR operators are generated in the .i file, but if the
- *  array contains an anonymous sequence, those CDR operators will not
- *  get generated on their own, and, since the sequence may contain a
- *  recursive type, they must also be generated in the .cpp file. That is
- *  the sole purpose of this visitor type.
- *
- *
- *  @author Jeff Parsons <parsons@cs.wustl.edu>
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_cs.h
+//
+// = DESCRIPTION
+//    The array's own CDR operators are generated in the .i file, but if the
+//    array contains an anonymous sequence, those CDR operators will not
+//    get generated on their own, and, since the sequence may contain a
+//    recursive type, they must also be generated in the .cpp file. That is
+//    the sole purpose of this visitor type.
+//
+// = AUTHOR
+//    Jeff Parsons <parsons@cs.wustl.edu>
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_ARRAY_CDR_OP_CS_H_
 #define _BE_VISITOR_ARRAY_CDR_OP_CS_H_
@@ -24,69 +29,69 @@
 // class be_visitor_array_cdr_op_cs
 // ************************************************************
 
-/**
- * @class be_visitor_array_cdr_op_cs
- *
- * @brief be_visitor_array_cdr_op_cs
- *
- * This is a concrete visitor for array that generates the CDR operator
- * implementations for the array's element type, if that type is
- * an anonymous sequence.
- */
 class be_visitor_array_cdr_op_cs : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //   be_visitor_array_cdr_op_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for array that generates the CDR operator
+  //   implementations for the array's element type, if that type is
+  //   an anonymous sequence.
+  //
 
 public:
-  /// constructor
   be_visitor_array_cdr_op_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_array_cdr_op_cs (void);
+  // destructor
 
-  /// visit array
   virtual int visit_array (be_array *node);
+  // visit array
 
   // = Visitor methods on array types
 
-  /// visit an enum
   virtual int visit_enum (be_enum *node);
+  // visit an enum
 
-  /// visit an interface
   virtual int visit_interface (be_interface *node);
+  // visit an interface
 
-  /// visit an interface forward node
   virtual int visit_interface_fwd (be_interface_fwd *node);
+  // visit an interface forward node
 
-  /// visit a valuebox
   virtual int visit_valuebox (be_valuebox *node);
+  // visit a valuebox
 
-  /// visit a valuetype
   virtual int visit_valuetype (be_valuetype *node);
+  // visit a valuetype
 
-  /// visit a valuetype forward node
   virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+  // visit a valuetype forward node
 
-  /// visit a predefined type node
   virtual int visit_predefined_type (be_predefined_type *node);
+  // visit a predefined type node
 
-  /// visit sequence
   virtual int visit_sequence (be_sequence *node);
+  // visit sequence
 
-  /// visit string
   virtual int visit_string (be_string *node);
+  // visit string
 
-  /// visit structure
   virtual int visit_structure (be_structure *node);
+  // visit structure
 
-  /// visit typedef
   virtual int visit_typedef (be_typedef *node);
+  // visit typedef
 
-  /// visit union
   virtual int visit_union (be_union *node);
+  // visit union
 
 protected:
-  /// helper that does the common job
   int visit_node (be_type *);
+  // helper that does the common job
 };
 
 #endif /* _BE_VISITOR_ARRAY_CDR_OP_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/serializer_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_array/serializer_op_ch.h
index 8696cde3e46..4ed57472afa 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_array/serializer_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_array/serializer_op_ch.h
@@ -1,19 +1,24 @@
-
-//=============================================================================
-/**
- *  @file    serializer_op_ch.h
- *
- *  $Id$
- *
- *  Visitors for generation of TAO::DCPS::Serializer operators code 
- *  for Arrays in client header. This one
- *  generates the TAO::DCPS::Serializer operators.
- *
- *
- *  @author Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    serializer_op_ch.h
+//
+// = DESCRIPTION
+//    Visitors for generation of TAO::DCPS::Serializer operators code 
+//    for Arrays in client header. This one
+//    generates the TAO::DCPS::Serializer operators.
+//
+// = AUTHOR
+//    Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_ARRAY_serializer_op_CH_H_
 #define _BE_VISITOR_ARRAY_serializer_op_CH_H_
@@ -22,29 +27,29 @@
 // class be_visitor_array_serializer_op_ch
 // ************************************************************
 
-/**
- * @class be_visitor_array_serializer_op_ch
- *
- * @brief be_visitor_array_serializer_op_ch
- *
- * This is a concrete visitor for array that generates the Serializer operator
- * declarations
- */
 class be_visitor_array_serializer_op_ch : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //   be_visitor_array_serializer_op_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for array that generates the Serializer operator
+  //   declarations
+  //
 
 public:
-  /// constructor
   be_visitor_array_serializer_op_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_array_serializer_op_ch (void);
+  // destructor
 
-  /// helper - common code
   void gen_arg_ref(be_array *node);
+  // helper - common code
 
-  /// visit array
   virtual int visit_array (be_array *node);
+  // visit array
 };
 
 #endif /* _BE_VISITOR_ARRAY_serializer_op_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/serializer_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_array/serializer_op_cs.h
index 1df99890299..f2f55211619 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_array/serializer_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_array/serializer_op_cs.h
@@ -1,23 +1,29 @@
-
-//=============================================================================
-/**
- *  @file    serializer_op_cs.h
- *
- *  $Id$
- *
- *  The array's own TAO::DCPS::Serializer operators are generated in 
- *  the .i file, but if the
- *  array contains an anonymous sequence, those 
- *  TAO::DCPS::Serializer operators will not
- *  get generated on their own, and, since the sequence may contain a
- *  recursive type, they must also be generated in the .cpp file. That is
- *  the sole purpose of this visitor type.
- *
- *
- *  @author Scott Harris <harris_s@ociweb.com> based on code by  Jeff Parsons <parsons@cs.wustl.edu>
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    serializer_op_cs.h
+//
+// = DESCRIPTION
+//    The array's own TAO::DCPS::Serializer operators are generated in 
+//    the .i file, but if the
+//    array contains an anonymous sequence, those 
+//    TAO::DCPS::Serializer operators will not
+//    get generated on their own, and, since the sequence may contain a
+//    recursive type, they must also be generated in the .cpp file. That is
+//    the sole purpose of this visitor type.
+//
+// = AUTHOR
+//    Scott Harris <harris_s@ociweb.com> based on code by 
+//    Jeff Parsons <parsons@cs.wustl.edu>
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_ARRAY_serializer_op_CS_H_
 #define _BE_VISITOR_ARRAY_serializer_op_CS_H_
@@ -26,66 +32,66 @@
 // class be_visitor_array_serializer_op_cs
 // ************************************************************
 
-/**
- * @class be_visitor_array_serializer_op_cs
- *
- * @brief be_visitor_array_serializer_op_cs
- *
- * This is a concrete visitor for array that generates the Serializer operator
- * implementations for the array's element type, if that type is
- * an anonymous sequence.
- */
 class be_visitor_array_serializer_op_cs : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //   be_visitor_array_serializer_op_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for array that generates the Serializer operator
+  //   implementations for the array's element type, if that type is
+  //   an anonymous sequence.
+  //
 
 public:
-  /// constructor
   be_visitor_array_serializer_op_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_array_serializer_op_cs (void);
+  // destructor
 
-  /// visit array
   virtual int visit_array (be_array *node);
+  // visit array
 
   // = Visitor methods on array types
 
-  /// visit an enum
   virtual int visit_enum (be_enum *node);
+  // visit an enum
 
-  /// visit an interface
   virtual int visit_interface (be_interface *node);
+  // visit an interface
 
-  /// visit an interface forward node
   virtual int visit_interface_fwd (be_interface_fwd *node);
+  // visit an interface forward node
 
-  /// visit a valuetype
   virtual int visit_valuetype (be_valuetype *node);
+  // visit a valuetype
 
-  /// visit a valuetype forward node
   virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+  // visit a valuetype forward node
 
-  /// visit a predefined type node
   virtual int visit_predefined_type (be_predefined_type *node);
+  // visit a predefined type node
 
-  /// visit sequence
   virtual int visit_sequence (be_sequence *node);
+  // visit sequence
 
-  /// visit string
   virtual int visit_string (be_string *node);
+  // visit string
 
-  /// visit structure
   virtual int visit_structure (be_structure *node);
+  // visit structure
 
-  /// visit typedef
   virtual int visit_typedef (be_typedef *node);
+  // visit typedef
 
-  /// visit union
   virtual int visit_union (be_union *node);
+  // visit union
 
 protected:
-  /// helper that does the common job
   int visit_node (be_type *);
+  // helper that does the common job
 };
 
 #endif /* _BE_VISITOR_ARRAY_serializer_op_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_attribute.h b/TAO/TAO_IDL/be_include/be_visitor_attribute.h
index ecdcc3d634b..b8849a25864 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_attribute.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_attribute.h
@@ -1,18 +1,23 @@
 /* -*- c++ -*- */
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    be_visitor_attribute.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Attribute class
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_attribute.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Attribute class
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef TAO_BE_VISITOR_ATTRIBUTE_H
 #define TAO_BE_VISITOR_ATTRIBUTE_H
diff --git a/TAO/TAO_IDL/be_include/be_visitor_attribute/attribute.h b/TAO/TAO_IDL/be_include/be_visitor_attribute/attribute.h
index 209959093d4..43214555ca7 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_attribute/attribute.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_attribute/attribute.h
@@ -1,18 +1,23 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    attribute.h
- *
- *  $Id$
- *
- *  Visitor for the Attribute class.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    attribute.h
+//
+// = DESCRIPTION
+//    Visitor for the Attribute class.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_ATTRIBUTE_ATTRIBUTE_H
 #define _BE_VISITOR_ATTRIBUTE_ATTRIBUTE_H
@@ -21,25 +26,26 @@
 // Attribute visitor
 // ************************************************************
 
-/**
- * @class be_visitor_attribute
- *
- * @brief be_visitor_attribute
- *
- * This is a concrete visitor to generate code for attributes. We have one
- * class for mapping into the client and server.
- */
 class be_visitor_attribute : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //   be_visitor_attribute
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate code for attributes. We have one
+  //   class for mapping into the client and server.
+  //
+  //
 public:
-  /// constructor
   be_visitor_attribute (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_attribute (void);
+  // destructor
 
-  /// visit attribute. We provide code for this method in the derived class
   virtual int visit_attribute (be_attribute *node);
+  // visit attribute. We provide code for this method in the derived class
 
   void for_facets (bool val);
   void op_scope (be_interface *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_attribute/component_init.h b/TAO/TAO_IDL/be_include/be_visitor_attribute/component_init.h
index ea0b355784a..25a099d9c50 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_attribute/component_init.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_attribute/component_init.h
@@ -1,18 +1,23 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    component_init.h
- *
- *  $Id$
- *
- *  Visitor generating a block of code to initialize
- *  each of a component's read/write attributes
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    component_init.h
+//
+// = DESCRIPTION
+//    Visitor generating a block of code to initialize
+//    each of a component's read/write attributes
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef BE_VISITOR_ATTRIBUTE_COMPONENT_INIT_H
 #define BE_VISITOR_ATTRIBUTE_COMPONENT_INIT_H
diff --git a/TAO/TAO_IDL/be_include/be_visitor_attribute/set_from_extracted.h b/TAO/TAO_IDL/be_include/be_visitor_attribute/set_from_extracted.h
index d94353030b6..878a6679108 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_attribute/set_from_extracted.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_attribute/set_from_extracted.h
@@ -1,18 +1,23 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    set_from_extracted.h
- *
- *  $Id$
- *
- *  Encapsulation the variations in setting read/write
- *  attributes from values extracted from an Any
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    set_from_extracted.h
+//
+// = DESCRIPTION
+//    Encapsulation the variations in setting read/write
+//    attributes from values extracted from an Any
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef BE_VISITOR_ATTRIBUTE_SET_FROM_EXTRACTED_H
 #define BE_VISITOR_ATTRIBUTE_SET_FROM_EXTRACTED_H
diff --git a/TAO/TAO_IDL/be_include/be_visitor_ccm_pre_proc.h b/TAO/TAO_IDL/be_include/be_visitor_ccm_pre_proc.h
index 5eac196cbb6..fbcea505907 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_ccm_pre_proc.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_ccm_pre_proc.h
@@ -1,21 +1,26 @@
+//
+// $Id$
+//
 
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    be_visitor_ccm_pre_proc.h
- *
- *  $Id$
- *
- *  This visitor creates for components the appropriate AST
- *  (Abstract Syntax Tree) nodes, corresponding to provides, uses,
- *  emits, publishes and consumes declarations,
- *  and adds the nodes to the AST.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_ccm_pre_proc.h
+//
+// = DESCRIPTION
+//    This visitor creates for components the appropriate AST
+//    (Abstract Syntax Tree) nodes, corresponding to provides, uses,
+//    emits, publishes and consumes declarations,
+//    and adds the nodes to the AST.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef TAO_BE_VISITOR_CCM_PRE_PROC_H
 #define TAO_BE_VISITOR_CCM_PRE_PROC_H
@@ -28,15 +33,15 @@ class be_valuetype;
 class be_exception;
 class UTL_ExceptList;
 
-/**
- * @class be_visitor_ccm_pre_proc
- *
- * @brief be_visitor_ccm_pre_proc
- *
- * Adds CCM implied IDL code to the AST.
- */
 class be_visitor_ccm_pre_proc : public be_visitor_component_scope
 {
+  //
+  // = TITLE
+  //   be_visitor_ccm_pre_proc
+  //
+  // = DESCRIPTION
+  //   Adds CCM implied IDL code to the AST.
+  //
 public:
   be_visitor_ccm_pre_proc (be_visitor_context *ctx);
 
@@ -45,7 +50,6 @@ public:
   virtual int visit_root (be_root *node);
   virtual int visit_module (be_module *node);
   virtual int visit_component (be_component *node);
-  virtual int visit_connector (be_connector *node);
   virtual int visit_provides (be_provides *node);
   virtual int visit_uses (be_uses *node);
   virtual int visit_publishes (be_publishes *node);
@@ -55,8 +59,12 @@ public:
   virtual int visit_eventtype (be_eventtype *node);
   virtual int visit_eventtype_fwd (be_eventtype_fwd *node);
   
-protected:
+private:
   // Utility methods to handle the corresponding IDL declarations.
+  int gen_factories (be_home *node,
+                     AST_Interface *xplicit);
+  int gen_finders (be_home *node,
+                   AST_Interface *xplicit);
   int gen_implicit_ops (be_home *node,
                         AST_Interface *implicit);
 
@@ -106,7 +114,7 @@ protected:
                                       AST_Decl *parent);
   UTL_NameList *compute_inheritance (be_home *node);
   
-protected:
+private:
   // These are created for operations implied by 'uses multiple' declarations.
   Identifier module_id_;
   be_valuetype *cookie_;
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component.h b/TAO/TAO_IDL/be_include/be_visitor_component.h
index 61ca769d3c9..92a14b88dfe 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component.h
@@ -1,18 +1,23 @@
 /* -*- c++ -*- */
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    be_visitor_component.h
- *
- *  $Id$
- *
- *  Concrete visitors for the Component class
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_component.h
+//
+// = DESCRIPTION
+//    Concrete visitors for the Component class
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef TAO_BE_VISITOR_COMPONENT_H
 #define TAO_BE_VISITOR_COMPONENT_H
@@ -27,6 +32,8 @@
 #include "be_visitor_component/component_sh.h"
 #include "be_visitor_component/component_si.h"
 #include "be_visitor_component/component_ss.h"
+#include "be_visitor_component/component_ih.h"
+#include "be_visitor_component/component_is.h"
 #include "be_visitor_component/component_svh.h"
 #include "be_visitor_component/facet_svh.h"
 #include "be_visitor_component/context_svh.h"
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_component/any_op_ch.h
index 877422cfd4a..e5aec9e8f02 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/any_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/any_op_ch.h
@@ -1,38 +1,47 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    any_op_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Component node.
- *  This one provides code generation for the Any operators
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    any_op_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Component node.
+//    This one provides code generation for the Any operators
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_COMPONENT_ANY_OP_CH_H_
 #define _BE_COMPONENT_ANY_OP_CH_H_
 
-/**
- * @class be_visitor_component_any_op_ch
- *
- * @brief be_visitor_component_any_op_ch
- *
- * This is a concrete visitor for component that generates the Any
- * operator declarations
- */
 class be_visitor_component_any_op_ch : public be_visitor_component
 {
+  //
+  // = TITLE
+  //   be_visitor_component_any_op_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for component that generates the Any
+  //   operator declarations
+  //
 
 public:
   be_visitor_component_any_op_ch (be_visitor_context *ctx);
+  // constructor
+
   ~be_visitor_component_any_op_ch (void);
+  // destructor
 
   virtual int visit_component (be_component *node);
-  virtual int visit_connector (be_connector *node);
+  // visit interface
 };
 
 #endif /* _BE_COMPONENT_ANY_OP_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_component/any_op_cs.h
index dc2016d7c4b..9d1c560a694 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/any_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/any_op_cs.h
@@ -1,37 +1,47 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    any_op_cs.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Component node.
- *  This one provides code generation for the Any operators
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    any_op_cs.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Component node.
+//    This one provides code generation for the Any operators
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_COMPONENT_ANY_OP_CS_H_
 #define _BE_COMPONENT_ANY_OP_CS_H_
 
-/**
- * @class be_visitor_component_any_op_cs
- *
- * @brief be_visitor_interface_any_op_cs
- *
- * This is a concrete visitor for interface that generates the Any operator
- * implementations
- */
 class be_visitor_component_any_op_cs : public be_visitor_component
 {
+  //
+  // = TITLE
+  //   be_visitor_interface_any_op_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for interface that generates the Any operator
+  //   implementations
+  //
+
 public:
   be_visitor_component_any_op_cs (be_visitor_context *ctx);
+  // constructor
+
   ~be_visitor_component_any_op_cs (void);
+  // destructor
 
   virtual int visit_component (be_component *node);
-  virtual int visit_connector (be_connector *node);
+  // visit interface
 };
 
 #endif /* _BE_COMPONENT_ANY_OP_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_component/cdr_op_ch.h
index f0869b72faf..ecb49788a08 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/cdr_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/cdr_op_ch.h
@@ -1,39 +1,49 @@
 /* -*- c++ -*- */
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    cdr_op_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Component class
- *  This one provides code generation for the CDR operators for the
- *  component in the client header.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Component class
+//    This one provides code generation for the CDR operators for the
+//    component in the client header.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_COMPONENT_CDR_OP_CH_H_
 #define _BE_VISITOR_COMPONENT_CDR_OP_CH_H_
 
-/**
- * @class be_visitor_component_cdr_op_ch
- *
- * @brief be_visitor_component_cdr_op_ch
- *
- * This is a concrete visitor for component that generates the CDR operator
- * declarations
- */
 class be_visitor_component_cdr_op_ch : public be_visitor_component
 {
+  //
+  // = TITLE
+  //   be_visitor_component_cdr_op_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for component that generates the CDR operator
+  //   declarations
+  //
+
 public:
   be_visitor_component_cdr_op_ch (be_visitor_context *ctx);
+  // constructor
+
   ~be_visitor_component_cdr_op_ch (void);
+  // destructor
 
   virtual int visit_component (be_component *node);
-  virtual int visit_connector (be_connector *node);
+  // visit component
 };
 
 #endif /* _BE_VISITOR_COMPONENT_CDR_OP_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_component/cdr_op_cs.h
index e400b0ca1c7..02076baf649 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/cdr_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/cdr_op_cs.h
@@ -1,39 +1,49 @@
 /* -*- c++ -*- */
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    cdr_op_cs.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Component class
- *  This one provides code generation for the CDR operators for the
- *  component in the client stub.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Component class
+//    This one provides code generation for the CDR operators for the
+//    component in the client stub.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_COMPONENT_CDR_OP_CS_H_
 #define _BE_VISITOR_COMPONENT_CDR_OP_CS_H_
 
-/**
- * @class be_visitor_component_cdr_op_cs
- *
- * @brief be_visitor_component_cdr_op_cs
- *
- * This is a concrete visitor for component that generates the CDR operator
- * implementations
- */
 class be_visitor_component_cdr_op_cs : public be_visitor_component
 {
+  //
+  // = TITLE
+  //   be_visitor_component_cdr_op_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for component that generates the CDR operator
+  //   implementations
+  //
+
 public:
   be_visitor_component_cdr_op_cs (be_visitor_context *ctx);
+  // constructor
+
   ~be_visitor_component_cdr_op_cs (void);
+  // destructor
 
   virtual int visit_component (be_component *node);
-  virtual int visit_connector (be_connector *node);
+  // visit interface
 };
 
 #endif /* _BE_VISITOR_COMPONENT_CDR_OP_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/component.h b/TAO/TAO_IDL/be_include/be_visitor_component/component.h
index 0a89ca55429..8991bb75fb4 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/component.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/component.h
@@ -1,50 +1,55 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    component.h
- *
- *  $Id$
- *
- *  Concrete visitor for components
- *  This one provides the generic visitor for the be_component node.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    component.h
+//
+// = DESCRIPTION
+//    Concrete visitor for components
+//    This one provides the generic visitor for the be_component node.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_COMPONENT_COMPONENT_H_
 #define _BE_VISITOR_COMPONENT_COMPONENT_H_
 
-/**
- * @class be_visitor_component
- *
- * @brief be_visitor_component
- *
- * This is a concrete visitor for component 
- * that abstracts all common tasks.
- */
 class be_visitor_component : public be_visitor_interface
 {
+  //
+  // = TITLE
+  //   be_visitor_component
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for component 
+  //   that abstracts all common tasks.
+  //
 
 public:
   be_visitor_component (be_visitor_context *ctx);
 
   ~be_visitor_component (void);
 
-  /// This is the only type of declaration a component may contain.
   virtual int visit_attribute (be_attribute *node);
+  // This is the only type of declaration a component may contain.
 
-  /// Operations are created by the back end for 'provides', 'uses', 'emits',
-  /// 'publishes' and 'consumes' declarations.
   virtual int visit_operation (be_operation *node);
+  // Operations are created by the back end for 'provides', 'uses', 'emits',
+  // 'publishes' and 'consumes' declarations.
 
-  /// Structs and sequences are created by the back end for 'uses multiple'
-  /// declarations.
   virtual int visit_structure (be_structure *node);
   virtual int visit_typedef (be_typedef *node);
+  // Structs and sequences are created by the back end for 'uses multiple'
+  // declarations.
 };
 
 #endif /* _BE_VISITOR_MODULE_MODULE_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/component_ch.h b/TAO/TAO_IDL/be_include/be_visitor_component/component_ch.h
index 323663b6bb2..4c5ae91b20e 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/component_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/component_ch.h
@@ -1,37 +1,46 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    component_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Component node.
- *  This one provides code generation for components in the client header.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    component_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Component node.
+//    This one provides code generation for components in the client header.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_COMPONENT_COMPONENT_CH_H_
 #define _BE_COMPONENT_COMPONENT_CH_H_
 
-/**
- * @class be_visitor_component_ch
- *
- * @brief be_visitor_component_ch
- *
- * This is a concrete visitor to generate the client header for component.
- */
 class be_visitor_component_ch : public be_visitor_component
 {
+  //
+  // = TITLE
+  //   be_visitor_component_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the client header for component.
+  //
+  //
 public:
   be_visitor_component_ch (be_visitor_context *ctx);
+  // constructor
+
   ~be_visitor_component_ch (void);
+  // destructor
 
   virtual int visit_component (be_component *node);
-  virtual int visit_connector (be_connector *node);
+  // set the right context and make a visitor
 };
 
 #endif /* _BE_COMPONENT_COMPONENT_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/component_ci.h b/TAO/TAO_IDL/be_include/be_visitor_component/component_ci.h
index f206bb35c63..403aa52e474 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/component_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/component_ci.h
@@ -1,37 +1,45 @@
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    component_ci.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Component node.
- *  This one provides code generation for components in the client inline.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    component_ci.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Component node.
+//    This one provides code generation for components in the client inline.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_COMPONENT_COMPONENT_CI_H_
 #define _BE_COMPONENT_COMPONENT_CI_H_
 
-/**
- * @class be_visitor_component_ci
- *
- * @brief be_visitor_interface_ci
- *
- * This is a concrete visitor to generate the client header for component.
- */
 class be_visitor_component_ci : public be_visitor_component
 {
+  //
+  // = TITLE
+  //   be_visitor_interface_ci
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the client header for component.
+  //
+  //
 public:
   be_visitor_component_ci (be_visitor_context *ctx);
+  // constructor
+
   ~be_visitor_component_ci (void);
+  // destructor
 
   virtual int visit_component (be_component *node);
-  virtual int visit_connector (be_connector *node);
+  // set the right context and make a visitor
 };
 
 #endif /* _BE_COMPONENT_COMPONENT_CI_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/component_cs.h b/TAO/TAO_IDL/be_include/be_visitor_component/component_cs.h
index b24e3ad676a..e6acb03b7d2 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/component_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/component_cs.h
@@ -1,37 +1,45 @@
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    component_cs.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Component node.
- *  This one provides code generation for components in the client stub.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    component_cs.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Component node.
+//    This one provides code generation for components in the client stub.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_COMPONENT_COMPONENT_CS_H_
 #define _BE_COMPONENT_COMPONENT_CS_H_
 
-/**
- * @class be_visitor_component_cs
- *
- * @brief be_visitor_component_cs
- *
- * This is a concrete visitor to generate the client stub for component.
- */
 class be_visitor_component_cs : public be_visitor_component
 {
+  //
+  // = TITLE
+  //   be_visitor_component_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the client stub for component.
+  //
+  //
 public:
   be_visitor_component_cs (be_visitor_context *ctx);
+  // constructor
+
   ~be_visitor_component_cs (void);
+  // destructor
 
   virtual int visit_component (be_component *node);
-  virtual int visit_connector (be_connector *node);
+  // set the right context and make a visitor
 };
 
 #endif /* _BE_COMPONENT_COMPONENT_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/component_ex_idl.h b/TAO/TAO_IDL/be_include/be_visitor_component/component_ex_idl.h
index 6aa5c0b2867..b6283d55ed4 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/component_ex_idl.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/component_ex_idl.h
@@ -1,38 +1,44 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    component_ex_idl.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Component node.
- *  Provides code generation for components in the CIAO executor IDL
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    component_ex_idl.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Component node.
+//    Provides code generation for components in the CIAO executor IDL
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_COMPONENT_COMPONENT_EX_IDL_H_
 #define _BE_COMPONENT_COMPONENT_EX_IDL_H_
 
-/**
- * @class be_visitor_component_ex_idl
- *
- * @brief be_visitor_component_ex_idl
- *
- * This is a concrete visitor to generate the 
- * CIAO executor IDL for component.
- */
 class be_visitor_component_ex_idl : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //   be_visitor_component_ex_idl
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the 
+  //   CIAO executor IDL for component.
+  //
+  //
 public:
   be_visitor_component_ex_idl (be_visitor_context *ctx);
 
   ~be_visitor_component_ex_idl (void);
 
   virtual int visit_component (be_component *node);
-  virtual int visit_connector (be_connector *node);
   
 private:
   TAO_OutStream &os_;
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/component_exh.h b/TAO/TAO_IDL/be_include/be_visitor_component/component_exh.h
index bd853dc8c8a..48020c07bca 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/component_exh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/component_exh.h
@@ -1,18 +1,23 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    component_exh.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Component node.
- *  This provides for code generation in the exec impl header
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO_IDL_BE
+//
+// = FILENAME
+//    component_exh.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Component node.
+//    This provides for code generation in the exec impl header
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_COMPONENT_COMPONENT_EXH_H_
 #define _BE_COMPONENT_COMPONENT_EXH_H_
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/component_exs.h b/TAO/TAO_IDL/be_include/be_visitor_component/component_exs.h
index 4eb779927ef..2f40c66ea7b 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/component_exs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/component_exs.h
@@ -1,18 +1,23 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    component_exs.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Component node.
- *  This provides for code generation in the exec impl source
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO_IDL_BE
+//
+// = FILENAME
+//    component_exs.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Component node.
+//    This provides for code generation in the exec impl source
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_COMPONENT_COMPONENT_EXS_H_
 #define _BE_COMPONENT_COMPONENT_EXS_H_
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/component_ih.h b/TAO/TAO_IDL/be_include/be_visitor_component/component_ih.h
new file mode 100644
index 00000000000..938fbb08017
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/component_ih.h
@@ -0,0 +1,46 @@
+/* -*- c++ -*- */
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    component_ih.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Component node.
+//    This provides for code generation in the implementation header
+//
+// = AUTHOR
+//   Jeff Parsons
+//
+// ============================================================================
+
+#ifndef _BE_COMPONENT_COMPONENT_IH_H_
+#define _BE_COMPONENT_COMPONENT_IH_H_
+
+class be_visitor_component_ih : public be_visitor_component
+{
+  //
+  // = TITLE
+  //   be_visitor_component_ih
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate 
+  //   the implementation header for component
+  //
+  //
+public:
+  be_visitor_component_ih (be_visitor_context *ctx);
+  // constructor
+
+  ~be_visitor_component_ih (void);
+  // destructor
+
+  virtual int visit_component (be_component *node);
+  // set the right context and make a visitor
+};
+
+#endif /* _BE_COMPONENT_COMPONENT_IH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/component_is.h b/TAO/TAO_IDL/be_include/be_visitor_component/component_is.h
new file mode 100644
index 00000000000..dd3360448c5
--- /dev/null
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/component_is.h
@@ -0,0 +1,46 @@
+/* -*- c++ -*- */
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    component_is.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Component node.
+//    This provides for code generation in the implementation skeleton
+//
+// = AUTHOR
+//   Jeff Parsons
+//
+// ============================================================================
+
+#ifndef _BE_COMPONENT_COMPONENT_IS_H_
+#define _BE_COMPONENT_COMPONENT_IS_H_
+
+class be_visitor_component_is : public be_visitor_component
+{
+  //
+  // = TITLE
+  //   be_visitor_component_ih
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate 
+  //   the implementation skeleton for component
+  //
+  //
+public:
+  be_visitor_component_is (be_visitor_context *ctx);
+  // constructor
+
+  ~be_visitor_component_is (void);
+  // destructor
+
+  virtual int visit_component (be_component *node);
+  // set the right context and make a visitor
+};
+
+#endif /* _BE_COMPONENT_COMPONENT_IS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/component_sh.h b/TAO/TAO_IDL/be_include/be_visitor_component/component_sh.h
index d03948c064d..011c1bc2888 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/component_sh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/component_sh.h
@@ -1,37 +1,46 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    component_sh.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Component node.
- *  This provides for code generation in the server header
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    component_sh.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Component node.
+//    This provides for code generation in the server header
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_COMPONENT_COMPONENT_SH_H_
 #define _BE_COMPONENT_COMPONENT_SH_H_
 
-/**
- * @class be_visitor_component_sh
- *
- * @brief be_visitor_component_sh
- *
- * This is a concrete visitor to generate the server header for component.
- */
 class be_visitor_component_sh : public be_visitor_component
 {
+  //
+  // = TITLE
+  //   be_visitor_component_sh
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the server header for component.
+  //
+  //
 public:
   be_visitor_component_sh (be_visitor_context *ctx);
+  // constructor
+  
   ~be_visitor_component_sh (void);
+  // destructor
   
   virtual int visit_component (be_component *node);
-  virtual int visit_connector (be_connector *node);
-  
+  // set the right context and make a visitor
 protected:
   virtual int generate_amh_classes (be_component *node);
 };
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/component_si.h b/TAO/TAO_IDL/be_include/be_visitor_component/component_si.h
index 42f46d52726..18df6aa2053 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/component_si.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/component_si.h
@@ -1,36 +1,46 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    component_si.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Component node.
- *  This provides for code generation in the server inline
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    component_si.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Component node.
+//    This provides for code generation in the server inline
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_COMPONENT_COMPONENT_SI_H_
 #define _BE_COMPONENT_COMPONENT_SI_H_
 
-/**
- * @class be_visitor_component_si
- *
- * @brief be_visitor_component_sh
- *
- * This is a concrete visitor to generate the server header for component.
- */
 class be_visitor_component_si : public be_visitor_component
 {
+  //
+  // = TITLE
+  //   be_visitor_component_sh
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the server header for component.
+  //
+  //
 public:
   be_visitor_component_si (be_visitor_context *ctx);
+  // constructor
+  
   ~be_visitor_component_si (void);
+  // destructor
   
   virtual int visit_component (be_component *node);
-  virtual int visit_connector (be_connector *node);
+  // set the right context and make a visitor
 };
 
 #endif /* _BE_COMPONENT_COMPONENT_SI_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/component_ss.h b/TAO/TAO_IDL/be_include/be_visitor_component/component_ss.h
index 17968be0fef..05120e29ef6 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/component_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/component_ss.h
@@ -1,37 +1,47 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    component_ss.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Component node.
- *  This provides for code generation in the server skeleton
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    component_ss.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Component node.
+//    This provides for code generation in the server skeleton
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_COMPONENT_COMPONENT_SS_H_
 #define _BE_COMPONENT_COMPONENT_SS_H_
 
-/**
- * @class be_visitor_component_ss
- *
- * @brief be_visitor_component_ss
- *
- * This is a concrete visitor to generate 
- * the server skeleton for component.
- */
 class be_visitor_component_ss : public be_visitor_component
 {
+  //
+  // = TITLE
+  //   be_visitor_component_ss
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate 
+  //   the server skeleton for component.
+  //
+  //
 public:
   be_visitor_component_ss (be_visitor_context *ctx);
+  // constructor
+  
   ~be_visitor_component_ss (void);
+  // destructor
   
   virtual int visit_component (be_component *node);
-  virtual int visit_connector (be_connector *node);
+  // set the right context and make a visitor
 };
 
 #endif /* _BE_COMPONENT_COMPONENT_SS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/component_svh.h b/TAO/TAO_IDL/be_include/be_visitor_component/component_svh.h
index e9d957a3c2e..935bcc0179c 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/component_svh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/component_svh.h
@@ -1,37 +1,43 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    component_svh.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Component node.
- *  This provides for code generation in the servant header
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    component_svh.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Component node.
+//    This provides for code generation in the servant header
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_COMPONENT_COMPONENT_SVH_H_
 #define _BE_COMPONENT_COMPONENT_SVH_H_
 
-/**
- * @class be_visitor_component_svh
- *
- * @brief be_visitor_component_svh
- *
- * This is a concrete visitor to generate the servant header for component.
- */
 class be_visitor_component_svh : public be_visitor_component
 {
+  //
+  // = TITLE
+  //   be_visitor_component_svh
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the servant header for component.
+  //
+  //
 public:
   be_visitor_component_svh (be_visitor_context *ctx);
   
   ~be_visitor_component_svh (void);
   
   virtual int visit_component (be_component *node);
-  virtual int visit_connector (be_connector *node);
   
 private:
   void gen_entrypoint (be_component *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/component_svs.h b/TAO/TAO_IDL/be_include/be_visitor_component/component_svs.h
index 3040bcffe65..8456b92b55f 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/component_svs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/component_svs.h
@@ -1,38 +1,44 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    component_svs.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Component node.
- *  This provides for code generation in the servant source
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    component_svs.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Component node.
+//    This provides for code generation in the servant source
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_COMPONENT_COMPONENT_SVS_H_
 #define _BE_COMPONENT_COMPONENT_SVS_H_
 
-/**
- * @class be_visitor_component_svs
- *
- * @brief be_visitor_component_svs
- *
- * This is a concrete visitor to generate the servant
- * source for component.
- */
 class be_visitor_component_svs : public be_visitor_component
 {
+  //
+  // = TITLE
+  //   be_visitor_component_svs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the servant
+  //   source for component.
+  //
+  //
 public:
   be_visitor_component_svs (be_visitor_context *ctx);
   
   ~be_visitor_component_svs (void);
   
   virtual int visit_component (be_component *node);
-  virtual int visit_connector (be_connector *node);
   
 private:
   void gen_entrypoint (AST_Component *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/context_ex_idl.h b/TAO/TAO_IDL/be_include/be_visitor_component/context_ex_idl.h
index 8247bcc7f0b..af4200097fd 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/context_ex_idl.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/context_ex_idl.h
@@ -1,17 +1,23 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    context_ex_idl.h
- *
- *  $Id$
- *
- *  Provides code generation for the context class
- *  in the CIAO executor IDL.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    context_ex_idl.h
+//
+// = DESCRIPTION
+//    Provides code generation for the context class
+//    in the CIAO executor IDL.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_COMPONENT_CONTEXT_EX_IDL_H_
 #define _BE_COMPONENT_CONTEXT_EX_IDL_H_
@@ -34,7 +40,6 @@ public:
   ~be_visitor_context_ex_idl (void);
 
   virtual int visit_component (be_component *node);
-  virtual int visit_connector (be_connector *node);
   virtual int visit_uses (be_uses *node);
   virtual int visit_publishes (be_publishes *node);
   virtual int visit_emits (be_emits *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/context_svh.h b/TAO/TAO_IDL/be_include/be_visitor_component/context_svh.h
index c13ca8bc334..f8bdf732279 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/context_svh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/context_svh.h
@@ -1,39 +1,45 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    context_svh.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Component node.
- *  This provides for code generation for the Context
- *  class declaration
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    context_svh.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Component node.
+//    This provides for code generation for the Context
+//    class declaration
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_COMPONENT_CONTEXT_SVH_H_
 #define _BE_COMPONENT_CONTEXT_SVH_H_
 
-/**
- * @class be_visitor_context_svh
- *
- * @brief be_visitor_context_svh
- *
- * This is a concrete visitor to generate the context class decl
- * for a component.
- */
 class be_visitor_context_svh : public be_visitor_component_scope
 {
+  //
+  // = TITLE
+  //   be_visitor_context_svh
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the context class decl
+  //   for a component.
+  //
+  //
 public:
   be_visitor_context_svh (be_visitor_context *ctx);
   
   ~be_visitor_context_svh (void);
   
   virtual int visit_component (be_component *node);
-  virtual int visit_connector (be_connector *node);
   virtual int visit_uses (be_uses *node);
   virtual int visit_publishes (be_publishes *node);
   virtual int visit_emits (be_emits *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/context_svs.h b/TAO/TAO_IDL/be_include/be_visitor_component/context_svs.h
index e94633b3f6a..5c540859839 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/context_svs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/context_svs.h
@@ -1,49 +1,77 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    context_svs.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Component node.
- *  This provides for code generation for the Context
- *  class definition
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    context_svs.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Component node.
+//    This provides for code generation for the Context
+//    class definition
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_COMPONENT_CONTEXT_SVS_H_
 #define _BE_COMPONENT_CONTEXT_SVS_H_
 
-/**
- * @class be_visitor_context_svs
- *
- * @brief be_visitor_context_svs
- *
- * This is a concrete visitor to generate the context class defn
- * for a component.
- */
 class be_visitor_context_svs : public be_visitor_component_scope
 {
+  //
+  // = TITLE
+  //   be_visitor_context_svs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the context class defn
+  //   for a component.
+  //
+  //
 public:
   be_visitor_context_svs (be_visitor_context *ctx);
-
+  
   ~be_visitor_context_svs (void);
-
+  
   virtual int visit_component (be_component *node);
-  virtual int visit_connector (be_connector *node);
   virtual int visit_uses (be_uses *node);
   virtual int visit_publishes (be_publishes *node);
   virtual int visit_emits (be_emits *node);
-
+  
 private:
   void gen_uses_simplex (AST_Type *obj,
-                         const char *port_name);
+                         const char *port_name);       
   void gen_uses_multiplex (AST_Type *obj,
                            const char *port_name);
 };
 
+// ======================================================
+
+class be_visitor_swapping_get_consumer
+  : public be_visitor_component_scope
+{
+  //
+  // = TITLE
+  //   be_visitor_swapping_get_comsumer
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate a block of code
+  //   for each publishes port, including inherited ports.
+  //
+  //
+public:
+  be_visitor_swapping_get_consumer (be_visitor_context *ctx);
+  
+  ~be_visitor_swapping_get_consumer (void);
+  
+  virtual int visit_publishes (be_publishes *node);
+};
+
 #endif /* _BE_COMPONENT_CONTEXT_SVS_H_ */
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/executor_ex_idl.h b/TAO/TAO_IDL/be_include/be_visitor_component/executor_ex_idl.h
index 0f4b928c185..a0c47c99457 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/executor_ex_idl.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/executor_ex_idl.h
@@ -1,16 +1,22 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    executor_ex_idl.h
- *
- *  $Id$
- *
- *  Provides code generation for components in the CIAO executor IDL.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    executor_ex_idl.h
+//
+// = DESCRIPTION
+//    Provides code generation for components in the CIAO executor IDL.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_COMPONENT_EXECUTOR_EX_IDL_H_
 #define _BE_COMPONENT_EXECUTOR_EX_IDL_H_
@@ -33,7 +39,6 @@ public:
   ~be_visitor_executor_ex_idl (void);
 
   virtual int visit_component (be_component *node);
-  virtual int visit_connector (be_connector *node);
 
   /// To regenerate attribute declarations.
   virtual int visit_attribute (be_attribute *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/executor_exh.h b/TAO/TAO_IDL/be_include/be_visitor_component/executor_exh.h
index 05870f4ed9a..641d1c9cf74 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/executor_exh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/executor_exh.h
@@ -1,17 +1,22 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    executor_exh.h
- *
- *  $Id$
- *
- *  This provides code generation in the exec impl header,
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO_IDL_BE
+//
+// = FILENAME
+//    executor_exh.h
+//
+// = DESCRIPTION
+//    This provides code generation in the exec impl header,
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_COMPONENT_EXECUTOR_EXH_H_
 #define _BE_COMPONENT_EXECUTOR_EXH_H_
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/executor_exs.h b/TAO/TAO_IDL/be_include/be_visitor_component/executor_exs.h
index 23afac20bd6..bd8c6871dfa 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/executor_exs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/executor_exs.h
@@ -1,17 +1,22 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    executor_exs.h
- *
- *  $Id$
- *
- *  This provides code generation in the exec impl source.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO_IDL_BE
+//
+// = FILENAME
+//    executor_exs.h
+//
+// = DESCRIPTION
+//    This provides code generation in the exec impl source.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_COMPONENT_EXECUTOR_EXS_H_
 #define _BE_COMPONENT_EXECUTOR_EXS_H_
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/facet_ex_idl.h b/TAO/TAO_IDL/be_include/be_visitor_component/facet_ex_idl.h
index 244872ccb9a..6e70a89d375 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/facet_ex_idl.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/facet_ex_idl.h
@@ -1,17 +1,23 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    facet_ex_idl.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Component node.
- *  Provides code generation for facets in the CIAO executor IDL
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    facet_ex_idl.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Component node.
+//    Provides code generation for facets in the CIAO executor IDL
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_COMPONENT_FACET_EX_IDL_H_
 #define _BE_COMPONENT_FACET_EX_IDL_H_
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/facet_exh.h b/TAO/TAO_IDL/be_include/be_visitor_component/facet_exh.h
index cc7a8912939..972ac12fcf3 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/facet_exh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/facet_exh.h
@@ -1,17 +1,22 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    facet_exh.h
- *
- *  $Id$
- *
- *  This provides code generation for facets in the exec impl header,
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO_IDL_BE
+//
+// = FILENAME
+//    facet_exh.h
+//
+// = DESCRIPTION
+//    This provides code generation for facets in the exec impl header,
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_COMPONENT_FACET_EXH_H_
 #define _BE_COMPONENT_FACET_EXH_H_
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/facet_exs.h b/TAO/TAO_IDL/be_include/be_visitor_component/facet_exs.h
index a9eda920edb..4a0966f233f 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/facet_exs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/facet_exs.h
@@ -1,17 +1,22 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    facet_exs.h
- *
- *  $Id$
- *
- *  This provides code generation for facets in the exec impl source.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO_IDL_BE
+//
+// = FILENAME
+//    facet_exs.h
+//
+// = DESCRIPTION
+//    This provides code generation for facets in the exec impl source.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_COMPONENT_FACET_EXS_H_
 #define _BE_COMPONENT_FACET_EXS_H_
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/facet_svh.h b/TAO/TAO_IDL/be_include/be_visitor_component/facet_svh.h
index 395b394693f..5c57ea3e0e6 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/facet_svh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/facet_svh.h
@@ -1,32 +1,39 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    facet_svh.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Component node.
- *  This provides for code generation for the facet servant
- *  class declaration
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    facet_svh.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Component node.
+//    This provides for code generation for the facet servant
+//    class declaration
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_COMPONENT_FACET_SVH_H_
 #define _BE_COMPONENT_FACET_SVH_H_
 
-/**
- * @class be_visitor_facet_svh
- *
- * @brief be_visitor_facet_svh
- *
- * This is a concrete visitor to generate the facet servant decl
- * for a component.
- */
 class be_visitor_facet_svh : public be_visitor_component_scope
 {
+  //
+  // = TITLE
+  //   be_visitor_facet_svh
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the facet servant decl
+  //   for a component.
+  //
+  //
 public:
   be_visitor_facet_svh (be_visitor_context *ctx);
   
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/facet_svs.h b/TAO/TAO_IDL/be_include/be_visitor_component/facet_svs.h
index f8dd0988b39..9dbc7dc64f5 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/facet_svs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/facet_svs.h
@@ -1,32 +1,39 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    facet_svs.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Component node.
- *  This provides for code generation for the facet servant
- *  class definition
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    facet_svs.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Component node.
+//    This provides for code generation for the facet servant
+//    class definition
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_COMPONENT_FACET_SVS_H_
 #define _BE_COMPONENT_FACET_SVS_H_
 
-/**
- * @class be_visitor_facet_svs
- *
- * @brief be_visitor_facet_svs
- *
- * This is a concrete visitor to generate the facet servant defn
- * for a component.
- */
 class be_visitor_facet_svs : public be_visitor_component_scope
 {
+  //
+  // = TITLE
+  //   be_visitor_facet_svs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the facet servant defn
+  //   for a component.
+  //
+  //
 public:
   be_visitor_facet_svs (be_visitor_context *ctx);
   
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/servant_svh.h b/TAO/TAO_IDL/be_include/be_visitor_component/servant_svh.h
index e1ce49b94bb..1eb8267dca2 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/servant_svh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/servant_svh.h
@@ -1,39 +1,45 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    servant_svh.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Component node.
- *  This provides for code generation for the Servant
- *  class declaration
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    servant_svh.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Component node.
+//    This provides for code generation for the Servant
+//    class declaration
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_COMPONENT_SERVANT_SVH_H_
 #define _BE_COMPONENT_SERVANT_SVH_H_
 
-/**
- * @class be_visitor_servant_svh
- *
- * @brief be_visitor_servant_svh
- *
- * This is a concrete visitor to generate the servant class decl
- * for a component.
- */
 class be_visitor_servant_svh : public be_visitor_component_scope
 {
+  //
+  // = TITLE
+  //   be_visitor_servant_svh
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the servant class decl
+  //   for a component.
+  //
+  //
 public:
   be_visitor_servant_svh (be_visitor_context *ctx);
   
   ~be_visitor_servant_svh (void);
   
   virtual int visit_component (be_component *node);
-  virtual int visit_connector (be_connector *node);
   virtual int visit_attribute (be_attribute *node);
   virtual int visit_provides (be_provides *node);
   virtual int visit_uses (be_uses *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/servant_svs.h b/TAO/TAO_IDL/be_include/be_visitor_component/servant_svs.h
index 1d1ed572cc2..86492aaebf2 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component/servant_svs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component/servant_svs.h
@@ -1,18 +1,24 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    servant_svs.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Component node.
- *  This provides for code generation for the Servant
- *  class definition
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    servant_svs.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Component node.
+//    This provides for code generation for the Servant
+//    class definition
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_COMPONENT_SERVANT_SVS_H_
 #define _BE_COMPONENT_SERVANT_SVS_H_
@@ -35,7 +41,6 @@ public:
   ~be_visitor_servant_svs (void);
   
   virtual int visit_component (be_component *node);
-  virtual int visit_connector (be_connector *node);
   virtual int visit_operation (be_operation *node);
   virtual int visit_attribute (be_attribute *node);
   virtual int visit_provides (be_provides *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component_fwd.h b/TAO/TAO_IDL/be_include/be_visitor_component_fwd.h
index 33a7daf8449..c496984f24e 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component_fwd.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component_fwd.h
@@ -1,18 +1,23 @@
 /* -*- c++ -*- */
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    be_visitor_component_fwd.h
- *
- *  $Id$
- *
- *  Concrete visitor for the forward declared component class.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_component_fwd.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the forward declared component class.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef TAO_BE_VISITOR_COMPONENT_FWD_H
 #define TAO_BE_VISITOR_COMPONENT_FWD_H
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component_fwd/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_component_fwd/any_op_ch.h
index 73ce058684a..a85a465160b 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component_fwd/any_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component_fwd/any_op_ch.h
@@ -1,42 +1,47 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    any_op_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for the forward declared Component node.
- *  This one provides code generation for the Any operators.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    any_op_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the forward declared Component node.
+//    This one provides code generation for the Any operators.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_COMPONENT_FWD_ANY_OP_CH_H_
 #define _BE_COMPONENT_FWD_ANY_OP_CH_H_
 
-/**
- * @class be_visitor_component_fwd_any_op_ch
- *
- * @brief be_visitor_component_fwd_any_op_ch
- *
- * This is a concrete visitor for forward declared components that
- * generates the Any operator declaration.
- */
 class be_visitor_component_fwd_any_op_ch : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //   be_visitor_component_fwd_any_op_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for forward declared components that
+  //   generates the Any operator declaration.
+  //
 
 public:
-  /// constructor
   be_visitor_component_fwd_any_op_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_component_fwd_any_op_ch (void);
+  // destructor
 
-  /// visit component_fwd
   virtual int visit_component_fwd (be_component_fwd *node);
+  // visit component_fwd
 };
 
 #endif /* _BE_COMPONENT_FWD_ANY_OP_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component_fwd/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_component_fwd/cdr_op_ch.h
index 544971cc8ae..1294a1f282c 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component_fwd/cdr_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component_fwd/cdr_op_ch.h
@@ -1,44 +1,49 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    cdr_op_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for the ComponentFwd class
- *  This one provides code generation for the CDR operators for the forward
- *  declared component in the client header, if the node is not later defined
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the ComponentFwd class
+//    This one provides code generation for the CDR operators for the forward
+//    declared component in the client header, if the node is not later defined
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_COMPONENT_FWD_CDR_OP_CH_H_
 #define _BE_VISITOR_COMPONENT_FWD_CDR_OP_CH_H_
 
-/**
- * @class be_visitor_component_fwd_cdr_op_ch
- *
- * @brief be_visitor_component_fwd_cdr_op_ch
- *
- * This is a concrete visitor for forward declared component that generates
- * the CDR operator declarations, if the node is not later defined.
- */
 class be_visitor_component_fwd_cdr_op_ch : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //   be_visitor_component_fwd_cdr_op_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for forward declared component that generates
+  //   the CDR operator declarations, if the node is not later defined.
+  //
 
 public:
-  /// constructor
   be_visitor_component_fwd_cdr_op_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_component_fwd_cdr_op_ch (void);
+  // destructor
 
-  /// visit forward declared component.
   virtual int visit_component_fwd (be_component_fwd *node);
+  // visit forward declared component.
 };
 
 #endif /* _BE_VISITOR_COMPONENT_FWD_CDR_OP_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component_fwd/component_fwd_ch.h b/TAO/TAO_IDL/be_include/be_visitor_component_fwd/component_fwd_ch.h
index 81c1f2d16ea..6ce3f927239 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component_fwd/component_fwd_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component_fwd/component_fwd_ch.h
@@ -1,40 +1,46 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    component_fwd_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Component Forward node.
- *  This one provides code generation for component forward node.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    component_fwd_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Component Forward node.
+//    This one provides code generation for component forward node.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_COMPONENT_COMPONENT_FWD_CH_H_
 #define _BE_COMPONENT_COMPONENT_FWD_CH_H_
 
-/**
- * @class be_visitor_component_fwd_ch
- *
- * @brief be_visitor_component_fwd_ch
- *
- * This is the visitor for component_fwd for the header file
- */
 class be_visitor_component_fwd_ch : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //   be_visitor_component_fwd_ch
+  //
+  // = DESCRIPTION
+  //   This is the visitor for component_fwd for the header file
+  //
+  //
 public:
-  /// constructor
   be_visitor_component_fwd_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_component_fwd_ch (void);
+  // destructor
 
-  /// visit interface_fwd.
   virtual int visit_component_fwd (be_component_fwd *node);
+  // visit interface_fwd.
 };
 
 #endif /* _BE_COMPONENT_COMPONENT_FWD_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_component_scope.h b/TAO/TAO_IDL/be_include/be_visitor_component_scope.h
index d5f3b78bebc..ef4581f3f2f 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_component_scope.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_component_scope.h
@@ -1,18 +1,23 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    be_visitor_component_scope.h
- *
- *  $Id$
- *
- *  Base class for visitors that need to visit the scope of a
- *  component and its ancestors, if any.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_component_scope.h
+//
+// = DESCRIPTION
+//    Base class for visitors that need to visit the scope of a 
+//    component and its ancestors, if any.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_COMPONENT_COMPONENT_SCOPE_H_
 #define _BE_COMPONENT_COMPONENT_SCOPE_H_
@@ -21,47 +26,48 @@
 
 #include "be_visitor_scope.h"
 
-/**
- * @class be_visitor_component_scope
- *
- * @brief be_visitor_component_scope
- *
- * This is an abstract visitor providing a scope visitation
- * method that traverses the base component recursively.
- */
 class be_visitor_component_scope : public be_visitor_scope
 {
+  //
+  // = TITLE
+  //   be_visitor_component_scope
+  //
+  // = DESCRIPTION
+  //   This is an abstract visitor providing a scope visitation
+  //   method that traverses the base component recursively.
+  //
 protected:
   be_visitor_component_scope (be_visitor_context *ctx);
-
+  
   virtual ~be_visitor_component_scope (void);
-
+  
 public:
   virtual int visit_extended_port (be_extended_port *node);
   virtual int visit_mirror_port (be_mirror_port *node);
 
   // Automatically recurses to the ancestor scopes, if any.
   int visit_component_scope (be_component *node);
-
+  
   // These two methods are used instead of overriding
   // visit_porttype so we can traverse a porttype only
   // when it is referenced.
-
+  
   int visit_porttype_scope (be_porttype *node);
 
-  // Swaps uses for provides members and vice versa.S
+  // Swaps uses for provides members and vice versa.S 
   int visit_porttype_scope_mirror (be_porttype *node);
-
+  
 protected:
   void gen_svnt_entrypoint_decl (void);
   void gen_svnt_entrypoint_defn (void);
   void gen_exec_entrypoint_decl (void);
   void gen_exec_entrypoint_defn (void);
-
+  
 protected:
   be_component *node_;
   TAO_OutStream &os_;
   ACE_CString export_macro_;
+  bool swapping_;
   bool static_config_;
   ACE_CString port_prefix_;
 };
diff --git a/TAO/TAO_IDL/be_include/be_visitor_connector.h b/TAO/TAO_IDL/be_include/be_visitor_connector.h
index db605ad2f9b..bd625551215 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_connector.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_connector.h
@@ -1,18 +1,23 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    be_visitor_connector.h
- *
- *  $Id$
- *
- *  Concrete visitors for the Connector
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_connector.h
+//
+// = DESCRIPTION
+//    Concrete visitors for the Connector
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef TAO_BE_VISITOR_CONNECTOR_H
 #define TAO_BE_VISITOR_CONNECTOR_H
@@ -24,7 +29,6 @@
 
 #include "be_visitor_component_scope.h"
 
-#include "be_visitor_connector/connector_dds_ex_base.h"
 #include "be_visitor_connector/connector_dds_exh.h"
 #include "be_visitor_connector/connector_dds_exs.h"
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_ex_base.h b/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_ex_base.h
deleted file mode 100644
index 293a35b4a6d..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_ex_base.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    connector_dds_ex_base.h
- *
- *  $Id$
- *
- *  Base class visitor for the DDS Connector node.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
-
-#ifndef _BE_CONNECTOR_CONNECTOR_DDS_EX_BASE_H_
-#define _BE_CONNECTOR_CONNECTOR_DDS_EX_BASE_H_
-
-class be_visitor_context;
-
-class be_visitor_connector_dds_ex_base
-  : public be_visitor_component_scope
-{
-  //
-  // = TITLE
-  //   be_visitor_connector_dds_ex_base
-  //
-  // = DESCRIPTION
-  //   This is a base class visitor to generate
-  //   the executor implementation for DDS connectors.
-  //
-  //
-public:
-  be_visitor_connector_dds_ex_base (be_visitor_context *ctx);
-  
-  ~be_visitor_connector_dds_ex_base (void);
-  
-protected:
-  void process_template_args (AST_Connector *base);
-  
-protected:
-  // Storage for the current template module instantiation we
-  // are using, and its associated template args.
-  AST_Template_Module_Inst *t_inst_;
-  FE_Utils::T_ARGLIST *t_args_;
-  
-  // Derives from the DDS datatype, so we want to calculate it
-  // once and store it.
-  ACE_CString dds_traits_name_;
-};
-
-#endif /* _BE_CONNECTOR_CONNECTOR_DDS_EX_BASE_H_ */
-
diff --git a/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_exh.h b/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_exh.h
index ac20fc605a4..2c7071d3f94 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_exh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_exh.h
@@ -1,18 +1,23 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    connector_dds_exh.h
- *
- *  $Id$
- *
- *  Concrete visitor for the DDS Connector node.
- *  This provides for code generation in the exec impl header
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO_IDL_BE
+//
+// = FILENAME
+//    connector_dds_exh.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the DDS Connector node.
+//    This provides for code generation in the exec impl header
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_CONNECTOR_CONNECTOR_DDS_EXH_H_
 #define _BE_CONNECTOR_CONNECTOR_DDS_EXH_H_
@@ -20,7 +25,7 @@
 class be_visitor_context;
 
 class be_visitor_connector_dds_exh
-  : public be_visitor_connector_dds_ex_base
+  : public be_visitor_component_scope
 {
   //
   // = TITLE
@@ -37,12 +42,6 @@ public:
   ~be_visitor_connector_dds_exh (void);
   
   virtual int visit_connector (be_connector *node);
-  
-private:
-  // Generate application-specific instantiations of
-  // middleware templates containing traits constructs.
-  void gen_dds_traits (void);
-  void gen_connector_traits (void);
 };
 
 #endif /* _BE_CONNECTOR_CONNECTOR_DDS_EXH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_exs.h b/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_exs.h
index 0f3184b1597..66a996ccc8a 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_exs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_exs.h
@@ -1,24 +1,29 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    connector_dds_exs.h
- *
- *  $Id$
- *
- *  Concrete visitor for the DDS Connector node.
- *  This provides for code generation in the exec impl source.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO_IDL_BE
+//
+// = FILENAME
+//    connector_dds_exs.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the DDS Connector node.
+//    This provides for code generation in the exec impl source.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_CONNECTOR_CONNECTOR_DDS_EXS_H_
 #define _BE_CONNECTOR_CONNECTOR_DDS_EXS_H_
 
 class be_visitor_connector_dds_exs
-  : public be_visitor_connector_dds_ex_base
+  : public be_visitor_component_scope
 {
   //
   // = TITLE
diff --git a/TAO/TAO_IDL/be_include/be_visitor_constant.h b/TAO/TAO_IDL/be_include/be_visitor_constant.h
index 8f9f9003667..5b5d1e9f616 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_constant.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_constant.h
@@ -1,18 +1,23 @@
 /* -*- C++ -*- */
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    be_visitor_constant.h
- *
- *  $Id$
- *
- *  Concrete visitor for the constant class
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_constant.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the constant class
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef TAO_BE_VISITOR_CONSTANT_H
 #define TAO_BE_VISITOR_CONSTANT_H
diff --git a/TAO/TAO_IDL/be_include/be_visitor_constant/constant_ch.h b/TAO/TAO_IDL/be_include/be_visitor_constant/constant_ch.h
index b837a5ce25a..f902c16864d 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_constant/constant_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_constant/constant_ch.h
@@ -1,40 +1,46 @@
 /* -*- C++ -*- */
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    constant_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for the constant class generating code in the client header.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    constant_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the constant class generating code in the client header.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_CONSTANT_CONSTANT_CH_H_
 #define _BE_VISITOR_CONSTANT_CONSTANT_CH_H_
 
-/**
- * @class be_visitor_constant_ch
- *
- * @brief be_visitor_constant_ch
- *
- * This is the visitor for constant for the header file
- */
 class be_visitor_constant_ch : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //   be_visitor_constant_ch
+  //
+  // = DESCRIPTION
+  //   This is the visitor for constant for the header file
+  //
+  //
 public:
-  /// constructor
   be_visitor_constant_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_constant_ch (void);
+  // destructor
 
-  /// visit constant.
   virtual int visit_constant (be_constant *node);
+  // visit constant.
 };
 
 #endif /* _BE_VISITOR_CONSTANT_CONSTANT_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_constant/constant_cs.h b/TAO/TAO_IDL/be_include/be_visitor_constant/constant_cs.h
index f21fa5dc185..db2fccf96ca 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_constant/constant_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_constant/constant_cs.h
@@ -1,48 +1,54 @@
 /* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file    constant_cs.h
- *
- *  $Id$
- *
- *  Concrete visitor for the constant class generating code in the client stub.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    constant_cs.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the constant class generating code in the client stub.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_CONSTANT_CONSTANT_CS_H_
 #define _BE_VISITOR_CONSTANT_CONSTANT_CS_H_
 
-/**
- * @class be_visitor_constant_cs
- *
- * @brief be_visitor_constant_cs
- *
- * This is the visitor for constant for the impl file
- */
 class be_visitor_constant_cs : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //   be_visitor_constant_cs
+  //
+  // = DESCRIPTION
+  //   This is the visitor for constant for the impl file
+  //
+  //
 public:
-  /// constructor
   be_visitor_constant_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_constant_cs (void);
+  // destructor
 
-  /// visit constant
   virtual int visit_constant (be_constant *node);
+  // visit constant
 
   // = special methods
 
-  /// generate the nested namespace begins
   virtual int gen_nested_namespace_begin (be_module *node);
+  // generate the nested namespace begins
 
-  /// generate the nested namespace ends
   virtual int gen_nested_namespace_end (be_module *node);
+  // generate the nested namespace ends
 };
 
 #endif /* _BE_VISITOR_CONSTANT_CONSTANT_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_context.h b/TAO/TAO_IDL/be_include/be_visitor_context.h
index 70ed43005bd..8ecc5843691 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_context.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_context.h
@@ -1,22 +1,27 @@
+//
+// $Id$
+//
 
 /* -*- C++ -*- */
-//=============================================================================
-/**
- *  @file    be_visitor_context.h
- *
- *  $Id$
- *
- *  This class serves to provide all the necessary context information to the
- *  visitor as it generates code. This may include the scope inside which the
- *  code is generated, the output file that is being used, and others. This
- *  context information will be passed to the abstract/concrete visitor
- *  factory which in turn will use it to construct the right visitor.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO_IDL_BE
+//
+// = FILENAME
+//    be_visitor_context.h
+//
+// = DESCRIPTION
+//    This class serves to provide all the necessary context information to the
+//    visitor as it generates code. This may include the scope inside which the
+//    code is generated, the output file that is being used, and others. This
+//    context information will be passed to the abstract/concrete visitor
+//    factory which in turn will use it to construct the right visitor.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef TAO_BE_VISITOR_CONTEXT_H
 #define TAO_BE_VISITOR_CONTEXT_H
@@ -29,10 +34,29 @@
 
 class TAO_OutStream;
 class be_decl;
-class be_interface;
 class be_typedef;
 class be_attribute;
+class be_interface;
+class be_interface_fwd;
+class be_argument;
+class be_array;
+class be_constant;
+class be_enum;
+class be_enum_val;
+class be_exceptionl;
+class be_field;
+class be_module;
+class be_operation;
+class be_exception;
+class be_predefined_type;
+class be_root;
 class be_scope;
+class be_sequence;
+class be_string;
+class be_structure;
+class be_typedef;
+class be_union;
+class be_union_branch;
 
 // When interface is defined as macro redefine it as aceinterface
 #if defined (interface)
@@ -43,132 +67,230 @@ class be_scope;
 class be_visitor_context : public ast_visitor_context
 {
 public:
-  /// default constructor
   be_visitor_context (void);
+  // default constructor
 
-  /// default constructor
   be_visitor_context (const be_visitor_context &ctx);
+  // default constructor
 
-  /// destructor
   ~be_visitor_context (void);
+  // destructor
 
-  /// assignment operator
   be_visitor_context &operator= (const be_visitor_context &ctx);
+  // assignment operator
 
   // =helpers
 
-  /// reset the context
   void reset (void);
+  // reset the context
 
-  /// set the output stream
   void stream (TAO_OutStream *os);
+  // set the output stream
 
-  /// get the stream
   TAO_OutStream *stream (void);
+  // get the stream
 
-  /// set the scope
   void scope (be_scope *scope);
+  // set the scope
 
-  /// get the scope in which code will be generated
   be_scope *scope (void);
+  // get the scope in which code will be generated
 
-  /// current node being visited
   void node (be_decl *node);
+  // current node being visited
 
-  /// node being visited
   be_decl *node (void);
+  // node being visited
 
-  /// code generation state
   void state (TAO_CodeGen::CG_STATE);
+  // code generation state
 
-  /// return the code generation state
   TAO_CodeGen::CG_STATE state (void);
+  // return the code generation state
 
-  /// code generation state
   void sub_state (TAO_CodeGen::CG_SUB_STATE);
+  // code generation state
 
-  /// return the code generation state
   TAO_CodeGen::CG_SUB_STATE sub_state (void);
+  // return the code generation state
 
-  /// set the alias node (if any)
   void alias (be_typedef *node);
+  // set the alias node (if any)
 
-  /// return the aliased node (if any)
   be_typedef *alias (void);
+  // return the aliased node (if any)
 
-  /// set the typedef node (if any)
   void tdef (be_typedef *node);
+  // set the typedef node (if any)
 
-  /// return the typedef node (if any)
   be_typedef *tdef (void);
+  // return the typedef node (if any)
 
-  /// set the attribute node if any
   void attribute (be_attribute *attr);
+  // set the attribute node if any
 
-  /// get the attribute node
   be_attribute *attribute (void);
+  // get the attribute node
 
-  /// is it the special ctor for exceptions?
   void exception (bool);
+  // is it the special ctor for exceptions?
 
-  /// is it the special ctor for exceptions?
   bool exception (void);
+  // is it the special ctor for exceptions?
 
-  /// scope supoorts generation of comma after each element
   void comma (bool);
+  // scope supoorts generation of comma after each element
 
-  /// are we supposed to generate a comma?
   bool comma (void);
+  // are we supposed to generate a comma?
 
-  /**
-   * In some cases we need to generate the objects of one interface as
-   * members of a derived visitor (the TIE classes are a good
-   * example). This field is use to hold the interface where we are
-   * *generating* code, as opposed to the interfaces where the methods
-   * or structures are defined.
-   */
   be_interface *interface (void) const;
-  void interface (be_interface *);
+  void interface (be_interface*);
+  // In some cases we need to generate the objects of one interface as
+  // members of a derived visitor (the TIE classes are a good
+  // example). This field is use to hold the interface where we are
+  // *generating* code, as opposed to the interfaces where the methods
+  // or structures are defined.
   
-  /// return the export macro currently in force
+  // = helpers
+
+  // visitors may need the actual type of the node stored in this context. We
+  // could have kept separate nodes but that would have increased the size of
+  // the context class by a large extent. So we will rely on the
+  // "narrow_from_decl" approach
+
+  // two types of helpers are provided here. One of them returns the node as
+  // the desired actual type. The other returns the scope as the desired type.
+
+  be_argument *be_node_as_argument (void);
+  // return the node as argument if possible
+
+  be_array *be_node_as_array (void);
+  // return the node as array if possible
+
+  be_attribute *be_node_as_attribute (void);
+  // return the node as attribute if possible
+
+  be_constant *be_node_as_constant (void);
+  // return the node as constant if possible
+
+  be_enum *be_node_as_enum (void);
+  // return the node as enum if possible
+
+  be_enum_val *be_node_as_enum_val (void);
+  // return the node as enum_val if possible
+
+  be_exception *be_node_as_exception (void);
+  // return the node as exception if possible
+
+  be_field *be_node_as_field (void);
+  // return the node as field if possible
+
+  be_interface *be_node_as_interface (void);
+  // return the node as interface if possible
+
+  be_interface_fwd *be_node_as_interface_fwd (void);
+  // return the node as interface_fwd if possible
+
+  be_module *be_node_as_module (void);
+  // return the node as module if possible
+
+  be_operation *be_node_as_operation (void);
+  // return the node as operation if possible
+
+  be_predefined_type *be_node_as_predefined_type (void);
+  // return the node as predefined_type if possible
+
+  be_root *be_node_as_root (void);
+  // return the node as root if possible
+
+  be_sequence *be_node_as_sequence (void);
+  // return the node as sequence if possible
+
+  be_string *be_node_as_string (void);
+  // return the node as string if possible
+
+  be_structure *be_node_as_structure (void);
+  // return the node as structure if possible
+
+  be_typedef *be_node_as_typedef (void);
+  // return the node as typedef if possible
+
+  be_union *be_node_as_union (void);
+  // return the node as union if possible
+
+  be_union_branch *be_node_as_union_branch (void);
+  // return the node as union_branch if possible
+
+  // for scope
+
+  be_enum *be_scope_as_enum (void);
+  // return the scope as enum if possible
+
+  be_exception *be_scope_as_exception (void);
+  // return the scope as exception if possible
+
+  be_interface *be_scope_as_interface (void);
+  // return the scope as interface if possible
+
+  be_module *be_scope_as_module (void);
+  // return the scope as module if possible
+
+  be_operation *be_scope_as_operation (void);
+  // return the scope as operation if possible
+
+  be_root *be_scope_as_root (void);
+  // return the scope as root if possible
+
+  be_structure *be_scope_as_structure (void);
+  // return the scope as structure if possible
+
+  be_union *be_scope_as_union (void);
+  // return the scope as union if possible
+
   const char *export_macro (void) const;
+  // return the export macro currently in force
 
-  /// if anyop export macro is empty, check stub.
   const char *non_null_export_macro (void) const;
+  // if anyop export macro is empty, check stub.
 
 private:
-  /// code generation state
   TAO_CodeGen::CG_STATE state_;
+  // code generation state
 
-  /// code generation state
   TAO_CodeGen::CG_SUB_STATE sub_state_;
+  // code generation state
 
-  /// current output stream
   TAO_OutStream *os_;
+  // current output stream
 
-  /// current scope in which code is generated
   be_scope *scope_;
+  // current scope in which code is generated
 
-  /// current node
   be_decl *node_;
+  // current node
 
-  /// aliased node used as a scoped name to define IDL types.
   be_typedef *alias_;
+  // aliased node used as a scoped name to define IDL types.
 
-  /// typedef node
   be_typedef *tdef_;
+  // typedef node
 
-  /// attribute node stored here while generating its code
   be_attribute *attr_;
+  // attribute node stored here while generating its code
 
-  /// is it the special ctor for exceptions?
   bool exception_;
+  // is it the special ctor for exceptions?
 
-  /// whether scope should generate a comma after every element
   bool comma_;
+  // whether scope should generate a comma after every element
 
-  /// See the method declaration above.
   be_interface *interface_;
+  // See the method declaration above.
+  
+  // Storage for the current template module params and args.
+  FE_Utils::T_PARAMLIST_INFO *template_params_;
+  FE_Utils::T_ARGLIST *template_args_;
 };
 
 #if defined (interface)
diff --git a/TAO/TAO_IDL/be_include/be_visitor_decl.h b/TAO/TAO_IDL/be_include/be_visitor_decl.h
index a6f9e616227..ca9132d486a 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_decl.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_decl.h
@@ -1,17 +1,22 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    be_visitor_decl.h
- *
- *  $Id$
- *
- *  Concrete visitor for the base "BE_Decl" node
- *
- *
- *  @author Aniruddha Gokhale and Carlos O'Ryan
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_decl.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the base "BE_Decl" node
+//
+// = AUTHOR
+//    Aniruddha Gokhale and Carlos O'Ryan
+//
+// ============================================================================
 
 #ifndef TAO_BE_VISITOR_DECL_H
 #define TAO_BE_VISITOR_DECL_H
@@ -19,16 +24,16 @@
 #include "be_visitor.h"
 #include "be_codegen.h"
 
-/**
- * @class be_visitor_decl
- *
- * @brief be_visitor_decl
- *
- * This is a concrete visitor for the be_decl node. Its only purpose is to
- * maintain state information for the derived visitor
- */
 class be_visitor_decl : public be_visitor
 {
+  //
+  // = TITLE
+  //    be_visitor_decl
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for the be_decl node. Its only purpose is to
+  //   maintain state information for the derived visitor
+  //
 public:
   be_visitor_decl (be_visitor_context *ctx);
 
@@ -40,13 +45,13 @@ protected:
   // Using a protected mechanism will allow derived visitors to access this
   // information.
 
-  /// Any context information required by the visitor.
   be_visitor_context *ctx_;
+  // Any context information required by the visitor.
 
-  /// Factors out common code used when one anonymous type is
-  /// contained by another.
   int gen_anonymous_base_type (be_type *bt,
                                TAO_CodeGen::CG_STATE cg_state);
+  // Factors out common code used when one anonymous type is
+  // contained by another.
 };
 
 #endif // TAO_BE_VISITOR_DECL_H
diff --git a/TAO/TAO_IDL/be_include/be_visitor_enum.h b/TAO/TAO_IDL/be_include/be_visitor_enum.h
index 782536e6431..130033f4fd8 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_enum.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_enum.h
@@ -1,18 +1,23 @@
 /* -*- c++ -*- */
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    be_visitor_enum.h
- *
- *  $Id$
- *
- *  Concrete visitor for the enum class
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_enum.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the enum class
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef TAO_BE_VISITOR_ENUM_H
 #define TAO_BE_VISITOR_ENUM_H
diff --git a/TAO/TAO_IDL/be_include/be_visitor_enum/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_enum/any_op_ch.h
index 42eabb02bec..f9d25ecf81c 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_enum/any_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_enum/any_op_ch.h
@@ -1,42 +1,47 @@
 /* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file    any_op_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for Enums generating code for the Any operators
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    any_op_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for Enums generating code for the Any operators
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_ENUM_ANY_OP_CH_H_
 #define _BE_VISITOR_ENUM_ANY_OP_CH_H_
 
-/**
- * @class be_visitor_enum_any_op_ch
- *
- * @brief be_visitor_enum_any_op_ch
- *
- * This is a concrete visitor for enum that generates the Any operator
- * declarations
- */
 class be_visitor_enum_any_op_ch : public be_visitor_scope
 {
+  //
+  // = TITLE
+  //   be_visitor_enum_any_op_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for enum that generates the Any operator
+  //   declarations
+  //
 
 public:
-  /// constructor
   be_visitor_enum_any_op_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_enum_any_op_ch (void);
+  // destructor
 
-  /// visit enum
   virtual int visit_enum (be_enum *node);
+  // visit enum
 };
 
 #endif /* _BE_VISITOR_ENUM_ANY_OP_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_enum/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_enum/any_op_cs.h
index ace1bdd1b20..f3db76c2be4 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_enum/any_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_enum/any_op_cs.h
@@ -1,42 +1,47 @@
 /* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file    any_op_cs.h
- *
- *  $Id$
- *
- *  Concrete visitor for Enums generating code for the Any operators
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    any_op_cs.h
+//
+// = DESCRIPTION
+//    Concrete visitor for Enums generating code for the Any operators
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_ENUM_ANY_OP_CS_H_
 #define _BE_VISITOR_ENUM_ANY_OP_CS_H_
 
-/**
- * @class be_visitor_enum_any_op_cs
- *
- * @brief be_visitor_enum_any_op_cs
- *
- * This is a concrete visitor for enum that generates the Any operator
- * implementations
- */
 class be_visitor_enum_any_op_cs : public be_visitor_scope
 {
+  //
+  // = TITLE
+  //   be_visitor_enum_any_op_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for enum that generates the Any operator
+  //   implementations
+  //
 
 public:
-  /// constructor
   be_visitor_enum_any_op_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_enum_any_op_cs (void);
+  // destructor
 
-  /// visit enum
   virtual int visit_enum (be_enum *node);
+  // visit enum
 };
 
 #endif /* _BE_VISITOR_ENUM_ANY_OP_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_ch.h
index 5ce22ee4678..70880813b57 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_ch.h
@@ -1,42 +1,47 @@
 /* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file    cdr_op_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for Enums generating code for the CDR operators
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for Enums generating code for the CDR operators
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_ENUM_CDR_OP_CH_H_
 #define _BE_VISITOR_ENUM_CDR_OP_CH_H_
 
-/**
- * @class be_visitor_enum_cdr_op_ch
- *
- * @brief be_visitor_enum_cdr_op_ch
- *
- * This is a concrete visitor for enum that generates the CDR operator
- * declarations
- */
 class be_visitor_enum_cdr_op_ch : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //   be_visitor_enum_cdr_op_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for enum that generates the CDR operator
+  //   declarations
+  //
 
 public:
-  /// constructor
   be_visitor_enum_cdr_op_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_enum_cdr_op_ch (void);
+  // destructor
 
-  /// visit enum
   virtual int visit_enum (be_enum *node);
+  // visit enum
 };
 
 #endif /* _BE_VISITOR_ENUM_CDR_OP_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_cs.h
index a8bcf5d8b04..7c4cdb6235d 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_cs.h
@@ -1,42 +1,47 @@
 /* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file    cdr_op_cs.h
- *
- *  $Id$
- *
- *  Concrete visitor for Enums generating code for the CDR operators
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_cs.h
+//
+// = DESCRIPTION
+//    Concrete visitor for Enums generating code for the CDR operators
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_ENUM_CDR_OP_CS_H_
 #define _BE_VISITOR_ENUM_CDR_OP_CS_H_
 
-/**
- * @class be_visitor_enum_cdr_op_cs
- *
- * @brief be_visitor_enum_cdr_op_cs
- *
- * This is a concrete visitor for enum that generates the CDR operator
- * implementations
- */
 class be_visitor_enum_cdr_op_cs : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //   be_visitor_enum_cdr_op_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for enum that generates the CDR operator
+  //   implementations
+  //
 
 public:
-  /// constructor
   be_visitor_enum_cdr_op_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_enum_cdr_op_cs (void);
+  // destructor
 
-  /// visit enum
   virtual int visit_enum (be_enum *node);
+  // visit enum
 };
 
 #endif /* _BE_VISITOR_ENUM_CDR_OP_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_enum/enum_ch.h b/TAO/TAO_IDL/be_include/be_visitor_enum/enum_ch.h
index 1708ea9c00d..8a3f922dce4 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_enum/enum_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_enum/enum_ch.h
@@ -1,50 +1,56 @@
 /* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file    enum_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for Enums generating code in the client header.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    enum_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for Enums generating code in the client header.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_ENUM_ENUM_CH_H_
 #define _BE_VISITOR_ENUM_ENUM_CH_H_
 
-/**
- * @class be_visitor_enum_ch
- *
- * @brief be_visitor_enum_ch
- *
- * This is the base visitor for enum for the header file
- */
 class be_visitor_enum_ch : public be_visitor_scope
 {
+  //
+  // = TITLE
+  //   be_visitor_enum_ch
+  //
+  // = DESCRIPTION
+  //   This is the base visitor for enum for the header file
+  //
+  //
 public:
-  /// conenumor
   be_visitor_enum_ch (be_visitor_context *ctx);
+  // conenumor
 
-  /// deenumor
   ~be_visitor_enum_ch (void);
+  // deenumor
 
-  /// visit enum.
   virtual int visit_enum (be_enum *node);
+  // visit enum.
 
   // =visit operations on syntactically valid elements in our scope
 
-  /// visit enum_val
   virtual int visit_enum_val (be_enum_val *node);
+  // visit enum_val
 
   // = helper
 
-  /// generate a comma after each element is processed
   virtual int post_process (be_decl *);
+  // generate a comma after each element is processed
 };
 
 #endif /* _BE_VISITOR_ENUM_ENUM_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_enum/enum_cs.h b/TAO/TAO_IDL/be_include/be_visitor_enum/enum_cs.h
index 7b81806d734..412842ed536 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_enum/enum_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_enum/enum_cs.h
@@ -1,40 +1,46 @@
 /* -*- C++ -*- */
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    enum_cs.h
- *
- *  $Id$
- *
- *  Concrete visitor for Enums generating code in the client stubs.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    enum_cs.h
+//
+// = DESCRIPTION
+//    Concrete visitor for Enums generating code in the client stubs.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_ENUM_ENUM_CS_H_
 #define _BE_VISITOR_ENUM_ENUM_CS_H_
 
-/**
- * @class be_visitor_enum_cs
- *
- * @brief be_visitor_enum_cs
- *
- * This is the visitor for enum for the impl file
- */
 class be_visitor_enum_cs : public be_visitor_scope
 {
+  //
+  // = TITLE
+  //   be_visitor_enum_cs
+  //
+  // = DESCRIPTION
+  //   This is the visitor for enum for the impl file
+  //
+  //
 public:
-  /// conenumor
   be_visitor_enum_cs (be_visitor_context *ctx);
+  // conenumor
 
-  /// deenumor
   ~be_visitor_enum_cs (void);
+  // deenumor
 
-  /// visit enum and generate the typecode
   virtual int visit_enum (be_enum *node);
+  // visit enum and generate the typecode
 };
 
 #endif /* _BE_VISITOR_ENUM_ENUM_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_enum/serializer_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_enum/serializer_op_ch.h
index 61660264c86..6619d36d274 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_enum/serializer_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_enum/serializer_op_ch.h
@@ -1,43 +1,48 @@
 /* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file    serializer_op_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for Enums generating code for the 
- *  TAO::DCPS::Serializer operators
- *
- *
- *  @author Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    serializer_op_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for Enums generating code for the 
+//    TAO::DCPS::Serializer operators
+//
+// = AUTHOR
+//    Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_ENUM_serializer_op_CH_H_
 #define _BE_VISITOR_ENUM_serializer_op_CH_H_
 
-/**
- * @class be_visitor_enum_serializer_op_ch
- *
- * @brief be_visitor_enum_serializer_op_ch
- *
- * This is a concrete visitor for enum that generates the Serializer operator
- * declarations
- */
 class be_visitor_enum_serializer_op_ch : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //   be_visitor_enum_serializer_op_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for enum that generates the Serializer operator
+  //   declarations
+  //
 
 public:
-  /// constructor
   be_visitor_enum_serializer_op_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_enum_serializer_op_ch (void);
+  // destructor
 
-  /// visit enum
   virtual int visit_enum (be_enum *node);
+  // visit enum
 };
 
 #endif /* _BE_VISITOR_ENUM_serializer_op_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_enum/serializer_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_enum/serializer_op_cs.h
index 2187dea092f..0af226580d4 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_enum/serializer_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_enum/serializer_op_cs.h
@@ -1,43 +1,48 @@
 /* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file    serializer_op_cs.h
- *
- *  $Id$
- *
- *  Concrete visitor for Enums generating code for the 
- *  TAO::DCPS::Serializer operators
- *
- *
- *  @author Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    serializer_op_cs.h
+//
+// = DESCRIPTION
+//    Concrete visitor for Enums generating code for the 
+//    TAO::DCPS::Serializer operators
+//
+// = AUTHOR
+//    Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_ENUM_serializer_op_CS_H_
 #define _BE_VISITOR_ENUM_serializer_op_CS_H_
 
-/**
- * @class be_visitor_enum_serializer_op_cs
- *
- * @brief be_visitor_enum_serializer_op_cs
- *
- * This is a concrete visitor for enum that generates the Serializer operator
- * implementations
- */
 class be_visitor_enum_serializer_op_cs : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //   be_visitor_enum_serializer_op_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for enum that generates the Serializer operator
+  //   implementations
+  //
 
 public:
-  /// constructor
   be_visitor_enum_serializer_op_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_enum_serializer_op_cs (void);
+  // destructor
 
-  /// visit enum
   virtual int visit_enum (be_enum *node);
+  // visit enum
 };
 
 #endif /* _BE_VISITOR_ENUM_serializer_op_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception.h b/TAO/TAO_IDL/be_include/be_visitor_exception.h
index 9e2f4dba743..bc0d8c761ef 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_exception.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_exception.h
@@ -1,18 +1,23 @@
 /* -*- c++ -*- */
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    be_visitor_exception.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Exception class
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_exception.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Exception class
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef TAO_BE_VISITOR_EXCEPTION_H
 #define TAO_BE_VISITOR_EXCEPTION_H
diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_ch.h
index 6118d7e8b78..f027af57be9 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_ch.h
@@ -1,55 +1,60 @@
 /* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file    any_op_ch.h
- *
- *  $Id$
- *
- *  Visitor for Exceptions.
- *  For code generation of Any operator in client header
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    any_op_ch.h
+//
+// = DESCRIPTION
+//    Visitor for Exceptions.
+//    For code generation of Any operator in client header
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_EXCEPTION_ANY_OP_CH_H_
 #define _BE_VISITOR_EXCEPTION_ANY_OP_CH_H_
 
-/**
- * @class be_visitor_exception_any_op_ch
- *
- * @brief be_visitor_exception_any_op_ch
- *
- * This is a concrete visitor for exception that generates the Any operator
- * declarations
- */
 class be_visitor_exception_any_op_ch : public be_visitor_scope
 {
+  //
+  // = TITLE
+  //   be_visitor_exception_any_op_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for exception that generates the Any operator
+  //   declarations
+  //
 
 public:
-  /// constructor
   be_visitor_exception_any_op_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_exception_any_op_ch (void);
+  // destructor
 
-  /// visit exception
   virtual int visit_exception (be_exception *node);
+  // visit exception
 
-  /// visit field
   virtual int visit_field (be_field *node);
+  // visit field
 
-  /// visit field
   virtual int visit_enum (be_enum *node);
+  // visit field
 
-  /// visit field
   virtual int visit_structure (be_structure *node);
+  // visit field
 
-  /// visit field
   virtual int visit_union (be_union *node);
+  // visit field
 };
 
 #endif /* _BE_VISITOR_EXCEPTION_ANY_OP_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_cs.h
index 4ef5ab18604..6055997d1cb 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_cs.h
@@ -1,55 +1,60 @@
 /* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file    any_op_cs.h
- *
- *  $Id$
- *
- *  Visitor for Exceptions.
- *  For code generation of Any operator in client stubs
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    any_op_cs.h
+//
+// = DESCRIPTION
+//    Visitor for Exceptions.
+//    For code generation of Any operator in client stubs
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_EXCEPTION_ANY_OP_CS_H_
 #define _BE_VISITOR_EXCEPTION_ANY_OP_CS_H_
 
-/**
- * @class be_visitor_exception_any_op_cs
- *
- * @brief be_visitor_exception_any_op_cs
- *
- * This is a concrete visitor for exception that generates the Any operator
- * implementations
- */
 class be_visitor_exception_any_op_cs : public be_visitor_scope
 {
+  //
+  // = TITLE
+  //   be_visitor_exception_any_op_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for exception that generates the Any operator
+  //   implementations
+  //
 
 public:
-  /// constructor
   be_visitor_exception_any_op_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_exception_any_op_cs (void);
+  // destructor
 
-  /// visit exception
   virtual int visit_exception (be_exception *node);
+  // visit exception
 
-  /// visit field
   virtual int visit_field (be_field *node);
+  // visit field
 
-  /// visit field
   virtual int visit_enum (be_enum *node);
+  // visit field
 
-  /// visit field
   virtual int visit_structure (be_structure *node);
+  // visit field
 
-  /// visit field
   virtual int visit_union (be_union *node);
+  // visit field
 };
 
 #endif /* _BE_VISITOR_EXCEPTION_ANY_OP_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_ch.h
index ced828c3dd2..dd5df6266e2 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_ch.h
@@ -1,44 +1,49 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    cdr_op_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Exception class
- *  This one provides code generation for the CDR operators for the exception
- *  in the client header.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Exception class
+//    This one provides code generation for the CDR operators for the exception
+//    in the client header.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_EXCEPTION_CDR_OP_CH_H_
 #define _BE_VISITOR_EXCEPTION_CDR_OP_CH_H_
 
-/**
- * @class be_visitor_exception_cdr_op_ch
- *
- * @brief be_visitor_exception_cdr_op_ch
- *
- * This is a concrete visitor for exception that generates the CDR operator
- * declarations
- */
 class be_visitor_exception_cdr_op_ch : public be_visitor_exception
 {
+  //
+  // = TITLE
+  //   be_visitor_exception_cdr_op_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for exception that generates the CDR operator
+  //   declarations
+  //
 
 public:
-  /// constructor
   be_visitor_exception_cdr_op_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_exception_cdr_op_ch (void);
+  // destructor
 
-  /// visit exception
   virtual int visit_exception (be_exception *node);
+  // visit exception
 
 };
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_cs.h
index 0267c2b90b7..a77f6c4bdf7 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_cs.h
@@ -1,47 +1,52 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    cdr_op_cs.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Exception class
- *  This one provides code generation for the CDR operators for the exception
- *  in the client stub.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Exception class
+//    This one provides code generation for the CDR operators for the exception
+//    in the client stub.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_EXCEPTION_CDR_OP_CS_H_
 #define _BE_VISITOR_EXCEPTION_CDR_OP_CS_H_
 
-/**
- * @class be_visitor_exception_cdr_op_cs
- *
- * @brief be_visitor_exception_cdr_op_cs
- *
- * This is a concrete visitor for exception that generates the CDR operator
- * implementations
- */
 class be_visitor_exception_cdr_op_cs : public be_visitor_exception
 {
+  //
+  // = TITLE
+  //   be_visitor_exception_cdr_op_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for exception that generates the CDR operator
+  //   implementations
+  //
 
 public:
-  /// constructor
   be_visitor_exception_cdr_op_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_exception_cdr_op_cs (void);
+  // destructor
 
-  /// visit exception
   virtual int visit_exception (be_exception *node);
+  // visit exception
 
-  /// any post processing that needs to be done after a scope element is handled
   virtual int post_process (be_decl *);
+  // any post processing that needs to be done after a scope element is handled
 };
 
 #endif /* _BE_VISITOR_EXCEPTION_CDR_OP_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/ctor.h b/TAO/TAO_IDL/be_include/be_visitor_exception/ctor.h
index 855d5e7403c..bdb52021a4e 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_exception/ctor.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_exception/ctor.h
@@ -1,88 +1,91 @@
 /* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file    ctor.h
- *
- *  $Id$
- *
- *  Visitor for Exceptions.
- *  For code generation for the special constructor for exceptions
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    ctor.h
+//
+// = DESCRIPTION
+//    Visitor for Exceptions.
+//    For code generation for the special constructor for exceptions
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_EXCEPTION_CTOR_H_
 #define _BE_VISITOR_EXCEPTION_CTOR_H_
 
-/**
- * @class be_visitor_exception_ctor
- =TITLE
- * be_visitor_exception_ctor
- * =DESCRIPTION
- * generation of the special constructor
- */
 class be_visitor_exception_ctor : public be_visitor_scope
 {
+  // =TITLE
+  //   be_visitor_exception_ctor
+  //
+  // =DESCRIPTION
+  //   generation of the special constructor
 public:
-  /// ctor
   be_visitor_exception_ctor (be_visitor_context *ctx);
+  // ctor
 
-  /// dtor
   ~be_visitor_exception_ctor (void);
+  // dtor
 
-  /// post processing after each element
   virtual int post_process (be_decl *);
+  // post processing after each element
 
-  /// visit exception. We provide code for this method in the derived class
   virtual int visit_exception (be_exception *node);
+  // visit exception. We provide code for this method in the derived class
 
-  /// visit the argument node
   virtual int visit_field (be_field *node);
+  // visit the argument node
 
   // =visit all the nodes that can be the types for the field
 
-  /// visit array type
   virtual int visit_array (be_array *node);
+  // visit array type
 
-  /// visit the enum node
   virtual int visit_enum (be_enum *node);
+  // visit the enum node
 
-  /// visit interface
   virtual int visit_interface (be_interface *node);
+  // visit interface
 
-  /// visit interface forward
   virtual int visit_interface_fwd (be_interface_fwd *node);
+  // visit interface forward
 
-  /// visit valuebox
   virtual int visit_valuebox (be_valuebox *node);
+  // visit valuebox
 
-  /// visit valuetype
   virtual int visit_valuetype (be_valuetype *node);
+  // visit valuetype
 
-  /// visit valuetype forward
   virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+  // visit valuetype forward
 
-  /// visit predefined type
   virtual int visit_predefined_type (be_predefined_type *node);
+  // visit predefined type
 
-  /// visit sequence type
   virtual int visit_sequence (be_sequence *node);
+  // visit sequence type
 
-  /// visit string type
   virtual int visit_string (be_string *node);
+  // visit string type
 
-  /// visit structure type
   virtual int visit_structure (be_structure *node);
+  // visit structure type
 
-  /// visit union type
   virtual int visit_union (be_union *node);
+  // visit union type
 
-  /// visit the typedef type
   virtual int visit_typedef (be_typedef *node);
+  // visit the typedef type
 
 private:
   int emit_common (be_type *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/ctor_assign.h b/TAO/TAO_IDL/be_include/be_visitor_exception/ctor_assign.h
index ce21b18ff27..ab1e501afe8 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_exception/ctor_assign.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_exception/ctor_assign.h
@@ -1,86 +1,89 @@
 /* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file    ctor_assign.h
- *
- *  $Id$
- *
- *  Visitor for Exceptions.
- *  For code generation for the special constructor and assignment operator
- *  for exceptions.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    ctor_assign.h
+//
+// = DESCRIPTION
+//    Visitor for Exceptions.
+//    For code generation for the special constructor and assignment operator
+//    for exceptions.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_EXCEPTION_CTOR_ASSIGN_H_
 #define _BE_VISITOR_EXCEPTION_CTOR_ASSIGN_H_
 
-/**
- * @class be_visitor_exception_ctor_assign
- =TITLE
- * be_visitor_exception_ctor_assign
- * =DESCRIPTION
- * generation of the assignment statements in
- */
 class be_visitor_exception_ctor_assign : public be_visitor_scope
 {
+  // =TITLE
+  //   be_visitor_exception_ctor_assign
+  //
+  // =DESCRIPTION
+  //   generation of the assignment statements in
 public:
-  /// ctor
   be_visitor_exception_ctor_assign (be_visitor_context *ctx);
+  // ctor
 
-  /// dtor
   ~be_visitor_exception_ctor_assign (void);
+  // dtor
 
-  /// visit exception.
   virtual int visit_exception (be_exception *node);
+  // visit exception.
 
-  /// visit the field node
   virtual int visit_field (be_field *node);
+  // visit the field node
 
   // =visit all the nodes that can be the types for the field
 
-  /// visit array type
   virtual int visit_array (be_array *node);
+  // visit array type
 
-  /// visit the enum node
   virtual int visit_enum (be_enum *node);
+  // visit the enum node
 
-  /// visit interface
   virtual int visit_interface (be_interface *node);
+  // visit interface
 
-  /// visit interface forward
   virtual int visit_interface_fwd (be_interface_fwd *node);
+  // visit interface forward
 
-  /// visit valuebox
   virtual int visit_valuebox (be_valuebox *node);
+  // visit valuebox
 
-  /// visit valuetype
   virtual int visit_valuetype (be_valuetype *node);
+  // visit valuetype
 
-  /// visit valuetype forward
   virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+  // visit valuetype forward
 
-  /// visit predefined type
   virtual int visit_predefined_type (be_predefined_type *node);
+  // visit predefined type
 
-  /// visit sequence type
   virtual int visit_sequence (be_sequence *node);
+  // visit sequence type
 
-  /// visit string type
   virtual int visit_string (be_string *node);
+  // visit string type
 
-  /// visit structure type
   virtual int visit_structure (be_structure *node);
+  // visit structure type
 
-  /// visit union type
   virtual int visit_union (be_union *node);
+  // visit union type
 
-  /// visit the typedef type
   virtual int visit_typedef (be_typedef *node);
+  // visit the typedef type
 
 private:
   int emit_valuetype_common (be_type *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/exception.h b/TAO/TAO_IDL/be_include/be_visitor_exception/exception.h
index 01b6ac319c7..c4be6b317dc 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_exception/exception.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_exception/exception.h
@@ -1,46 +1,52 @@
 /* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file    exception.h
- *
- *  $Id$
- *
- *  Visitor for Exceptions.
- *  This is the generic (common) visitor for all exceptions.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    exception.h
+//
+// = DESCRIPTION
+//    Visitor for Exceptions.
+//    This is the generic (common) visitor for all exceptions.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_EXCEPTION_EXCEPTION_H_
 #define _BE_VISITOR_EXCEPTION_EXCEPTION_H_
 
-/**
- * @class be_visitor_exception
- *
- * @brief be_visitor_exception
- *
- * This is the base visitor for exception
- */
 class be_visitor_exception : public be_visitor_scope
 {
+  //
+  // = TITLE
+  //   be_visitor_exception
+  //
+  // = DESCRIPTION
+  //   This is the base visitor for exception
+  //
+  //
 public:
-  /// ctor
   be_visitor_exception (be_visitor_context *ctx);
+  // ctor
 
-  /// dtor
   ~be_visitor_exception (void);
+  // dtor
 
-  /// visit exception. We provide code for this method in the derived class
   virtual int visit_exception (be_exception *node);
+  // visit exception. We provide code for this method in the derived class
 
   // =visit operations on syntactically valid elements in our scope
 
-  /// visit field
   virtual int visit_field (be_field *node);
+  // visit field
 };
 
 #endif /* _BE_VISITOR_EXCEPTION_EXCEPTION_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ch.h b/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ch.h
index 735dc6b3e95..c664d166593 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ch.h
@@ -1,41 +1,47 @@
 /* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file    exception_ch.h
- *
- *  $Id$
- *
- *  Visitor for Exceptions.
- *  For code generation in client header
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    exception_ch.h
+//
+// = DESCRIPTION
+//    Visitor for Exceptions.
+//    For code generation in client header
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_EXCEPTION_EXCEPTION_CH_H_
 #define _BE_VISITOR_EXCEPTION_EXCEPTION_CH_H_
 
-/**
- * @class be_visitor_exception_ch
- *
- * @brief be_visitor_exception_ch
- *
- * This is a concrete visitor to generate the client header for exception
- */
 class be_visitor_exception_ch : public be_visitor_exception
 {
+  //
+  // = TITLE
+  //   be_visitor_exception_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the client header for exception
+  //
+  //
 public:
-  /// constructureor
   be_visitor_exception_ch (be_visitor_context *ctx);
+  // constructureor
 
-  /// destructureor
   ~be_visitor_exception_ch (void);
+  // destructureor
 
-  /// visit exception. We provide code for this method in the derived class
   virtual int visit_exception (be_exception *node);
+  // visit exception. We provide code for this method in the derived class
 
 };
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ci.h b/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ci.h
index 7eaef1a8aa7..ccd48fbb07b 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ci.h
@@ -1,41 +1,47 @@
 /* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file    exception_ci.h
- *
- *  $Id$
- *
- *  Visitor for Exceptions.
- *  For code generation in client inline.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    exception_ci.h
+//
+// = DESCRIPTION
+//    Visitor for Exceptions.
+//    For code generation in client inline.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_EXCEPTION_EXCEPTION_CI_H_
 #define _BE_VISITOR_EXCEPTION_EXCEPTION_CI_H_
 
-/**
- * @class be_visitor_exception_ci
- *
- * @brief be_visitor_exception_ci
- *
- * This is a concrete visitor to generate the client inline for exception
- */
 class be_visitor_exception_ci : public be_visitor_exception
 {
+  //
+  // = TITLE
+  //   be_visitor_exception_ci
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the client inline for exception
+  //
+  //
 public:
-  /// ctor
   be_visitor_exception_ci (be_visitor_context *ctx);
+  // ctor
 
-  /// dtor
   ~be_visitor_exception_ci (void);
+  // dtor
 
-  /// visit exception.
   virtual int visit_exception (be_exception *node);
+  // visit exception.
 
 };
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/exception_cs.h b/TAO/TAO_IDL/be_include/be_visitor_exception/exception_cs.h
index 92558b5cce5..a3d0c0e9c62 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_exception/exception_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_exception/exception_cs.h
@@ -1,41 +1,47 @@
 /* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file    exception_cs.h
- *
- *  $Id$
- *
- *  Visitor for Exceptions.
- *  For code generation in client stubs.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    exception_cs.h
+//
+// = DESCRIPTION
+//    Visitor for Exceptions.
+//    For code generation in client stubs.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_EXCEPTION_EXCEPTION_CS_H_
 #define _BE_VISITOR_EXCEPTION_EXCEPTION_CS_H_
 
-/**
- * @class be_visitor_exception_cs
- *
- * @brief be_visitor_exception_cs
- *
- * This is a concrete visitor to generate the client stubs for exception
- */
 class be_visitor_exception_cs : public be_visitor_exception
 {
+  //
+  // = TITLE
+  //   be_visitor_exception_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the client stubs for exception
+  //
+  //
 public:
-  /// ctor
   be_visitor_exception_cs (be_visitor_context *ctx);
+  // ctor
 
-  /// dtor
   ~be_visitor_exception_cs (void);
+  // dtor
 
-  /// visit exception. We provide code for this method in the derived class
   virtual int visit_exception (be_exception *node);
+  // visit exception. We provide code for this method in the derived class
 
 };
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ctor.h b/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ctor.h
index 8dd53eda515..fd0ddf8ff0c 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ctor.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ctor.h
@@ -1,79 +1,82 @@
 /* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file    exception_ctor.h
- *
- *  $Id$
- *
- *  Visitor for Exceptions.
- *  For code generation for the special constructor for exceptions
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    exception_ctor.h
+//
+// = DESCRIPTION
+//    Visitor for Exceptions.
+//    For code generation for the special constructor for exceptions
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_EXCEPTION_EXCEPTION_CTOR_H_
 #define _BE_VISITOR_EXCEPTION_EXCEPTION_CTOR_H_
 
-/**
- * @class be_visitor_exception_ctor
- =TITLE
- * be_visitor_exception_ctor
- * =DESCRIPTION
- * generation of the special constructor
- */
 class be_visitor_exception_ctor : public be_visitor_scope
 {
+  // =TITLE
+  //   be_visitor_exception_ctor
+  //
+  // =DESCRIPTION
+  //   generation of the special constructor
 public:
-  /// ctor
   be_visitor_exception_ctor (be_visitor_context *ctx);
+  // ctor
 
-  /// dtor
   ~be_visitor_exception_ctor (void);
+  // dtor
 
-  /// post processing after each element
   virtual int post_process (be_decl *);
+  // post processing after each element
 
-  /// visit exception. We provide code for this method in the derived class
   virtual int visit_exception (be_exception *node);
+  // visit exception. We provide code for this method in the derived class
 
-  /// visit the argument node
   virtual int visit_field (be_field *node);
+  // visit the argument node
 
   // =visit all the nodes that can be the types for the field
 
-  /// visit array type
   virtual int visit_array (be_array *node);
+  // visit array type
 
-  /// visit the enum node
   virtual int visit_enum (be_enum *node);
+  // visit the enum node
 
-  /// visit interface
   virtual int visit_interface (be_interface *node);
+  // visit interface
 
-  /// visit interface forward
   virtual int visit_interface_fwd (be_interface_fwd *node);
+  // visit interface forward
 
-  /// visit predefined type
   virtual int visit_predefined_type (be_predefined_type *node);
+  // visit predefined type
 
-  /// visit sequence type
   virtual int visit_sequence (be_sequence *node);
+  // visit sequence type
 
-  /// visit string type
   virtual int visit_string (be_string *node);
+  // visit string type
 
-  /// visit structure type
   virtual int visit_structure (be_structure *node);
+  // visit structure type
 
-  /// visit union type
   virtual int visit_union (be_union *node);
+  // visit union type
 
-  /// visit the typedef type
   virtual int visit_typedef (be_typedef *node);
+  // visit the typedef type
 
 };
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_factory.h b/TAO/TAO_IDL/be_include/be_visitor_factory.h
index 855c3adf6cd..2aa1f9e61d7 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_factory.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_factory.h
@@ -1,18 +1,21 @@
+// $Id$
 
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    be_visitor_factory.h
- *
- *  $Id$
- *
- *  Define a visitor Factory which is a singleton.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL Backend
+//
+// = FILENAME
+//    be_visitor_factory.h
+//
+// = DESCRIPTION
+//    Define a visitor Factory which is a singleton.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef TAO_BE_VISITOR_FACTORY_H
 #define TAO_BE_VISITOR_FACTORY_H
@@ -23,15 +26,13 @@
 class be_visitor;
 class be_visitor_context;
 
-/**
- * @class TAO_Visitor_Factory
- =TITLE
- * TAO_Visitor_Factory
- * =DESCRIPTION
- * Visitor factory class
- */
 class TAO_Visitor_Factory
 {
+  // =TITLE
+  //   TAO_Visitor_Factory
+  //
+  // =DESCRIPTION
+  //   Visitor factory class
 
 public:
 
@@ -39,8 +40,8 @@ public:
 
   ~TAO_Visitor_Factory (void);
 
-  /// Make a visitor.
   be_visitor *make_visitor (be_visitor_context *);
+  // Make a visitor.
 };
 
 // Singleton instance of the BE Visitor Factory.
diff --git a/TAO/TAO_IDL/be_include/be_visitor_field.h b/TAO/TAO_IDL/be_include/be_visitor_field.h
index fc916d21e02..cf2fcec1cf2 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_field.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_field.h
@@ -1,17 +1,22 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    be_visitor_field.h
- *
- *  $Id$
- *
- *  Concrete visitor for the base "BE_Field" node
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_field.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the base "BE_Field" node
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef TAO_BE_VISITOR_FIELD_H
 #define TAO_BE_VISITOR_FIELD_H
diff --git a/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_ch.h
index 10375d55668..16cad59d193 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_ch.h
@@ -1,60 +1,65 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    cdr_op_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for the base "BE_Field" node
- *  This generates code for structure members in the client header.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the base "BE_Field" node
+//    This generates code for structure members in the client header.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_FIELD_CDR_OP_CH_H_
 #define _BE_VISITOR_FIELD_CDR_OP_CH_H_
 
-/**
- * @class be_visitor_field_cdr_op_ch
- *
- * @brief be_visitor_cdr_op_ch
- *
- * This is a concrete visitor for the be_field node for the client header.
- */
 class be_visitor_field_cdr_op_ch : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //    be_visitor_cdr_op_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for the be_field node for the client header.
+  //
 public:
-  /// constructor
   be_visitor_field_cdr_op_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_field_cdr_op_ch (void);
+  // destructor
 
-  /// visit the field node
   virtual int visit_field (be_field *node);
+  // visit the field node
 
   // =visit operations on all possible data types that a field can be
 
-  /// visit array type
   virtual int visit_array (be_array *node);
+  // visit array type
 
-  /// visit enum type
   virtual int visit_enum (be_enum *node);
+  // visit enum type
 
-  /// visit sequence type
   virtual int visit_sequence (be_sequence *node);
+  // visit sequence type
 
-  /// visit structure type
   virtual int visit_structure (be_structure *node);
+  // visit structure type
 
-  /// visit typedefed type
   virtual int visit_typedef (be_typedef *node);
+  // visit typedefed type
 
-  /// visit union type
   virtual int visit_union (be_union *node);
+  // visit union type
 };
 
 #endif /*  _BE_VISITOR_FIELD_CDR_OP_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_cs.h
index 67673c9378f..37b2f217116 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_cs.h
@@ -1,40 +1,45 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    cdr_op_cs.h
- *
- *  $Id$
- *
- *  Concrete visitor for the base "BE_Field" node
- *  This generates code for structure members in the client header.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_cs.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the base "BE_Field" node
+//    This generates code for structure members in the client header.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_FIELD_CDR_OP_CS_H_
 #define _BE_VISITOR_FIELD_CDR_OP_CS_H_
 
-/**
- * @class be_visitor_field_cdr_op_cs
- *
- * @brief be_visitor_field_cdr_op_cs
- *
- * This is a concrete visitor for the be_field node for the client header.
- */
 class be_visitor_field_cdr_op_cs : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //    be_visitor_field_cdr_op_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for the be_field node for the client header.
+  //
 public:
-  /// constructor
   be_visitor_field_cdr_op_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_field_cdr_op_cs (void);
+  // destructor
 
-  /// visit the field node
   virtual int visit_field (be_field *node);
+  // visit the field node
 
   // =visit operations on all possible data types that a field can be
 
@@ -60,32 +65,32 @@ public:
   int emit_valuetype_common (void);
 };
 
-/**
- * @class be_visitor_cdr_op_field_decl
- *
- * @brief be_visitor_cdr_op_ci_field_decl
- *
- * When generating CDR operators for fields of structures and/or
- * unions it may be necessary to define some local variables (for
- * instance to hold temporary T_forany objects); this visitor
- * generates that code.
- */
 class be_visitor_cdr_op_field_decl : public be_visitor_scope
 {
+  //
+  // = TITLE
+  //   be_visitor_cdr_op_ci_field_decl
+  //
+  // = DESCRIPTION
+  //   When generating CDR operators for fields of structures and/or
+  //   unions it may be necessary to define some local variables (for
+  //   instance to hold temporary T_forany objects); this visitor
+  //   generates that code.
+  //
 public:
-  /// constructor
   be_visitor_cdr_op_field_decl (be_visitor_context *ctx);
+  // constructor
 
-  /// visit the field node
   virtual int visit_field (be_field *node);
+  // visit the field node
 
   // = visit operations for data types that require a local variable.
 
-  /// visit array type
   virtual int visit_array (be_array *node);
+  // visit array type
 
-  /// visit typedef type
   virtual int visit_typedef (be_typedef *node);
+  // visit typedef type
 };
 
 #endif /*  _BE_VISITOR_FIELD_CDR_OP_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_field/field_ch.h b/TAO/TAO_IDL/be_include/be_visitor_field/field_ch.h
index 7abf0142528..5786bd19c6c 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_field/field_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_field/field_ch.h
@@ -1,93 +1,98 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    field_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for the base "BE_Field" node
- *  This generates code for structure members in the client header.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    field_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the base "BE_Field" node
+//    This generates code for structure members in the client header.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_FIELD_CH_H_
 #define _BE_VISITOR_FIELD_CH_H_
 
-/**
- * @class be_visitor_field_ch
- *
- * @brief be_visitor_field_ch
- *
- * This is a concrete visitor for the be_field node for the client header.
- */
 class be_visitor_field_ch : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //    be_visitor_field_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for the be_field node for the client header.
+  //
 public:
-  /// constructor
   be_visitor_field_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_field_ch (void);
+  // destructor
 
-  /// visit the field node
   virtual int visit_field (be_field *node);
+  // visit the field node
 
   // =visit operations on all possible data types that a field can be
 
-  /// visit array type
   virtual int visit_array (be_array *node);
+  // visit array type
 
-  /// visit enum type
   virtual int visit_enum (be_enum *node);
+  // visit enum type
 
-  /// visit interface type
   virtual int visit_interface (be_interface *node);
+  // visit interface type
 
-  /// visit interface forward type
   virtual int visit_interface_fwd (be_interface_fwd *node);
+  // visit interface forward type
 
-  /// visit valuebox type
   virtual int visit_valuebox (be_valuebox *node);
+  // visit valuebox type
 
-  /// visit valuetype type
   virtual int visit_valuetype (be_valuetype *node);
+  // visit valuetype type
 
-  /// visit valuetype forward type
   virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+  // visit valuetype forward type
 
-  /// visit predefined type
   virtual int visit_predefined_type (be_predefined_type *node);
+  // visit predefined type
 
-  /// visit sequence type
   virtual int visit_sequence (be_sequence *node);
+  // visit sequence type
 
-  /// visit string type
   virtual int visit_string (be_string *node);
+  // visit string type
 
-  /// visit structure type
   virtual int visit_structure (be_structure *node);
+  // visit structure type
 
-  /// visit typedefed type
   virtual int visit_typedef (be_typedef *node);
+  // visit typedefed type
 
-  /// visit union type
   virtual int visit_union (be_union *node);
+  // visit union type
 
-  /// visit a component node
   virtual int visit_component (be_component *node);
+  // visit a component node
 
-  /// visit a forward declared component node
   virtual int visit_component_fwd (be_component_fwd *node);
+  // visit a forward declared component node
 
-  /// visit an eventtype node
   virtual int visit_eventtype (be_eventtype *node);
+  // visit an eventtype node
 
-  /// visit a forward declared eventtype node
   virtual int visit_eventtype_fwd (be_eventtype_fwd *node);
+  // visit a forward declared eventtype node
 
  private:
   int emit_common (be_type *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_field/field_ci.h b/TAO/TAO_IDL/be_include/be_visitor_field/field_ci.h
index 2a58f758415..583a6fd92c9 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_field/field_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_field/field_ci.h
@@ -1,59 +1,64 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    field_ci.h
- *
- *  $Id$
- *
- *  Concrete visitor for the base "BE_Field" node
- *  This generates code for structure members in the client inline.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    field_ci.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the base "BE_Field" node
+//    This generates code for structure members in the client inline.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_FIELD_CI_H_
 #define _BE_VISITOR_FIELD_CI_H_
 
-/**
- * @class be_visitor_field_ci
- *
- * @brief be_visitor_field_ci
- *
- * This is a concrete visitor for the be_field node for the client inline
- * file
- */
 class be_visitor_field_ci : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //    be_visitor_field_ci
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for the be_field node for the client inline
+  //   file
+  //
 public:
-  /// constructor
   be_visitor_field_ci (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_field_ci (void);
+  // destructor
 
-  /// visit the field node
   virtual int visit_field (be_field *node);
+  // visit the field node
 
   // =visit operations on all possible data types that a field can be and for
   // which inline code must be generated
 
-  /// visit array type
   virtual int visit_array (be_array *node);
+  // visit array type
 
-  /// visit sequence type
   virtual int visit_sequence (be_sequence *node);
+  // visit sequence type
 
-  /// visit structure type
   virtual int visit_structure (be_structure *node);
+  // visit structure type
 
-  /// visit typedefed type
   virtual int visit_typedef (be_typedef *node);
+  // visit typedefed type
 
-  /// visit union type
   virtual int visit_union (be_union *node);
+  // visit union type
 };
 
 #endif /*  _BE_VISITOR_FIELD_CI_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_field/field_cs.h b/TAO/TAO_IDL/be_include/be_visitor_field/field_cs.h
index 3f6949fd867..787babe68f9 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_field/field_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_field/field_cs.h
@@ -1,62 +1,67 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    field_cs.h
- *
- *  $Id$
- *
- *  Concrete visitor for the base "BE_Field" node
- *  This generates code for structure members in the client stubs.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    field_cs.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the base "BE_Field" node
+//    This generates code for structure members in the client stubs.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_FIELD_CS_H_
 #define _BE_VISITOR_FIELD_CS_H_
 
-/**
- * @class be_visitor_field_cs
- *
- * @brief be_visitor_field_cs
- *
- * This is a concrete visitor for the be_field node for the client stubs
- * file
- */
 class be_visitor_field_cs : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //    be_visitor_field_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for the be_field node for the client stubs
+  //   file
+  //
 public:
-  /// constructor
   be_visitor_field_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_field_cs (void);
+  // destructor
 
-  /// visit the field node
   virtual int visit_field (be_field *node);
+  // visit the field node
 
   // =visit operations on all possible data types that a field can be and impl
   // code must be generated
 
-  /// visit array type
   virtual int visit_array (be_array *node);
+  // visit array type
 
-  /// visit enum type
   virtual int visit_enum (be_enum *node);
+  // visit enum type
 
-  /// visit sequence type
   virtual int visit_sequence (be_sequence *node);
+  // visit sequence type
 
-  /// visit structure type
   virtual int visit_structure (be_structure *node);
+  // visit structure type
 
-  /// visit typedefed type
   virtual int visit_typedef (be_typedef *node);
+  // visit typedefed type
 
-  /// visit union type
   virtual int visit_union (be_union *node);
+  // visit union type
 };
 
 #endif /*  _BE_VISITOR_FIELD_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_field/serializer_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_field/serializer_op_ch.h
index fb80e261ae8..ea3092716de 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_field/serializer_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_field/serializer_op_ch.h
@@ -1,61 +1,66 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    serializer_op_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for the base "BE_Field" node
- *  This generates TAO::DCPS::Serializer operators code for structure members 
- *  in the client header.
- *
- *
- *  @author Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    serializer_op_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the base "BE_Field" node
+//    This generates TAO::DCPS::Serializer operators code for structure members 
+//    in the client header.
+//
+// = AUTHOR
+//    Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_FIELD_serializer_op_CH_H_
 #define _BE_VISITOR_FIELD_serializer_op_CH_H_
 
-/**
- * @class be_visitor_field_serializer_op_ch
- *
- * @brief be_visitor_serializer_op_ch
- *
- * This is a concrete visitor for the be_field node for the client header.
- */
 class be_visitor_field_serializer_op_ch : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //    be_visitor_serializer_op_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for the be_field node for the client header.
+  //
 public:
-  /// constructor
   be_visitor_field_serializer_op_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_field_serializer_op_ch (void);
+  // destructor
 
-  /// visit the field node
   virtual int visit_field (be_field *node);
+  // visit the field node
 
   // =visit operations on all possible data types that a field can be
 
-  /// visit array type
   virtual int visit_array (be_array *node);
+  // visit array type
 
-  /// visit enum type
   virtual int visit_enum (be_enum *node);
+  // visit enum type
 
-  /// visit sequence type
   virtual int visit_sequence (be_sequence *node);
+  // visit sequence type
 
-  /// visit structure type
   virtual int visit_structure (be_structure *node);
+  // visit structure type
 
-  /// visit typedefed type
   virtual int visit_typedef (be_typedef *node);
+  // visit typedefed type
 
-  /// visit union type
   virtual int visit_union (be_union *node);
+  // visit union type
 };
 
 #endif /*  _BE_VISITOR_FIELD_serializer_op_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_field/serializer_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_field/serializer_op_cs.h
index efca16be2ec..79d679cc8e8 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_field/serializer_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_field/serializer_op_cs.h
@@ -1,41 +1,46 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    serializer_op_cs.h
- *
- *  $Id$
- *
- *  Concrete visitor for the base "BE_Field" node
- *  This generates TAO::DCPS::Serializer operators code for structure members
- *  in the client header.
- *
- *
- *  @author Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    serializer_op_cs.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the base "BE_Field" node
+//    This generates TAO::DCPS::Serializer operators code for structure members
+//    in the client header.
+//
+// = AUTHOR
+//    Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_FIELD_serializer_op_CS_H_
 #define _BE_VISITOR_FIELD_serializer_op_CS_H_
 
-/**
- * @class be_visitor_field_serializer_op_cs
- *
- * @brief be_visitor_field_serializer_op_cs
- *
- * This is a concrete visitor for the be_field node for the client header.
- */
 class be_visitor_field_serializer_op_cs : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //    be_visitor_field_serializer_op_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for the be_field node for the client header.
+  //
 public:
-  /// constructor
   be_visitor_field_serializer_op_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_field_serializer_op_cs (void);
+  // destructor
 
-  /// visit the field node
   virtual int visit_field (be_field *node);
+  // visit the field node
 
   // =visit operations on all possible data types that a field can be
 
@@ -57,32 +62,32 @@ public:
   virtual int visit_union (be_union *node);
 };
 
-/**
- * @class be_visitor_serializer_op_field_decl
- *
- * @brief be_visitor_serializer_op_ci_field_decl
- *
- * When generating TAO::DCPS::Serializer operators for fields of structures and/or
- * unions it may be necessary to define some local variables (for
- * instance to hold temporary T_forany objects); this visitor
- * generates that code.
- */
 class be_visitor_serializer_op_field_decl : public be_visitor_scope
 {
+  //
+  // = TITLE
+  //   be_visitor_serializer_op_ci_field_decl
+  //
+  // = DESCRIPTION
+  //   When generating TAO::DCPS::Serializer operators for fields of structures and/or
+  //   unions it may be necessary to define some local variables (for
+  //   instance to hold temporary T_forany objects); this visitor
+  //   generates that code.
+  //
 public:
-  /// constructor
   be_visitor_serializer_op_field_decl (be_visitor_context *ctx);
+  // constructor
 
-  /// visit the field node
   virtual int visit_field (be_field *node);
+  // visit the field node
 
   // = visit operations for data types that require a local variable.
 
-  /// visit array type
   virtual int visit_array (be_array *node);
+  // visit array type
 
-  /// visit typedef type
   virtual int visit_typedef (be_typedef *node);
+  // visit typedef type
 };
 
 #endif /*  _BE_VISITOR_FIELD_serializer_op_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_home.h b/TAO/TAO_IDL/be_include/be_visitor_home.h
index 83883c1ffcf..9c4d117bdf2 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_home.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_home.h
@@ -1,18 +1,23 @@
 /* -*- c++ -*- */
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    be_visitor_home.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Home class
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO_IDL_BE
+//
+// = FILENAME
+//    be_visitor_home.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Home class
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef TAO_BE_VISITOR_HOME_H
 #define TAO_BE_VISITOR_HOME_H
diff --git a/TAO/TAO_IDL/be_include/be_visitor_home/home_ch.h b/TAO/TAO_IDL/be_include/be_visitor_home/home_ch.h
index 03a0adbd1b3..79fe815e178 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_home/home_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_home/home_ch.h
@@ -1,40 +1,46 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    home_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Component Home node.
- *  This one provides code generation for component home node.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    home_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Component Home node.
+//    This one provides code generation for component home node.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_HOME_CH_H_
 #define _BE_VISITOR_HOME_CH_H_
 
-/**
- * @class be_visitor_home_ch
- *
- * @brief be_visitor_home_ch
- *
- * This is the visitor for component home for the header file
- */
 class be_visitor_home_ch : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //   be_visitor_home_ch
+  //
+  // = DESCRIPTION
+  //   This is the visitor for component home for the header file
+  //
+  //
 public:
-  /// constructor
   be_visitor_home_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_home_ch (void);
+  // destructor
 
-  /// visit home.
   virtual int visit_home (be_home *node);
+  // visit home.
 };
 
 #endif /* _BE_VISITOR_HOME_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_home/home_cs.h b/TAO/TAO_IDL/be_include/be_visitor_home/home_cs.h
index fdd18125011..77c1a60f7e6 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_home/home_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_home/home_cs.h
@@ -1,40 +1,46 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    home_cs.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Component Home node.
- *  This one provides code generation for component home node.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    home_cs.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Component Home node.
+//    This one provides code generation for component home node.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_HOME_CS_H_
 #define _BE_VISITOR_HOME_CS_H_
 
-/**
- * @class be_visitor_home_cs
- *
- * @brief be_visitor_home_cs
- *
- * This is the visitor for component home for the source file
- */
 class be_visitor_home_cs : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //   be_visitor_home_cs
+  //
+  // = DESCRIPTION
+  //   This is the visitor for component home for the source file
+  //
+  //
 public:
-  /// constructor
   be_visitor_home_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_home_cs (void);
+  // destructor
 
-  /// visit home.
   virtual int visit_home (be_home *node);
+  // visit home.
 };
 
 #endif /* _BE_VISITOR_HOME_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_home/home_ex_idl.h b/TAO/TAO_IDL/be_include/be_visitor_home/home_ex_idl.h
index cf3c6c55105..d47d19c42c8 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_home/home_ex_idl.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_home/home_ex_idl.h
@@ -1,32 +1,38 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    home_ex_idl.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Home node.
- *  Provides code generation for homes in the CIAO executor IDL
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO_IDL_BE
+//
+// = FILENAME
+//    home_ex_idl.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Home node.
+//    Provides code generation for homes in the CIAO executor IDL
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_HOME_HOME_EX_IDL_H_
 #define _BE_HOME_HOME_EX_IDL_H_
 
-/**
- * @class be_visitor_home_ex_idl
- *
- * @brief be_visitor_home_ex_idl
- *
- * This is a concrete visitor to generate the 
- * CIAO executor IDL for home.
- */
 class be_visitor_home_ex_idl : public be_visitor_scope
 {
+  //
+  // = TITLE
+  //   be_visitor_home_ex_idl
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the 
+  //   CIAO executor IDL for home.
+  //
+  //
 public:
   be_visitor_home_ex_idl (be_visitor_context *ctx);
 
@@ -34,10 +40,10 @@ public:
 
   virtual int visit_home (be_home *node);
   
+  /// To regenerate attribute & operation declarations.
   virtual int visit_attribute (be_attribute *node);
   virtual int visit_operation (be_operation *node);
   virtual int visit_argument (be_argument *node);
-  virtual int visit_factory (be_factory *node);
   
   /// To regenerate the name of an anonymous type.
   /// Anonymous arrays are not allowed.
@@ -58,6 +64,10 @@ private:
                            const char *prefix = "",
                            bool init_op = false);
                            
+  void gen_factories (void);
+  void gen_finders (void);
+  void gen_init_ops (AST_Home::INIT_LIST & list);
+                     
   void gen_home_executor (void);
   
   /// The CCM preproc visitor changed the scoped name and the
diff --git a/TAO/TAO_IDL/be_include/be_visitor_home/home_exh.h b/TAO/TAO_IDL/be_include/be_visitor_home/home_exh.h
index f09f0a654f0..781d77779b7 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_home/home_exh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_home/home_exh.h
@@ -1,32 +1,38 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    home_exh.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Home node.
- *  This provides for code generation in the exec impl header
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    home_exh.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Home node.
+//    This provides for code generation in the exec impl header
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_HOME_HOME_EXH_H_
 #define _BE_HOME_HOME_EXH_H_
 
-/**
- * @class be_visitor_home_exh
- *
- * @brief be_visitor_home_exh
- *
- * This is a concrete visitor to generate the
- * exec impl header for home.
- */
 class be_visitor_home_exh : public be_visitor_scope
 {
+  //
+  // = TITLE
+  //   be_visitor_home_exh
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the
+  //   exec impl header for home.
+  //
+  //
 public:
   be_visitor_home_exh (be_visitor_context *ctx);
   
@@ -35,7 +41,21 @@ public:
   virtual int visit_home (be_home *node);
   virtual int visit_operation (be_operation *node);
   virtual int visit_attribute (be_attribute *node);
-  virtual int visit_factory (be_factory *node);
+  
+private:
+  int gen_exec_class (void);
+  
+  int gen_ops_attrs (void);
+  
+  int gen_factories (void);
+  int gen_factories_r (AST_Home *node);
+  
+  int gen_finders (void);
+  int gen_finders_r (AST_Home *node);
+  
+  int gen_init_ops_i (AST_Home::INIT_LIST & list);
+  
+  void gen_entrypoint (void);
   
   /// Helper method passed to traverse_inheritance_graph(),
   /// collects supported operations and attributes.
@@ -44,11 +64,6 @@ public:
                                   TAO_OutStream *);
                      
 private:
-  int gen_exec_class (void);
-  
-  void gen_entrypoint (void);
-  
-private:
   be_home *node_;
   AST_Component *comp_;
   TAO_OutStream &os_;
diff --git a/TAO/TAO_IDL/be_include/be_visitor_home/home_exs.h b/TAO/TAO_IDL/be_include/be_visitor_home/home_exs.h
index 53faae2b1fe..7e97dd71af7 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_home/home_exs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_home/home_exs.h
@@ -1,32 +1,38 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    home_exs.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Home node.
- *  This provides for code generation in the exec impl source
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO_IDL_BE
+//
+// = FILENAME
+//    home_exs.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Home node.
+//    This provides for code generation in the exec impl source
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_HOME_HOME_EXS_H_
 #define _BE_HOME_HOME_EXS_H_
 
-/**
- * @class be_visitor_home_exs
- *
- * @brief be_visitor_home_exs
- *
- * This is a concrete visitor to generate the
- * exec impl source for home.
- */
 class be_visitor_home_exs : public be_visitor_scope
 {
+  //
+  // = TITLE
+  //   be_visitor_home_exs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the
+  //   exec impl source for home.
+  //
+  //
 public:
   be_visitor_home_exs (be_visitor_context *ctx);
   
@@ -35,11 +41,20 @@ public:
   virtual int visit_home (be_home *node);
   virtual int visit_operation (be_operation *node);
   virtual int visit_attribute (be_attribute *node);
-  virtual int visit_factory (be_factory *node);
   
 private:
   int gen_exec_class (void);
   
+  int gen_ops_attrs (void);
+  
+  int gen_factories (void);
+  int gen_factories_r (AST_Home *node);
+  
+  int gen_finders (void);
+  int gen_finders_r (AST_Home *node);
+  
+  int gen_init_ops_i (AST_Home::INIT_LIST & list);
+  
   void gen_entrypoint (void);
   
 private:
diff --git a/TAO/TAO_IDL/be_include/be_visitor_home/home_svh.h b/TAO/TAO_IDL/be_include/be_visitor_home/home_svh.h
index b4c79bf8076..af922537a57 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_home/home_svh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_home/home_svh.h
@@ -1,31 +1,37 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    home_svh.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Home node.
- *  This provides for code generation in the servant header
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    home_svh.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Home node.
+//    This provides for code generation in the servant header
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_HOME_HOME_SVH_H_
 #define _BE_HOME_HOME_SVH_H_
 
-/**
- * @class be_visitor_home_svh
- *
- * @brief be_visitor_home_svh
- *
- * This is a concrete visitor to generate the servant header for component.
- */
 class be_visitor_home_svh : public be_visitor_scope
 {
+  //
+  // = TITLE
+  //   be_visitor_home_svh
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the servant header for component.
+  //
+  //
 public:
   be_visitor_home_svh (be_visitor_context *ctx);
   
@@ -34,12 +40,20 @@ public:
   virtual int visit_home (be_home *node);
   virtual int visit_operation (be_operation *node);
   virtual int visit_attribute (be_attribute *node);
-  virtual int visit_factory (be_factory *node);
-  virtual int visit_finder (be_finder *node);
   
 private:
   int gen_servant_class (void);
   
+  int gen_ops_attrs (void);
+  
+  int gen_factories (void);
+  int gen_factories_r (AST_Home *node);
+  
+  int gen_finders (void);
+  int gen_finders_r (AST_Home *node);
+  
+  int gen_init_ops_i (AST_Home::INIT_LIST & list);
+  
   void gen_entrypoint (void);
   
   /// Helper method passed to traverse_inheritance_graph(),
diff --git a/TAO/TAO_IDL/be_include/be_visitor_home/home_svs.h b/TAO/TAO_IDL/be_include/be_visitor_home/home_svs.h
index 027d1378585..c3fbcc394ea 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_home/home_svs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_home/home_svs.h
@@ -1,55 +1,75 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    home_svs.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Home node.
- *  This provides for code generation in the servant source
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    home_svs.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Home node.
+//    This provides for code generation in the servant source
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_HOME_HOME_SVS_H_
 #define _BE_HOME_HOME_SVS_H_
 
-/**
- * @class be_visitor_home_svs
- *
- * @brief be_visitor_home_svs
- *
- * This is a concrete visitor to generate the servant
- * source for a comopnent home.
- */
 class be_visitor_home_svs : public be_visitor_scope
 {
+  //
+  // = TITLE
+  //   be_visitor_home_svs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the servant header for component.
+  //
+  //
 public:
   be_visitor_home_svs (be_visitor_context *ctx);
-
+  
   ~be_visitor_home_svs (void);
-
+  
   virtual int visit_home (be_home *node);
   virtual int visit_operation (be_operation *node);
   virtual int visit_attribute (be_attribute *node);
   virtual int visit_argument (be_argument *node);
-  virtual int visit_factory (be_factory *node);
-  virtual int visit_finder (be_finder *node);
-
+  
 private:
   int gen_servant_class (void);
-
+  
+  int gen_ops_attrs (void);
+  
+  int gen_factories (void);
+  int gen_factories_r (AST_Home *node);
+  
+  int gen_finders (void);
+  int gen_finders_r (AST_Home *node);
+  
+  int gen_init_ops (AST_Home::INIT_LIST & list,
+                    bool finder_list);
+  
   void gen_entrypoint (void);
-
+  
+  /// Helper method passed to traverse_inheritance_graph(),
+  /// collects supported operations and attributes.
+  static int op_attr_defn_helper (be_interface *,
+                                  be_interface *,
+                                  TAO_OutStream *);
+                     
 private:
   be_home *node_;
   AST_Component *comp_;
   TAO_OutStream &os_;
   ACE_CString export_macro_;
-  bool for_finder_;
+  bool swapping_;
 };
 
 /// Worker class passed to traverse_inheritance_graph(),
@@ -59,7 +79,7 @@ class Home_Op_Attr_Generator
 {
 public:
   Home_Op_Attr_Generator (be_visitor_scope * visitor);
-
+  
   virtual int emit (be_interface * derived_interface,
                     TAO_OutStream * os,
                     be_interface * base_interface);
@@ -67,6 +87,6 @@ public:
 private:
   be_visitor_scope * visitor_;
 };
-
+                     
 #endif /* _BE_HOME_HOME_SVS_H_ */
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface.h b/TAO/TAO_IDL/be_include/be_visitor_interface.h
index 6afc52dd55f..c56e2b24594 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface.h
@@ -1,18 +1,22 @@
 
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    be_visitor_interface.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Interface class
- *
- *
- *  @author Carlos O'Ryan and Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_interface.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Interface class
+//
+// = AUTHOR
+//    Carlos O'Ryan and Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef TAO_BE_VISITOR_INTERFACE_H
 #define TAO_BE_VISITOR_INTERFACE_H
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/amh_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface/amh_ch.h
index c0acac9c88d..35e5a07ca48 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/amh_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/amh_ch.h
@@ -1,42 +1,47 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    amh_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for the AMH-RH Interface node.
- *  This one provides code generation for interfaces in the client
- *  header.
- *
- *
- *  @author Mayur Deshpande
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    amh_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the AMH-RH Interface node.
+//    This one provides code generation for interfaces in the client
+//    header.
+//
+// = AUTHOR
+//    Mayur Deshpande
+//
+// ============================================================================
 
 #ifndef _BE_INTERFACE_AMH_INTERFACE_CH_H_
 #define _BE_INTERFACE_AMH_INTERFACE_CH_H_
 
-/**
- * @class be_visitor_amh_interface_ch
- *
- * @brief be_visitor_amh_interface_ch
- *
- * This is a concrete visitor to generate the client header for
- * AMH interface
- */
 class be_visitor_amh_interface_ch : public be_visitor_interface
 {
+  //
+  // = TITLE
+  //   be_visitor_amh_interface_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the client header for
+  //   AMH interface
+  //
 public:
-  /// constructor
   be_visitor_amh_interface_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_amh_interface_ch (void);
+  // destructor
 
-  /// set the right context and make a visitor
   virtual int visit_interface (be_interface *node);
+  // set the right context and make a visitor
 };
 
 #endif /* _BE_INTERFACE_AMH_INTERFACE_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/ami_interface_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface/ami_interface_ch.h
index 1cce2214b6e..2cd4ba82fab 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/ami_interface_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/ami_interface_ch.h
@@ -1,18 +1,23 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    ami_interface_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for the AMI Interface node.
- *  This one provides code generation for interfaces in the client header.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    interface_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the AMI Interface node.
+//    This one provides code generation for interfaces in the client header.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_INTERFACE_AMI_INTERFACE_CH_H_
 #define _BE_INTERFACE_AMI_INTERFACE_CH_H_
@@ -20,24 +25,25 @@
 // we need derived interface visitors for the client and server header files. For
 // the others, they use the default interface visitor
 
-/**
- * @class be_visitor_ami_interface_ch
- *
- * @brief be_visitor_interface_ch
- *
- * This is a concrete visitor to generate the client header for interface
- */
 class be_visitor_ami_interface_ch : public be_visitor_interface
 {
+  //
+  // = TITLE
+  //   be_visitor_interface_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the client header for interface
+  //
+  //
 public:
-  /// constructor
   be_visitor_ami_interface_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_ami_interface_ch (void);
+  // destructor
 
-  /// set the right context and make a visitor
   virtual int visit_interface (be_interface *node);
+  // set the right context and make a visitor
 };
 
 #endif /* _BE_INTERFACE_AMI_INTERFACE_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_ch.h
index a1182ac4597..0b25ff3f3be 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_ch.h
@@ -1,42 +1,47 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    any_op_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Interface node.
- *  This one provides code generation for the Any operators
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    any_op_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Interface node.
+//    This one provides code generation for the Any operators
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_INTERFACE_ANY_OP_CH_H_
 #define _BE_INTERFACE_ANY_OP_CH_H_
 
-/**
- * @class be_visitor_interface_any_op_ch
- *
- * @brief be_visitor_interface_any_op_ch
- *
- * This is a concrete visitor for interface that generates the Any operator
- * declarations
- */
 class be_visitor_interface_any_op_ch : public be_visitor_interface
 {
+  //
+  // = TITLE
+  //   be_visitor_interface_any_op_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for interface that generates the Any operator
+  //   declarations
+  //
 
 public:
-  /// constructor
   be_visitor_interface_any_op_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_interface_any_op_ch (void);
+  // destructor
 
-  /// visit interface
   virtual int visit_interface (be_interface *node);
+  // visit interface
 };
 
 #endif /* _BE_INTERFACE_ANY_OP_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_cs.h
index 8a68d6918d5..aa84f6fd2c9 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_cs.h
@@ -1,42 +1,47 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    any_op_cs.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Interface node.
- *  This one provides code generation for the Any operators
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    any_op_cs.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Interface node.
+//    This one provides code generation for the Any operators
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_INTERFACE_ANY_OP_CS_H_
 #define _BE_INTERFACE_ANY_OP_CS_H_
 
-/**
- * @class be_visitor_interface_any_op_cs
- *
- * @brief be_visitor_interface_any_op_cs
- *
- * This is a concrete visitor for interface that generates the Any operator
- * implementations
- */
 class be_visitor_interface_any_op_cs : public be_visitor_interface
 {
+  //
+  // = TITLE
+  //   be_visitor_interface_any_op_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for interface that generates the Any operator
+  //   implementations
+  //
 
 public:
-  /// constructor
   be_visitor_interface_any_op_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_interface_any_op_cs (void);
+  // destructor
 
-  /// visit interface
   virtual int visit_interface (be_interface *node);
+  // visit interface
 };
 
 #endif /* _BE_INTERFACE_ANY_OP_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/base_proxy_broker_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface/base_proxy_broker_ch.h
index 108b55ca18f..5c4f36fdb1f 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/base_proxy_broker_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/base_proxy_broker_ch.h
@@ -1,30 +1,31 @@
-//=============================================================================
-/**
- *  @file    base_proxy_broker_ch.h
- *
- *  $Id$
- *
- *   Concrete visitor for the Interface node. This
- *   visitor generates the declaration for the base
- *   ProxyBroker class.
- *
- *
- *  @author  Angelo Corsaro <corsaro@cs.wustl.edu>
- */
-//=============================================================================
-
+//$Id$
+//
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    base_proxy_broker_ch.h
+//
+// = DESCRIPTION
+//     Concrete visitor for the Interface node. This
+//     visitor generates the declaration for the base
+//     ProxyBroker class.
+//
+// = AUTHOR
+//     Angelo Corsaro <corsaro@cs.wustl.edu>
+//
+// ============================================================================
 
 #ifndef BE_BASE_PROXY_BROKER_CH_H_
 #define BE_BASE_PROXY_BROKER_CH_H_
 
-/**
- * @class be_visitor_interface_base_proxy_broker_ch
- *
- * @brief Generates the declaration for the base proxy
- * broker class.
- */
 class be_visitor_interface_base_proxy_broker_ch : public be_visitor_interface
 {
+  // = TITLE
+  //   Generates the declaration for the base proxy
+  //   broker class.
 
 public:
   // -- Ctor/Dtor Decl. --
@@ -32,12 +33,12 @@ public:
 
   virtual ~be_visitor_interface_base_proxy_broker_ch (void);
 
-  /// visit an interface
   virtual int visit_interface (be_interface *node);
+  // visit an interface
 
-  /// This will just call the above method - no need to create
-  /// another set of visitors for this stuff.
   virtual int visit_component (be_component *node);
+  // This will just call the above method - no need to create
+  // another set of visitors for this stuff.
 };
 
 #endif /* BE_BASE_PROXY_BROKER_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/base_proxy_impl_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface/base_proxy_impl_ch.h
index 3590e9a6c1d..4df4ef8d872 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/base_proxy_impl_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/base_proxy_impl_ch.h
@@ -1,30 +1,31 @@
-//=============================================================================
-/**
- *  @file    base_proxy_impl_ch.h
- *
- *  $Id$
- *
- *   Concrete visitor for the Interface node. This
- *   visitor handle the generation of the proxy
- *   implementations base clas.
- *
- *
- *  @author  Angelo Corsaro <corsaro@cs.wustl.edu>
- */
-//=============================================================================
-
+//$Id$
+//
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    base_proxy_impl_ch.h
+//
+// = DESCRIPTION
+//     Concrete visitor for the Interface node. This
+//     visitor handle the generation of the proxy
+//     implementations base clas.
+//
+// = AUTHOR
+//     Angelo Corsaro <corsaro@cs.wustl.edu>
+//
+// ============================================================================
 
 #ifndef BE_BASE_PROXY_IMPL_CH_H_
 #define BE_BASE_PROXY_IMPL_CH_H_
 
-/**
- * @class be_visitor_interface_base_proxy_impl_ch
- *
- * @brief Generates the declaration for the base proxy
- * implementation classes.
- */
 class be_visitor_interface_base_proxy_impl_ch : public be_visitor_interface
 {
+  // = TITLE
+  //   Generates the declaration for the base proxy
+  //   implementation classes.
 
 public:
   // -- Ctor/Dtor Decl. --
@@ -32,18 +33,18 @@ public:
 
   virtual ~be_visitor_interface_base_proxy_impl_ch (void);
 
-  /// visit an interface
   virtual int visit_interface (be_interface *node);
+  // visit an interface
 
-  /// This will just call the above method - no need to create
-  /// another set of visitors for this stuff.
   virtual int visit_component (be_component *node);
+  // This will just call the above method - no need to create
+  // another set of visitors for this stuff.
 
-  /// Helper to generate the declarations for the operations
-  /// of any abstract parents we may have.
   static int gen_abstract_ops_helper (be_interface *node,
                                       be_interface *base,
                                       TAO_OutStream *os);
+  // Helper to generate the declarations for the operations
+  // of any abstract parents we may have.
 };
 
 #endif /* BE_BASE_PROXY_IMPL_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_ch.h
index c8314e8f88e..9d4a989f36d 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_ch.h
@@ -1,44 +1,49 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    cdr_op_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Interface class
- *  This one provides code generation for the CDR operators for the interface
- *  in the client header.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Interface class
+//    This one provides code generation for the CDR operators for the interface
+//    in the client header.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_INTERFACE_CDR_OP_CH_H_
 #define _BE_VISITOR_INTERFACE_CDR_OP_CH_H_
 
-/**
- * @class be_visitor_interface_cdr_op_ch
- *
- * @brief be_visitor_interface_cdr_op_ch
- *
- * This is a concrete visitor for interface that generates the CDR operator
- * declarations
- */
 class be_visitor_interface_cdr_op_ch : public be_visitor_interface
 {
+  //
+  // = TITLE
+  //   be_visitor_interface_cdr_op_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for interface that generates the CDR operator
+  //   declarations
+  //
 
 public:
-  /// constructor
   be_visitor_interface_cdr_op_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_interface_cdr_op_ch (void);
+  // destructor
 
-  /// visit interface
   virtual int visit_interface (be_interface *node);
+  // visit interface
 };
 
 #endif /* _BE_VISITOR_INTERFACE_CDR_OP_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_cs.h
index db47580d9cb..9d684ff8e9d 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_cs.h
@@ -1,44 +1,49 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    cdr_op_cs.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Interface class
- *  This one provides code generation for the CDR operators for the interface
- *  in the client stub.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Interface class
+//    This one provides code generation for the CDR operators for the interface
+//    in the client stub.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_INTERFACE_CDR_OP_CS_H_
 #define _BE_VISITOR_INTERFACE_CDR_OP_CS_H_
 
-/**
- * @class be_visitor_interface_cdr_op_cs
- *
- * @brief be_visitor_interface_cdr_op_cs
- *
- * This is a concrete visitor for interface that generates the CDR operator
- * implementations
- */
 class be_visitor_interface_cdr_op_cs : public be_visitor_interface
 {
+  //
+  // = TITLE
+  //   be_visitor_interface_cdr_op_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for interface that generates the CDR operator
+  //   implementations
+  //
 
 public:
-  /// constructor
   be_visitor_interface_cdr_op_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_interface_cdr_op_cs (void);
+  // destructor
 
-  /// visit interface
   virtual int visit_interface (be_interface *node);
+  // visit interface
 };
 
 #endif /* _BE_VISITOR_INTERFACE_CDR_OP_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_sh.h b/TAO/TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_sh.h
index 77d0b074db9..15f33e4bee7 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_sh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_sh.h
@@ -1,30 +1,31 @@
-//=============================================================================
-/**
- *  @file    direct_proxy_impl_sh.h
- *
- *  $Id$
- *
- *   Concrete visitor for the Interface node. This
- *   visitor handle the generation of the proxy
- *   implementations Direct clas.
- *
- *
- *  @author  Angelo Corsaro <corsaro@cs.wustl.edu>
- */
-//=============================================================================
-
+//$Id$
+//
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    direct_proxy_impl_sh.h
+//
+// = DESCRIPTION
+//     Concrete visitor for the Interface node. This
+//     visitor handle the generation of the proxy
+//     implementations Direct clas.
+//
+// = AUTHOR
+//     Angelo Corsaro <corsaro@cs.wustl.edu>
+//
+// ============================================================================
 
 #ifndef BE_DIRECT_PROXY_IMPL_SH_H_
 #define BE_DIRECT_PROXY_IMPL_SH_H_
 
-/**
- * @class be_visitor_interface_direct_proxy_impl_sh
- *
- * @brief Generates the declaration for the Direct proxy
- * implementation classes.
- */
 class be_visitor_interface_direct_proxy_impl_sh : public be_visitor_interface
 {
+  // = TITLE
+  //   Generates the declaration for the Direct proxy
+  //   implementation classes.
 
 public:
   // -- Ctor/Dtor Decl. --
@@ -32,18 +33,18 @@ public:
 
   virtual ~be_visitor_interface_direct_proxy_impl_sh (void);
 
-  /// visit an interface
   virtual int visit_interface (be_interface *node);
+  // visit an interface
 
-  /// This will just call the above method - no need to create
-  /// another set of visitors for this stuff.
   virtual int visit_component (be_component *node);
+  // This will just call the above method - no need to create
+  // another set of visitors for this stuff.
 
-  /// Helper to generate the declarations for the operations
-  /// of any abstract parents we may have.
   static int gen_abstract_ops_helper (be_interface *node,
                                       be_interface *base,
                                       TAO_OutStream *os);
+  // Helper to generate the declarations for the operations
+  // of any abstract parents we may have.
 };
 
 #endif /* BE_DIRECT_PROXY_IMPL_SH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_ss.h b/TAO/TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_ss.h
index d5e7564b5fe..2fd30eaf71f 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_ss.h
@@ -1,29 +1,30 @@
-//=============================================================================
-/**
- *  @file    direct_proxy_impl_ss.h
- *
- *  $Id$
- *
- *  Visitor that takes care of generation the implementation
- *  for the direct proxy implementation.
- *
- *
- *  @author Angelo Corsaro
- */
-//=============================================================================
-
+//$Id$
+//
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    direct_proxy_impl_ss.h
+//
+// = DESCRIPTION
+//    Visitor that takes care of generation the implementation
+//    for the direct proxy implementation.
+//
+// = AUTHOR
+//    Angelo Corsaro
+//
+// ============================================================================
 
 #ifndef BE_DIRECT_PROXY_IMPL_SS_H_
 #define BE_DIRECT_PROXY_IMPL_SS_H_
 
-/**
- * @class be_visitor_interface_direct_proxy_impl_ss
- *
- * @brief Generates the declaration for the Direct proxy
- * implementation classes.
- */
 class be_visitor_interface_direct_proxy_impl_ss : public be_visitor_interface
 {
+  // = TITLE
+  //   Generates the declaration for the Direct proxy
+  //   implementation classes.
 
 public:
   // -- Ctor/Dtor Decl. --
@@ -31,18 +32,18 @@ public:
 
   virtual ~be_visitor_interface_direct_proxy_impl_ss (void);
 
-  /// visit an interface
   virtual int visit_interface (be_interface *node);
+  // visit an interface
 
-  /// This will just call the above method - no need to create
-  /// another set of visitors for this stuff.
   virtual int visit_component (be_component *node);
+  // This will just call the above method - no need to create
+  // another set of visitors for this stuff.
 
-  /// Helper to generate the declarations for the operations
-  /// of any abstract parents we may have.
   static int gen_abstract_ops_helper (be_interface *node,
                                       be_interface *base,
                                       TAO_OutStream *os);
+  // Helper to generate the declarations for the operations
+  // of any abstract parents we may have.
 };
 
 #endif /* BE_DIRECT_PROXY_IMPL_SS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface.h
index 69c0a0a66d7..1ceabc28c33 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface.h
@@ -1,19 +1,24 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    interface.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Interface node.
- *  This one provides the generic visitor for interfaces from which others
- *  will inherit.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    interface.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Interface node.
+//    This one provides the generic visitor for interfaces from which others
+//    will inherit.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_INTERFACE_INTERFACE_H_
 #define _BE_INTERFACE_INTERFACE_H_
@@ -37,63 +42,63 @@
 
 class AST_Operation;
 
-/**
- * @class be_visitor_interface
- *
- * @brief be_visitor_interface
- *
- * This is a concrete visitor for interface that abstracts all common tasks
- */
 class be_visitor_interface : public be_visitor_scope
 {
+  //
+  // = TITLE
+  //   be_visitor_interface
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for interface that abstracts all common tasks
+  //
 public:
-  /// constructor
   be_visitor_interface (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_interface (void);
+  // destructor
 
-  /// visit the interface node
   virtual int visit_interface (be_interface *node);
+  // visit the interface node
 
-  /// An override of the base class method so we can generate code for
-  /// any abstract parents the interface may have.
   virtual int visit_scope (be_scope *node);
+  // An override of the base class method so we can generate code for
+  // any abstract parents the interface may have.
 
   // =visit methods on all elements syntactically valid in a Interface scope
 
-  /// visit attribute
   virtual int visit_attribute (be_attribute *node);
+  // visit attribute
 
-  /// visit a constant
   virtual int visit_constant (be_constant *node);
+  // visit a constant
 
-  /// visit an native
   virtual int visit_native (be_native *node);
+  // visit an native
 
-  /// visit an enum
   virtual int visit_enum (be_enum *node);
+  // visit an enum
 
-  /// visit an exception
   virtual int visit_exception (be_exception *node);
+  // visit an exception
 
-  /// visit operation
   virtual int visit_operation (be_operation *node);
+  // visit operation
 
-  /// visit a structure
   virtual int visit_structure (be_structure *node);
+  // visit a structure
 
-  /// visit a forward declared structure
   virtual int visit_structure_fwd (be_structure_fwd *node);
+  // visit a forward declared structure
 
-  /// visit a union
   virtual int visit_union (be_union *node);
+  // visit a union
 
-  /// visit a union
   virtual int visit_union_fwd (be_union_fwd *node);
+  // visit a union
 
-  /// visit the typedef node
   virtual int visit_typedef (be_typedef *node);
+  // visit the typedef node
 
  protected:
     int is_amh_rh_node (be_interface *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ch.h
index 3614b96fb01..ed30df9f941 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ch.h
@@ -1,18 +1,23 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    interface_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Interface node.
- *  This one provides code generation for interfaces in the client header.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    interface_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Interface node.
+//    This one provides code generation for interfaces in the client header.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_INTERFACE_INTERFACE_CH_H_
 #define _BE_INTERFACE_INTERFACE_CH_H_
@@ -20,30 +25,31 @@
 // we need derived interface visitors for the client and server header files. For
 // the others, they use the default interface visitor
 
-/**
- * @class be_visitor_interface_ch
- *
- * @brief be_visitor_interface_ch
- *
- * This is a concrete visitor to generate the client header for interface
- */
 class be_visitor_interface_ch : public be_visitor_interface
 {
+  //
+  // = TITLE
+  //   be_visitor_interface_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the client header for interface
+  //
+  //
 public:
-  /// constructor
   be_visitor_interface_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_interface_ch (void);
+  // destructor
 
-  /// set the right context and make a visitor
   virtual int visit_interface (be_interface *node);
+  // set the right context and make a visitor
 
-  /// Helper to generate the declarations for the operations
-  /// of any abstract parents we may have.
   static int gen_abstract_ops_helper (be_interface *node,
                                       be_interface *base,
                                       TAO_OutStream *os);
+  // Helper to generate the declarations for the operations
+  // of any abstract parents we may have.
 private:
   /// Helper to generate declarations for _narrow () and
   /// _unchecked_narrow ()
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ci.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ci.h
index 7478ab0c319..c9791f74cac 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ci.h
@@ -1,40 +1,46 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    interface_ci.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Interface node.
- *  This one provides code generation for interfaces in the client inline.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    interface_ci.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Interface node.
+//    This one provides code generation for interfaces in the client inline.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_INTERFACE_INTERFACE_CI_H_
 #define _BE_INTERFACE_INTERFACE_CI_H_
 
-/**
- * @class be_visitor_interface_ci
- *
- * @brief be_visitor_interface_ci
- *
- * This is a concrete visitor to generate the client inline for interface
- */
 class be_visitor_interface_ci : public be_visitor_interface
 {
+  //
+  // = TITLE
+  //   be_visitor_interface_ci
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the client inline for interface
+  //
+  //
 public:
-  /// constructor
   be_visitor_interface_ci (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_interface_ci (void);
+  // destructor
 
-  /// set the right context and make a visitor
   virtual int visit_interface (be_interface *node);
+  // set the right context and make a visitor
 };
 
 #endif /* _BE_INTERFACE_INTERFACE_CI_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_cs.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_cs.h
index 1bc2ebd35f6..2e65b5d2656 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_cs.h
@@ -1,46 +1,52 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    interface_cs.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Interface node.
- *  This one provides code generation for interfaces in the client stubs.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    interface_cs.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Interface node.
+//    This one provides code generation for interfaces in the client stubs.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_INTERFACE_INTERFACE_CS_H_
 #define _BE_INTERFACE_INTERFACE_CS_H_
 
-/**
- * @class be_visitor_interface_cs
- *
- * @brief be_visitor_interface_cs
- *
- * This is a concrete visitor to generate the client stubs for interface
- */
 class be_visitor_interface_cs : public be_visitor_interface
 {
+  //
+  // = TITLE
+  //   be_visitor_interface_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the client stubs for interface
+  //
+  //
 public:
-  /// constructor
   be_visitor_interface_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_interface_cs (void);
+  // destructor
 
-  /// set the right context and make a visitor
   virtual int visit_interface (be_interface *node);
+  // set the right context and make a visitor
 
-  /// Helper to generate the definitions for the operations
-  /// of any abstract parents we may have.
   static int gen_abstract_ops_helper (be_interface *node,
                                       be_interface *base,
                                       TAO_OutStream *os);
+  // Helper to generate the definitions for the operations
+  // of any abstract parents we may have.
 
 private:
   /// Helper method to generate _narrow and _unchecked_narrow. The
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ex_idl.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ex_idl.h
index c037bbfd331..faa8c3f1ef4 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ex_idl.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ex_idl.h
@@ -1,33 +1,37 @@
+// $Id$
 
-//=============================================================================
-/**
- *  @file    interface_ex_idl.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Interface node.
- *  This provides for code generation in the CIAO
- *  executor IDL
- *
- *
- *  @author Jeff Parsons <j.parsons@vanderbilt.edu>
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO_IDL_BE
+//
+// = FILENAME
+//    interface_ex_idl.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Interface node.
+//    This provides for code generation in the CIAO
+//    executor IDL
+//
+// = AUTHOR
+//   Jeff Parsons <j.parsons@vanderbilt.edu>
+//
+// ============================================================================
 
 #ifndef _BE_INTERFACE_INTERFACE_EX_IDL_H_
 #define _BE_INTERFACE_INTERFACE_EX_IDL_H_
 
-/**
- * @class be_visitor_interface_ex_idl
- *
- * @brief be_visitor_interface_ex_idl
- *
- * This is a concrete visitor to generate the
- * CIAO executor IDL for interface
- */
 class be_visitor_interface_ex_idl : public be_visitor_interface
 {
+  //
+  // = TITLE
+  //   be_visitor_interface_ex_idl
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the
+  //   CIAO executor IDL for interface
+  //
+  //
 public:
   be_visitor_interface_ex_idl (be_visitor_context *ctx);
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ih.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ih.h
index 445ba1c8533..1c540eb905f 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ih.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ih.h
@@ -1,41 +1,45 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    interface_ih.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Interface node.
- *  This provides for code generation in the implementation header
- *
- *
- *  @author Yamuna Krishnamurthy (yamuna@cs.wustl.edu)
- */
-//=============================================================================
-
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    interface_ih.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Interface node.
+//    This provides for code generation in the implementation header
+//
+// = AUTHOR
+//   Yamuna Krishnamurthy (yamuna@cs.wustl.edu)
+//
+// ============================================================================
 
 #ifndef _BE_INTERFACE_INTERFACE_IH_H_
 #define _BE_INTERFACE_INTERFACE_IH_H_
 
-/**
- * @class be_visitor_interface_ih
- *
- * @brief be_visitor_interface_ih
- *
- * This is a concrete visitor to generate the implementation header for interface
- */
 class be_visitor_interface_ih : public be_visitor_interface
 {
+  //
+  // = TITLE
+  //   be_visitor_interface_ih
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the implementation header for interface
+  //
+  //
 public:
-  /// constructor
   be_visitor_interface_ih (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_interface_ih (void);
+  // destructor
 
-  /// set the right context and make a visitor
   virtual int visit_interface (be_interface *node);
+  // set the right context and make a visitor
 
   static int method_helper (be_interface *derived,
                             be_interface *node,
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_is.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_is.h
index a3cfcb0641c..7c59bf5d0ee 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_is.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_is.h
@@ -1,40 +1,44 @@
-
-//=============================================================================
-/**
- *  @file    interface_is.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Interface node.
- *  This provides for code generation in the implementation skeleton
- *
- *
- *  @author Yamuna Krishnamurthy (yamuna@cs.wustl.edu)
- */
-//=============================================================================
-
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    interface_is.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Interface node.
+//    This provides for code generation in the implementation skeleton
+//
+// = AUTHOR
+//   Yamuna Krishnamurthy (yamuna@cs.wustl.edu)
+//
+// ============================================================================
 
 #ifndef _BE_INTERFACE_INTERFACE_IS_H_
 #define _BE_INTERFACE_INTERFACE_IS_H_
 
-/**
- * @class be_visitor_interface_is
- *
- * @brief be_visitor_interface_is
- *
- * This is a concrete visitor to generate the implementation skeletons for interface
- */
 class be_visitor_interface_is : public be_visitor_interface
 {
+  //
+  // = TITLE
+  //   be_visitor_interface_is
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the implementation skeletons for interface
+  //
+  //
 public:
-  /// constructor
   be_visitor_interface_is (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_interface_is (void);
+  // destructor
 
-  /// set the right context and make a visitor
   virtual int visit_interface (be_interface *node);
+  // set the right context and make a visitor
 
 
   static int method_helper (be_interface *derived,
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_sh.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_sh.h
index 6e180cbea9e..f7fb788769b 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_sh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_sh.h
@@ -1,46 +1,52 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    interface_sh.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Interface node.
- *  This provides for code generation in the server header
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    interface_sh.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Interface node.
+//    This provides for code generation in the server header
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_INTERFACE_INTERFACE_SH_H_
 #define _BE_INTERFACE_INTERFACE_SH_H_
 
-/**
- * @class be_visitor_interface_sh
- *
- * @brief be_visitor_interface_sh
- *
- * This is a concrete visitor to generate the server header for interface
- */
 class be_visitor_interface_sh : public be_visitor_interface
 {
+  //
+  // = TITLE
+  //   be_visitor_interface_sh
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the server header for interface
+  //
+  //
 public:
-  /// constructor
   be_visitor_interface_sh (be_visitor_context *ctx);
+  // constructor
   
-  /// destructor
   ~be_visitor_interface_sh (void);
+  // destructor
   
-  /// set the right context and make a visitor
   virtual int visit_interface (be_interface *node);
+  // set the right context and make a visitor
     
-  /// Helper to generate the declarations for the operations
-  /// of any abstract parents we may have.
   static int gen_abstract_ops_helper (be_interface *node,
                                       be_interface *base,
                                       TAO_OutStream *os);
+  // Helper to generate the declarations for the operations
+  // of any abstract parents we may have.
 
 protected:
   virtual void this_method (be_interface *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_si.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_si.h
index 93269de40a4..61e055ad51e 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_si.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_si.h
@@ -1,40 +1,46 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    interface_si.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Interface node.
- *  This provides for code generation in the server inline
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    interface_si.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Interface node.
+//    This provides for code generation in the server inline
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_INTERFACE_INTERFACE_SI_H_
 #define _BE_INTERFACE_INTERFACE_SI_H_
 
-/**
- * @class be_visitor_interface_si
- *
- * @brief be_visitor_interface_si
- *
- * This is a concrete visitor to generate the server inline for interface
- */
 class be_visitor_interface_si : public be_visitor_interface
 {
+  //
+  // = TITLE
+  //   be_visitor_interface_si
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the server inline for interface
+  //
+  //
 public:
-  /// constructor
   be_visitor_interface_si (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_interface_si (void);
+  // destructor
 
-  /// set the right context and make a visitor
   virtual int visit_interface (be_interface *node);
+  // set the right context and make a visitor
 
 protected:
   virtual int generate_amh_classes (be_interface *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ss.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ss.h
index 7c35a33e681..67642002063 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ss.h
@@ -1,49 +1,53 @@
 // -*- C++ -*-
+//
+// $Id$
 
 
-//=============================================================================
-/**
- *  @file    interface_ss.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Interface node.
- *  This provides for code generation in the server skeleton
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    interface_ss.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Interface node.
+//    This provides for code generation in the server skeleton
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_INTERFACE_INTERFACE_SS_H_
 #define _BE_INTERFACE_INTERFACE_SS_H_
 
-/**
- * @class be_visitor_interface_ss
- *
- * @brief be_visitor_interface_ss
- *
- * This is a concrete visitor to generate the server skeletons for
- * interface
- */
 class be_visitor_interface_ss : public be_visitor_interface
 {
+  //
+  // = TITLE
+  //   be_visitor_interface_ss
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the server skeletons for
+  //   interface
+  //
 public:
-  /// constructor
   be_visitor_interface_ss (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_interface_ss (void);
+  // destructor
 
-  /// set the right context and make a visitor
   virtual int visit_interface (be_interface *node);
+  // set the right context and make a visitor
 
-  /// Helper to generate the declarations for the operations
-  /// of any abstract parents we may have.
   static int gen_abstract_ops_helper (be_interface *node,
                                       be_interface *base,
                                       TAO_OutStream *os);
+  // Helper to generate the declarations for the operations
+  // of any abstract parents we may have.
 
 protected:
   virtual void this_method (be_interface *node);
@@ -54,10 +58,10 @@ protected:
   // generates the explicit call.
   virtual void generate_send_reply (TAO_OutStream * os);
 
-///   virtual int generate_downcast_implementation (be_interface *node,
-///                                                 TAO_OutStream *os);
   virtual int generate_amh_classes (be_interface *node);
   virtual int generate_proxy_classes (be_interface *node);
+//   virtual int generate_downcast_implementation (be_interface *node,
+//                                                 TAO_OutStream *os);
   virtual int generate_copy_ctor (be_interface *node,
                                   TAO_OutStream *os);
   virtual ACE_CString generate_flat_name (be_interface *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_svh.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_svh.h
index b16fa01d8dc..7697f515ce5 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_svh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_svh.h
@@ -1,33 +1,37 @@
+// $Id$
 
-//=============================================================================
-/**
- *  @file    interface_svh.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Interface node.
- *  This provides for code generation in the CIAO
- *  servant header
- *
- *
- *  @author Jeff Parsons <j.parsons@vanderbilt.edu>
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO_IDL_BE
+//
+// = FILENAME
+//    interface_svh.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Interface node.
+//    This provides for code generation in the CIAO
+//    servant header
+//
+// = AUTHOR
+//   Jeff Parsons <j.parsons@vanderbilt.edu>
+//
+// ============================================================================
 
 #ifndef _BE_INTERFACE_INTERFACE_SVH_H_
 #define _BE_INTERFACE_INTERFACE_SVH_H_
 
-/**
- * @class be_visitor_interface_svh
- *
- * @brief be_visitor_interface_svh
- *
- * This is a concrete visitor to generate the
- * CIAO servant header for interface
- */
 class be_visitor_interface_svh : public be_visitor_interface
 {
+  //
+  // = TITLE
+  //   be_visitor_interface_svh
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the
+  //   CIAO servant header for interface
+  //
+  //
 public:
   be_visitor_interface_svh (be_visitor_context *ctx);
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_svs.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_svs.h
index d17fc2be936..933735e3624 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_svs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_svs.h
@@ -1,33 +1,37 @@
+// $Id$
 
-//=============================================================================
-/**
- *  @file    interface_svs.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Interface node.
- *  This provides for code generation in the CIAO
- *  servant sourc e
- *
- *
- *  @author Jeff Parsons <j.parsons@vanderbilt.edu>
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO_IDL_BE
+//
+// = FILENAME
+//    interface_svs.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Interface node.
+//    This provides for code generation in the CIAO
+//    servant sourc e
+//
+// = AUTHOR
+//   Jeff Parsons <j.parsons@vanderbilt.edu>
+//
+// ============================================================================
 
 #ifndef _BE_INTERFACE_INTERFACE_SVS_H_
 #define _BE_INTERFACE_INTERFACE_SVS_H_
 
-/**
- * @class be_visitor_interface_svs
- *
- * @brief be_visitor_interface_svs
- *
- * This is a concrete visitor to generate the
- * CIAO servant source for interface
- */
 class be_visitor_interface_svs : public be_visitor_interface
 {
+  //
+  // = TITLE
+  //   be_visitor_interface_svs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the
+  //   CIAO servant source for interface
+  //
+  //
 public:
   be_visitor_interface_svs (be_visitor_context *ctx);
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/proxy_brokers_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface/proxy_brokers_ch.h
index 52611bef708..9d9348a5645 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/proxy_brokers_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/proxy_brokers_ch.h
@@ -1,30 +1,31 @@
-//=============================================================================
-/**
- *  @file    proxy_brokers_ch.h
- *
- *  $Id$
- *
- *   Concrete visitor for the Interface node. This
- *   visitor handle the generation of the proxy brokers
- *   for the given interface.
- *
- *
- *  @author  Angelo Corsaro <corsaro@cs.wustl.edu>
- */
-//=============================================================================
-
+//$Id$
+//
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    proxy_brokers_ch.h
+//
+// = DESCRIPTION
+//     Concrete visitor for the Interface node. This
+//     visitor handle the generation of the proxy brokers
+//     for the given interface.
+//
+// = AUTHOR
+//     Angelo Corsaro <corsaro@cs.wustl.edu>
+//
+// ============================================================================
 
 #ifndef BE_PROXY_BROKERS_CH_H_
 #define BE_PROXY_BROKERS_CH_H_
 
-/**
- * @class be_visitor_interface_proxy_brokers_ch
- *
- * @brief Generates the declaration for the base proxy
- * broker class.
- */
 class be_visitor_interface_proxy_brokers_ch : public be_visitor_interface
 {
+  // = TITLE
+  //   Generates the declaration for the base proxy
+  //   broker class.
 
 public:
   // -- Ctor/Dtor Decl. --
@@ -32,12 +33,12 @@ public:
 
   virtual ~be_visitor_interface_proxy_brokers_ch (void);
 
-  /// visit an interface
   virtual int visit_interface (be_interface *node);
+  // visit an interface
 
-  /// This will just call the above method - no need to create
-  /// another set of visitors for this stuff.
   virtual int visit_component (be_component *node);
+  // This will just call the above method - no need to create
+  // another set of visitors for this stuff.
 };
 
 #endif /* BE_PROXY_BROKERS_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/proxy_impls_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface/proxy_impls_ch.h
index 5903fddd85f..b7b67bd306e 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/proxy_impls_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/proxy_impls_ch.h
@@ -1,30 +1,31 @@
-//=============================================================================
-/**
- *  @file    proxy_impls_ch.h
- *
- *  $Id$
- *
- *   Concrete visitor for the Interface node. This
- *   visitor handle the generation of the proxy
- *   implementations  class.
- *
- *
- *  @author  Angelo Corsaro <corsaro@cs.wustl.edu>
- */
-//=============================================================================
-
+//$Id$
+//
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    proxy_impls_ch.h
+//
+// = DESCRIPTION
+//     Concrete visitor for the Interface node. This
+//     visitor handle the generation of the proxy
+//     implementations  class.
+//
+// = AUTHOR
+//     Angelo Corsaro <corsaro@cs.wustl.edu>
+//
+// ============================================================================
 
 #ifndef BE_PROXY_BROKER_IMPLS_CH_H_
 #define BE_PROXY_BROKER_IMPLS_CH_H_
 
-/**
- * @class be_visitor_interface_proxy_impls_ch
- *
- * @brief Generates the declaration for the base proxy
- * implementation classes.
- */
 class be_visitor_interface_proxy_impls_ch : public be_visitor_interface
 {
+  // = TITLE
+  //   Generates the declaration for the base proxy
+  //   implementation classes.
 
 public:
   // -- Ctor/Dtor Decl. --
@@ -32,12 +33,12 @@ public:
 
   virtual ~be_visitor_interface_proxy_impls_ch (void);
 
-  /// visit an interface
   virtual int visit_interface (be_interface *node);
+  // visit an interface
 
-  /// This will just call the above method - no need to create
-  /// another set of visitors for this stuff.
   virtual int visit_component (be_component *node);
+  // This will just call the above method - no need to create
+  // another set of visitors for this stuff.
 };
 
 #endif /* BE_PROXY_BROKER_IMPLS_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/remote_proxy_broker_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface/remote_proxy_broker_ch.h
index a919cb5c4d3..3e7a9f4cd20 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/remote_proxy_broker_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/remote_proxy_broker_ch.h
@@ -1,30 +1,31 @@
-//=============================================================================
-/**
- *  @file    remote_proxy_broker_ch.h
- *
- *  $Id$
- *
- *   Concrete visitor for the Interface node. This
- *   visitor generates the declaration for the remote
- *   ProxyBroker class.
- *
- *
- *  @author  Angelo Corsaro <corsaro@cs.wustl.edu>
- */
-//=============================================================================
-
+//$Id$
+//
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    remote_proxy_broker_ch.h
+//
+// = DESCRIPTION
+//     Concrete visitor for the Interface node. This
+//     visitor generates the declaration for the remote
+//     ProxyBroker class.
+//
+// = AUTHOR
+//     Angelo Corsaro <corsaro@cs.wustl.edu>
+//
+// ============================================================================
 
 #ifndef BE_REMOTE_PROXY_BROKER_CH_H_
 #define BE_REMOTE_PROXY_BROKER_CH_H_
 
-/**
- * @class be_visitor_interface_remote_proxy_broker_ch
- *
- * @brief Generates the declaration for the base proxy
- * broker class.
- */
 class be_visitor_interface_remote_proxy_broker_ch : public be_visitor_interface
 {
+  // = TITLE
+  //   Generates the declaration for the base proxy
+  //   broker class.
 
 public:
   // -- Ctor/Dtor Decl. --
@@ -32,12 +33,12 @@ public:
 
   virtual ~be_visitor_interface_remote_proxy_broker_ch (void);
 
-  /// visit an interface
   virtual int visit_interface (be_interface *node);
+  // visit an interface
 
-  /// This will just call the above method - no need to create
-  /// another set of visitors for this stuff.
   virtual int visit_component (be_component *node);
+  // This will just call the above method - no need to create
+  // another set of visitors for this stuff.
 };
 
 #endif /* BE_REMOTE_PROXY_BROKER_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/remote_proxy_broker_cs.h b/TAO/TAO_IDL/be_include/be_visitor_interface/remote_proxy_broker_cs.h
index 5ca2b2ecd0e..4b5aa1fe514 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/remote_proxy_broker_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/remote_proxy_broker_cs.h
@@ -1,30 +1,31 @@
-//=============================================================================
-/**
- *  @file    remote_proxy_broker_cs.h
- *
- *  $Id$
- *
- *   Concrete visitor for the Interface node. This
- *   visitor generates the declaration for the remote
- *   ProxyBroker class.
- *
- *
- *  @author  Angelo Corsaro <corsaro@cs.wustl.edu>
- */
-//=============================================================================
-
+//$Id$
+//
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    remote_proxy_broker_cs.h
+//
+// = DESCRIPTION
+//     Concrete visitor for the Interface node. This
+//     visitor generates the declaration for the remote
+//     ProxyBroker class.
+//
+// = AUTHOR
+//     Angelo Corsaro <corsaro@cs.wustl.edu>
+//
+// ============================================================================
 
 #ifndef BE_REMOTE_PROXY_BROKER_CS_H_
 #define BE_REMOTE_PROXY_BROKER_CS_H_
 
-/**
- * @class be_visitor_interface_remote_proxy_broker_cs
- *
- * @brief Generates the implementation  for the base proxy
- * broker class.
- */
 class be_visitor_interface_remote_proxy_broker_cs : public be_visitor_interface
 {
+  // = TITLE
+  //   Generates the implementation  for the base proxy
+  //   broker class.
 
 public:
   // -- Ctor/Dtor Decl. --
@@ -32,12 +33,12 @@ public:
 
   virtual ~be_visitor_interface_remote_proxy_broker_cs (void);
 
-  /// visit an interface
   virtual int visit_interface (be_interface *node);
+  // visit an interface
 
-  /// This will just call the above method - no need to create
-  /// another set of visitors for this stuff.
   virtual int visit_component (be_component *node);
+  // This will just call the above method - no need to create
+  // another set of visitors for this stuff.
 };
 
 #endif /* BE_REMOTE_PROXY_BROKER_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/remote_proxy_impl_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface/remote_proxy_impl_ch.h
index da1de9779a0..d07f234ae18 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/remote_proxy_impl_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/remote_proxy_impl_ch.h
@@ -1,30 +1,31 @@
-//=============================================================================
-/**
- *  @file    remote_proxy_impl_ch.h
- *
- *  $Id$
- *
- *   Concrete visitor for the Interface node. This
- *   visitor handle the generation of the proxy
- *   implementations remote clas.
- *
- *
- *  @author  Angelo Corsaro <corsaro@cs.wustl.edu>
- */
-//=============================================================================
-
+//$Id$
+//
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    remote_proxy_impl_ch.h
+//
+// = DESCRIPTION
+//     Concrete visitor for the Interface node. This
+//     visitor handle the generation of the proxy
+//     implementations remote clas.
+//
+// = AUTHOR
+//     Angelo Corsaro <corsaro@cs.wustl.edu>
+//
+// ============================================================================
 
 #ifndef BE_REMOTE_PROXY_IMPL_CH_H_
 #define BE_REMOTE_PROXY_IMPL_CH_H_
 
-/**
- * @class be_visitor_interface_remote_proxy_impl_ch
- *
- * @brief Generates the declaration for the remote proxy
- * implementation classes.
- */
 class be_visitor_interface_remote_proxy_impl_ch : public be_visitor_interface
 {
+  // = TITLE
+  //   Generates the declaration for the remote proxy
+  //   implementation classes.
 
 public:
   // -- Ctor/Dtor Decl. --
@@ -32,18 +33,18 @@ public:
 
   virtual ~be_visitor_interface_remote_proxy_impl_ch (void);
 
-  /// visit an interface
   virtual int visit_interface (be_interface *node);
+  // visit an interface
 
-  /// This will just call the above method - no need to create
-  /// another set of visitors for this stuff.
   virtual int visit_component (be_component *node);
+  // This will just call the above method - no need to create
+  // another set of visitors for this stuff.
 
-  /// Helper to generate the declarations for the operations
-  /// of any abstract parents we may have.
   static int gen_abstract_ops_helper (be_interface *node,
                                       be_interface *base,
                                       TAO_OutStream *os);
+  // Helper to generate the declarations for the operations
+  // of any abstract parents we may have.
 };
 
 #endif /* BE_REMOTE_PROXY_IMPL_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/smart_proxy_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface/smart_proxy_ch.h
index 7f0274d368f..8a1a97ec2cc 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/smart_proxy_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/smart_proxy_ch.h
@@ -1,44 +1,46 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    smart_proxy_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Interface node.
- *  This provides code generation for smart proxy classes for an
- *  interface in the client header.
- *
- *
- *  @author Kirthika Parameswaran
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    smart_proxy_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Interface node.
+//    This provides code generation for smart proxy classes for an
+//    interface in the client header.
+//
+// = AUTHOR
+//    Kirthika Parameswaran
+//
+// ============================================================================
 
 #ifndef _BE_INTERFACE_SMART_PROXY_CH_H_
 #define _BE_INTERFACE_SMART_PROXY_CH_H_
 
-/**
- * @class be_visitor_interface_smart_proxy_ch
- *
- * @brief Generate the "smart proxy" class declaration.
- */
 class be_visitor_interface_smart_proxy_ch : public be_visitor_interface
 {
+  // = TITLE
+  //   Generate the "smart proxy" class declaration.
 
 public:
-  /// constructor
   be_visitor_interface_smart_proxy_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   virtual ~be_visitor_interface_smart_proxy_ch (void);
+  // destructor
 
-  /// visit an interface
   virtual int visit_interface (be_interface *node);
+  // visit an interface
 
-  /// This will just call the above method - no need to create
-  /// another set of visitors for this stuff.
   virtual int visit_component (be_component *node);
+  // This will just call the above method - no need to create
+  // another set of visitors for this stuff.
 };
 
 #endif /* _BE_INTERFACE_SMART_PROXY_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/smart_proxy_cs.h b/TAO/TAO_IDL/be_include/be_visitor_interface/smart_proxy_cs.h
index b27e517e583..f0d12a2bd3d 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/smart_proxy_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/smart_proxy_cs.h
@@ -1,43 +1,45 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    smart_proxy_cs.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Interface node.
- *  This provides code generation for smart proxy classes in the client stub.
- *
- *
- *  @author Kirthika Parameswaran
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    smart_proxy_cs.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Interface node.
+//    This provides code generation for smart proxy classes in the client stub.
+//
+// = AUTHOR
+//    Kirthika Parameswaran
+//
+// ============================================================================
 
 #ifndef _BE_INTERFACE_SMART_PROXY_CS_H_
 #define _BE_INTERFACE_SMART_PROXY_CS_H_
 
-/**
- * @class be_visitor_interface_smart_proxy_cs
- *
- * @brief Generate the "smart proxy" class declaration.
- */
 class be_visitor_interface_smart_proxy_cs : public be_visitor_interface
 {
+  // = TITLE
+  //   Generate the "smart proxy" class declaration.
 
 public:
-  /// constructor
   be_visitor_interface_smart_proxy_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   virtual ~be_visitor_interface_smart_proxy_cs (void);
+  // destructor
 
-  /// visit interface
   virtual int visit_interface (be_interface *node);
+  // visit interface
 
-  /// This will just call the above method - no need to create
-  /// another set of visitors for this stuff.
   virtual int visit_component (be_component *node);
+  // This will just call the above method - no need to create
+  // another set of visitors for this stuff.
 };
 
 #endif /* _BE_INTERFACE_SMART_PROXY_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/strategized_proxy_broker_sh.h b/TAO/TAO_IDL/be_include/be_visitor_interface/strategized_proxy_broker_sh.h
index 0373dc003dd..b06651ac36b 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/strategized_proxy_broker_sh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/strategized_proxy_broker_sh.h
@@ -1,30 +1,31 @@
-//=============================================================================
-/**
- *  @file    strategized_proxy_broker_sh.h
- *
- *  $Id$
- *
- *   Concrete visitor for the Interface node. This
- *   visitor generates the declaration for the strategized
- *   ProxyBroker class.
- *
- *
- *  @author  Angelo Corsaro <corsaro@cs.wustl.edu>
- */
-//=============================================================================
-
+//$Id$
+//
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    strategized_proxy_broker_sh.h
+//
+// = DESCRIPTION
+//     Concrete visitor for the Interface node. This
+//     visitor generates the declaration for the strategized
+//     ProxyBroker class.
+//
+// = AUTHOR
+//     Angelo Corsaro <corsaro@cs.wustl.edu>
+//
+// ============================================================================
 
 #ifndef BE_STRATEGIZED_PROXY_BROKER_SH_H_
 #define BE_STRATEGIZED_PROXY_BROKER_SH_H_
 
-/**
- * @class be_visitor_interface_strategized_proxy_broker_sh
- *
- * @brief Generates the declaration for the base proxy
- * broker class.
- */
 class be_visitor_interface_strategized_proxy_broker_sh : public be_visitor_interface
 {
+  // = TITLE
+  //   Generates the declaration for the base proxy
+  //   broker class.
 
 public:
   // -- Ctor/Dtor Decl. --
@@ -32,12 +33,12 @@ public:
 
   virtual ~be_visitor_interface_strategized_proxy_broker_sh (void);
 
-  /// visit an interface
   virtual int visit_interface (be_interface *node);
+  // visit an interface
 
-  /// This will just call the above method - no need to create
-  /// another set of visitors for this stuff.
   virtual int visit_component (be_component *node);
+  // This will just call the above method - no need to create
+  // another set of visitors for this stuff.
 };
 
 #endif /* BE_STRATEGIZED_PROXY_BROKER_SH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/strategized_proxy_broker_ss.h b/TAO/TAO_IDL/be_include/be_visitor_interface/strategized_proxy_broker_ss.h
index 2ef0624165a..7130a5c3fc4 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/strategized_proxy_broker_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/strategized_proxy_broker_ss.h
@@ -1,18 +1,22 @@
-//=============================================================================
-/**
- *  @file    strategized_proxy_broker_ss.h
- *
- *  $Id$
- *
- *   Concrete visitor for the Interface node. This
- *   visitor generates the declaration for the strategized
- *   ProxyBroker class.
- *
- *
- *  @author  Angelo Corsaro <corsaro@cs.wustl.edu>
- */
-//=============================================================================
-
+//$Id$
+//
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    strategized_proxy_broker_cs.h
+//
+// = DESCRIPTION
+//     Concrete visitor for the Interface node. This
+//     visitor generates the declaration for the strategized
+//     ProxyBroker class.
+//
+// = AUTHOR
+//     Angelo Corsaro <corsaro@cs.wustl.edu>
+//
+// ============================================================================
 
 #ifndef BE_STRATEGIZED_PROXY_BROKER_SS_H_
 #define BE_STRATEGIZED_PROXY_BROKER_SS_H_
@@ -30,12 +34,12 @@ public:
 
   virtual ~be_visitor_interface_strategized_proxy_broker_ss (void);
 
-  /// visit an interface
   virtual int visit_interface (be_interface *node);
+  // visit an interface
 
-  /// This will just call the above method - no need to create
-  /// another set of visitors for this stuff.
   virtual int visit_component (be_component *node);
+  // This will just call the above method - no need to create
+  // another set of visitors for this stuff.
 
 private:
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/tie_sh.h b/TAO/TAO_IDL/be_include/be_visitor_interface/tie_sh.h
index 7813870c0f6..fd27d61c022 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/tie_sh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/tie_sh.h
@@ -1,43 +1,49 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    tie_sh.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Interface node.
- *  This one provides the code generation for TIE classes
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    tie_sh.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Interface node.
+//    This one provides the code generation for TIE classes
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_INTERFACE_TIE_SH_H_
 #define _BE_INTERFACE_TIE_SH_H_
 
-/**
- * @class be_visitor_interface_tie_sh
- *
- * @brief be_visitor_interface_tie_sh
- *
- * This is a concrete visitor to generate the server header for the TIE class
- */
 class be_visitor_interface_tie_sh : public be_visitor_interface
 {
+  //
+  // = TITLE
+  //   be_visitor_interface_tie_sh
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the server header for the TIE class
+  //
+  //
 public:
-  /// constructor
   be_visitor_interface_tie_sh (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_interface_tie_sh (void);
+  // destructor
 
-  /// set the right context and make a visitor
   virtual int visit_interface (be_interface *node);
+  // set the right context and make a visitor
 
-  /// set the right context and make a visitor
   virtual int visit_component (be_component *node);
+  // set the right context and make a visitor
 
   static int method_helper (be_interface *,
                             be_interface *,
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/tie_ss.h b/TAO/TAO_IDL/be_include/be_visitor_interface/tie_ss.h
index 1eae5b827b5..9f6c28b733a 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface/tie_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface/tie_ss.h
@@ -1,49 +1,55 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    tie_ss.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Interface node.
- *  This one provides the code generation for TIE classes
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    tie_ss.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Interface node.
+//    This one provides the code generation for TIE classes
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_INTERFACE_TIE_SS_H_
 #define _BE_INTERFACE_TIE_SS_H_
 
-/**
- * @class be_visitor_interface_tie_ss
- *
- * @brief be_visitor_interface_tie_ss
- *
- * This is a concrete visitor to generate the server skeleton for operations
- * of the TIE class
- */
 class be_visitor_interface_tie_ss : public be_visitor_interface
 {
+  //
+  // = TITLE
+  //   be_visitor_interface_tie_ss
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the server skeleton for operations
+  //   of the TIE class
+  //
+  //
 public:
-  /// constructor
   be_visitor_interface_tie_ss (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_interface_tie_ss (void);
+  // destructor
 
-  /// set the right context and make a visitor
   virtual int visit_interface (be_interface *node);
+  // set the right context and make a visitor
 
-  /// set the right context and make a visitor
   virtual int visit_component (be_component *node);
+  // set the right context and make a visitor
 
-  /// helper method to generate method declaration in the TIE classes.
   static int method_helper (be_interface *,
                             be_interface *,
                             TAO_OutStream *os);
+  // helper method to generate method declaration in the TIE classes.
 };
 
 #endif /* _BE_INTERFACE_TIE_SS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface_fwd.h b/TAO/TAO_IDL/be_include/be_visitor_interface_fwd.h
index 6e1c5020b2b..91985c89078 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface_fwd.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface_fwd.h
@@ -1,18 +1,23 @@
 /* -*- C++ -*- */
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    be_visitor_interface_fwd.h
- *
- *  $Id$
- *
- *  Concrete visitor for the interface_fwd class
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_interface_fwd.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the interface_fwd class
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef TAO_BE_VISITOR_INTERFACE_FWD_H
 #define TAO_BE_VISITOR_INTERFACE_FWD_H
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/any_op_ch.h
index ef59ba05def..2c53d3aabd6 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/any_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/any_op_ch.h
@@ -1,42 +1,47 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    any_op_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for the forward declared Interface node.
- *  This one provides code generation for the Any operators.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    any_op_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the forward declared Interface node.
+//    This one provides code generation for the Any operators.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_INTERFACE_FWD_ANY_OP_CH_H_
 #define _BE_INTERFACE_FWD_ANY_OP_CH_H_
 
-/**
- * @class be_visitor_interface_fwd_any_op_ch
- *
- * @brief be_visitor_interface_fwd_any_op_ch
- *
- * This is a concrete visitor for forward declared interfaces that
- * generates the Any operator declaration.
- */
 class be_visitor_interface_fwd_any_op_ch : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //   be_visitor_interface_fwd_any_op_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for forward declared interfaces that
+  //   generates the Any operator declaration.
+  //
 
 public:
-  /// constructor
   be_visitor_interface_fwd_any_op_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_interface_fwd_any_op_ch (void);
+  // destructor
 
-  /// visit interface_fwd
   virtual int visit_interface_fwd (be_interface_fwd *node);
+  // visit interface_fwd
 };
 
 #endif /* _BE_INTERFACE_FWD_ANY_OP_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/cdr_op_ch.h
index f977d7464f6..9a75dc8bdc6 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/cdr_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/cdr_op_ch.h
@@ -1,44 +1,49 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    cdr_op_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for the InterfaceFwd class
- *  This one provides code generation for the CDR operators for the forward
- *  declared interface in the client header, if the node is not later defined
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the InterfaceFwd class
+//    This one provides code generation for the CDR operators for the forward
+//    declared interface in the client header, if the node is not later defined
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_INTERFACE_FWD_CDR_OP_CH_H_
 #define _BE_VISITOR_INTERFACE_FWD_CDR_OP_CH_H_
 
-/**
- * @class be_visitor_interface_fwd_cdr_op_ch
- *
- * @brief be_visitor_interface_fwd_cdr_op_ch
- *
- * This is a concrete visitor for forward declared interface that generates
- * the CDR operator declarations, if the node is not later defined.
- */
 class be_visitor_interface_fwd_cdr_op_ch : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //   be_visitor_interface_fwd_cdr_op_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for forward declared interface that generates
+  //   the CDR operator declarations, if the node is not later defined.
+  //
 
 public:
-  /// constructor
   be_visitor_interface_fwd_cdr_op_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_interface_fwd_cdr_op_ch (void);
+  // destructor
 
-  /// visit forward declared interface
   virtual int visit_interface_fwd (be_interface_fwd *node);
+  // visit forward declared interface
 };
 
 #endif /* _BE_VISITOR_INTERFACE_FWD_CDR_OP_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/interface_fwd_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/interface_fwd_ch.h
index 43bdb49b19b..71d37c0ee70 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/interface_fwd_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/interface_fwd_ch.h
@@ -1,40 +1,46 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    interface_fwd_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Interface Forward node.
- *  This one provides code generation for interface forward node.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    interface_fwd_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Interface Forward node.
+//    This one provides code generation for interface forward node.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_INTERFACE_INTERFACE_FWD_CH_H_
 #define _BE_INTERFACE_INTERFACE_FWD_CH_H_
 
-/**
- * @class be_visitor_interface_fwd_ch
- *
- * @brief be_visitor_interface_fwd_ch
- *
- * This is the visitor for interface_fwd for the header file
- */
 class be_visitor_interface_fwd_ch : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //   be_visitor_interface_fwd_ch
+  //
+  // = DESCRIPTION
+  //   This is the visitor for interface_fwd for the header file
+  //
+  //
 public:
-  /// constructor
   be_visitor_interface_fwd_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_interface_fwd_ch (void);
+  // destructor
 
-  /// visit interface_fwd.
   virtual int visit_interface_fwd (be_interface_fwd *node);
+  // visit interface_fwd.
 };
 
 #endif /* _BE_INTERFACE_INTERFACE_FWD_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_module.h b/TAO/TAO_IDL/be_include/be_visitor_module.h
index 6af50f862eb..be863aa967f 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_module.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_module.h
@@ -1,18 +1,23 @@
 /* -*- c++ -*- */
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    be_visitor_module.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Module class
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_module.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Module class
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef TAO_BE_VISITOR_MODULE_H
 #define TAO_BE_VISITOR_MODULE_H
diff --git a/TAO/TAO_IDL/be_include/be_visitor_module/any_op.h b/TAO/TAO_IDL/be_include/be_visitor_module/any_op.h
index 186dbee2174..a41fec48195 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_module/any_op.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_module/any_op.h
@@ -1,44 +1,49 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    any_op.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Module class
- *  This one provides visitors to generate the Any operators for elements in
- *  the Module's scope.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    any_op.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Module class
+//    This one provides visitors to generate the Any operators for elements in
+//    the Module's scope.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_MODULE_ANY_OP_H_
 #define _BE_VISITOR_MODULE_ANY_OP_H_
 
-/**
- * @class be_visitor_module_any_op
- *
- * @brief be_visitor_module_any_op
- *
- * This is a concrete visitor for module that generates the Any operator
- * declarations and implementations
- */
 class be_visitor_module_any_op : public be_visitor_module
 {
+  //
+  // = TITLE
+  //   be_visitor_module_any_op
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for module that generates the Any operator
+  //   declarations and implementations
+  //
 
 public:
-  /// constructor
   be_visitor_module_any_op (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_module_any_op (void);
+  // destructor
 
-  /// visit module
   virtual int visit_module (be_module *node);
+  // visit module
 };
 
 #endif /* _BE_VISITOR_MODULE_ANY_OP_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_module/cdr_op.h b/TAO/TAO_IDL/be_include/be_visitor_module/cdr_op.h
index dfc2c85171b..78a56a082f9 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_module/cdr_op.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_module/cdr_op.h
@@ -1,44 +1,49 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    cdr_op.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Module class
- *  This one provides visitors to generate the CDR operators for elements in
- *  the Module's scope.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Module class
+//    This one provides visitors to generate the CDR operators for elements in
+//    the Module's scope.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_MODULE_CDR_OP_H_
 #define _BE_VISITOR_MODULE_CDR_OP_H_
 
-/**
- * @class be_visitor_module_cdr_op
- *
- * @brief be_visitor_module_cdr_op
- *
- * This is a concrete visitor for module that generates the CDR operator
- * declarations and implementations
- */
 class be_visitor_module_cdr_op : public be_visitor_module
 {
+  //
+  // = TITLE
+  //   be_visitor_module_cdr_op
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for module that generates the CDR operator
+  //   declarations and implementations
+  //
 
 public:
-  /// constructor
   be_visitor_module_cdr_op (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_module_cdr_op (void);
+  // destructor
 
-  /// visit module
   virtual int visit_module (be_module *node);
+  // visit module
 };
 
 #endif /* _BE_VISITOR_MODULE_CDR_OP_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_module/module.h b/TAO/TAO_IDL/be_include/be_visitor_module/module.h
index 3c290107758..d1c045d3aed 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_module/module.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_module/module.h
@@ -1,59 +1,106 @@
 /* -*- c++ -*- */
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    module.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Module class
- *  This one provides the generic visitor for the Module node.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    module.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Module class
+//    This one provides the generic visitor for the Module node.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_MODULE_MODULE_H_
 #define _BE_VISITOR_MODULE_MODULE_H_
 
-/**
- * @class be_visitor_module
- *
- * @brief be_visitor_module
- *
- * This is a concrete visitor for module that abstracts all common tasks.
- */
 class be_visitor_module : public be_visitor_scope
 {
+  //
+  // = TITLE
+  //   be_visitor_module
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for module that abstracts all common tasks.
+  //
 
 public:
   be_visitor_module (be_visitor_context *ctx);
+  // constructor
 
   ~be_visitor_module (void);
+  // destructor
+
+  // =visit methods on all elements syntactically valid in a Module scope
 
   virtual int visit_constant (be_constant *node);
+  // visit a constant
+
   virtual int visit_enum (be_enum *node);
+  // visit an enum
+
   virtual int visit_native (be_native *node);
+  // visit a native
+
   virtual int visit_exception (be_exception *node);
+  // visit an exception
+
   virtual int visit_interface (be_interface *node);
+  // visit an interface
+
   virtual int visit_interface_fwd (be_interface_fwd *node);
+  // visit a forward declared interface
+
   virtual int visit_valuebox (be_valuebox *node);
+  // visit the valuebox node
+
   virtual int visit_valuetype (be_valuetype *node);
+  // visit a valuetype
+
   virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+  // visit a forward declared valuetype
+
   virtual int visit_eventtype (be_eventtype *node);
+  // visit an eventtype
+
   virtual int visit_eventtype_fwd (be_eventtype_fwd *node);
+  // visit a forward declared eventtype
+
   virtual int visit_component (be_component *node);
+  // visit a component
+
   virtual int visit_component_fwd (be_component_fwd *node);
+  // visit a forward declared component
+
   virtual int visit_home (be_home *node);
-  virtual int visit_connector (be_connector *node);
+  // visit a home
+
   virtual int visit_module (be_module *node);
+  // visit a module
+
   virtual int visit_structure (be_structure *node);
+  // visit a structure
+
   virtual int visit_structure_fwd (be_structure_fwd *node);
+  // visit a structure
+
   virtual int visit_union (be_union *node);
+  // visit a union
+
   virtual int visit_union_fwd (be_union_fwd *node);
+  // visit a union
+
   virtual int visit_typedef (be_typedef *node);
+  // visit the typedef node
 };
 
 #endif /* _BE_VISITOR_MODULE_MODULE_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_module/module_ch.h b/TAO/TAO_IDL/be_include/be_visitor_module/module_ch.h
index b982a1a7217..da55a641498 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_module/module_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_module/module_ch.h
@@ -1,41 +1,47 @@
 /* -*- c++ -*- */
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    module_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Module class
- *  This provides code generation for the module in the client header.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    module_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Module class
+//    This provides code generation for the module in the client header.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_MODULE_MODULE_CH_H_
 #define _BE_VISITOR_MODULE_MODULE_CH_H_
 
-/**
- * @class be_visitor_module_ch
- *
- * @brief be_visitor_module_ch
- *
- * This is a concrete visitor to generate the client header for module
- */
 class be_visitor_module_ch : public be_visitor_module
 {
+  //
+  // = TITLE
+  //   be_visitor_module_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the client header for module
+  //
+  //
 public:
-  /// constructor
   be_visitor_module_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_module_ch (void);
+  // destructor
 
-  /// visit module. We provide code for this method in the derived class
   virtual int visit_module (be_module *node);
+  // visit module. We provide code for this method in the derived class
 };
 
 #endif /* _BE_VISITOR_MODULE_MODULE_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_module/module_ih.h b/TAO/TAO_IDL/be_include/be_visitor_module/module_ih.h
index 7e8bbdf6cc6..40e1b9f351a 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_module/module_ih.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_module/module_ih.h
@@ -1,42 +1,46 @@
 /* -*- c++ -*- */
-
-
-//=============================================================================
-/**
- *  @file    module_ih.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Module class
- *  This provides code generation for the module in the implementation header.
- *
- *
- *  @author Yamuna Krishnamurthy (yamuna@cs.wustl.edu)
- */
-//=============================================================================
-
+// $Id$
+
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    module_ih.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Module class
+//    This provides code generation for the module in the implementation header.
+//
+// = AUTHOR
+//   Yamuna Krishnamurthy (yamuna@cs.wustl.edu)
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_MODULE_MODULE_IH_H_
 #define _BE_VISITOR_MODULE_MODULE_IH_H_
 
-/**
- * @class be_visitor_module_ih
- *
- * @brief be_visitor_module_ih
- *
- * This is a concrete visitor to generate the implementation header for module
- */
 class be_visitor_module_ih : public be_visitor_module
 {
+  //
+  // = TITLE
+  //   be_visitor_module_ih
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the implementation header for module
+  //
+  //
 public:
-  /// constructor
   be_visitor_module_ih (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_module_ih (void);
+  // destructor
 
-  /// visit module. We provide code for this method in the derived class
   virtual int visit_module (be_module *node);
+  // visit module. We provide code for this method in the derived class
 };
 
 #endif /* _BE_VISITOR_MODULE_MODULE_SH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_module/module_sh.h b/TAO/TAO_IDL/be_include/be_visitor_module/module_sh.h
index 00541b393da..b70f41e6f86 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_module/module_sh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_module/module_sh.h
@@ -1,41 +1,47 @@
 /* -*- c++ -*- */
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    module_sh.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Module class
- *  This provides code generation for the module in the server header.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    module_sh.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Module class
+//    This provides code generation for the module in the server header.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_MODULE_MODULE_SH_H_
 #define _BE_VISITOR_MODULE_MODULE_SH_H_
 
-/**
- * @class be_visitor_module_sh
- *
- * @brief be_visitor_module_sh
- *
- * This is a concrete visitor to generate the server header for module
- */
 class be_visitor_module_sh : public be_visitor_module
 {
+  //
+  // = TITLE
+  //   be_visitor_module_sh
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the server header for module
+  //
+  //
 public:
-  /// constructor
   be_visitor_module_sh (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_module_sh (void);
+  // destructor
 
-  /// visit module. We provide code for this method in the derived class
   virtual int visit_module (be_module *node);
+  // visit module. We provide code for this method in the derived class
 };
 
 #endif /* _BE_VISITOR_MODULE_MODULE_SH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_module/serializer_op.h b/TAO/TAO_IDL/be_include/be_visitor_module/serializer_op.h
index 2481284b5cb..54d83515334 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_module/serializer_op.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_module/serializer_op.h
@@ -1,45 +1,50 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    serializer_op.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Module class
- *  This one provides visitors to generate the 
- *  TAO::DCPS::Serializer operators for elements in
- *  the Module's scope.
- *
- *
- *  @author Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    serializer_op.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Module class
+//    This one provides visitors to generate the 
+//    TAO::DCPS::Serializer operators for elements in
+//    the Module's scope.
+//
+// = AUTHOR
+//    Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_MODULE_serializer_op_H_
 #define _BE_VISITOR_MODULE_serializer_op_H_
 
-/**
- * @class be_visitor_module_serializer_op
- *
- * @brief be_visitor_module_serializer_op
- *
- * This is a concrete visitor for module that generates the Serializer operator
- * declarations and implementations
- */
 class be_visitor_module_serializer_op : public be_visitor_module
 {
+  //
+  // = TITLE
+  //   be_visitor_module_serializer_op
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for module that generates the Serializer operator
+  //   declarations and implementations
+  //
 
 public:
-  /// constructor
   be_visitor_module_serializer_op (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_module_serializer_op (void);
+  // destructor
 
-  /// visit module
   virtual int visit_module (be_module *node);
+  // visit module
 };
 
 #endif /* _BE_VISITOR_MODULE_serializer_op_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_native.h b/TAO/TAO_IDL/be_include/be_visitor_native.h
index 269e8d24684..c3cc894dd9c 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_native.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_native.h
@@ -1,18 +1,23 @@
 /* -*- c++ -*- */
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    be_visitor_native.h
- *
- *  $Id$
- *
- *  Concrete visitor for the native class
- *
- *
- *  @author Johnny Willemsen
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_native.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the native class
+//
+// = AUTHOR
+//    Johnny Willemsen
+//
+// ============================================================================
 
 #ifndef TAO_BE_VISITOR_NATIVE_H
 #define TAO_BE_VISITOR_NATIVE_H
diff --git a/TAO/TAO_IDL/be_include/be_visitor_native/native_ch.h b/TAO/TAO_IDL/be_include/be_visitor_native/native_ch.h
index 45a29b65cbe..284fd66451c 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_native/native_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_native/native_ch.h
@@ -1,40 +1,46 @@
 /* -*- C++ -*- */
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    native_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for Native generating code in the client header.
- *
- *
- *  @author Johnny Willemsen
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    native_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for Native generating code in the client header.
+//
+// = AUTHOR
+//    Johnny Willemsen
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_NATIVE_NATIVE_CH_H_
 #define _BE_VISITOR_NATIVE_NATIVE_CH_H_
 
-/**
- * @class be_visitor_native_ch
- *
- * @brief be_visitor_native_ch
- *
- * This is the base visitor for enum for the header file
- */
 class be_visitor_native_ch : public be_visitor_scope
 {
+  //
+  // = TITLE
+  //   be_visitor_native_ch
+  //
+  // = DESCRIPTION
+  //   This is the base visitor for enum for the header file
+  //
+  //
 public:
-  /// conenumor
   be_visitor_native_ch (be_visitor_context *ctx);
+  // conenumor
 
-  /// deenumor
   ~be_visitor_native_ch (void);
+  // deenumor
 
-  /// visit native.
   virtual int visit_native (be_native *node);
+  // visit native.
 };
 
 #endif /* _BE_VISITOR_NATIVE_NATIVE_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_null_return_value.h b/TAO/TAO_IDL/be_include/be_visitor_null_return_value.h
index 879ae5621ad..883582526ca 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_null_return_value.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_null_return_value.h
@@ -1,17 +1,22 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    be_visitor_null_return_value.h
- *
- *  $Id$
- *
- *  Encapsulation of rules for generating null return values
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO_IDL_BE
+//
+// = FILENAME
+//    be_visitor_null_return_value.h
+//
+// = DESCRIPTION
+//    Encapsulation of rules for generating null return values
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef BE_VISITOR_NULL_RETURN_VALUE_H
 #define BE_VISITOR_NULL_RETURN_VALUE_H
@@ -20,17 +25,18 @@
 
 class TAO_OutStream;
 
-/**
- * @class be_visitor_null_return_value
- *
- * @brief be_visitor_null_return_value
- *
- * Contains overloaded methods that generate null return
- * values, compliant with the CORBA IDL C++ mapping, and
- * portable to all platforms supported by ACE.
- */
 class be_visitor_null_return_value : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //   be_visitor_null_return_value
+  //
+  // = DESCRIPTION
+  //   Contains overloaded methods that generate null return
+  //   values, compliant with the CORBA IDL C++ mapping, and
+  //   portable to all platforms supported by ACE.
+  //
+  //
 public:
   be_visitor_null_return_value (be_visitor_context *ctx);
   virtual ~be_visitor_null_return_value (void);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation.h b/TAO/TAO_IDL/be_include/be_visitor_operation.h
index 96881efcb0b..684d9ca7c63 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation.h
@@ -1,18 +1,23 @@
 /* -*- c++ -*- */
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    be_visitor_operation.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Operation class
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_operation.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Operation class
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef TAO_BE_VISITOR_OPERATION_H
 #define TAO_BE_VISITOR_OPERATION_H
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/ami_ch.h b/TAO/TAO_IDL/be_include/be_visitor_operation/ami_ch.h
index 77800e5279b..2c962022eca 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/ami_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/ami_ch.h
@@ -1,18 +1,23 @@
-
-//=============================================================================
-/**
- *  @file    ami_ch.h
- *
- *  $Id$
- *
- *  Visitor for generating AMI stub code for IDL operations in
- *  client header.
- *
- *
- *  @author Alexander Babu Arulanthu <alex@cs.wustl.edu>
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    ami_ch.h
+//
+// = DESCRIPTION
+//    Visitor for generating AMI stub code for IDL operations in
+//    client header.
+//
+// = AUTHOR
+//    Alexander Babu Arulanthu <alex@cs.wustl.edu>
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_OPERATION_AMI_CH_H_
 #define _BE_VISITOR_OPERATION_AMI_CH_H_
@@ -21,25 +26,26 @@
 // Operation visitor to generate AMI stubs for client header
 // ************************************************************
 
-/**
- * @class be_visitor_operation_ami_ch
- *
- * @brief be_visitor_operation_ami_ch.
- *
- * This is a concrete visitor to generate the AMI stubs in the
- * client header for operation.
- */
 class be_visitor_operation_ami_ch : public be_visitor_operation
 {
+  //
+  // = TITLE
+  //     be_visitor_operation_ami_ch.
+  //
+  // = DESCRIPTION
+  //     This is a concrete visitor to generate the AMI stubs in the
+  //     client header for operation.
+  //
+  //
 public:
-  /// constructor
   be_visitor_operation_ami_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_operation_ami_ch (void);
+  // destructor
 
-  /// visit operation.
   virtual int visit_operation (be_operation *node);
+  // visit operation.
 };
 
 #endif /* _BE_VISITOR_OPERATION_AMI_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/ami_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/ami_cs.h
index 3e96d971477..287018111cc 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/ami_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/ami_cs.h
@@ -1,17 +1,22 @@
-
-//=============================================================================
-/**
- *  @file    ami_cs.h
- *
- *  $Id$
- *
- *  Visitor for generating code for IDL operations in client stubs
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    ami_cs.h
+//
+// = DESCRIPTION
+//    Visitor for generating code for IDL operations in client stubs
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_OPERATION_AMI_CS_H_
 #define _BE_VISITOR_OPERATION_AMI_CS_H_
@@ -20,36 +25,37 @@
 // Operation visitor for client stubs
 // ************************************************************
 
-/**
- * @class be_visitor_operation_ami_cs
- *
- * @brief be_visitor_operation_ami_cs
- *
- * This is a concrete visitor to generate the client stubs for operation
- */
 class be_visitor_operation_ami_cs : public be_visitor_operation
 {
+  //
+  // = TITLE
+  //   be_visitor_operation_ami_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the client stubs for operation
+  //
+  //
 public:
-  /// constructor
   be_visitor_operation_ami_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_operation_ami_cs (void);
+  // destructor
 
-  /// visit operation.
   virtual int visit_operation (be_operation *node);
+  // visit operation.
 
-  /// visit argument to generate ParamData entries
   virtual int visit_argument (be_argument *node);
+  // visit argument to generate ParamData entries
 
   // = template methods
-  /// generate any info before the actual code for the stub is generated
   int gen_pre_stub_info (be_operation *node,
                          be_type *bt);
+  // generate any info before the actual code for the stub is generated
 
   // =helper
-  /// stuff to output after every member of the scope is handled
   virtual int post_process (be_decl *);
+  // stuff to output after every member of the scope is handled
 };
 
 #endif /* _BE_VISITOR_OPERATION_AMI_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/ami_exception_holder_operation_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/ami_exception_holder_operation_cs.h
index 04fec4105f3..95511995658 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/ami_exception_holder_operation_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/ami_exception_holder_operation_cs.h
@@ -1,40 +1,46 @@
-
-//=============================================================================
-/**
- *  @file    ami_exception_holder_operation_cs.h
- *
- *  $Id$
- *
- *  Visitor for generating code for IDL operations in client stubs
- *
- *
- *  @author Michael Kircher <Michael.Kircher@mchp.siemens.de<
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    operation_ami_exception_holder_operation_cs.h
+//
+// = DESCRIPTION
+//    Visitor for generating code for IDL operations in client stubs
+//
+// = AUTHOR
+//    Michael Kircher <Michael.Kircher@mchp.siemens.de<
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_OPERATION_OPERATION_AMI_EXCEPTION_HOLDER_OPERATION_CS_H_
 #define _BE_VISITOR_OPERATION_OPERATION_AMI_EXCEPTION_HOLDER_OPERATION_CS_H_
 
 
-/**
- * @class be_visitor_operation_ami_exception_holder_operation_cs
- *
- * @brief be_visitor_operation_ami_exception_holder_operation_cs
- *
- * This is a concrete visitor to generate the client stubs for operation
- */
 class be_visitor_operation_ami_exception_holder_operation_cs : public be_visitor_operation
 {
+  //
+  // = TITLE
+  //   be_visitor_operation_ami_exception_holder_operation_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the client stubs for operation
+  //
+  //
 public:
-  /// constructor
   be_visitor_operation_ami_exception_holder_operation_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_operation_ami_exception_holder_operation_cs (void);
+  // destructor
 
-  /// visit operation.
   virtual int visit_operation (be_operation *node);
+  // visit operation.
 };
 
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/ami_handler_reply_stub_operation_ch.h b/TAO/TAO_IDL/be_include/be_visitor_operation/ami_handler_reply_stub_operation_ch.h
index fd4cea6664b..800641aa5d9 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/ami_handler_reply_stub_operation_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/ami_handler_reply_stub_operation_ch.h
@@ -1,18 +1,24 @@
-
-//=============================================================================
-/**
- *  @file    ami_handler_reply_stub_operation_ch.h
- *
- *  $Id$
- *
- *  Visitor for generating code for AMI Handler call back operations
- *  in client header.
- *
- *
- *  @author Aniruddha Gokhale and Alexander Babu Arulanthu <alex@cs.wustl.edu>
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    ami_handler_reply_stub_operation_ch.h
+//
+// = DESCRIPTION
+//    Visitor for generating code for AMI Handler call back operations
+//    in client header.
+//
+// = AUTHOR
+//    Aniruddha Gokhale and Alexander Babu Arulanthu
+//    <alex@cs.wustl.edu>
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_OPERATION_ami_handler_reply_stub_operation_ch_H_
 #define _BE_VISITOR_OPERATION_ami_handler_reply_stub_operation_ch_H_
@@ -21,24 +27,25 @@
 // Operation visitor for server header
 // ************************************************************
 
-/**
- * @class be_visitor_operation_ami_handler_reply_stub_operation_ch
- *
- * @brief be_visitor_ami_handler_reply_stub_operation_ch
- *
- * This is a concrete visitor to generate the server header for operation
- */
 class be_visitor_operation_ami_handler_reply_stub_operation_ch : public be_visitor_operation
 {
+  //
+  // = TITLE
+  //   be_visitor_ami_handler_reply_stub_operation_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the server header for operation
+  //
+  //
 public:
-  /// constructor
   be_visitor_operation_ami_handler_reply_stub_operation_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_operation_ami_handler_reply_stub_operation_ch (void);
+  // destructor
 
-  /// visit operation.
   virtual int visit_operation (be_operation *node);
+  // visit operation.
 };
 
 #endif /* _BE_VISITOR_OPERATION_ami_handler_reply_stub_operation_ch_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/ami_handler_reply_stub_operation_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/ami_handler_reply_stub_operation_cs.h
index 5a1d4ab1f63..5dac08ce2b8 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/ami_handler_reply_stub_operation_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/ami_handler_reply_stub_operation_cs.h
@@ -1,18 +1,23 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    ami_handler_reply_stub_operation_cs.h
- *
- *  $Id$
- *
- *  Visitor for generating code skelton code for IDL operations
- *  of AMI Reply Handlers.
- *
- *
- *  @author Michael Kircher
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    operation_ami_handler_reply_stub_operation_cs.h
+//
+// = DESCRIPTION
+//    Visitor for generating code skelton code for IDL operations
+//    of AMI Reply Handlers.
+//
+// = AUTHOR
+//    Michael Kircher
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_OPERATION_OPERATION_AMI_HANDLER_REPLY_STUB_OPERATION_CS_H_
 #define _BE_VISITOR_OPERATION_OPERATION_AMI_HANDLER_REPLY_STUB_OPERATION_CS_H_
@@ -21,41 +26,42 @@
 // Operation visitor for client stubs
 // ************************************************************
 
-/**
- * @class be_visitor_operation_ami_handler_reply_stub_operation_cs
- *
- * @brief be_visitor_operation_ami_handler_operation_cs
- *
- * Visitor for generating code skelton code for IDL operations
- * of AMI Reply Handlers.
- */
 class be_visitor_operation_ami_handler_reply_stub_operation_cs : public be_visitor_operation
 {
+  //
+  // = TITLE
+  //   be_visitor_operation_ami_handler_operation_cs
+  //
+  // = DESCRIPTION
+  //    Visitor for generating code skelton code for IDL operations
+  //    of AMI Reply Handlers.
+  //
+  //
 public:
-  /// constructor
   be_visitor_operation_ami_handler_reply_stub_operation_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_operation_ami_handler_reply_stub_operation_cs (void);
+  // destructor
 
-  /// visit operation.
   virtual int visit_operation (be_operation *node);
+  // visit operation.
 
-  /// visit argument to generate ParamData entries
   virtual int visit_argument (be_argument *node);
+  // visit argument to generate ParamData entries
 
   // = template methods
-  /// generate any info before the actual code for the stub is generated
-  int gen_pre_stub_info (be_operation *node,
+  int gen_pre_stub_info (be_operation *node, 
                          be_type *bt);
+  // generate any info before the actual code for the stub is generated
 
-  /// generate code that marshals the arguments and transmits them
-  virtual int gen_marshal_and_invoke (be_operation *node,
+  virtual int gen_marshal_and_invoke (be_operation *node, 
                                       be_type *bt);
+  // generate code that marshals the arguments and transmits them
 
   // =helper
-  /// stuff to output after every member of the scope is handled
   virtual int post_process (be_decl *);
+  // stuff to output after every member of the scope is handled
 };
 
 #endif /* _BE_VISITOR_OPERATION_OPERATION_AMI_HANDLER_REPLY_STUB_OPERATION_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/arglist.h b/TAO/TAO_IDL/be_include/be_visitor_operation/arglist.h
index e3e00e96b33..ee03504ded5 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/arglist.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/arglist.h
@@ -1,18 +1,23 @@
-
-//=============================================================================
-/**
- *  @file    arglist.h
- *
- *  $Id$
- *
- *  Visitor for generating code for IDL operations. This generates the
- *  operation signature.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    arglist.h
+//
+// = DESCRIPTION
+//    Visitor for generating code for IDL operations. This generates the
+//    operation signature.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_OPERATION_ARGLIST_H_
 #define _BE_VISITOR_OPERATION_ARGLIST_H_
@@ -21,29 +26,34 @@
 // Operation visitor for argument list - generates parameters in the signature
 // ******************************************************************************
 
-/**
- * @class be_visitor_operation_arglist
- *
- * @brief be_visitor_operaion_arglist
- *
- * This is a visitor to generate operation argument list
- */
 class be_visitor_operation_arglist : public be_visitor_operation
 {
+  //
+  // = TITLE
+  //   be_visitor_operaion_arglist
+  //
+  // = DESCRIPTION
+  //   This is a visitor to generate operation argument list
+  //
+  //
 public:
   be_visitor_operation_arglist (be_visitor_context *ctx);
+  // constructor
 
   ~be_visitor_operation_arglist (void);
+  // destructor
 
   virtual int visit_operation (be_operation *node);
-  virtual int visit_factory (be_factory *node);
+  // visit the operation
+
   virtual int visit_argument (be_argument *node);
+  // visit each argument
 
-  /// Stuff to output after each element of the scope is handled.
   virtual int post_process (be_decl *);
+  // stuff to o/p after each element of the scope is handled.
   
-  /// Set the member.
   void unused (bool val);
+  // Set the member.
   
 private:
   bool unused_;
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/argument.h b/TAO/TAO_IDL/be_include/be_visitor_operation/argument.h
index 2e95bc998ce..06a7d315b10 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/argument.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/argument.h
@@ -1,18 +1,23 @@
-
-//=============================================================================
-/**
- *  @file    argument.h
- *
- *  $Id$
- *
- *  Visitor for generating code for IDL operations. This is a generic visitor
- *  that calls visitors for the Argument class.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    argument.h
+//
+// = DESCRIPTION
+//    Visitor for generating code for IDL operations. This is a generic visitor
+//    that calls visitors for the Argument class.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_OPERATION_ARGUMENT_H_
 #define _BE_VISITOR_OPERATION_ARGUMENT_H_
@@ -21,31 +26,31 @@
 // generic operation visitor for docall, upcall, pre/post
 // ************************************************************
 
-/**
- * @class be_visitor_operation_argument
- *
- * @brief be_visitor_operation_argument
- *
- * This is a visitor to generate a variable declaration ofr an operation
- * return type
- */
 class be_visitor_operation_argument : public be_visitor_operation
 {
+  //
+  // = TITLE
+  //   be_visitor_operation_argument
+  //
+  // = DESCRIPTION
+  //   This is a visitor to generate a variable declaration ofr an operation
+  //   return type
+  //
 public:
-  /// constructor
   be_visitor_operation_argument (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_operation_argument (void);
+  // destructor
 
-  /// stuff to o/p after each element of the scope is handled
   virtual int post_process (be_decl *);
+  // stuff to o/p after each element of the scope is handled
 
-  /// visit the operation
   virtual int visit_operation (be_operation *node);
+  // visit the operation
 
-  /// visit argument
   virtual int visit_argument (be_argument *node);
+  // visit argument
 };
 
 #endif /* _BE_VISITOR_OPERATION_ARGUMENT_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/argument_invoke.h b/TAO/TAO_IDL/be_include/be_visitor_operation/argument_invoke.h
index 5d6d7e45864..47ed79ccfaa 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/argument_invoke.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/argument_invoke.h
@@ -1,19 +1,24 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    argument_invoke.h
- *
- *  $Id$
- *
- *  Visitor for generating code for IDL operations. This is a visitor for
- *  passing arguments to the CDR operators in a compiled marshaling
- *  stub/skeleton
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    argument_invoke.h
+//
+// = DESCRIPTION
+//    Visitor for generating code for IDL operations. This is a visitor for
+//    passing arguments to the CDR operators in a compiled marshaling
+//    stub/skeleton
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_OPERATION_ARGUMENT_INVOKE_H_
 #define _BE_VISITOR_OPERATION_ARGUMENT_INVOKE_H_
@@ -34,17 +39,17 @@ class be_visitor_operation_argument_invoke
   //   return type
   //
 public:
-  /// constructor
   be_visitor_operation_argument_invoke (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_operation_argument_invoke (void);
+  // destructor
 
-  /// stuff to o/p before each element of the scope is handled
   virtual int pre_process (be_decl *bd);
+  // stuff to o/p before each element of the scope is handled
 
-  /// stuff to o/p after each element of the scope is handled
   virtual int post_process (be_decl *bd);
+  // stuff to o/p after each element of the scope is handled
 
   enum LAST_ARG_PRINTED
   {
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/argument_marshal.h b/TAO/TAO_IDL/be_include/be_visitor_operation/argument_marshal.h
index a42ef19565d..183b1baa7b3 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/argument_marshal.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/argument_marshal.h
@@ -1,19 +1,24 @@
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    argument_marshal.h
- *
- *  $Id$
- *
- *  Visitor for generating code for IDL operations. This is a visitor for
- *  passing arguments to the CDR operators in a compiled marshaling
- *  stub/skeleton
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    argument_marshal.h
+//
+// = DESCRIPTION
+//    Visitor for generating code for IDL operations. This is a visitor for
+//    passing arguments to the CDR operators in a compiled marshaling
+//    stub/skeleton
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_OPERATION_ARGUMENT_MARSHAL_H_
 #define _BE_VISITOR_OPERATION_ARGUMENT_MARSHAL_H_
@@ -34,17 +39,17 @@ class be_visitor_operation_argument_marshal
   //   return type
   //
 public:
-  /// constructor
   be_visitor_operation_argument_marshal (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_operation_argument_marshal (void);
+  // destructor
 
-  /// stuff to o/p before each element of the scope is handled
   virtual int pre_process (be_decl *bd);
+  // stuff to o/p before each element of the scope is handled
 
-  /// stuff to o/p after each element of the scope is handled
   virtual int post_process (be_decl *bd);
+  // stuff to o/p after each element of the scope is handled
 
   enum LAST_ARG_PRINTED
   {
@@ -60,19 +65,19 @@ private:
 
 // ****************************************************************
 
-/**
- * @class be_visitor_args_decl
- *
- * @brief be_visitor_compiled_args_decl
- *
- * This is a visitor to generate variables declarations in the
- * compiled marshaling stubs.
- */
 class be_visitor_args_decl : public be_visitor_scope
 {
+  //
+  // = TITLE
+  //   be_visitor_compiled_args_decl
+  //
+  // = DESCRIPTION
+  //   This is a visitor to generate variables declarations in the
+  //   compiled marshaling stubs.
+  //
 public:
-  /// constructor
   be_visitor_args_decl (be_visitor_context *ctx);
+  // constructor
 
   int visit_array (be_array *node);
   int visit_typedef (be_typedef *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/base_proxy_impl_ch.h b/TAO/TAO_IDL/be_include/be_visitor_operation/base_proxy_impl_ch.h
index 6634ce65a66..c8d2dd9158c 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/base_proxy_impl_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/base_proxy_impl_ch.h
@@ -1,40 +1,45 @@
-//=============================================================================
-/**
- *  @file    base_proxy_impl_ch.h
- *
- *  $Id$
- *
- *  Visitor for generating code for proxy implementations.
- *
- *
- *  @author Angelo Corsaro
- */
-//=============================================================================
-
+// $Id$
+//
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    base_proxy_impl_ch.h
+//
+// = DESCRIPTION
+//    Visitor for generating code for proxy implementations.
+//
+// = AUTHOR
+//    Angelo Corsaro
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_OPERATION_BASE_PROXY_IMPL_CH_H_
 #define _BE_VISITOR_OPERATION_BASE_PROXY_IMPL_CH_H_
 
 
-/**
- * @class be_visitor_operation_base_proxy_impl_ch
- *
- * @brief be_visitor_operation_base_proxy_impl_ch
- *
- * Concrete visitor that generates the code for the base class
- * of Proxy Impls.
- */
 class be_visitor_operation_base_proxy_impl_ch : public be_visitor_scope
 {
+  //
+  // = TITLE
+  //   be_visitor_operation_base_proxy_impl_ch
+  //
+  // = DESCRIPTION
+  //   Concrete visitor that generates the code for the base class
+  //   of Proxy Impls.
+  //
+  //
 public:
-  /// constructor
   be_visitor_operation_base_proxy_impl_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_operation_base_proxy_impl_ch (void);
+  // destructor
 
-  /// visit operation.
   virtual int visit_operation (be_operation *node);
+  // visit operation.
 };
 
 #endif /* _BE_VISITOR_OPERATION_BASE_PROXY_IMPL_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/direct_proxy_impl_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/direct_proxy_impl_ss.h
index 79d0b5867e1..3bbb72d9107 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/direct_proxy_impl_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/direct_proxy_impl_ss.h
@@ -1,43 +1,48 @@
-//=============================================================================
-/**
- *  @file    direct_proxy_impl_ss.h
- *
- *  $Id$
- *
- *  Visitor that generates the code for the operation
- *  in the Direct Proxy Implementation.
- *
- *
- *  @author Angelo Corsaro
- */
-//=============================================================================
-
+//$Id$
+//
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    direct_proxy_impl_ss.h
+//
+// = DESCRIPTION
+//    Visitor that generates the code for the operation
+//    in the Direct Proxy Implementation.
+//
+// = AUTHOR
+//    Angelo Corsaro
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_OPERATION_DIRECT_PROXY_IMPL_SS_H_
 #define _BE_VISITOR_OPERATION_DIRECT_PROXY_IMPL_SS_H_
 
-/**
- * @class be_visitor_operation_direct_proxy_impl_ss
- *
- * @brief be_visitor_operation_direct_proxy_impl_ss
- *
- * This visitor generates the code for the
- * operation of the Direct Proxy Implementation.
- */
 class be_visitor_operation_direct_proxy_impl_ss : public be_visitor_operation
 {
+  //
+  // = TITLE
+  //   be_visitor_operation_direct_proxy_impl_ss
+  //
+  // = DESCRIPTION
+  //   This visitor generates the code for the
+  //   operation of the Direct Proxy Implementation.
+  //
+  //
 public:
-  /// constructor
   be_visitor_operation_direct_proxy_impl_ss (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_operation_direct_proxy_impl_ss (void);
+  // destructor
 
-  /// visit operation node.
   virtual int visit_operation (be_operation *node);
+  // visit operation node.
 
-  /// A helper method to generate operation invocation code.
   virtual int gen_invoke (be_visitor_context &ctx, be_operation *node);
+  // A helper method to generate operation invocation code.
 };
 
 #endif /* _BE_VISITOR_OPERATION_DIRECT_PROXY_IMPL_SS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/exceptlist_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/exceptlist_cs.h
index df9fac17773..1900c981438 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/exceptlist_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/exceptlist_cs.h
@@ -1,18 +1,23 @@
-
-//=============================================================================
-/**
- *  @file    exceptlist_cs.h
- *
- *  $Id$
- *
- *  Visitor for generating code for IDL operations. This generates the tables
- *  for the exceptions used by the stubs.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    exceptlist_cs.h
+//
+// = DESCRIPTION
+//    Visitor for generating code for IDL operations. This generates the tables
+//    for the exceptions used by the stubs.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_OPERATION_EXCEPTIONLIST_CS_H_
 #define _BE_VISITOR_OPERATION_EXCEPTIONLIST_CS_H_
@@ -21,25 +26,26 @@
 // Visitor for generating the exception list
 // ******************************************************************************
 
-/**
- * @class be_visitor_operation_exceptlist_cs
- *
- * @brief be_visitor_operaion_exceptlist_cs
- *
- * This is a visitor to generate operation exception list to be provided to
- * the do_static_call
- */
 class be_visitor_operation_exceptlist_cs : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //   be_visitor_operaion_exceptlist_cs
+  //
+  // = DESCRIPTION
+  //   This is a visitor to generate operation exception list to be provided to
+  //   the do_static_call
+  //
+  //
 public:
-  /// constructor
   be_visitor_operation_exceptlist_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_operation_exceptlist_cs (void);
+  // destructor
 
-  /// visit the operation
   int visit_operation (be_operation *node);
+  // visit the operation
 };
 
 #endif /* _BE_VISITOR_OPERATION_EXCEPTIONLIST_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/exceptlist_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/exceptlist_ss.h
index a41af89c06a..7af7556bdd6 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/exceptlist_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/exceptlist_ss.h
@@ -1,19 +1,23 @@
 // -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    exceptlist_ss.h
- *
- *  $Id$
- *
- *  Generates the array of user exception TypeCodes used by the
- *  skeletons.
- *
- *
- *  @author Ossama Othman
- */
-//=============================================================================
-
+//
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    exceptlist_ss.h
+//
+// = DESCRIPTION
+//    Generates the array of user exception TypeCodes used by the
+//    skeletons.
+//
+// = AUTHOR
+//    Ossama Othman
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_OPERATION_EXCEPTIONLIST_SS_H_
 #define _BE_VISITOR_OPERATION_EXCEPTIONLIST_SS_H_
@@ -23,16 +27,17 @@
 // skeletons.
 // ***************************************************************************
 
-/**
- * @class be_visitor_operation_exceptlist_ss
- *
- * @brief be_visitor_operaion_exceptlist_ss
- *
- * This is a visitor to generate operation exception TypeCode list
- * to be used by the skeletons.
- */
 class be_visitor_operation_exceptlist_ss : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //   be_visitor_operaion_exceptlist_ss
+  //
+  // = DESCRIPTION
+  //   This is a visitor to generate operation exception TypeCode list
+  //   to be used by the skeletons.
+  //
+  //
 public:
 
   /// constructor
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation.h
index a7fe0396b92..7513653d63e 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation.h
@@ -1,18 +1,22 @@
 // -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    operation.h
- *
- *  $Id$
- *
- *  Visitor for generating code for IDL operations in client stubs
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    operation.h
+//
+// = DESCRIPTION
+//    Visitor for generating code for IDL operations in client stubs
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_OPERATION_OPERATION_H_
 #define _BE_VISITOR_OPERATION_OPERATION_H_
@@ -21,30 +25,31 @@
 // Generic Operation visitor with some helper methods
 // ************************************************************
 
-/**
- * @class be_visitor_operation
- *
- * @brief be_visitor_operation
- *
- * This is a base helper visitor for operation node
- */
 class be_visitor_operation : public be_visitor_scope
 {
+  //
+  // = TITLE
+  //   be_visitor_operation
+  //
+  // = DESCRIPTION
+  //   This is a base helper visitor for operation node
+  //
+  //
 public:
-  /// constructor
   be_visitor_operation (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_operation (void);
+  // destructor
 
   // =helper
 
-  /// is my return type void?
   virtual int void_return_type (be_type *);
+  // is my return type void?
 
-  /// does any of the argument node have the specified direction
   virtual int has_param_type (be_operation *,
                               AST_Argument::Direction);
+  // does any of the argument node have the specified direction
 
   /// Count the number of "in" and "inout" parameters.
   virtual size_t count_non_out_parameters (be_operation *node);
@@ -53,30 +58,28 @@ public:
   /// 0:false, 1:true
   virtual int is_amh_exception_holder (be_interface *node);
 
-  /// helper that generates code for raising an exception
   virtual int gen_raise_exception (const char *exception_name,
                                    const char *exception_arguments);
+  // helper that generates code for raising an exception
 
-  /**
-   * Generates the code from opening brace to closing brace for
-   * stub operations. Also called (for now)
-   * from be_visitor_operation_cs, to generate operation stub
-   * bodies for abstract interfaces (unless and until abstract
-   * interfaces are made to interoperate with collocatino).
-   */
   virtual int gen_stub_operation_body (be_operation *node,
                                        be_type *return_type);
+  // Generates the code from opening brace to closing brace for
+  // stub operations. Also called (for now)
+  // from be_visitor_operation_cs, to generate operation stub
+  // bodies for abstract interfaces (unless and until abstract
+  // interfaces are made to interoperate with collocatino).
 
-  /// generate any info before the actual code for the stub is generated
   int gen_pre_stub_info (be_operation *node);
+  // generate any info before the actual code for the stub is generated
 
-  /// helper that generates code for raising an exception within
-  /// interceptor's try block
   virtual int gen_raise_interceptor_exception (
       be_type *return_type,
       const char *exception_name,
       const char *exception_arguments
     );
+  // helper that generates code for raising an exception within
+  // interceptor's try block
 
   void gen_stub_body_arglist (be_operation *node,
                               TAO_OutStream *os,
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ch.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ch.h
index dc912929a26..484a4d4dd34 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ch.h
@@ -1,17 +1,22 @@
-
-//=============================================================================
-/**
- *  @file    operation_ch.h
- *
- *  $Id$
- *
- *  Visitor for generating code for IDL operations in client header
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    operation_ch.h
+//
+// = DESCRIPTION
+//    Visitor for generating code for IDL operations in client header
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_OPERATION_OPERATION_CH_H_
 #define _BE_VISITOR_OPERATION_OPERATION_CH_H_
@@ -20,24 +25,25 @@
 // Operation visitor for client header
 // ************************************************************
 
-/**
- * @class be_visitor_operation_ch
- *
- * @brief be_visitor_operation_ch
- *
- * This is a concrete visitor to generate the client header for operation
- */
 class be_visitor_operation_ch : public be_visitor_operation
 {
+  //
+  // = TITLE
+  //   be_visitor_operation_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the client header for operation
+  //
+  //
 public:
-  /// constructor
   be_visitor_operation_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_operation_ch (void);
+  // destructor
 
-  /// visit operation.
   virtual int visit_operation (be_operation *node);
+  // visit operation.
 };
 
 #endif /* _BE_VISITOR_OPERATION_OPERATION_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_cs.h
index a5326f6717a..2a8faa405bc 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_cs.h
@@ -1,17 +1,22 @@
-
-//=============================================================================
-/**
- *  @file    operation_cs.h
- *
- *  $Id$
- *
- *  Visitor for generating code for IDL operations in client stubs
- *
- *
- *  @author Aniruddha Gokhale & Angelo Corsaro
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    operation_cs.h
+//
+// = DESCRIPTION
+//    Visitor for generating code for IDL operations in client stubs
+//
+// = AUTHOR
+//    Aniruddha Gokhale & Angelo Corsaro
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_OPERATION_OPERATION_CS_H_
 #define _BE_VISITOR_OPERATION_OPERATION_CS_H_
@@ -20,31 +25,32 @@
 // Operation visitor for client stubs
 // ************************************************************
 
-/**
- * @class be_visitor_operation_cs
- *
- * @brief be_visitor_operation_cs
- *
- * This is a concrete visitor to generate the client stubs for operation
- */
 class be_visitor_operation_cs : public be_visitor_operation
 {
+  //
+  // = TITLE
+  //   be_visitor_operation_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the client stubs for operation
+  //
+  //
 public:
-  /// constructor
   be_visitor_operation_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_operation_cs (void);
+  // destructor
 
-  /// visit operation.
   virtual int visit_operation (be_operation *node);
+  // visit operation.
 
-  /// visit argument to generate ParamData entries
   virtual int visit_argument (be_argument *node);
+  // visit argument to generate ParamData entries
 
   // =helper
-  /// stuff to output after every member of the scope is handled
   virtual int post_process (be_decl *);
+  // stuff to output after every member of the scope is handled
 };
 
 #endif /* _BE_VISITOR_OPERATION_OPERATION_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_exs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_exs.h
index 03a4fbe9063..62bf38d20a3 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_exs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_exs.h
@@ -1,18 +1,23 @@
-
-//=============================================================================
-/**
- *  @file    operation_exs.h
- *
- *  $Id$
- *
- *  Visitor for generating code for IDL operations in
- *  CIAO executor implementations
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO_IDL_BE
+//
+// = FILENAME
+//    operation_exs.h
+//
+// = DESCRIPTION
+//    Visitor for generating code for IDL operations in
+//    CIAO executor implementations
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_OPERATION_OPERATION_EXS_H_
 #define _BE_VISITOR_OPERATION_OPERATION_EXS_H_
@@ -21,16 +26,17 @@
 // Operation visitor for CIAO executor implementations
 // ************************************************************
 
-/**
- * @class be_visitor_operation_exs
- *
- * @brief be_visitor_operation_exs
- *
- * This is a concrete visitor to generate the CIAO executor
- * implementations for operation
- */
 class be_visitor_operation_exs : public be_visitor_scope
 {
+  //
+  // = TITLE
+  //   be_visitor_operation_exs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the CIAO executor
+  //   implementations for operation
+  //
+  //
 public:
   be_visitor_operation_exs (be_visitor_context *ctx);
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ih.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ih.h
index 7208729c5dc..55a3c1fd955 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ih.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ih.h
@@ -1,17 +1,20 @@
-
-//=============================================================================
-/**
- *  @file    operation_ih.h
- *
- *  $Id$
- *
- *  Visitor for generating code for IDL operations in implementation header
- *
- *
- *  @author Yamuna Krishnamurthy (yamuna@cs.wustl.edu)
- */
-//=============================================================================
-
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    operation_ih.h
+//
+// = DESCRIPTION
+//    Visitor for generating code for IDL operations in implementation header
+//
+// = AUTHOR
+//   Yamuna Krishnamurthy (yamuna@cs.wustl.edu)
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_OPERATION_OPERATION_IH_H_
 #define _BE_VISITOR_OPERATION_OPERATION_IH_H_
@@ -20,24 +23,25 @@
 // Operation visitor for implementation header
 // ************************************************************
 
-/**
- * @class be_visitor_operation_ih
- *
- * @brief be_visitor_operation_ih
- *
- * This is a concrete visitor to generate the implementation header for operation
- */
 class be_visitor_operation_ih : public be_visitor_operation
 {
+  //
+  // = TITLE
+  //   be_visitor_operation_ih
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the implementation header for operation
+  //
+  //
 public:
-  /// constructor
   be_visitor_operation_ih (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_operation_ih (void);
+  // destructor
 
-  /// visit operation. We provide code for this method in the derived class
   virtual int visit_operation (be_operation *node);
+  // visit operation. We provide code for this method in the derived class
 };
 
 #endif /* _BE_VISITOR_OPERATION_OPERATION_IH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_is.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_is.h
index 00b3abec3da..aa5da748f19 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_is.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_is.h
@@ -1,17 +1,20 @@
-
-//=============================================================================
-/**
- *  @file    operation_is.h
- *
- *  $Id$
- *
- *  Visitor for generating code for IDL operations in implementation skeleton
- *
- *
- *  @author Yamuna Krishnamurthy (yamuna@cs.wustl.edu)
- */
-//=============================================================================
-
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    operation_is.cpp
+//
+// = DESCRIPTION
+//    Visitor for generating code for IDL operations in implementation skeleton
+//
+// = AUTHOR
+//   Yamuna Krishnamurthy (yamuna@cs.wustl.edu)
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_OPERATION_OPERATION_IS_CPP_
 #define _BE_VISITOR_OPERATION_OPERATION_IS_CPP_
@@ -20,24 +23,25 @@
 // Operation visitor for implementation skeleton
 // ************************************************************
 
-/**
- * @class be_visitor_operation_is
- *
- * @brief be_visitor_operation_is
- *
- * This is a concrete visitor to generate the implementation skeleton for operation
- */
 class be_visitor_operation_is : public be_visitor_operation
 {
+  //
+  // = TITLE
+  //   be_visitor_operation_is
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the implementation skeleton for operation
+  //
+  //
 public:
-  /// constructor
   be_visitor_operation_is (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_operation_is (void);
+  // destructor
 
-  /// visit operation. We provide code for this method in the derived class
   virtual int visit_operation (be_operation *node);
+  // visit operation. We provide code for this method in the derived class
 };
 
 #endif /* _BE_VISITOR_OPERATION_OPERATION_IS_CPP_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_sh.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_sh.h
index e2ef21dbb82..2074b69417e 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_sh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_sh.h
@@ -1,17 +1,22 @@
-
-//=============================================================================
-/**
- *  @file    operation_sh.h
- *
- *  $Id$
- *
- *  Visitor for generating code for IDL operations in server header
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    operation_sh.h
+//
+// = DESCRIPTION
+//    Visitor for generating code for IDL operations in server header
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_OPERATION_OPERATION_SH_H_
 #define _BE_VISITOR_OPERATION_OPERATION_SH_H_
@@ -20,24 +25,25 @@
 // Operation visitor for server header
 // ************************************************************
 
-/**
- * @class be_visitor_operation_sh
- *
- * @brief be_visitor_operation_sh
- *
- * This is a concrete visitor to generate the server header for operation
- */
 class be_visitor_operation_sh : public be_visitor_operation
 {
+  //
+  // = TITLE
+  //   be_visitor_operation_sh
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the server header for operation
+  //
+  //
 public:
-  /// constructor
   be_visitor_operation_sh (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_operation_sh (void);
+  // destructor
 
-  /// visit operation.
   virtual int visit_operation (be_operation *node);
+  // visit operation.
 };
 
 #endif /* _BE_VISITOR_OPERATION_OPERATION_SH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ss.h
index b25aa18ee62..826d9912e6c 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ss.h
@@ -1,18 +1,22 @@
 // -*- C++ -*-
+//
+// $Id$
 
-//=============================================================================
-/**
- *  @file    operation_ss.h
- *
- *  $Id$
- *
- *  Visitor for generating code for IDL operations in server skeletons
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    operation_ss.h
+//
+// = DESCRIPTION
+//    Visitor for generating code for IDL operations in server skeletons
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_OPERATION_OPERATION_SS_H_
 #define _BE_VISITOR_OPERATION_OPERATION_SS_H_
@@ -21,32 +25,33 @@
 // Operation visitor for server skeletons
 // ************************************************************
 
-/**
- * @class be_visitor_operation_ss
- *
- * @brief be_visitor_operation_ss
- *
- * This is a concrete visitor to generate the server skeletons for operation
- */
 class be_visitor_operation_ss : public be_visitor_operation
 {
+  //
+  // = TITLE
+  //   be_visitor_operation_ss
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the server skeletons for operation
+  //
+  //
 public:
-  /// constructor
   be_visitor_operation_ss (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_operation_ss (void);
+  // destructor
 
-  /// visit operation. We provide code for this method in the derived class
   virtual int visit_operation (be_operation *node);
+  // visit operation. We provide code for this method in the derived class
 
-  /// visit argument to generate ParamData entries
   virtual int visit_argument (be_argument *node);
+  // visit argument to generate ParamData entries
 
   // template methods
 
-  /// generate any pre skeleton code info
   virtual int gen_pre_skel_info (be_operation *node);
+  // generate any pre skeleton code info
 
   /// Generate the skeleton operation body.
   int gen_skel_operation_body (be_operation * node,
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_svs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_svs.h
index efcd5684a70..80110eaa08d 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_svs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_svs.h
@@ -1,18 +1,23 @@
-
-//=============================================================================
-/**
- *  @file    operation_svs.h
- *
- *  $Id$
- *
- *  Visitor for generating code for IDL operations in
- *  CIAO servant implementations
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO_IDL_BE
+//
+// = FILENAME
+//    operation_svs.h
+//
+// = DESCRIPTION
+//    Visitor for generating code for IDL operations in
+//    CIAO servant implementations
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_OPERATION_OPERATION_SVS_H_
 #define _BE_VISITOR_OPERATION_OPERATION_SVS_H_
@@ -21,16 +26,17 @@
 // Operation visitor for CIAO servant implementations
 // ************************************************************
 
-/**
- * @class be_visitor_operation_svs
- *
- * @brief be_visitor_operation_svs
- *
- * This is a concrete visitor to generate the CIAO servant
- * implementations for operation
- */
 class be_visitor_operation_svs : public be_visitor_scope
 {
+  //
+  // = TITLE
+  //   be_visitor_operation_svs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the CIAO servant
+  //   implementations for operation
+  //
+  //
 public:
   be_visitor_operation_svs (be_visitor_context *ctx);
 
@@ -38,16 +44,17 @@ public:
 
   virtual int visit_operation (be_operation *node);
   virtual int visit_argument (be_argument *node);
-
+  
   virtual int post_process (be_decl *bd);
-
+  
   void scope (be_interface *node);
-
+  
 private:
   int gen_op_body (be_operation *node);
-
+  
 private:
   be_interface *scope_;
+  bool swapping_;
 };
 
 #endif /* _BE_VISITOR_OPERATION_OPERATION_SVS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/proxy_impl_xh.h b/TAO/TAO_IDL/be_include/be_visitor_operation/proxy_impl_xh.h
index da7232514ad..7c2716e32c3 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/proxy_impl_xh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/proxy_impl_xh.h
@@ -1,40 +1,45 @@
-//=============================================================================
-/**
- *  @file    proxy_impl_xh.h
- *
- *  $Id$
- *
- *  Visitor for generating code for proxy implementations.
- *
- *
- *  @author Angelo Corsaro
- */
-//=============================================================================
-
+// $Id$
+//
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    proxy_impl_xh.h
+//
+// = DESCRIPTION
+//    Visitor for generating code for proxy implementations.
+//
+// = AUTHOR
+//    Angelo Corsaro
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_OPERATION_PROXY_IMPL_XH_H_
 #define _BE_VISITOR_OPERATION_PROXY_IMPL_XH_H_
 
 
-/**
- * @class be_visitor_operation_proxy_impl_xh
- *
- * @brief be_visitor_operation_proxy_impl_xh
- *
- * Concrete visitor that generates the code for the base class
- * of Proxy Impls.
- */
 class be_visitor_operation_proxy_impl_xh : public be_visitor_operation
 {
+  //
+  // = TITLE
+  //   be_visitor_operation_proxy_impl_xh
+  //
+  // = DESCRIPTION
+  //   Concrete visitor that generates the code for the base class
+  //   of Proxy Impls.
+  //
+  //
 public:
-  /// constructor
   be_visitor_operation_proxy_impl_xh (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_operation_proxy_impl_xh (void);
+  // destructor
 
-  /// visit operation.
   virtual int visit_operation (be_operation *node);
+  // visit operation.
 };
 
 #endif /* _BE_VISITOR_OPERATION_PROXY_IMPL_XH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/remote_proxy_impl_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/remote_proxy_impl_cs.h
index cbc22ba84d7..51b2b2340e4 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/remote_proxy_impl_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/remote_proxy_impl_cs.h
@@ -1,18 +1,22 @@
-//=============================================================================
-/**
- *  @file    remote_proxy_impl_cs.h
- *
- *  $Id$
- *
- *  Visitor for generating code for remote proxy impls
- *  in client stubs.
- *
- *
- *
- *  @author Aniruddha Gokhale & Angelo Corsaro
- */
-//=============================================================================
-
+// $Id$
+//
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    operation_remote_proxy_impl_cs.h
+//
+// = DESCRIPTION
+//    Visitor for generating code for remote proxy impls
+//    in client stubs.
+//
+//
+// = AUTHOR
+//    Aniruddha Gokhale & Angelo Corsaro
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_OPERATION_REMOTE_PROXY_IMPL_OPERATION_REMOTE_PROXY_IMPL_CS_H_
 #define _BE_VISITOR_OPERATION_REMOTE_PROXY_IMPL_OPERATION_REMOTE_PROXY_IMPL_CS_H_
@@ -21,34 +25,34 @@
 // Operation_Remote_Proxy_Impl visitor for client stubs
 // ************************************************************
 
-/**
- * @class be_visitor_operation_remote_proxy_impl_cs
- *
- * @brief be_visitor_operation_remote_proxy_impl_cs
- *
- * This is a concrete visitor to generate the client invocation
- * code for the Remote Proxy Implementation.
- */
 class be_visitor_operation_remote_proxy_impl_cs : public be_visitor_operation
 {
+  //
+  // = TITLE
+  //   be_visitor_operation_remote_proxy_impl_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the client invocation
+  //   code for the Remote Proxy Implementation.
+  //
 public:
-  /// constructor
   be_visitor_operation_remote_proxy_impl_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_operation_remote_proxy_impl_cs (void);
+  // destructor
 
-  /// visit operation_remote_proxy_impl.
   virtual int visit_operation (be_operation *node);
+  // visit operation_remote_proxy_impl.
 
-  /// visit argument to generate ParamData entries
   virtual int visit_argument (be_argument *node);
+  // visit argument to generate ParamData entries
 
   // = template methods
 
   // =helper
-  /// stuff to output after every member of the scope is handled
   virtual int post_process (be_decl *);
+  // stuff to output after every member of the scope is handled
 };
 
 #endif /* _BE_VISITOR_OPERATION_REMOTE_PROXY_IMPL_OPERATION_REMOTE_PROXY_IMPL_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype.h
index 5549615b9bb..b842a0b9dbd 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype.h
@@ -1,18 +1,23 @@
-
-//=============================================================================
-/**
- *  @file    rettype.h
- *
- *  $Id$
- *
- *  Visitor for generating code for IDL operations. This generates the return
- *  type of the operation
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    rettype.h
+//
+// = DESCRIPTION
+//    Visitor for generating code for IDL operations. This generates the return
+//    type of the operation
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_OPERATION_RETTYPE_H_
 #define _BE_VISITOR_OPERATION_RETTYPE_H_
@@ -21,78 +26,79 @@
 // Operation visitor for return types in the signature of the operation
 // ***********************************************************************
 
-/**
- * @class be_visitor_operation_rettype
- *
- * @brief be_visitor_operation_ch
- *
- * This is a visitor to generate operation return types
- */
 class be_visitor_operation_rettype : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //   be_visitor_operation_ch
+  //
+  // = DESCRIPTION
+  //   This is a visitor to generate operation return types
+  //
+  //
 public:
-  /// constructor
   be_visitor_operation_rettype (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_operation_rettype (void);
+  // destructor
 
-  /// visit an array node
   int visit_array (be_array *node);
+  // visit an array node
 
-  /// visit an enum node
   int visit_enum (be_enum *node);
+  // visit an enum node
 
-  /// visit an interface node
   int visit_interface (be_interface *node);
+  // visit an interface node
 
-  /// visit an interface node
   int visit_interface_fwd (be_interface_fwd *node);
+  // visit an interface node
 
-  /// visit native type
   int visit_native (be_native *node);
+  // visit native type
 
-  /// visit a predefined type node
   int visit_predefined_type (be_predefined_type *node);
+  // visit a predefined type node
 
-  /// visit a sequence node
   int visit_sequence (be_sequence *node);
+  // visit a sequence node
 
-  /// visit a sequence node
   int visit_string (be_string *node);
+  // visit a sequence node
 
-  /// visit a structure node
   int visit_structure (be_structure *node);
+  // visit a structure node
 
-  /// visit a typedef node
   int visit_typedef (be_typedef *node);
+  // visit a typedef node
 
-  /// visit a union node
   int visit_union (be_union *node);
+  // visit a union node
 
-  /// visit a valuetype node
   int visit_valuetype (be_valuetype *node);
+  // visit a valuetype node
 
-  /// visit a forward declared valuetype node
   int visit_valuetype_fwd (be_valuetype_fwd *node);
+  // visit a forward declared valuetype node
 
-  /// visit a component node
   int visit_component (be_component *node);
+  // visit a component node
 
-  /// visit a forward declared component node
   int visit_component_fwd (be_component_fwd *node);
+  // visit a forward declared component node
 
-  /// visit an eventtype node
   int visit_eventtype (be_eventtype *node);
+  // visit an eventtype node
 
-  /// visit a forward declared eventtype node
   int visit_eventtype_fwd (be_eventtype_fwd *node);
+  // visit a forward declared eventtype node
 
-  /// visit a component home node
   int visit_home (be_home *node);
+  // visit a component home node
 
-  /// visit a valuebox node
   int visit_valuebox (be_valuebox *node);
+  // visit a valuebox node
   
 private:
   const char *type_name (be_type *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_return_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_return_cs.h
index 2e8feac6db8..eec65ea8f52 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_return_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_return_cs.h
@@ -1,18 +1,23 @@
-
-//=============================================================================
-/**
- *  @file    rettype_return_cs.h
- *
- *  $Id$
- *
- *  Visitor for generating code for IDL operations. This generates the return
- *  statement for returning the return type variable in the client stub.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    rettype_return_cs.h
+//
+// = DESCRIPTION
+//    Visitor for generating code for IDL operations. This generates the return
+//    statement for returning the return type variable in the client stub.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_OPERATION_RETTYPE_RETURN_CS_H_
 #define _BE_VISITOR_OPERATION_RETTYPE_CS_H_
@@ -21,76 +26,76 @@
 // Operation visitor for returning the return val
 // ************************************************************
 
-/**
- * @class be_visitor_operation_rettype_return_cs
- *
- * @brief be_visitor_operation_rettype_return_cs
- *
- * This is a visitor to generate a variable declaration ofr an operation
- * return type
- */
 class be_visitor_operation_rettype_return_cs :public be_visitor_decl
 {
+  //
+  // = TITLE
+  //   be_visitor_operation_rettype_return_cs
+  //
+  // = DESCRIPTION
+  //   This is a visitor to generate a variable declaration ofr an operation
+  //   return type
+  //
 public:
-  /// constructor
   be_visitor_operation_rettype_return_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_operation_rettype_return_cs (void);
+  // destructor
 
-  /// visit an array node
   int visit_array (be_array *node);
+  // visit an array node
 
-  /// visit an enum node
   int visit_enum (be_enum *node);
+  // visit an enum node
 
-  /// visit an interface node
   int visit_interface (be_interface *node);
+  // visit an interface node
 
-  /// visit an interface node
   int visit_interface_fwd (be_interface_fwd *node);
+  // visit an interface node
 
-  /// visit a valuebox node
   int visit_valuebox (be_valuebox *node);
+  // visit a valuebox node
 
-  /// visit valuetype
   int visit_valuetype (be_valuetype *node);
+  // visit valuetype
 
-  /// visit valuetype forward
   int visit_valuetype_fwd (be_valuetype_fwd *node);
+  // visit valuetype forward
 
-  /// visit a predefined type node
   int visit_predefined_type (be_predefined_type *node);
+  // visit a predefined type node
 
-  /// visit a sequence node
   int visit_sequence (be_sequence *node);
+  // visit a sequence node
 
-  /// visit a sequence node
   int visit_string (be_string *node);
+  // visit a sequence node
 
-  /// visit a structure node
   int visit_structure (be_structure *node);
+  // visit a structure node
 
-  /// visit a typedef node
   int visit_typedef (be_typedef *node);
+  // visit a typedef node
 
-  /// visit a union node
   int visit_union (be_union *node);
+  // visit a union node
 
-  /// visit component
   int visit_component (be_component *node);
+  // visit component
 
-  /// visit component forward
   int visit_component_fwd (be_component_fwd *node);
+  // visit component forward
 
-  /// visit eventtype
   int visit_eventtype (be_eventtype *node);
+  // visit eventtype
 
-  /// visit eventtype forward
   int visit_eventtype_fwd (be_eventtype_fwd *node);
+  // visit eventtype forward
 
-  /// visit component home
   int visit_home (be_home *node);
+  // visit component home
 };
 
 #endif /* _BE_VISITOR_OPERATION_RETTYPE_RETURN_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/smart_proxy_ch.h b/TAO/TAO_IDL/be_include/be_visitor_operation/smart_proxy_ch.h
index b1560a62b17..6dbe525cc45 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/smart_proxy_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/smart_proxy_ch.h
@@ -1,18 +1,23 @@
-
-//=============================================================================
-/**
- *  @file    smart_proxy_ch.h
- *
- *  $Id$
- *
- *  Visitor for generating code for IDL operations for the smart proxy case
- *  inside of the client stubs header
- *
- *
- *  @author Kirthika Parameswaran  <kirthika@cs.wustl.edu>
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    smart_proxy_ch.h
+//
+// = DESCRIPTION
+//    Visitor for generating code for IDL operations for the smart proxy case
+//    inside of the client stubs header
+//
+// = AUTHOR
+//    Kirthika Parameswaran  <kirthika@cs.wustl.edu>
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_OPERATION_SMART_PROXY_CH_H_
 #define _BE_VISITOR_OPERATION_SMART_PROXY_CH_H_
@@ -21,25 +26,26 @@
 // Operation visitor for client header in the smart proxy class
 // ************************************************************
 
-/**
- * @class be_visitor_operation_smart_proxy_ch
- *
- * @brief be_visitor_operation_smart_proxy_ch
- *
- * This is a concrete visitor to generate the client header for operation
- * in the smart proxy class
- */
 class be_visitor_operation_smart_proxy_ch : public be_visitor_scope
 {
+  //
+  // = TITLE
+  //   be_visitor_operation_smart_proxy_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the client header for operation
+  //   in the smart proxy class
+  //
+  //
 public:
-  /// constructor
   be_visitor_operation_smart_proxy_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_operation_smart_proxy_ch (void);
+  // destructor
 
-  /// visit operation node.
   virtual int visit_operation (be_operation *node);
+  // visit operation node.
 };
 
 #endif /* _BE_VISITOR_OPERATION_SMART_PROXY_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/smart_proxy_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/smart_proxy_cs.h
index 020ed2b2267..8bbba1ab4ee 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/smart_proxy_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/smart_proxy_cs.h
@@ -1,16 +1,20 @@
-//=============================================================================
-/**
- *  @file    smart_proxy_cs.h
- *
- *  $Id$
- *
- *  Visitor for generating code for IDL operations in client stubs
- *
- *
- *  @author Kirthika Parameswaran <kirthika@cs.wustl.edu>
- */
-//=============================================================================
-
+// $Id$
+//
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    operation_smart_proxy_cs.h
+//
+// = DESCRIPTION
+//    Visitor for generating code for IDL operations in client stubs
+//
+// = AUTHOR
+//    Kirthika Parameswaran <kirthika@cs.wustl.edu>
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_OPERATION_OPERATION_SMART_PROXY_CS_H_
 #define _BE_VISITOR_OPERATION_OPERATION_SMART_PROXY_CS_H_
@@ -19,27 +23,28 @@
 // Operation visitor for client stubs
 // ************************************************************
 
-/**
- * @class be_visitor_operation_smart_proxy_cs
- *
- * @brief be_visitor_operation_smart_proxy_cs
- *
- * This is a concrete visitor to generate the client stubs for operation
- */
 class be_visitor_operation_smart_proxy_cs : public be_visitor_operation
 {
+  //
+  // = TITLE
+  //   be_visitor_operation_smart_proxy_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the client stubs for operation
+  //
+  //
 public:
-  /// constructor
   be_visitor_operation_smart_proxy_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_operation_smart_proxy_cs (void);
+  // destructor
 
-  /// visit operation.
   virtual int visit_operation (be_operation *node);
+  // visit operation.
 
-  /// A helper method to generate operation invocation code.
   virtual int gen_invoke (be_visitor_context &ctx, be_operation *node);
+  // A helper method to generate operation invocation code.
 };
 
 #endif /* _BE_VISITOR_OPERATION_OPERATION_SMART_PROXY_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/tie_sh.h b/TAO/TAO_IDL/be_include/be_visitor_operation/tie_sh.h
index 2ed5ca0ef7e..14d0f2a4243 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/tie_sh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/tie_sh.h
@@ -1,18 +1,23 @@
-
-//=============================================================================
-/**
- *  @file    tie_sh.h
- *
- *  $Id$
- *
- *  Visitor for generating code for IDL operations for the TIE class inside
- *  the server header
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    tie_sh.h
+//
+// = DESCRIPTION
+//    Visitor for generating code for IDL operations for the TIE class inside
+//    the server header
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_OPERATION_TIE_SH_H_
 #define _BE_VISITOR_OPERATION_TIE_SH_H_
@@ -21,24 +26,25 @@
 // Operation visitor for operation declaration inside the TIE class
 // ***********************************************************************
 
-/**
- * @class be_visitor_operation_tie_sh
- *
- * @brief be_visitor_operation_tie_sh
- *
- * This is a concrete visitor to generate the operaton inside a TIE class
- */
 class be_visitor_operation_tie_sh : public be_visitor_scope
 {
+  //
+  // = TITLE
+  //   be_visitor_operation_tie_sh
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the operaton inside a TIE class
+  //
+  //
 public:
-  /// constructor
   be_visitor_operation_tie_sh (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_operation_tie_sh (void);
+  // destructor
 
-  /// set the right context and make a visitor
   virtual int visit_operation (be_operation *node);
+  // set the right context and make a visitor
 };
 
 #endif /* _BE_VISITOR_OPERATION_TIE_SH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/tie_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/tie_ss.h
index 8ce7b2ae422..20e055a6a14 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/tie_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/tie_ss.h
@@ -1,17 +1,22 @@
-
-//=============================================================================
-/**
- *  @file    tie_ss.h
- *
- *  $Id$
- *
- *  Visitor for generating code for IDL operations for the TIE class
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    tie_ss.h
+//
+// = DESCRIPTION
+//    Visitor for generating code for IDL operations for the TIE class
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_OPERATION_TIE_SS_H_
 #define _BE_VISITOR_OPERATION_TIE_SS_H_
@@ -20,24 +25,25 @@
 // Operation visitor for operation declaration inside the TIE class
 // ***********************************************************************
 
-/**
- * @class be_visitor_operation_tie_ss
- *
- * @brief be_visitor_operation_tie_ss
- *
- * This is a concrete visitor to generate the operaton inside a TIE class
- */
 class be_visitor_operation_tie_ss : public be_visitor_scope
 {
+  //
+  // = TITLE
+  //   be_visitor_operation_tie_ss
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the operaton inside a TIE class
+  //
+  //
 public:
-  /// constructor
   be_visitor_operation_tie_ss (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_operation_tie_ss (void);
+  // destructor
 
-  /// set the right context and make a visitor
   virtual int visit_operation (be_operation *node);
+  // set the right context and make a visitor
 };
 
 #endif /* _BE_VISITOR_OPERATION_TIE_SS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/upcall_command_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/upcall_command_ss.h
index c12b0e21b9d..45124e346a1 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/upcall_command_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/upcall_command_ss.h
@@ -1,19 +1,23 @@
 // -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    upcall_command_ss.h
- *
- *  $Id$
- *
- *  Visitor that generates operation-specific TAO::Upcall_Command
- *  objects in skeletons.
- *
- *
- *  @author Ossama Othman
- */
-//=============================================================================
-
+//
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    upcall_command_ss.cpp
+//
+// = DESCRIPTION
+//    Visitor that generates operation-specific TAO::Upcall_Command
+//    objects in skeletons.
+//
+// = AUTHOR
+//    Ossama Othman
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_OPERATION_UPCALL_COMMAND_SS_H_
 #define _BE_VISITOR_OPERATION_UPCALL_COMMAND_SS_H_
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root.h b/TAO/TAO_IDL/be_include/be_visitor_root.h
index 0a178a7e616..f43ac2ccb9a 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_root.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_root.h
@@ -1,18 +1,23 @@
 /* -*- c++ -*- */
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    be_visitor_root.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Root class
- *
- *
- *  @author Aniruddha Gokhale and Carlos O'Ryan
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_root.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Root class
+//
+// = AUTHOR
+//    Aniruddha Gokhale and Carlos O'Ryan
+//
+// ============================================================================
 
 #ifndef TAO_BE_VISITOR_ROOT_H
 #define TAO_BE_VISITOR_ROOT_H
@@ -33,8 +38,6 @@
 #include "be_visitor_root/root_ex_idl.h"
 #include "be_visitor_root/root_exh.h"
 #include "be_visitor_root/root_exs.h"
-#include "be_visitor_root/root_cnh.h"
-#include "be_visitor_root/root_cns.h"
 #include "be_visitor_root/any_op.h"
 #include "be_visitor_root/cdr_op.h"
 #include "be_visitor_root/serializer_op.h"
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/any_op.h b/TAO/TAO_IDL/be_include/be_visitor_root/any_op.h
index 14407058d81..e7c0ea72c0c 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_root/any_op.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_root/any_op.h
@@ -1,44 +1,49 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    any_op.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Root class
- *  This one provides code generation for the Any operators for elements of
- *  the Root scope.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    any_op.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Root class
+//    This one provides code generation for the Any operators for elements of
+//    the Root scope.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_ROOT_ANY_OP_H_
 #define _BE_VISITOR_ROOT_ANY_OP_H_
 
-/**
- * @class be_visitor_root_any_op
- *
- * @brief be_visitor_root_any_op
- *
- * This is a concrete visitor for root that generates the Any operator
- * declarations and implementations
- */
 class be_visitor_root_any_op : public be_visitor_root
 {
+  //
+  // = TITLE
+  //   be_visitor_root_any_op
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for root that generates the Any operator
+  //   declarations and implementations
+  //
 
 public:
-  /// constructor
   be_visitor_root_any_op (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_root_any_op (void);
+  // destructor
 
-  /// visit root
   virtual int visit_root (be_root *node);
+  // visit root
 };
 
 #endif /* _BE_VISITOR_ROOT_ANY_OP_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/cdr_op.h b/TAO/TAO_IDL/be_include/be_visitor_root/cdr_op.h
index 99bdce3a1d3..2df86ebcdfe 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_root/cdr_op.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_root/cdr_op.h
@@ -1,44 +1,49 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    cdr_op.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Root class
- *  This one provides code generation for the CDR operators for elements of
- *  the Root scope.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Root class
+//    This one provides code generation for the CDR operators for elements of
+//    the Root scope.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_ROOT_CDR_OP_H_
 #define _BE_VISITOR_ROOT_CDR_OP_H_
 
-/**
- * @class be_visitor_root_cdr_op
- *
- * @brief be_visitor_root_cdr_op
- *
- * This is a concrete visitor for root that generates the CDR operator
- * declarations and implementations
- */
 class be_visitor_root_cdr_op : public be_visitor_root
 {
+  //
+  // = TITLE
+  //   be_visitor_root_cdr_op
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for root that generates the CDR operator
+  //   declarations and implementations
+  //
 
 public:
-  /// constructor
   be_visitor_root_cdr_op (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_root_cdr_op (void);
+  // destructor
 
-  /// visit root
   virtual int visit_root (be_root *node);
+  // visit root
 };
 
 #endif /* _BE_VISITOR_ROOT_CDR_OP_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root.h b/TAO/TAO_IDL/be_include/be_visitor_root/root.h
index 44518121c54..a3695653508 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_root/root.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_root/root.h
@@ -1,65 +1,113 @@
 /* -*- c++ -*- */
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    root.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Root class
- *  This one provides the generic visitor for the Root node.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    root.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Root class
+//    This one provides the generic visitor for the Root node.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_ROOT_ROOT_H_
 #define _BE_VISITOR_ROOT_ROOT_H_
 
-/**
- * @class be_visitor_root
- *
- * @brief be_visitor_root
- *
- * This is a concrete visitor for root that abstracts all common tasks
- */
 class be_visitor_root : public be_visitor_scope
 {
+  //
+  // = TITLE
+  //   be_visitor_root
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for root that abstracts all common tasks
+  //
 
 public:
   be_visitor_root (be_visitor_context *ctx);
+  // constructor
 
   ~be_visitor_root (void);
+  // destructor
 
   virtual int visit_root (be_root *node);
+  // visit root
+
+  // =visit methods on all elements syntactically valid in a Root scope
+
   virtual int visit_constant (be_constant *node);
+  // visit a constant
+
   virtual int visit_enum (be_enum *node);
+  // visit an enum
+
   virtual int visit_exception (be_exception *node);
+  // visit an exception
+
   virtual int visit_interface (be_interface *node);
+  // visit an interface
+
   virtual int visit_interface_fwd (be_interface_fwd *node);
+  // visit a forward declared interface
+
   virtual int visit_valuebox (be_valuebox *node);
+  // visit a valuebox
+
   virtual int visit_valuetype (be_valuetype *node);
+  // visit a valuetype
+
   virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+  // visit a forward declared valuetype
+
   virtual int visit_eventtype (be_eventtype *node);
+  // visit an eventtype
+
   virtual int visit_eventtype_fwd (be_eventtype_fwd *node);
+  // visit a forward declared eventtype
+
   virtual int visit_component (be_component *node);
+  // visit a component
+
   virtual int visit_component_fwd (be_component_fwd *node);
+  // visit a forward declared component
+
   virtual int visit_home (be_home *node);
-  virtual int visit_connector (be_connector *node);
+  // visit a home
+
   virtual int visit_module (be_module *node);
+  // visit a module
+
   virtual int visit_structure (be_structure *node);
+  // visit a structure
+
   virtual int visit_structure_fwd (be_structure_fwd *node);
+  // visit a forward declared structure
+
   virtual int visit_union (be_union *node);
+  // visit a union
+
   virtual int visit_union_fwd (be_union_fwd *node);
+  // visit a forward declared union
+
   virtual int visit_typedef (be_typedef *node);
+  // visit the typedef node
+
   virtual int visit_native (be_native *node);
 
   // =helper. This is used by derived clases to set the right context
 
-  /// will be overridden by derived classes that set the appropriate context
   virtual int init (void);
+  // will be overridden by derived classes that set the appropriate context
 };
 
 #endif /* _BE_VISITOR_ROOT_ROOT_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_ch.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_ch.h
index 941ba17071b..c36cf7f5192 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_root/root_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_ch.h
@@ -1,42 +1,48 @@
 /* -*- c++ -*- */
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    root_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Root class
- *  This one provides code generation for elements of the Root node in the
- *  client header.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    root_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Root class
+//    This one provides code generation for elements of the Root node in the
+//    client header.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_ROOT_ROOT_CH_H_
 #define _BE_VISITOR_ROOT_ROOT_CH_H_
 
-/**
- * @class be_visitor_root_ch
- *
- * @brief be_visitor_root_ch
- *
- * This is a concrete visitor to generate the client header for root
- */
 class be_visitor_root_ch : public be_visitor_root
 {
+  //
+  // = TITLE
+  //   be_visitor_root_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the client header for root
+  //
+  //
 public:
-  /// constructor
   be_visitor_root_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_root_ch (void);
+  // destructor
 
-  /// set the right context and make a visitor
   virtual int init (void);
+  // set the right context and make a visitor
 };
 
 #endif /* _BE_VISITOR_ROOT_ROOT_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_ci.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_ci.h
index 08e667e8148..e39eab1ac4f 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_root/root_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_ci.h
@@ -1,42 +1,48 @@
 /* -*- c++ -*- */
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    root_ci.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Root class
- *  This one provides code generation for elements of the Root node in the
- *  client inline.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    root_ci.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Root class
+//    This one provides code generation for elements of the Root node in the
+//    client inline.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_ROOT_ROOT_CI_H_
 #define _BE_VISITOR_ROOT_ROOT_CI_H_
 
-/**
- * @class be_visitor_root_ci
- *
- * @brief be_visitor_root_ci
- *
- * This is a concrete visitor to generate the client inline for root
- */
 class be_visitor_root_ci : public be_visitor_root
 {
+  //
+  // = TITLE
+  //   be_visitor_root_ci
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the client inline for root
+  //
+  //
 public:
-  /// constructor
   be_visitor_root_ci (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_root_ci (void);
+  // destructor
 
-  /// set the right context and make a visitor
   virtual int init (void);
+  // set the right context and make a visitor
 };
 
 #endif /* _BE_VISITOR_ROOT_ROOT_CI_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_cnh.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_cnh.h
deleted file mode 100644
index be1aeff2bd6..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_root/root_cnh.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    root_cnh.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Root class
- *  This one provides code generation for elements of the Root node in the
- *  CIAO connector impl header.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
-
-#ifndef _BE_VISITOR_ROOT_ROOT_CNH_H_
-#define _BE_VISITOR_ROOT_ROOT_CNH_H_
-
-/**
- * @class be_visitor_root_cnh
- *
- * @brief be_visitor_root_cnh
- *
- * This is a concrete visitor to generate the CIAO connector
- * header for root
- */
-class be_visitor_root_cnh : public be_visitor_root
-{
-public:
-  be_visitor_root_cnh (be_visitor_context *ctx);
-
-  ~be_visitor_root_cnh (void);
-
-  /// Set the right context and make a visitor.
-  virtual int init (void);
-};
-
-#endif /* _BE_VISITOR_ROOT_ROOT_CNH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_cns.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_cns.h
deleted file mode 100644
index 8cdedb07f9e..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_root/root_cns.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    root_cns.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Root class
- *  This one provides code generation for elements of the Root node in the
- *  CIAO connector impl source.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
-
-#ifndef _BE_VISITOR_ROOT_ROOT_CNS_H_
-#define _BE_VISITOR_ROOT_ROOT_CNS_H_
-
-/**
- * @class be_visitor_root_cns
- *
- * @brief be_visitor_root_cns
- *
- * This is a concrete visitor to generate the CIAO connector
- * header for root
- */
-class be_visitor_root_cns : public be_visitor_root
-{
-public:
-  be_visitor_root_cns (be_visitor_context *ctx);
-
-  ~be_visitor_root_cns (void);
-
-  /// Set the right context and make a visitor.
-  virtual int init (void);
-};
-
-#endif /* _BE_VISITOR_ROOT_ROOT_CNS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_cs.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_cs.h
index e60bb1fae44..64b5df10792 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_root/root_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_cs.h
@@ -1,42 +1,48 @@
 /* -*- c++ -*- */
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    root_cs.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Root class
- *  This one provides code generation for elements of the Root node in the
- *  client stubs.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    root_cs.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Root class
+//    This one provides code generation for elements of the Root node in the
+//    client stubs.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_ROOT_ROOT_CS_H_
 #define _BE_VISITOR_ROOT_ROOT_CS_H_
 
-/**
- * @class be_visitor_root_cs
- *
- * @brief be_visitor_root_cs
- *
- * This is a concrete visitor to generate the client stubs for root
- */
 class be_visitor_root_cs : public be_visitor_root
 {
+  //
+  // = TITLE
+  //   be_visitor_root_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the client stubs for root
+  //
+  //
 public:
-  /// constructor
   be_visitor_root_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_root_cs (void);
+  // destructor
 
-  /// set the right context and make a visitor
   virtual int init (void);
+  // set the right context and make a visitor
 };
 
 #endif /* _BE_VISITOR_ROOT_ROOT_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_ex_idl.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_ex_idl.h
index 1902244fb87..2911e462353 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_root/root_ex_idl.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_ex_idl.h
@@ -1,41 +1,47 @@
 /* -*- c++ -*- */
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    root_ex_idl.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Root class
- *  This one provides code generation for elements of the Root node in the
- *  CIAO executor IDL.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    root_ex_idl.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Root class
+//    This one provides code generation for elements of the Root node in the
+//    CIAO executor IDL.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_ROOT_ROOT_EX_IDL_H_
 #define _BE_VISITOR_ROOT_ROOT_EX_IDL_H_
 
-/**
- * @class be_visitor_root_ex_idl
- *
- * @brief be_visitor_root_ex_idl
- *
- * This is a concrete visitor to generate the CIAO executor
- * IDL for root
- */
 class be_visitor_root_ex_idl : public be_visitor_root
 {
+  //
+  // = TITLE
+  //   be_visitor_root_ex_idl
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the CIAO executor
+  //   IDL for root
+  //
+  //
 public:
   be_visitor_root_ex_idl (be_visitor_context *ctx);
 
   ~be_visitor_root_ex_idl (void);
 
-  /// Set the right context and make a visitor.
   virtual int init (void);
+  // Set the right context and make a visitor.
 };
 
 #endif /* _BE_VISITOR_ROOT_ROOT_EX_IDL_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_exh.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_exh.h
index d8d6ad8446e..21a4e5f5ee9 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_root/root_exh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_exh.h
@@ -1,41 +1,47 @@
 /* -*- c++ -*- */
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    root_exh.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Root class
- *  This one provides code generation for elements of the Root node in the
- *  CIAO exec impl header.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO_IDL_BE
+//
+// = FILENAME
+//    root_exh.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Root class
+//    This one provides code generation for elements of the Root node in the
+//    CIAO exec impl header.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_ROOT_ROOT_EXH_H_
 #define _BE_VISITOR_ROOT_ROOT_EXH_H_
 
-/**
- * @class be_visitor_root_exh
- *
- * @brief be_visitor_root_exh
- *
- * This is a concrete visitor to generate the CIAO executor
- * header for root
- */
 class be_visitor_root_exh : public be_visitor_root
 {
+  //
+  // = TITLE
+  //   be_visitor_root_exh
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the CIAO servant
+  //   header for root
+  //
+  //
 public:
   be_visitor_root_exh (be_visitor_context *ctx);
 
   ~be_visitor_root_exh (void);
 
-  /// Set the right context and make a visitor.
   virtual int init (void);
+  // Set the right context and make a visitor.
 };
 
 #endif /* _BE_VISITOR_ROOT_ROOT_EXH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_exs.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_exs.h
index c220692c97c..cd4ccb444a2 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_root/root_exs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_exs.h
@@ -1,41 +1,47 @@
 /* -*- c++ -*- */
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    root_exs.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Root class
- *  This one provides code generation for elements of the Root node in the
- *  CIAO exec impl source.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO_IDL_BE
+//
+// = FILENAME
+//    root_exs.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Root class
+//    This one provides code generation for elements of the Root node in the
+//    CIAO exec impl source.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_ROOT_ROOT_EXS_H_
 #define _BE_VISITOR_ROOT_ROOT_EXS_H_
 
-/**
- * @class be_visitor_root_exs
- *
- * @brief be_visitor_root_exs
- *
- * This is a concrete visitor to generate the CIAO executor
- * header for root
- */
 class be_visitor_root_exs : public be_visitor_root
 {
+  //
+  // = TITLE
+  //   be_visitor_root_exs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the CIAO servant
+  //   header for root
+  //
+  //
 public:
   be_visitor_root_exs (be_visitor_context *ctx);
 
   ~be_visitor_root_exs (void);
 
-  /// Set the right context and make a visitor.
   virtual int init (void);
+  // Set the right context and make a visitor.
 };
 
 #endif /* _BE_VISITOR_ROOT_ROOT_EXS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_ih.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_ih.h
index f6d4cce4b4a..004bc0f73d5 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_root/root_ih.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_ih.h
@@ -1,41 +1,45 @@
+// $Id$
 
-//=============================================================================
-/**
- *  @file    root_ih.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Root class
- *  This one provides code generation for elements of the Root node in the
- *  implementation header.
- *
- *
- *  @author Yamuna Krishnamurthy
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    root_ih.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Root class
+//    This one provides code generation for elements of the Root node in the
+//    implementation header.
+//
+// = AUTHOR
+//   Yamuna Krishnamurthy
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_ROOT_ROOT_IH_H_
 #define _BE_VISITOR_ROOT_ROOT_IH_H_
 
-/**
- * @class be_visitor_root_ih
- *
- * @brief be_visitor_root_ih
- *
- * This is a concrete visitor to generate the implementation header for root
- */
 class be_visitor_root_ih : public be_visitor_root
 {
+  //
+  // = TITLE
+  //   be_visitor_root_ih
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the implementation header for root
+  //
+  //
 public:
-  /// constructor
   be_visitor_root_ih (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_root_ih (void);
+  // destructor
 
-  /// set the right context and make a visitor
   virtual int init (void);
+  // set the right context and make a visitor
 };
 
 #endif /* _BE_VISITOR_ROOT_ROOT_IH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_is.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_is.h
index 972d900d024..d39b16aeb8b 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_root/root_is.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_is.h
@@ -1,41 +1,45 @@
+// $Id$
 
-//=============================================================================
-/**
- *  @file    root_is.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Root class
- *  This one provides code generation for elements of the Root node in the
- *  implementation skeletons.
- *
- *
- *  @author Yamuna Krishnamurthy (yamuna@cs.wustl.edu)
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    root_is.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Root class
+//    This one provides code generation for elements of the Root node in the
+//    implementation skeletons.
+//
+// = AUTHOR
+//   Yamuna Krishnamurthy (yamuna@cs.wustl.edu)
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_ROOT_ROOT_IS_H_
 #define _BE_VISITOR_ROOT_ROOT_IS_H_
 
-/**
- * @class be_visitor_root_is
- *
- * @brief be_visitor_root_is
- *
- * This is a concrete visitor to generate the implementation skeletons for root
- */
 class be_visitor_root_is : public be_visitor_root
 {
+  //
+  // = TITLE
+  //   be_visitor_root_is
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the implementation skeletons for root
+  //
+  //
 public:
-  /// constructor
   be_visitor_root_is (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_root_is (void);
+  // destructor
 
-  /// set the right context and make a visitor
   virtual int init (void);
+  // set the right context and make a visitor
 };
 
 #endif /* _BE_VISITOR_ROOT_ROOT_IS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_sh.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_sh.h
index f76a93c4abd..d1c42ca580e 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_root/root_sh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_sh.h
@@ -1,42 +1,48 @@
 /* -*- c++ -*- */
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    root_sh.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Root class
- *  This one provides code generation for elements of the Root node in the
- *  server header.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    root_sh.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Root class
+//    This one provides code generation for elements of the Root node in the
+//    server header.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_ROOT_ROOT_SH_H_
 #define _BE_VISITOR_ROOT_ROOT_SH_H_
 
-/**
- * @class be_visitor_root_sh
- *
- * @brief be_visitor_root_sh
- *
- * This is a concrete visitor to generate the server header for root
- */
 class be_visitor_root_sh : public be_visitor_root
 {
+  //
+  // = TITLE
+  //   be_visitor_root_sh
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the server header for root
+  //
+  //
 public:
-  /// constructor
   be_visitor_root_sh (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_root_sh (void);
+  // destructor
 
-  /// set the right context and make a visitor
   virtual int init (void);
+  // set the right context and make a visitor
 };
 
 #endif /* _BE_VISITOR_ROOT_ROOT_SH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_si.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_si.h
index ce733f11915..b615a08d69d 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_root/root_si.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_si.h
@@ -1,42 +1,48 @@
 /* -*- c++ -*- */
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    root_si.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Root class
- *  This one provides code generation for elements of the Root node in the
- *  server inline.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    root_si.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Root class
+//    This one provides code generation for elements of the Root node in the
+//    server inline.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_ROOT_ROOT_SI_H_
 #define _BE_VISITOR_ROOT_ROOT_SI_H_
 
-/**
- * @class be_visitor_root_si
- *
- * @brief be_visitor_root_si
- *
- * This is a concrete visitor to generate the server inline for root
- */
 class be_visitor_root_si : public be_visitor_root
 {
+  //
+  // = TITLE
+  //   be_visitor_root_si
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the server inline for root
+  //
+  //
 public:
-  /// constructor
   be_visitor_root_si (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_root_si (void);
+  // destructor
 
-  /// set the right context and make a visitor
   virtual int init (void);
+  // set the right context and make a visitor
 };
 
 #endif /* _BE_VISITOR_ROOT_ROOT_SI_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_ss.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_ss.h
index 559f89f1821..0c75d137122 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_root/root_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_ss.h
@@ -1,42 +1,48 @@
 /* -*- c++ -*- */
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    root_ss.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Root class
- *  This one provides code generation for elements of the Root node in the
- *  server skeletons.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    root_ss.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Root class
+//    This one provides code generation for elements of the Root node in the
+//    server skeletons.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_ROOT_ROOT_SS_H_
 #define _BE_VISITOR_ROOT_ROOT_SS_H_
 
-/**
- * @class be_visitor_root_ss
- *
- * @brief be_visitor_root_ss
- *
- * This is a concrete visitor to generate the server skeletons for root
- */
 class be_visitor_root_ss : public be_visitor_root
 {
+  //
+  // = TITLE
+  //   be_visitor_root_ss
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the server skeletons for root
+  //
+  //
 public:
-  /// constructor
   be_visitor_root_ss (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_root_ss (void);
+  // destructor
 
-  /// set the right context and make a visitor
   virtual int init (void);
+  // set the right context and make a visitor
 };
 
 #endif /* _BE_VISITOR_ROOT_ROOT_SS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_sth.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_sth.h
index 856772b8576..e15265275c7 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_root/root_sth.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_sth.h
@@ -1,43 +1,49 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    root_sth.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Root class
- *  This one provides code generation for elements of the Root node in the
- *  server template header.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    root_sth.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Root class
+//    This one provides code generation for elements of the Root node in the
+//    server template header.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_ROOT_ROOT_STH_H_
 #define _BE_VISITOR_ROOT_ROOT_STH_H_
 
-/**
- * @class be_visitor_root_sth
- *
- * @brief be_visitor_root_sth
- *
- * This is a concrete visitor to generate the server template
- * header for root.
- */
 class be_visitor_root_sth : public be_visitor_root
 {
+  //
+  // = TITLE
+  //   be_visitor_root_sth
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the server template
+  //   header for root.
+  //
+  //
 public:
-  /// Constructor.
   be_visitor_root_sth (be_visitor_context *ctx);
+  // Constructor.
 
-  /// Destructor.
   ~be_visitor_root_sth (void);
+  // Destructor.
 
-  /// Set the right context and make a visitor.
   virtual int init (void);
+  // Set the right context and make a visitor.
 
   // Overrides of base class methods so we can skip unnecessary nodes.
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_svh.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_svh.h
index 68271e53556..e79d387b685 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_root/root_svh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_svh.h
@@ -1,41 +1,47 @@
 /* -*- c++ -*- */
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    root_svh.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Root class
- *  This one provides code generation for elements of the Root node in the
- *  CIAO servant header.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    root_svh.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Root class
+//    This one provides code generation for elements of the Root node in the
+//    CIAO servant header.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_ROOT_ROOT_SVH_H_
 #define _BE_VISITOR_ROOT_ROOT_SVH_H_
 
-/**
- * @class be_visitor_root_svh
- *
- * @brief be_visitor_root_svh
- *
- * This is a concrete visitor to generate the CIAO servant
- * header for root
- */
 class be_visitor_root_svh : public be_visitor_root
 {
+  //
+  // = TITLE
+  //   be_visitor_root_svh
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the CIAO servant
+  //   header for root
+  //
+  //
 public:
   be_visitor_root_svh (be_visitor_context *ctx);
 
   ~be_visitor_root_svh (void);
 
-  /// Set the right context and make a visitor.
   virtual int init (void);
+  // Set the right context and make a visitor.
 };
 
 #endif /* _BE_VISITOR_ROOT_ROOT_SVH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_svs.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_svs.h
index 30bc7179fdf..1272ac79696 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_root/root_svs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_svs.h
@@ -1,41 +1,47 @@
 /* -*- c++ -*- */
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    root_svs.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Root class
- *  This one provides code generation for elements of the Root node in the
- *  CIAO servant source.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    root_svs.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Root class
+//    This one provides code generation for elements of the Root node in the
+//    CIAO servant source.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_ROOT_ROOT_SVS_H_
 #define _BE_VISITOR_ROOT_ROOT_SVS_H_
 
-/**
- * @class be_visitor_root_svs
- *
- * @brief be_visitor_root_svs
- *
- * This is a concrete visitor to generate the CIAO servant
- * source for root
- */
 class be_visitor_root_svs : public be_visitor_root
 {
+  //
+  // = TITLE
+  //   be_visitor_root_svs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the CIAO servant
+  //   source for root
+  //
+  //
 public:
   be_visitor_root_svs (be_visitor_context *ctx);
 
   ~be_visitor_root_svs (void);
 
-  /// Set the right context and make a visitor.
   virtual int init (void);
+  // Set the right context and make a visitor.
 };
 
 #endif /* _BE_VISITOR_ROOT_ROOT_SVS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/serializer_op.h b/TAO/TAO_IDL/be_include/be_visitor_root/serializer_op.h
index 448c4002286..d0628c4b249 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_root/serializer_op.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_root/serializer_op.h
@@ -1,44 +1,49 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    serializer_op.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Root class
- *  This one provides code generation for the TAO::DCPS::Serializer operators
- *  for elements of the Root scope.
- *
- *
- *  @author Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    serializer_op.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Root class
+//    This one provides code generation for the TAO::DCPS::Serializer operators
+//    for elements of the Root scope.
+//
+// = AUTHOR
+//    Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_ROOT_serializer_op_H_
 #define _BE_VISITOR_ROOT_serializer_op_H_
 
-/**
- * @class be_visitor_root_serializer_op
- *
- * @brief be_visitor_root_serializer_op
- *
- * This is a concrete visitor for root that generates the Serializer operator
- * declarations and implementations
- */
 class be_visitor_root_serializer_op : public be_visitor_root
 {
+  //
+  // = TITLE
+  //   be_visitor_root_serializer_op
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for root that generates the Serializer operator
+  //   declarations and implementations
+  //
 
 public:
-  /// constructor
   be_visitor_root_serializer_op (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_root_serializer_op (void);
+  // destructor
 
-  /// visit root
   virtual int visit_root (be_root *node);
+  // visit root
 };
 
 #endif /* _BE_VISITOR_ROOT_serializer_op_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_scope.h b/TAO/TAO_IDL/be_include/be_visitor_scope.h
index 6b987d3f657..061aa2c158f 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_scope.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_scope.h
@@ -1,17 +1,22 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    be_visitor_scope.h
- *
- *  $Id$
- *
- *  Concrete visitor for the base "BE_Scope" node
- *
- *
- *  @author Aniruddha Gokhale and Carlos O'Ryan
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_scope.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the base "BE_Scope" node
+//
+// = AUTHOR
+//    Aniruddha Gokhale and Carlos O'Ryan
+//
+// ============================================================================
 
 #ifndef TAO_BE_VISITOR_SCOPE_H
 #define TAO_BE_VISITOR_SCOPE_H
@@ -19,44 +24,44 @@
 #include "be_visitor_decl.h"
 
 
-/**
- * @class be_visitor_scope
- *
- * @brief be_visitor_scope
- *
- * This is a concrete visitor for the be_scope node. Its only purpose is to
- * iterate over the elements of the scope
- */
 class be_visitor_scope : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //    be_visitor_scope
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for the be_scope node. Its only purpose is to
+  //   iterate over the elements of the scope
+  //
 public:
-  /// constructor
   be_visitor_scope (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_scope (void);
+  // destructor
 
-  /// visit scope
   int visit_scope (be_scope *node);
+  // visit scope
 
-  /// do any processing after every element except the last one of the scope is
-  /// processed
   virtual int post_process (be_decl *);
+  // do any processing after every element except the last one of the scope is
+  // processed
 
-  /// do any processing prior to processing the element in the scope
   virtual int pre_process (be_decl *);
+  // do any processing prior to processing the element in the scope
 
-  /// return the element number that is being processed
   virtual int elem_number (void);
+  // return the element number that is being processed
 
-  /// get the successor to elem
   virtual int next_elem (be_decl *elem, be_decl *&);
+  // get the successor to elem
 
-  /// Is bd the last node in the scope
   virtual bool last_node (be_decl *bd);
+  // Is bd the last node in the scope
 
-  /// Is bd the last inout or out in the scope
   bool last_inout_or_out_node (be_decl *bd);
+  // Is bd the last inout or out in the scope
 
 protected:
   int elem_number_;
diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_ch.h
index ab1ba92db07..71cc3bf65c5 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_ch.h
@@ -1,44 +1,49 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    any_op_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Sequence class
- *  This one provides code generation for the Any operators for the Sequence
- *  node in the client header.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    any_op_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Sequence class
+//    This one provides code generation for the Any operators for the Sequence
+//    node in the client header.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_SEQUENCE_ANY_OP_CH_H_
 #define _BE_VISITOR_SEQUENCE_ANY_OP_CH_H_
 
-/**
- * @class be_visitor_sequence_any_op_ch
- *
- * @brief be_visitor_sequence_any_op_ch
- *
- * This is a concrete visitor for sequence that generates the Any operator
- * declarations
- */
 class be_visitor_sequence_any_op_ch : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //   be_visitor_sequence_any_op_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for sequence that generates the Any operator
+  //   declarations
+  //
 
 public:
-  /// constructor
   be_visitor_sequence_any_op_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_sequence_any_op_ch (void);
+  // destructor
 
-  /// visit sequence
   virtual int visit_sequence (be_sequence *node);
+  // visit sequence
 };
 
 #endif /* _BE_VISITOR_SEQUENCE_ANY_OP_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_cs.h
index 585d5b9bf8b..fdb3e422d14 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_cs.h
@@ -1,44 +1,49 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    any_op_cs.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Sequence class
- *  This one provides code generation for the Sequence node in the client
- *  header.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    any_op_cs.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Sequence class
+//    This one provides code generation for the Sequence node in the client
+//    header.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_SEQUENCE_ANY_OP_CS_H_
 #define _BE_VISITOR_SEQUENCE_ANY_OP_CS_H_
 
-/**
- * @class be_visitor_sequence_any_op_cs
- *
- * @brief be_visitor_sequence_any_op_cs
- *
- * This is a concrete visitor for sequence that generates the Any operator
- * implementations
- */
 class be_visitor_sequence_any_op_cs : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //   be_visitor_sequence_any_op_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for sequence that generates the Any operator
+  //   implementations
+  //
 
 public:
-  /// constructor
   be_visitor_sequence_any_op_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_sequence_any_op_cs (void);
+  // destructor
 
-  /// visit sequence
   virtual int visit_sequence (be_sequence *node);
+  // visit sequence
 };
 
 #endif /* _BE_VISITOR_SEQUENCE_ANY_OP_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/buffer_type.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/buffer_type.h
index 79387e8268c..54c7bc051e1 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_sequence/buffer_type.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/buffer_type.h
@@ -1,40 +1,45 @@
 /* -*- c++ -*- */
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    buffer_type.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Sequence class
- *  This one provides code generation for the buffer type of the Sequence
- *  node.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    buffer_type.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Sequence class
+//    This one provides code generation for the buffer type of the Sequence
+//    node.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_SEQUENCE_BUFFER_TYPE_H_
 #define _BE_VISITOR_SEQUENCE_BUFFER_TYPE_H_
 
-/**
- * @class be_visitor_sequence_buffer_type
- *
- * @brief be_visitor_sequence_buffer_type
- *
- * This is a concrete visitor to generate the buffer type
- * for a TAO_*_Sequence instantiation.
- */
 class be_visitor_sequence_buffer_type : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //    be_visitor_sequence_buffer_type
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the buffer type
+  //   for a TAO_*_Sequence instantiation.
+  //
 public:
-  /// Constructor
   be_visitor_sequence_buffer_type (be_visitor_context *ctx);
+  // Constructor
 
-  /// destructor
   ~be_visitor_sequence_buffer_type (void);
+  // destructor
 
   // = Visitor methods.
   virtual int visit_predefined_type (be_predefined_type *node);
@@ -59,8 +64,8 @@ public:
   virtual int visit_typedef (be_typedef *node);
 
 protected:
-  /// helper that does the common job
   int visit_node (be_type *);
+  // helper that does the common job
 
 };
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_ch.h
index 996c7166dae..4e625f0656c 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_ch.h
@@ -1,44 +1,49 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    cdr_op_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Sequence class
- *  This one provides code generation for the CDR operators for the sequence
- *  in the client header.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Sequence class
+//    This one provides code generation for the CDR operators for the sequence
+//    in the client header.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_SEQUENCE_CDR_OP_CH_H_
 #define _BE_VISITOR_SEQUENCE_CDR_OP_CH_H_
 
-/**
- * @class be_visitor_sequence_cdr_op_ch
- *
- * @brief be_visitor_sequence_cdr_op_ch
- *
- * This is a concrete visitor for sequence that generates the CDR operator
- * declarations
- */
 class be_visitor_sequence_cdr_op_ch : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //   be_visitor_sequence_cdr_op_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for sequence that generates the CDR operator
+  //   declarations
+  //
 
 public:
-  /// constructor
   be_visitor_sequence_cdr_op_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_sequence_cdr_op_ch (void);
+  // destructor
 
-  /// visit sequence
   virtual int visit_sequence (be_sequence *node);
+  // visit sequence
 };
 
 #endif /* _BE_VISITOR_SEQUENCE_CDR_OP_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_cs.h
index 9493d06b2cd..eecfd9d0a74 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_cs.h
@@ -1,18 +1,23 @@
-
-//=============================================================================
-/**
- *  @file    cdr_op_cs.h
- *
- *  $Id$
- *
- *  Visitors for generation of code for Sequences in client stubs. This one
- *  generates the CDR operators.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_cs.h
+//
+// = DESCRIPTION
+//    Visitors for generation of code for Sequences in client stubs. This one
+//    generates the CDR operators.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_SEQUENCE_CDR_OP_CS_H_
 #define _BE_VISITOR_SEQUENCE_CDR_OP_CS_H_
@@ -21,84 +26,84 @@
 // class be_visitor_sequence_cs
 // ************************************************************
 
-/**
- * @class be_visitor_sequence_cdr_op_cs
- *
- * @brief be_visitor_sequence_cdr_op_cs
- *
- * This is a concrete visitor for sequence that generates the CDR operator
- * implementations
- */
 class be_visitor_sequence_cdr_op_cs : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //   be_visitor_sequence_cdr_op_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for sequence that generates the CDR operator
+  //   implementations
+  //
 
 public:
-  /// constructor
   be_visitor_sequence_cdr_op_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_sequence_cdr_op_cs (void);
+  // destructor
 
-  /// visit sequence
   virtual int visit_sequence (be_sequence *node);
+  // visit sequence
 
   // = Visitor methods on sequence types
 
-  /// visit sequence
   virtual int visit_array (be_array *node);
+  // visit sequence
 
-  /// visit an enum
   virtual int visit_enum (be_enum *node);
+  // visit an enum
 
-  /// visit an interface
   virtual int visit_interface (be_interface *node);
+  // visit an interface
 
-  /// visit an interface forward node
   virtual int visit_interface_fwd (be_interface_fwd *node);
+  // visit an interface forward node
 
-  /// visit a component
   virtual int visit_component (be_component *node);
+  // visit a component
 
-  /// visit a component forward node
   virtual int visit_component_fwd (be_component_fwd *node);
+  // visit a component forward node
 
-  /// visit a home
   virtual int visit_home (be_home *node);
+  // visit a home
 
-  /// visit valuebox
   virtual int visit_valuebox (be_valuebox *node);
+  // visit valuebox
 
-  /// visit a valuetype
   virtual int visit_valuetype (be_valuetype *node);
+  // visit a valuetype
 
-  /// visit a valuetype forward node
   virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+  // visit a valuetype forward node
 
-  /// visit an eventtype
   virtual int visit_eventtype (be_eventtype *node);
+  // visit an eventtype
 
-  /// visit an eventtype forward node
   virtual int visit_eventtype_fwd (be_eventtype_fwd *node);
+  // visit an eventtype forward node
 
-  /// visit a predefined type node
   virtual int visit_predefined_type (be_predefined_type *node);
+  // visit a predefined type node
 
-  /// visit string
   virtual int visit_string (be_string *node);
+  // visit string
 
-  /// visit structure
   virtual int visit_structure (be_structure *node);
+  // visit structure
 
-  /// visit typedef
   virtual int visit_typedef (be_typedef *node);
+  // visit typedef
 
-  /// visit union
   virtual int visit_union (be_union *node);
+  // visit union
 
 protected:
 
-  /// helper that does the common job
   int visit_node (be_type *);
+  // helper that does the common job
 
 };
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_base.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_base.h
index edf29fdaee8..5f8305d0492 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_base.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_base.h
@@ -1,45 +1,51 @@
 /* -*- c++ -*- */
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    sequence_base.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Sequence class
- *  This one provides code generation for the base typ of the Sequence node.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    sequence_base.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Sequence class
+//    This one provides code generation for the base typ of the Sequence node.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_SEQUENCE_SEQUENCE_BASE_H_
 #define _BE_VISITOR_SEQUENCE_SEQUENCE_BASE_H_
 
-/**
- * @class be_visitor_sequence_base
- *
- * @brief be_visitor_sequence_base
- *
- * This is a concrete visitor to generate the template parameters
- * for a TAO_*_Sequence instantiation.
- * = BUGS
- * The class name is misleading, eventually this class could be
- * used to generate code in other files, not only the client
- * header.
- * The visitor factory should provide a factory method that builds
- * this class on the fly.
- */
 class be_visitor_sequence_base : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //    be_visitor_sequence_base
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the template parameters
+  //   for a TAO_*_Sequence instantiation.
+  //
+  // = BUGS
+  //   The class name is misleading, eventually this class could be
+  //   used to generate code in other files, not only the client
+  //   header.
+  //   The visitor factory should provide a factory method that builds
+  //   this class on the fly.
+  //
 public:
-  /// Constructor
   be_visitor_sequence_base (be_visitor_context *ctx);
+  // Constructor
 
-  /// destructor
   ~be_visitor_sequence_base (void);
+  // destructor
 
   // = Visitor methods.
   virtual int visit_predefined_type (be_predefined_type *node);
@@ -60,30 +66,29 @@ public:
   virtual int visit_typedef (be_typedef *node);
 
 protected:
-  /// helper that does the common job
   int visit_node (be_type *);
+  // helper that does the common job
 
 };
 
-/**
- * @class be_visitor_sequence_base_template_args:
- =TITLE
- * be_visitor_sequnce_base_template_args
- * =Description
- * This is a derived class just used to override the method
- * visit_interface that generates the arguments for the
- * templates. This is necessary as the same visitor was being used
- * by the idl compiler to generate the template arguments and the
- * return arguments for some of the methods.
- */
 class be_visitor_sequence_base_template_args: public be_visitor_sequence_base
 {
+  //
+  // =TITLE
+  // be_visitor_sequnce_base_template_args
+  //
+  // =Description
+  // This is a derived class just used to override the method
+  // visit_interface that generates the arguments for the
+  // templates. This is necessary as the same visitor was being used
+  // by the idl compiler to generate the template arguments and the
+  // return arguments for some of the methods.
 public:
   be_visitor_sequence_base_template_args (be_visitor_context *ctx,
                                           be_sequence *node );
 
-  ///Dtor
   ~be_visitor_sequence_base_template_args (void);
+  //Dtor
 
   //= Visit methods
   virtual int visit_interface (be_interface *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ch.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ch.h
index 6a683f50e37..993e7c894ad 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ch.h
@@ -1,47 +1,52 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    sequence_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Sequence class
- *  This one provides code generation for the Sequence node in the client
- *  header.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    sequence_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Sequence class
+//    This one provides code generation for the Sequence node in the client
+//    header.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_SEQUENCE_SEQUENCE_CH_H_
 #define _BE_VISITOR_SEQUENCE_SEQUENCE_CH_H_
 
-/**
- * @class be_visitor_sequence_ch
- *
- * @brief be_visitor_sequence_ch
- *
- * This is a concrete visitor to generate the client header for
- * sequences
- */
 class be_visitor_sequence_ch : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //    be_visitor_sequence_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the client header for
+  //   sequences
+  //
 public:
-  /// constructor
   be_visitor_sequence_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_sequence_ch (void);
+  // destructor
 
-  /// visit sequence node.
   virtual int visit_sequence (be_sequence *node);
+  // visit sequence node.
 
-  /// Generate the typedefs for our _var and _out template classes.
   void gen_varout_typedefs (be_sequence *node, 
                             be_type *elem);
+  // Generate the typedefs for our _var and _out template classes.
 };
 
 #endif /* _BE_VISITOR_SEQUENCE_SEQUENCE_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_cs.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_cs.h
index c71ecd52b88..7bc66db48d5 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_cs.h
@@ -1,44 +1,49 @@
 /* -*- c++ -*- */
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    sequence_cs.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Sequence class
- *  This one provides code generation for the Sequence node in the client
- *  stubs.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    sequence_cs.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Sequence class
+//    This one provides code generation for the Sequence node in the client
+//    stubs.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_SEQUENCE_SEQUENCE_CS_H_
 #define _BE_VISITOR_SEQUENCE_SEQUENCE_CS_H_
 
-/**
- * @class be_visitor_sequence_cs
- *
- * @brief be_visitor_sequence_cs
- *
- * This is a concrete visitor to generate the client stubs for
- * sequences
- */
 class TAO_OutStream;
 class be_visitor_sequence_cs : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //    be_visitor_sequence_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the client stubs for
+  //   sequences
+  //
 public:
-  /// constructor
   be_visitor_sequence_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_sequence_cs (void);
+  // destructor
 
-  /// visit sequence node
   virtual int visit_sequence (be_sequence *node);
+  // visit sequence node
 };
 
 #endif /* _BE_VISITOR_SEQUENCE_SEQUENCE_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/serializer_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/serializer_op_ch.h
index ae89e7f82e9..d27985b5879 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_sequence/serializer_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/serializer_op_ch.h
@@ -1,45 +1,50 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    serializer_op_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Sequence class
- *  This one provides code generation for the 
- *  TAO::DCPS::Serializer operators for the sequence
- *  in the client header.
- *
- *
- *  @author Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    serializer_op_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Sequence class
+//    This one provides code generation for the 
+//    TAO::DCPS::Serializer operators for the sequence
+//    in the client header.
+//
+// = AUTHOR
+//    Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_SEQUENCE_serializer_op_CH_H_
 #define _BE_VISITOR_SEQUENCE_serializer_op_CH_H_
 
-/**
- * @class be_visitor_sequence_serializer_op_ch
- *
- * @brief be_visitor_sequence_serializer_op_ch
- *
- * This is a concrete visitor for sequence that generates the Serializer operator
- * declarations
- */
 class be_visitor_sequence_serializer_op_ch : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //   be_visitor_sequence_serializer_op_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for sequence that generates the Serializer operator
+  //   declarations
+  //
 
 public:
-  /// constructor
   be_visitor_sequence_serializer_op_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_sequence_serializer_op_ch (void);
+  // destructor
 
-  /// visit sequence
   virtual int visit_sequence (be_sequence *node);
+  // visit sequence
 };
 
 #endif /* _BE_VISITOR_SEQUENCE_serializer_op_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/serializer_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/serializer_op_cs.h
index 7f898d992b8..5102dd83686 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_sequence/serializer_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/serializer_op_cs.h
@@ -1,18 +1,23 @@
-
-//=============================================================================
-/**
- *  @file    serializer_op_cs.h
- *
- *  $Id$
- *
- *  Visitors for generation of code for Sequences in client stubs. This one
- *  generates the TAO::DCPS::Serializer operators.
- *
- *
- *  @author Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    serializer_op_cs.h
+//
+// = DESCRIPTION
+//    Visitors for generation of code for Sequences in client stubs. This one
+//    generates the TAO::DCPS::Serializer operators.
+//
+// = AUTHOR
+//    Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_SEQUENCE_serializer_op_CS_H_
 #define _BE_VISITOR_SEQUENCE_serializer_op_CS_H_
@@ -21,81 +26,81 @@
 // class be_visitor_sequence_cs
 // ************************************************************
 
-/**
- * @class be_visitor_sequence_serializer_op_cs
- *
- * @brief be_visitor_sequence_serializer_op_cs
- *
- * This is a concrete visitor for sequence that generates the Serializer operator
- * implementations
- */
 class be_visitor_sequence_serializer_op_cs : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //   be_visitor_sequence_serializer_op_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for sequence that generates the Serializer operator
+  //   implementations
+  //
 
 public:
-  /// constructor
   be_visitor_sequence_serializer_op_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_sequence_serializer_op_cs (void);
+  // destructor
 
-  /// visit sequence
   virtual int visit_sequence (be_sequence *node);
+  // visit sequence
 
   // = Visitor methods on sequence types
 
-  /// visit sequence
   virtual int visit_array (be_array *node);
+  // visit sequence
 
-  /// visit an enum
   virtual int visit_enum (be_enum *node);
+  // visit an enum
 
-  /// visit an interface
   virtual int visit_interface (be_interface *node);
+  // visit an interface
 
-  /// visit an interface forward node
   virtual int visit_interface_fwd (be_interface_fwd *node);
+  // visit an interface forward node
 
-  /// visit a component
   virtual int visit_component (be_component *node);
+  // visit a component
 
-  /// visit a component forward node
   virtual int visit_component_fwd (be_component_fwd *node);
+  // visit a component forward node
 
-  /// visit a home
   virtual int visit_home (be_home *node);
+  // visit a home
 
-  /// visit a valuetype
   virtual int visit_valuetype (be_valuetype *node);
+  // visit a valuetype
 
-  /// visit a valuetype forward node
   virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+  // visit a valuetype forward node
 
-  /// visit an eventtype
   virtual int visit_eventtype (be_eventtype *node);
+  // visit an eventtype
 
-  /// visit an eventtype forward node
   virtual int visit_eventtype_fwd (be_eventtype_fwd *node);
+  // visit an eventtype forward node
 
-  /// visit a predefined type node
   virtual int visit_predefined_type (be_predefined_type *node);
+  // visit a predefined type node
 
-  /// visit string
   virtual int visit_string (be_string *node);
+  // visit string
 
-  /// visit structure
   virtual int visit_structure (be_structure *node);
+  // visit structure
 
-  /// visit typedef
   virtual int visit_typedef (be_typedef *node);
+  // visit typedef
 
-  /// visit union
   virtual int visit_union (be_union *node);
+  // visit union
 
 protected:
 
-  /// helper that does the common job
   int visit_node (be_type *);
+  // helper that does the common job
 
 };
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure.h b/TAO/TAO_IDL/be_include/be_visitor_structure.h
index 773c5ceff49..478de9e0641 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_structure.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_structure.h
@@ -1,18 +1,23 @@
 /* -*- c++ -*- */
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    be_visitor_structure.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Structure class
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_structure.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Structure class
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef TAO_BE_VISITOR_STRUCTURE_H
 #define TAO_BE_VISITOR_STRUCTURE_H
diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_structure/any_op_ch.h
index c7bb7f505e9..d62c610d4eb 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_structure/any_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_structure/any_op_ch.h
@@ -1,53 +1,58 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    any_op_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Structure class
- *  This one provides code generation for the Any operators for the structure
- *  in the client header.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    any_op_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Structure class
+//    This one provides code generation for the Any operators for the structure
+//    in the client header.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_STRUCTURE_ANY_OP_CH_H_
 #define _BE_VISITOR_STRUCTURE_ANY_OP_CH_H_
 
-/**
- * @class be_visitor_structure_any_op_ch
- *
- * @brief be_visitor_structure_any_op_ch
- *
- * This is a concrete visitor for structure that generates the Any operator
- * declarations
- */
 class be_visitor_structure_any_op_ch : public be_visitor_structure
 {
+  //
+  // = TITLE
+  //   be_visitor_structure_any_op_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for structure that generates the Any operator
+  //   declarations
+  //
 
 public:
-  /// constructor
   be_visitor_structure_any_op_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_structure_any_op_ch (void);
+  // destructor
 
-  /// visit structure
   virtual int visit_structure (be_structure *node);
+  // visit structure
 
-  /// visit field
   virtual int visit_field (be_field *node);
+  // visit field
 
-  /// visit union
   virtual int visit_union (be_union *node);
+  // visit union
 
-  /// visit field
   virtual int visit_enum (be_enum *node);
+  // visit field
 };
 
 #endif /* _BE_VISITOR_STRUCTURE_ANY_OP_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_structure/any_op_cs.h
index eaf6eac85a2..217d8e611ba 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_structure/any_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_structure/any_op_cs.h
@@ -1,53 +1,58 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    any_op_cs.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Structure class
- *  This one provides code generation for the Any operators for the structure
- *  in the client header.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    any_op_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Structure class
+//    This one provides code generation for the Any operators for the structure
+//    in the client header.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_STRUCTURE_ANY_OP_CS_H_
 #define _BE_VISITOR_STRUCTURE_ANY_OP_CS_H_
 
-/**
- * @class be_visitor_structure_any_op_cs
- *
- * @brief be_visitor_structure_any_op_cs
- *
- * This is a concrete visitor for structure that generates the Any operator
- * implementations
- */
 class be_visitor_structure_any_op_cs : public be_visitor_structure
 {
+  //
+  // = TITLE
+  //   be_visitor_structure_any_op_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for structure that generates the Any operator
+  //   implementations
+  //
 
 public:
-  /// constructor
   be_visitor_structure_any_op_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_structure_any_op_cs (void);
+  // destructor
 
-  /// visit structure
   virtual int visit_structure (be_structure *node);
+  // visit structure
 
-  /// visit field
   virtual int visit_field (be_field *node);
+  // visit field
 
-  /// visit field
   virtual int visit_union (be_union *node);
+  // visit field
 
-  /// visit field
   virtual int visit_enum (be_enum *node);
+  // visit field
 };
 
 #endif /* _BE_VISITOR_STRUCTURE_ANY_OP_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_structure/cdr_op_ch.h
index 7b65c58b300..5ab95eb05d4 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_structure/cdr_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_structure/cdr_op_ch.h
@@ -1,44 +1,49 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    cdr_op_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Structure class
- *  This one provides code generation for the CDR operators for the structure
- *  in the client header.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Structure class
+//    This one provides code generation for the CDR operators for the structure
+//    in the client header.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_STRUCTURE_CDR_OP_CH_H_
 #define _BE_VISITOR_STRUCTURE_CDR_OP_CH_H_
 
-/**
- * @class be_visitor_structure_cdr_op_ch
- *
- * @brief be_visitor_structure_cdr_op_ch
- *
- * This is a concrete visitor for structure that generates the CDR operator
- * declarations
- */
 class be_visitor_structure_cdr_op_ch : public be_visitor_structure
 {
+  //
+  // = TITLE
+  //   be_visitor_structure_cdr_op_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for structure that generates the CDR operator
+  //   declarations
+  //
 
 public:
-  /// constructor
   be_visitor_structure_cdr_op_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_structure_cdr_op_ch (void);
+  // destructor
 
-  /// visit structure
   virtual int visit_structure (be_structure *node);
+  // visit structure
 };
 
 #endif /* _BE_VISITOR_STRUCTURE_CDR_OP_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_structure/cdr_op_cs.h
index 86b35dcedf6..d8b6d13f64a 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_structure/cdr_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_structure/cdr_op_cs.h
@@ -1,47 +1,52 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    cdr_op_cs.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Structure class
- *  This one provides code generation for the CDR operators for the structure
- *  in the client stub.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Structure class
+//    This one provides code generation for the CDR operators for the structure
+//    in the client stub.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_STRUCTURE_CDR_OP_CS_H_
 #define _BE_VISITOR_STRUCTURE_CDR_OP_CS_H_
 
-/**
- * @class be_visitor_structure_cdr_op_cs
- *
- * @brief be_visitor_structure_cdr_op_cs
- *
- * This is a concrete visitor for structure that generates the CDR operator
- * implementations
- */
 class be_visitor_structure_cdr_op_cs : public be_visitor_structure
 {
+  //
+  // = TITLE
+  //   be_visitor_structure_cdr_op_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for structure that generates the CDR operator
+  //   implementations
+  //
 
 public:
-  /// constructor
   be_visitor_structure_cdr_op_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_structure_cdr_op_cs (void);
+  // destructor
 
-  /// visit structure
   virtual int visit_structure (be_structure *node);
+  // visit structure
 
-  /// any post processing that needs to be done after a scope element is handled
   virtual int post_process (be_decl *);
+  // any post processing that needs to be done after a scope element is handled
 };
 
 #endif /* _BE_VISITOR_STRUCTURE_CDR_OP_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure/serializer_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_structure/serializer_op_ch.h
index 249c23f780b..d933328a197 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_structure/serializer_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_structure/serializer_op_ch.h
@@ -1,44 +1,49 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    serializer_op_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Structure class
- *  This one provides code generation for the TAO::DCPS::Serializer operators
- *  for the structure in the client header.
- *
- *
- *  @author Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    serializer_op_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Structure class
+//    This one provides code generation for the TAO::DCPS::Serializer operators
+//    for the structure in the client header.
+//
+// = AUTHOR
+//    Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_STRUCTURE_serializer_op_CH_H_
 #define _BE_VISITOR_STRUCTURE_serializer_op_CH_H_
 
-/**
- * @class be_visitor_structure_serializer_op_ch
- *
- * @brief be_visitor_structure_serializer_op_ch
- *
- * This is a concrete visitor for structure that generates the Serializer operator
- * declarations
- */
 class be_visitor_structure_serializer_op_ch : public be_visitor_structure
 {
+  //
+  // = TITLE
+  //   be_visitor_structure_serializer_op_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for structure that generates the Serializer operator
+  //   declarations
+  //
 
 public:
-  /// constructor
   be_visitor_structure_serializer_op_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_structure_serializer_op_ch (void);
+  // destructor
 
-  /// visit structure
   virtual int visit_structure (be_structure *node);
+  // visit structure
 };
 
 #endif /* _BE_VISITOR_STRUCTURE_serializer_op_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure/serializer_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_structure/serializer_op_cs.h
index bb553f914ef..f4c8292fbf8 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_structure/serializer_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_structure/serializer_op_cs.h
@@ -1,50 +1,55 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    serializer_op_cs.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Structure class
- *  This one provides code generation for the TAO::DCPS::Serializer operators
- *  for the structure in the client stub.
- *
- *
- *  @author Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    serializer_op_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Structure class
+//    This one provides code generation for the TAO::DCPS::Serializer operators
+//    for the structure in the client stub.
+//
+// = AUTHOR
+//    Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_STRUCTURE_serializer_op_CS_H_
 #define _BE_VISITOR_STRUCTURE_serializer_op_CS_H_
 
-/**
- * @class be_visitor_structure_serializer_op_cs
- *
- * @brief be_visitor_structure_serializer_op_cs
- *
- * This is a concrete visitor for structure that generates the Serializer operator
- * implementations
- */
 class be_visitor_structure_serializer_op_cs : public be_visitor_structure
 {
+  //
+  // = TITLE
+  //   be_visitor_structure_serializer_op_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for structure that generates the Serializer operator
+  //   implementations
+  //
 
 public:
-  /// constructor
   be_visitor_structure_serializer_op_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_structure_serializer_op_cs (void);
+  // destructor
 
-  /// visit structure
   virtual int visit_structure (be_structure *node);
+  // visit structure
 
-  /// any post processing that needs to be done after a field is handled
   virtual int post_process (be_decl *);
+  // any post processing that needs to be done after a field is handled
 
-  /// any preprocessing that needs to be done before a field is handled
   virtual int pre_process (be_decl *bd);
+  // any preprocessing that needs to be done before a field is handled
 };
 
 #endif /* _BE_VISITOR_STRUCTURE_serializer_op_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure/structure.h b/TAO/TAO_IDL/be_include/be_visitor_structure/structure.h
index 6537df8b58f..01a64e3f342 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_structure/structure.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_structure/structure.h
@@ -1,46 +1,52 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    structure.h
- *
- *  $Id$
- *
- *  Concrete visitor for the STRUCTURE class
- *  This one provides the generic visitor for the Structure node.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    structure.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the STRUCTURE class
+//    This one provides the generic visitor for the Structure node.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_STRUCTURE_STRUCTURE_H_
 #define _BE_VISITOR_STRUCTURE_STRUCTURE_H_
 
-/**
- * @class be_visitor_structure
- *
- * @brief be_visitor_structure
- *
- * This is the base visitor for structure
- */
 class be_visitor_structure : public be_visitor_scope
 {
+  //
+  // = TITLE
+  //   be_visitor_structure
+  //
+  // = DESCRIPTION
+  //   This is the base visitor for structure
+  //
+  //
 public:
-  /// constructureor
   be_visitor_structure (be_visitor_context *ctx);
+  // constructureor
 
-  /// destructureor
   ~be_visitor_structure (void);
+  // destructureor
 
-  /// visit structure. We provide code for this method in the derived class
   virtual int visit_structure (be_structure *node);
+  // visit structure. We provide code for this method in the derived class
 
   // =visit operations on syntactically valid elements in our scope
 
-  /// visit field
   virtual int visit_field (be_field *node);
+  // visit field
 };
 
 #endif /* _BE_VISITOR_STRUCTURE_STRUCTURE_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure/structure_ch.h b/TAO/TAO_IDL/be_include/be_visitor_structure/structure_ch.h
index 08a79a1e435..1b19214ecc9 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_structure/structure_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_structure/structure_ch.h
@@ -1,41 +1,47 @@
 /* -*- c++ -*- */
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    structure_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Structure class
- *  This one provides code generation for the structure in the client header.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    structure_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Structure class
+//    This one provides code generation for the structure in the client header.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_STRUCTURE_STRUCTURE_CH_H_
 #define _BE_VISITOR_STRUCTURE_STRUCTURE_CH_H_
 
-/**
- * @class be_visitor_structure_ch
- *
- * @brief be_visitor_structure_ch
- *
- * This is a concrete visitor to generate the client header for structure
- */
 class be_visitor_structure_ch : public be_visitor_structure
 {
+  //
+  // = TITLE
+  //   be_visitor_structure_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the client header for structure
+  //
+  //
 public:
-  /// constructureor
   be_visitor_structure_ch (be_visitor_context *ctx);
+  // constructureor
 
-  /// destructureor
   ~be_visitor_structure_ch (void);
+  // destructureor
 
-  /// visit structure. We provide code for this method in the derived class
   virtual int visit_structure (be_structure *node);
+  // visit structure. We provide code for this method in the derived class
 };
 
 #endif /* _BE_VISITOR_STRUCTURE_STRUCTURE_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure/structure_ci.h b/TAO/TAO_IDL/be_include/be_visitor_structure/structure_ci.h
index ad5f9d2fcf7..313657b6bac 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_structure/structure_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_structure/structure_ci.h
@@ -1,41 +1,47 @@
 /* -*- c++ -*- */
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    structure_ci.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Structure class
- *  This one provides code generation for the structure in the client inline.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    structure_ci.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Structure class
+//    This one provides code generation for the structure in the client inline.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_STRUCTURE_STRUCTURE_CI_H_
 #define _BE_VISITOR_STRUCTURE_STRUCTURE_CI_H_
 
-/**
- * @class be_visitor_structure_ci
- *
- * @brief be_visitor_structure_ci
- *
- * This is a concrete visitor to generate the client inline for structure
- */
 class be_visitor_structure_ci : public be_visitor_structure
 {
+  //
+  // = TITLE
+  //   be_visitor_structure_ci
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the client inline for structure
+  //
+  //
 public:
-  /// constructureor
   be_visitor_structure_ci (be_visitor_context *ctx);
+  // constructureor
 
-  /// destructureor
   ~be_visitor_structure_ci (void);
+  // destructureor
 
-  /// visit structure. We provide code for this method in the derived class
   virtual int visit_structure (be_structure *node);
+  // visit structure. We provide code for this method in the derived class
 };
 
 #endif /* _BE_VISITOR_STRUCTURE_STRUCTURE_CI_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure/structure_cs.h b/TAO/TAO_IDL/be_include/be_visitor_structure/structure_cs.h
index 758c014ab09..24ebf61be18 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_structure/structure_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_structure/structure_cs.h
@@ -1,41 +1,47 @@
 /* -*- c++ -*- */
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    structure_cs.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Structure class
- *  This one provides code generation for the structure in the client stubs.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    structure_cs.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Structure class
+//    This one provides code generation for the structure in the client stubs.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_STRUCTURE_STRUCTURE_CS_H_
 #define _BE_VISITOR_STRUCTURE_STRUCTURE_CS_H_
 
-/**
- * @class be_visitor_structure_cs
- *
- * @brief be_visitor_structure_cs
- *
- * This is a concrete visitor to generate the client stubs for structure
- */
 class be_visitor_structure_cs : public be_visitor_structure
 {
+  //
+  // = TITLE
+  //   be_visitor_structure_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the client stubs for structure
+  //
+  //
 public:
-  /// constructor
   be_visitor_structure_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_structure_cs (void);
+  // destructor
 
-  /// visit structure.
   virtual int visit_structure (be_structure *node);
+  // visit structure.
 };
 
 #endif /* _BE_VISITOR_STRUCTURE_STRUCTURE_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure_fwd.h b/TAO/TAO_IDL/be_include/be_visitor_structure_fwd.h
index b002b93dce6..fc0a7c6613d 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_structure_fwd.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_structure_fwd.h
@@ -1,18 +1,23 @@
 /* -*- C++ -*- */
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    be_visitor_structure_fwd.h
- *
- *  $Id$
- *
- *  Concrete visitor for the be_structure_fwd class
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_structure_fwd.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the be_structure_fwd class
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef TAO_BE_VISITOR_STRUCTURE_FWD_H
 #define TAO_BE_VISITOR_STRUCTURE_FWD_H
diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure_fwd/structure_fwd_ch.h b/TAO/TAO_IDL/be_include/be_visitor_structure_fwd/structure_fwd_ch.h
index 8b25a14a9f0..fd4f84e9448 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_structure_fwd/structure_fwd_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_structure_fwd/structure_fwd_ch.h
@@ -1,30 +1,36 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    structure_fwd_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for the be_structure_fwd node.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    structure_fwd_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the be_structure_fwd node.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_INTERFACE_STRUCTURE_FWD_CH_H_
 #define _BE_INTERFACE_STRUCTURE_FWD_CH_H_
 
-/**
- * @class be_visitor_structure_fwd_ch
- *
- * @brief be_visitor_structure_fwd_ch
- *
- * This is the visitor for be_structure_fwd for the header file
- */
 class be_visitor_structure_fwd_ch : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //   be_visitor_structure_fwd_ch
+  //
+  // = DESCRIPTION
+  //   This is the visitor for be_structure_fwd for the header file
+  //
+  //
 public:
   be_visitor_structure_fwd_ch (be_visitor_context *ctx);
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_template_export.h b/TAO/TAO_IDL/be_include/be_visitor_template_export.h
index 461ff358054..1f74232c376 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_template_export.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_template_export.h
@@ -1,22 +1,27 @@
+//
+// $Id$
+//
 
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    be_visitor_template_export.h
- *
- *  $Id$
- *
- *  This visitor generates an explicit export of a sequence's
- *  template base class. It is conditionally launched by a
- *  command line option and is motivated by a bug in Visual
- *  Studio C++ (.NET 2002, .NET 2003, and Express 2005), documented in
- *  http://support.microsoft.com/default.aspx?scid=kb;en-us;309801
- *
- *
- *  @author Jeff Parsons <j.parsons@vanderbilt.edu>
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_template_export.h
+//
+// = DESCRIPTION
+//    This visitor generates an explicit export of a sequence's
+//    template base class. It is conditionally launched by a
+//    command line option and is motivated by a bug in Visual
+//    Studio C++ (.NET 2002, .NET 2003, and Express 2005), documented in
+//    http://support.microsoft.com/default.aspx?scid=kb;en-us;309801
+//
+// = AUTHOR
+//    Jeff Parsons <j.parsons@vanderbilt.edu>
+//
+// ============================================================================
 
 #ifndef TAO_BE_VISITOR_TEMPLATE_EXPORT_H
 #define TAO_BE_VISITOR_TEMPLATE_EXPORT_H
@@ -25,15 +30,15 @@
 
 class AST_Interface;
 
-/**
- * @class :
- *
- * @brief be_visitor_template_export
- *
- * Generates sequence template base class export instantiation.
- */
 class be_visitor_template_export : public be_visitor_scope
 {
+  //
+  // = TITLE
+  //   be_visitor_template_export
+  //
+  // = DESCRIPTION
+  //   Generates sequence template base class export instantiation.
+  //
 public:
   be_visitor_template_export (be_visitor_context *ctx);
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_traits.h b/TAO/TAO_IDL/be_include/be_visitor_traits.h
index ccd134056ae..939b0b6bf17 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_traits.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_traits.h
@@ -11,7 +11,6 @@
 *  @author Jeff Parsons <j.parsons@vanderbilt.edu>
 */
 //=============================================================================
-
 #ifndef TAO_BE_VISITOR_TRAITS_H
 #define TAO_BE_VISITOR_TRAITS_H
 
@@ -30,23 +29,39 @@ public:
   virtual ~be_visitor_traits (void);
 
   virtual int visit_root (be_root *node);
+
   virtual int visit_module (be_module *node);
+
   virtual int visit_interface (be_interface *node);
+
   virtual int visit_interface_fwd (be_interface_fwd *node);
+
   virtual int visit_valuetype (be_valuetype *node);
+
   virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+
   virtual int visit_valuebox (be_valuebox *node);
+
   virtual int visit_component (be_component *node);
+
   virtual int visit_component_fwd (be_component_fwd *node);
-  virtual int visit_connector (be_connector *node);
+
   virtual int visit_eventtype (be_eventtype *node);
+
   virtual int visit_eventtype_fwd (be_eventtype_fwd *node);
+
   virtual int visit_field (be_field *node);
+
   virtual int visit_union_branch (be_union_branch *node);
+
   virtual int visit_exception (be_exception *node);
+
   virtual int visit_structure (be_structure *node);
+
   virtual int visit_union (be_union *node);
+
   virtual int visit_array (be_array *node);
+
   virtual int visit_typedef (be_typedef *node);
 };
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_typecode.h b/TAO/TAO_IDL/be_include/be_visitor_typecode.h
index 7e182281bdc..ae49fe87a1f 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_typecode.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_typecode.h
@@ -1,18 +1,23 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    be_visitor_typecode.h
- *
- *  $Id$
- *
- *  Concrete visitor to generate code for TypeCodes
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_typecode.h
+//
+// = DESCRIPTION
+//    Concrete visitor to generate code for TypeCodes
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef TAO_BE_VISITOR_TYPECODE_H
 #define TAO_BE_VISITOR_TYPECODE_H
diff --git a/TAO/TAO_IDL/be_include/be_visitor_typecode/objref_typecode.h b/TAO/TAO_IDL/be_include/be_visitor_typecode/objref_typecode.h
index d47705aa798..b860807cbb4 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_typecode/objref_typecode.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_typecode/objref_typecode.h
@@ -17,6 +17,7 @@
 
 namespace TAO
 {
+
   /**
    * @class be_visitor_objref_typecode
    *
@@ -31,6 +32,8 @@ namespace TAO
     : public be_visitor_typecode_defn
   {
   public:
+
+    /// Constructor.
     be_visitor_objref_typecode (be_visitor_context * ctx);
 
     /// Visit an object reference / interface.
@@ -50,13 +53,16 @@ namespace TAO
     virtual int visit_native (be_native * node);
 
   private:
+
     /// Generate TypeCode instance.
     int visit_i (char const * kind,
                  char const * flat_name,
                  char const * repository_id,
                  char const * original_local_name,
                  be_type * node);
+
   };
+
 }
 
 #endif  /* TAO_BE_VISITOR_OBJREF_TYPECODE_H */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_decl.h b/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_decl.h
index 66a9ce8129e..e1d0504dc10 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_decl.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_decl.h
@@ -1,83 +1,88 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    typecode_decl.h
- *
- *  $Id$
- *
- *  Concrete visitor for the generation of TypeCodes.
- *  This one generates the declaration.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    typecode_decl.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the generation of TypeCodes.
+//    This one generates the declaration.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_TYPECODE_TYPECODE_DECL_H_
 #define _BE_VISITOR_TYPECODE_TYPECODE_DECL_H_
 
-/**
- * @class be_visitor_typecode_decl
- *
- * @brief be_visitor_typecode_decl
- *
- * This is a concrete visitor for generating TypeCode declarations
- */
 class be_visitor_typecode_decl : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //    be_visitor_typecode_decl
+  //
+  // = DESCRIPTION
+  //    This is a concrete visitor for generating TypeCode declarations
+  //
 
 public:
-  /// constructor
   be_visitor_typecode_decl (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_typecode_decl (void);
+  // destructor
 
-  /// visit a generic be_type node
   virtual int visit_type (be_type *node);
+  // visit a generic be_type node
 
   // =visit methods on all types. They call the generic visit_type
 
-  /// visit a array
   virtual int visit_array (be_array *node);
+  // visit a array
 
-  /// visit an enum
   virtual int visit_enum (be_enum *node);
+  // visit an enum
 
-  /// visit an enum
   virtual int visit_exception (be_exception *node);
+  // visit an enum
 
-  /// visit interface
   virtual int visit_interface (be_interface *node);
+  // visit interface
 
-  /// visit component
   virtual int visit_component (be_component *node);
+  // visit component
 
-  /// visit home
   virtual int visit_home (be_home *node);
+  // visit home
 
-  /// visit a sequence
   virtual int visit_sequence (be_sequence *node);
+  // visit a sequence
 
-  /// visit a structure
   virtual int visit_structure (be_structure *node);
+  // visit a structure
 
-  /// visit a typedef
   virtual int visit_typedef (be_typedef *node);
+  // visit a typedef
 
-  /// visit a union
   virtual int visit_union (be_union *node);
+  // visit a union
 
-  /// visit a valuetype
   virtual int visit_valuebox (be_valuebox *node);
+  // visit a valuetype
 
-  /// visit a valuetype
   virtual int visit_valuetype (be_valuetype *node);
+  // visit a valuetype
 
-  /// visit a valuetype
   virtual int visit_eventtype (be_eventtype *node);
+  // visit a valuetype
 };
 
 #endif /* _BE_VISITOR_TYPECODE_TYPECODE_DECL_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h b/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h
index a31fbaea4a9..342f0576d81 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h
@@ -1,18 +1,23 @@
 // -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    typecode_defn.h
- *
- *  $Id$
- *
- *  Concrete visitor for the generation of TypeCodes.
- *  This one generates the definitions.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
+//
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    typecode_defn.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the generation of TypeCodes.
+//    This one generates the definitions.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_TYPECODE_TYPECODE_DEFN_H_
 #define _BE_VISITOR_TYPECODE_TYPECODE_DEFN_H_
@@ -27,45 +32,69 @@ const int TAO_BE_VISITOR_TYPECODE_DEFN_MAX_STACK_SIZE = 1024;
 class AST_Structure;
 class be_interface_fwd;
 
-/**
- * @class be_visitor_typecode_defn
- *
- * @brief be_visitor_typecode_defn
- *
- * This is a concrete visitor for generating TypeCode definitions
- */
 class be_visitor_typecode_defn : public be_visitor_scope
 {
+  //
+  // = TITLE
+  //    be_visitor_typecode_defn
+  //
+  // = DESCRIPTION
+  //    This is a concrete visitor for generating TypeCode definitions
+  //
+
 public:
   be_visitor_typecode_defn (be_visitor_context *ctx);
+  // constructor
+
   ~be_visitor_typecode_defn (void);
+  // destructor
 
   virtual int visit_array (be_array *node);
+  // visit a array
+
   virtual int visit_interface (be_interface *node);
+  // visit interface
+
   virtual int visit_interface_fwd (be_interface_fwd *node);
+  // visit interface
+
   virtual int visit_component (be_component *node);
-  virtual int visit_connector (be_connector *node);
+  // visit component
+
   virtual int visit_sequence (be_sequence *node);
+  // visit a sequence
+
   virtual int visit_string (be_string *node);
+  // visit a string
+
   virtual int visit_structure (be_structure *node);
+  // visit a structure
+
+  // visit a typedef
   virtual int visit_typedef (be_typedef *node);
+
   virtual int visit_union (be_union *node);
+  // visit a union
+
   virtual int visit_valuetype (be_valuetype * node);
+  // visit a valuetype
+
   virtual int visit_eventtype (be_eventtype * node);
+  // visit a valuetype
 
   // = special methods
 
-  /// generate the nested namespace begins
   virtual int gen_nested_namespace_begin (be_module *node);
+  // generate the nested namespace begins
 
-  /// generate the nested namespace ends
   virtual int gen_nested_namespace_end (be_module *node);
+  // generate the nested namespace ends
 
   // processing for scopes
 
-  /// do any processing after every element except the last one of the scope is
-  /// processed
   virtual int post_process (be_decl *);
+  // do any processing after every element except the last one of the scope is
+  // processed
 
   // data structure for handling recursive and repeated typecodes
 
@@ -122,25 +151,25 @@ private:
   //
   friend class Scoped_Compute_Queue_Guard;
 
-  /// the tc size of the node under consideration
   ACE_CDR::Long computed_tc_size_;
+  // the tc size of the node under consideration
 
-  /// the encap length of the node under consideration
   ACE_CDR::Long computed_encap_len_;
+  // the encap length of the node under consideration
 
-  /// the encap length of the scope of the node under consideration
   ACE_CDR::Long computed_scope_encap_len_;
+  // the encap length of the scope of the node under consideration
 
   // the following are used for recursive and repeated typecodes
 
-  /// current computed length of the typecode
   ACE_CDR::Long tc_offset_;
+  // current computed length of the typecode
 
-  /// queue to keep nodes
   ACE_Unbounded_Queue <QNode*> compute_queue_;
+  // queue to keep nodes
 
-  /// stores scope lens during computation
   ACE_CDR::Long scope_stack_ [TAO_BE_VISITOR_TYPECODE_DEFN_MAX_STACK_SIZE];
+  // stores scope lens during computation
 
   // scope related routines
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef.h b/TAO/TAO_IDL/be_include/be_visitor_typedef.h
index 6a20704f6ac..82f6dd899d6 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_typedef.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_typedef.h
@@ -1,18 +1,23 @@
 /* -*- c++ -*- */
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    be_visitor_typedef.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Typedef class
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_typedef.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Typedef class
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef TAO_BE_VISITOR_TYPEDEF_H
 #define TAO_BE_VISITOR_TYPEDEF_H
diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_ch.h
index d56b7545eaa..a614a30f71a 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_ch.h
@@ -1,63 +1,68 @@
 
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    any_op_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Typedef class
- *  This provides the code generation for the Any operators of the Typedef
- *  class in the client header.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    any_op_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Typedef class
+//    This provides the code generation for the Any operators of the Typedef
+//    class in the client header.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_TYPEDEF_ANY_OP_CH_H_
 #define _BE_VISITOR_TYPEDEF_ANY_OP_CH_H_
 
-/**
- * @class be_visitor_typedef_any_op_ch
- *
- * @brief be_visitor_typedef_any_op_ch
- *
- * This is a concrete visitor for typedef that generates the Any operator
- * declarations and implementations
- */
 class be_visitor_typedef_any_op_ch : public be_visitor_typedef
 {
+  //
+  // = TITLE
+  //   be_visitor_typedef_any_op_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for typedef that generates the Any operator
+  //   declarations and implementations
+  //
 
 public:
-  /// constructor
   be_visitor_typedef_any_op_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_typedef_any_op_ch (void);
+  // destructor
 
-  /// visit typedef
   virtual int visit_typedef (be_typedef *node);
+  // visit typedef
 
   // =visit methods on all elements syntactically valid as types that can be
   // typedefed.
 
-  /// visit a array
   virtual int visit_array (be_array *node);
+  // visit a array
 
-  /// visit an enum
   virtual int visit_enum (be_enum *node);
+  // visit an enum
 
-  /// visit a sequence
   virtual int visit_sequence (be_sequence *node);
+  // visit a sequence
 
-  /// visit a structure
   virtual int visit_structure (be_structure *node);
+  // visit a structure
 
-  /// visit a union
   virtual int visit_union (be_union *node);
+  // visit a union
 
 };
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_cs.h
index 92ea0fca628..f99033d4f43 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_cs.h
@@ -1,63 +1,68 @@
 
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    any_op_cs.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Typedef class
- *  This provides the code generation for the Any operators of the Typedef
- *  class in the client stubs.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    any_op_cs.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Typedef class
+//    This provides the code generation for the Any operators of the Typedef
+//    class in the client stubs.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_TYPEDEF_ANY_OP_CS_H_
 #define _BE_VISITOR_TYPEDEF_ANY_OP_CS_H_
 
-/**
- * @class be_visitor_typedef_any_op_cs
- *
- * @brief be_visitor_typedef_any_op_cs
- *
- * This is a concrete visitor for typedef that generates the Any operator
- * declarations and implementations
- */
 class be_visitor_typedef_any_op_cs : public be_visitor_typedef
 {
+  //
+  // = TITLE
+  //   be_visitor_typedef_any_op_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for typedef that generates the Any operator
+  //   declarations and implementations
+  //
 
 public:
-  /// constructor
   be_visitor_typedef_any_op_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_typedef_any_op_cs (void);
+  // destructor
 
-  /// visit typedef
   virtual int visit_typedef (be_typedef *node);
+  // visit typedef
 
   // =visit methods on all elements syntactically valid as types that can be
   // typedefed.
 
-  /// visit a array
   virtual int visit_array (be_array *node);
+  // visit a array
 
-  /// visit an enum
   virtual int visit_enum (be_enum *node);
+  // visit an enum
 
-  /// visit a sequence
   virtual int visit_sequence (be_sequence *node);
+  // visit a sequence
 
-  /// visit a structure
   virtual int visit_structure (be_structure *node);
+  // visit a structure
 
-  /// visit a union
   virtual int visit_union (be_union *node);
+  // visit a union
 
 };
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_ch.h
index 01390ac76c9..f832928c425 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_ch.h
@@ -1,62 +1,67 @@
 /* -*- c++ -*- */
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    cdr_op_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Typedef class
- *  This provides the code generation for the CDR operators of the Typedef
- *  class in the client header.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Typedef class
+//    This provides the code generation for the CDR operators of the Typedef
+//    class in the client header.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_TYPEDEF_CDR_OP_CH_H_
 #define _BE_VISITOR_TYPEDEF_CDR_OP_CH_H_
 
-/**
- * @class be_visitor_typedef_cdr_op_ch
- *
- * @brief be_visitor_typedef_cdr_op_ch
- *
- * This is a concrete visitor for typedef that generates the CDR operator
- * declarations and implementations
- */
 class be_visitor_typedef_cdr_op_ch : public be_visitor_typedef
 {
+  //
+  // = TITLE
+  //   be_visitor_typedef_cdr_op_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for typedef that generates the CDR operator
+  //   declarations and implementations
+  //
 
 public:
-  /// constructor
   be_visitor_typedef_cdr_op_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_typedef_cdr_op_ch (void);
+  // destructor
 
-  /// visit typedef
   virtual int visit_typedef (be_typedef *node);
+  // visit typedef
 
   // =visit methods on all elements syntactically valid as types that can be
   // typedefed.
 
-  /// visit a array
   virtual int visit_array (be_array *node);
+  // visit a array
 
-  /// visit an enum
   virtual int visit_enum (be_enum *node);
+  // visit an enum
 
-  /// visit a sequence
   virtual int visit_sequence (be_sequence *node);
+  // visit a sequence
 
-  /// visit a structure
   virtual int visit_structure (be_structure *node);
+  // visit a structure
 
-  /// visit a union
   virtual int visit_union (be_union *node);
+  // visit a union
 };
 
 #endif /* _BE_VISITOR_TYPEDEF_CDR_OP_CH_H_*/
diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_cs.h
index db2c2945b66..03af2ece923 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_cs.h
@@ -1,59 +1,64 @@
 /* -*- c++ -*- */
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    cdr_op_cs.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Typedef class
- *  This provides the code generation for the CDR operators of the Typedef
- *  class in the client stubs.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_cs.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Typedef class
+//    This provides the code generation for the CDR operators of the Typedef
+//    class in the client stubs.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_TYPEDEF_CDR_OP_CS_H_
 #define _BE_VISITOR_TYPEDEF_CDR_OP_CS_H_
 
-/**
- * @class be_visitor_typedef_cdr_op_cs
- *
- * @brief be_visitor_typedef_cdr_op_cs
- *
- * This is a concrete visitor for typedef that generates the CDR operator
- * declarations and implementations
- */
 class be_visitor_typedef_cdr_op_cs : public be_visitor_typedef
 {
+  //
+  // = TITLE
+  //   be_visitor_typedef_cdr_op_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for typedef that generates the CDR operator
+  //   declarations and implementations
+  //
 
 public:
-  /// constructor
   be_visitor_typedef_cdr_op_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_typedef_cdr_op_cs (void);
+  // destructor
 
-  /// visit typedef
   virtual int visit_typedef (be_typedef *node);
+  // visit typedef
 
   // =visit methods on all elements syntactically valid as types that can be
   // typedefed.
 
-  /// visit a array
   virtual int visit_array (be_array *node);
+  // visit a array
 
-  /// visit a sequence
   virtual int visit_sequence (be_sequence *node);
+  // visit a sequence
 
-  /// visit a structure
   virtual int visit_structure (be_structure *node);
+  // visit a structure
 
-  /// visit a union
   virtual int visit_union (be_union *node);
+  // visit a union
 };
 
 #endif /* _BE_VISITOR_TYPEDEF_CDR_OP_CS_H_*/
diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/serializer_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/serializer_op_ch.h
index 889393517a9..8e625e199b1 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_typedef/serializer_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/serializer_op_ch.h
@@ -1,62 +1,67 @@
 /* -*- c++ -*- */
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    serializer_op_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Typedef class
- *  This provides the code generation for the TAO::DCPS::Serializer operators
- *  of the Typedef class in the client header.
- *
- *
- *  @author Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    serializer_op_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Typedef class
+//    This provides the code generation for the TAO::DCPS::Serializer operators
+//    of the Typedef class in the client header.
+//
+// = AUTHOR
+//    Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_TYPEDEF_serializer_op_CH_H_
 #define _BE_VISITOR_TYPEDEF_serializer_op_CH_H_
 
-/**
- * @class be_visitor_typedef_serializer_op_ch
- *
- * @brief be_visitor_typedef_serializer_op_ch
- *
- * This is a concrete visitor for typedef that generates the Serializer operator
- * declarations and implementations
- */
 class be_visitor_typedef_serializer_op_ch : public be_visitor_typedef
 {
+  //
+  // = TITLE
+  //   be_visitor_typedef_serializer_op_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for typedef that generates the Serializer operator
+  //   declarations and implementations
+  //
 
 public:
-  /// constructor
   be_visitor_typedef_serializer_op_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_typedef_serializer_op_ch (void);
+  // destructor
 
-  /// visit typedef
   virtual int visit_typedef (be_typedef *node);
+  // visit typedef
 
   // =visit methods on all elements syntactically valid as types that can be
   // typedefed.
 
-  /// visit a array
   virtual int visit_array (be_array *node);
+  // visit a array
 
-  /// visit an enum
   virtual int visit_enum (be_enum *node);
+  // visit an enum
 
-  /// visit a sequence
   virtual int visit_sequence (be_sequence *node);
+  // visit a sequence
 
-  /// visit a structure
   virtual int visit_structure (be_structure *node);
+  // visit a structure
 
-  /// visit a union
   virtual int visit_union (be_union *node);
+  // visit a union
 };
 
 #endif /* _BE_VISITOR_TYPEDEF_serializer_op_CH_H_*/
diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/serializer_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/serializer_op_cs.h
index 071be68e67e..e2ada3ffcb8 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_typedef/serializer_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/serializer_op_cs.h
@@ -1,59 +1,64 @@
 /* -*- c++ -*- */
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    serializer_op_cs.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Typedef class
- *  This provides the code generation for the TAO::DCPS::Serializer operators
- *  of the Typedef class in the client stubs.
- *
- *
- *  @author Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    serializer_op_cs.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Typedef class
+//    This provides the code generation for the TAO::DCPS::Serializer operators
+//    of the Typedef class in the client stubs.
+//
+// = AUTHOR
+//    Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_TYPEDEF_serializer_op_CS_H_
 #define _BE_VISITOR_TYPEDEF_serializer_op_CS_H_
 
-/**
- * @class be_visitor_typedef_serializer_op_cs
- *
- * @brief be_visitor_typedef_serializer_op_cs
- *
- * This is a concrete visitor for typedef that generates the Serializer operator
- * declarations and implementations
- */
 class be_visitor_typedef_serializer_op_cs : public be_visitor_typedef
 {
+  //
+  // = TITLE
+  //   be_visitor_typedef_serializer_op_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for typedef that generates the Serializer operator
+  //   declarations and implementations
+  //
 
 public:
-  /// constructor
   be_visitor_typedef_serializer_op_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_typedef_serializer_op_cs (void);
+  // destructor
 
-  /// visit typedef
   virtual int visit_typedef (be_typedef *node);
+  // visit typedef
 
   // =visit methods on all elements syntactically valid as types that can be
   // typedefed.
 
-  /// visit a array
   virtual int visit_array (be_array *node);
+  // visit a array
 
-  /// visit a sequence
   virtual int visit_sequence (be_sequence *node);
+  // visit a sequence
 
-  /// visit a structure
   virtual int visit_structure (be_structure *node);
+  // visit a structure
 
-  /// visit a union
   virtual int visit_union (be_union *node);
+  // visit a union
 };
 
 #endif /* _BE_VISITOR_TYPEDEF_serializer_op_CS_H_*/
diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef.h
index c34f0ed4e3a..8a4a586917c 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef.h
@@ -1,60 +1,65 @@
 /* -*- c++ -*- */
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    typedef.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Typedef class
- *  This provides the generic visitors for the Typedef class.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    typedef.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Typedef class
+//    This provides the generic visitors for the Typedef class.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_TYPEDEF_TYPEDEF_H_
 #define _BE_VISITOR_TYPEDEF_TYPEDEF_H_
 
-/**
- * @class be_visitor_typedef
- *
- * @brief be_visitor_typedef
- *
- * This is a concrete visitor for typedef that abstracts all common tasks
- */
 class be_visitor_typedef : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //    be_visitor_typedef
+  //
+  // = DESCRIPTION
+  //    This is a concrete visitor for typedef that abstracts all common tasks
+  //
 
 public:
-  /// constructor
   be_visitor_typedef (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_typedef (void);
+  // destructor
 
-  /// must be overridden
   virtual int visit_typedef (be_typedef *node);
+  // must be overridden
 
   // =visit methods on all elements syntactically valid as types that can be
   // typedefed.
 
-  /// visit a array
   virtual int visit_array (be_array *node);
+  // visit a array
 
-  /// visit an enum
   virtual int visit_enum (be_enum *node);
+  // visit an enum
 
-  /// visit a sequence
   virtual int visit_sequence (be_sequence *node);
+  // visit a sequence
 
-  /// visit a structure
   virtual int visit_structure (be_structure *node);
+  // visit a structure
 
-  /// visit a union
   virtual int visit_union (be_union *node);
+  // visit a union
 };
 
 #endif /* _BE_VISITOR_TYPEDEF_TYPEDEF_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_ch.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_ch.h
index 99cd499c8b9..e220629cac6 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_ch.h
@@ -1,78 +1,84 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    typedef_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Typedef class
- *  This provides the code generation for the Typedef class in the client
- *  header.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    typedef_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Typedef class
+//    This provides the code generation for the Typedef class in the client
+//    header.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_TYPEDEF_TYPEDEF_CH_H_
 #define _BE_VISITOR_TYPEDEF_TYPEDEF_CH_H_
 
-/**
- * @class be_visitor_typedef_ch
- *
- * @brief be_visitor_typedef_ch
- *
- * This is a concrete visitor to generate the client header for typedef
- */
 class be_visitor_typedef_ch : public be_visitor_typedef
 {
+  //
+  // = TITLE
+  //   be_visitor_typedef_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the client header for typedef
+  //
+  //
 public:
-  /// constructor
   be_visitor_typedef_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_typedef_ch (void);
+  // destructor
 
-  /// visit typedef. We provide code for this method in the derived class
   virtual int visit_typedef (be_typedef *node);
+  // visit typedef. We provide code for this method in the derived class
 
   // =visit methods on all elements syntactically valid as types that can be
   // typedefed.
 
-  /// visit a array
   virtual int visit_array (be_array *node);
+  // visit a array
 
-  /// visit an enum
   virtual int visit_enum (be_enum *node);
+  // visit an enum
 
-  /// visit an interface;
   virtual int visit_interface (be_interface *node);
+  // visit an interface;
 
-  /// visit an interface;
   virtual int visit_interface_fwd (be_interface_fwd *node);
+  // visit an interface;
 
-  /// visit predefined type node
   virtual int visit_predefined_type (be_predefined_type *node);
+  // visit predefined type node
 
-  /// visit a typedef
   virtual int visit_string (be_string *node);
+  // visit a typedef
 
-  /// visit a sequence
   virtual int visit_sequence (be_sequence *node);
+  // visit a sequence
 
-  /// visit a structure
   virtual int visit_structure (be_structure *node);
+  // visit a structure
 
-  /// visit a union
   virtual int visit_union (be_union *node);
+  // visit a union
 
-  /// visit a valuebox
   virtual int visit_valuebox (be_valuebox *node);
+  // visit a valuebox
 
-  /// visit a valuetype
   virtual int visit_valuetype (be_valuetype *node);
+  // visit a valuetype
 };
 
 #endif /* _BE_VISITOR_TYPEDEF_TYPEDEF_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_ci.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_ci.h
index c9cde7c7fab..818bf9e91cc 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_ci.h
@@ -1,57 +1,63 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    typedef_ci.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Typedef class
- *  This provides the code generation for the Typedef class in the client
- *  inline.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    typedef_ci.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Typedef class
+//    This provides the code generation for the Typedef class in the client
+//    inline.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_TYPEDEF_TYPEDEF_CI_H_
 #define _BE_VISITOR_TYPEDEF_TYPEDEF_CI_H_
 
-/**
- * @class be_visitor_typedef_ci
- *
- * @brief be_visitor_typedef_sh
- *
- * This is a concrete visitor to generate the server header for typedef
- */
 class be_visitor_typedef_ci : public be_visitor_typedef
 {
+  //
+  // = TITLE
+  //   be_visitor_typedef_sh
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the server header for typedef
+  //
+  //
 public:
-  /// constructor
   be_visitor_typedef_ci (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_typedef_ci (void);
+  // destructor
 
-  /// visit typedef. We provide code for this method in the derived class
   virtual int visit_typedef (be_typedef *node);
+  // visit typedef. We provide code for this method in the derived class
 
   // =visit methods on all elements syntactically valid as types that can be
   // typedefed.
 
-  /// visit a array
   virtual int visit_array (be_array *node);
+  // visit a array
 
-  /// visit a sequence
   virtual int visit_sequence (be_sequence *node);
+  // visit a sequence
 
-  /// visit a structure
   virtual int visit_structure (be_structure *node);
+  // visit a structure
 
-  /// visit a union
   virtual int visit_union (be_union *node);
+  // visit a union
 };
 
 #endif /* _BE_VISITOR_TYPEDEF_TYPEDEF_CI_H_*/
diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_cs.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_cs.h
index 496a6a7d68b..6a48d19eaa1 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_cs.h
@@ -1,42 +1,48 @@
 /* -*- c++ -*- */
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    typedef_cs.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Typedef class
- *  This provides the code generation for the Typedef class in the client
- *  stubs.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    typedef_cs.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Typedef class
+//    This provides the code generation for the Typedef class in the client
+//    stubs.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_TYPEDEF_TYPEDEF_CS_H_
 #define _BE_VISITOR_TYPEDEF_TYPEDEF_CS_H_
 
-/**
- * @class be_visitor_typedef_cs
- *
- * @brief be_visitor_typedef_cs
- *
- * This is a concrete visitor to generate the server header for typedef
- */
 class be_visitor_typedef_cs : public be_visitor_typedef
 {
+  //
+  // = TITLE
+  //   be_visitor_typedef_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the server header for typedef
+  //
+  //
 public:
-  /// constructor
   be_visitor_typedef_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_typedef_cs (void);
+  // destructor
 
-  /// visit typedef. We provide code for this method in the derived class
   virtual int visit_typedef (be_typedef *node);
+  // visit typedef. We provide code for this method in the derived class
 };
 
 #endif /* _BE_VISITOR_TYPEDEF_TYPEDEF_CS_H_*/
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union.h b/TAO/TAO_IDL/be_include/be_visitor_union.h
index 292fcaaffc5..7adc2f0418b 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union.h
@@ -1,18 +1,23 @@
 /* -*- c++ -*- */
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    be_visitor_union.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Union class
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_union.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Union class
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef TAO_BE_VISITOR_UNION_H
 #define TAO_BE_VISITOR_UNION_H
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union/any_op_ch.h
index 84d2c61e5b7..be2dae30ded 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union/any_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union/any_op_ch.h
@@ -1,34 +1,39 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    any_op_ch.h
- *
- *  $Id$
- *
- *   Visitor for the Union class.
- *   This one generates code for the Any operators for the Union in the client
- *   header.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    any_op_ch.h
+//
+// = DESCRIPTION
+//     Visitor for the Union class.
+//     This one generates code for the Any operators for the Union in the client
+//     header.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_UNION_ANY_OP_CH_H_
 #define _BE_VISITOR_UNION_ANY_OP_CH_H_
 
-/**
- * @class be_visitor_union_any_op_ch
- *
- * @brief be_visitor_union_any_op_ch
- *
- * This is a concrete visitor for union that generates the Any operator
- * declarations
- */
 class be_visitor_union_any_op_ch : public be_visitor_union
 {
+  //
+  // = TITLE
+  //   be_visitor_union_any_op_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for union that generates the Any operator
+  //   declarations
+  //
 
 public:
   be_visitor_union_any_op_ch (be_visitor_context *ctx);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union/any_op_cs.h
index 5465deb5af4..6f7bef92ca0 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union/any_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union/any_op_cs.h
@@ -1,34 +1,39 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    any_op_cs.h
- *
- *  $Id$
- *
- *   Visitor for the Union class.
- *   This one generates code for the Any operators for the Union in the client
- *   header.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    any_op_cs.h
+//
+// = DESCRIPTION
+//     Visitor for the Union class.
+//     This one generates code for the Any operators for the Union in the client
+//     header.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_UNION_ANY_OP_CS_H_
 #define _BE_VISITOR_UNION_ANY_OP_CS_H_
 
-/**
- * @class be_visitor_union_any_op_cs
- *
- * @brief be_visitor_union_any_op_compiled_cs
- *
- * This is a visitor for unions that generates the Any
- * operator implementations.
- */
 class be_visitor_union_any_op_cs : public be_visitor_union
 {
+  //
+  // = TITLE
+  //   be_visitor_union_any_op_compiled_cs
+  //
+  // = DESCRIPTION
+  //   This is a visitor for unions that generates the Any
+  //   operator implementations.
+  //
 
 public:
   be_visitor_union_any_op_cs (be_visitor_context *ctx);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_ch.h
index 50889e2ce62..972dacf1335 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_ch.h
@@ -1,44 +1,49 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    cdr_op_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Union class
- *  This one provides code generation for the CDR operators for the union
- *  in the client header.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Union class
+//    This one provides code generation for the CDR operators for the union
+//    in the client header.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_UNION_CDR_OP_CH_H_
 #define _BE_VISITOR_UNION_CDR_OP_CH_H_
 
-/**
- * @class be_visitor_union_cdr_op_ch
- *
- * @brief be_visitor_union_cdr_op_ch
- *
- * This is a concrete visitor for union that generates the CDR operator
- * declarations
- */
 class be_visitor_union_cdr_op_ch : public be_visitor_union
 {
+  //
+  // = TITLE
+  //   be_visitor_union_cdr_op_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for union that generates the CDR operator
+  //   declarations
+  //
 
 public:
-  /// constructor
   be_visitor_union_cdr_op_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_union_cdr_op_ch (void);
+  // destructor
 
-  /// visit union
   virtual int visit_union (be_union *node);
+  // visit union
 
 };
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_cs.h
index 9e551a694f8..800c43910f6 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_cs.h
@@ -1,44 +1,49 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    cdr_op_cs.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Union class
- *  This one provides code generation for the CDR operators for the union
- *  in the client stub.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Union class
+//    This one provides code generation for the CDR operators for the union
+//    in the client stub.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_UNION_CDR_OP_CS_H_
 #define _BE_VISITOR_UNION_CDR_OP_CS_H_
 
-/**
- * @class be_visitor_union_cdr_op_cs
- *
- * @brief be_visitor_union_cdr_op_cs
- *
- * This is a concrete visitor for union that generates the CDR operator
- * implementations
- */
 class be_visitor_union_cdr_op_cs : public be_visitor_union
 {
+  //
+  // = TITLE
+  //   be_visitor_union_cdr_op_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for union that generates the CDR operator
+  //   implementations
+  //
 
 public:
-  /// constructor
   be_visitor_union_cdr_op_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_union_cdr_op_cs (void);
+  // destructor
 
-  /// visit union
   virtual int visit_union (be_union *node);
+  // visit union
 
   virtual int pre_process (be_decl *);
   virtual int post_process (be_decl *);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_ch.h
index 449f312e0a0..950deb597cd 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_ch.h
@@ -1,49 +1,55 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    discriminant_ch.h
- *
- *  $Id$
- *
- *   Visitor for the Union class.
- *   This one generates code for the discriminant of the Union in the client
- *   header.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    discriminant_ch.h
+//
+// = DESCRIPTION
+//     Visitor for the Union class.
+//     This one generates code for the discriminant of the Union in the client
+//     header.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_UNION_DISCRIMINANT_CH_H_
 #define _BE_VISITOR_UNION_DISCRIMINANT_CH_H_
 
-/**
- * @class be_visitor_union_discriminant_ch
- *
- * @brief be_visitor_union_discriminant_ch
- *
- * This is a concrete visitor to generate the client header for union
- * discriminant
- */
 class be_visitor_union_discriminant_ch : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //   be_visitor_union_discriminant_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the client header for union
+  //   discriminant
+  //
+  //
 public:
-  /// constructor
   be_visitor_union_discriminant_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_union_discriminant_ch (void);
+  // destructor
 
-  /// visit an enum
   virtual int visit_enum (be_enum *node);
+  // visit an enum
 
-  /// visit a predefined type
   virtual int visit_predefined_type (be_predefined_type *node);
+  // visit a predefined type
 
-  /// visit a typedef node
   virtual int visit_typedef (be_typedef *node);
+  // visit a typedef node
 };
 
 #endif /* _BE_VISITOR_UNION_DISCRIMINANT_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_ci.h b/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_ci.h
index 04a4fa12f28..3e7619a939e 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_ci.h
@@ -1,49 +1,55 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    discriminant_ci.h
- *
- *  $Id$
- *
- *   Visitor for the Union class.
- *   This one generates code for the discriminant of the Union in the client
- *   inline file.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    discriminant_ci.h
+//
+// = DESCRIPTION
+//     Visitor for the Union class.
+//     This one generates code for the discriminant of the Union in the client
+//     inline file.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_UNION_DISCRIMINANT_CI_H_
 #define _BE_VISITOR_UNION_DISCRIMINANT_CI_H_
 
-/**
- * @class be_visitor_union_discriminant_ci
- *
- * @brief be_visitor_union_discriminant_ci
- *
- * This is a concrete visitor to generate the client inline for union
- * discriminant
- */
 class be_visitor_union_discriminant_ci : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //   be_visitor_union_discriminant_ci
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the client inline for union
+  //   discriminant
+  //
+  //
 public:
-  /// constructor
   be_visitor_union_discriminant_ci (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_union_discriminant_ci (void);
+  // destructor
 
-  /// visit an enum
   virtual int visit_enum (be_enum *node);
+  // visit an enum
 
-  /// visit a predefined type
   virtual int visit_predefined_type (be_predefined_type *node);
+  // visit a predefined type
 
-  /// visit a typedef node
   virtual int visit_typedef (be_typedef *node);
+  // visit a typedef node
 };
 
 #endif /* _BE_VISITOR_UNION_DISCRIMINANT_CI_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_cs.h
index 78a1ba1a2ad..af61beb8b4d 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_cs.h
@@ -1,44 +1,50 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    discriminant_cs.h
- *
- *  $Id$
- *
- *   Visitor for the Union class.
- *   This one generates code for the discriminant of the Union in the client
- *   stubs.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    discriminant_cs.h
+//
+// = DESCRIPTION
+//     Visitor for the Union class.
+//     This one generates code for the discriminant of the Union in the client
+//     stubs.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_UNION_DISCRIMINANT_CS_H_
 #define _BE_VISITOR_UNION_DISCRIMINANT_CS_H_
 
-/**
- * @class be_visitor_union_discriminant_cs
- *
- * @brief be_visitor_union_discriminant_cs
- *
- * This is a concrete visitor to generate the client stubs for union
- * discriminant
- */
 class be_visitor_union_discriminant_cs : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //   be_visitor_union_discriminant_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the client stubs for union
+  //   discriminant
+  //
+  //
 public:
-  /// constructor
   be_visitor_union_discriminant_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_union_discriminant_cs (void);
+  // destructor
 
-  /// visit an enum. Required to generate the typecode for an enum definition
-  /// appearing side the union
   virtual int visit_enum (be_enum *node);
+  // visit an enum. Required to generate the typecode for an enum definition
+  // appearing side the union
 
 };
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/serializer_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union/serializer_op_ch.h
index f7dd09dce74..01ff118c903 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union/serializer_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union/serializer_op_ch.h
@@ -1,44 +1,49 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    serializer_op_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Union class
- *  This one provides code generation for the TAO::DCPS::Serializer operators 
- *  for the union in the client header.
- *
- *
- *  @author Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    serializer_op_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Union class
+//    This one provides code generation for the TAO::DCPS::Serializer operators 
+//    for the union in the client header.
+//
+// = AUTHOR
+//    Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_UNION_serializer_op_CH_H_
 #define _BE_VISITOR_UNION_serializer_op_CH_H_
 
-/**
- * @class be_visitor_union_serializer_op_ch
- *
- * @brief be_visitor_union_serializer_op_ch
- *
- * This is a concrete visitor for union that generates the Serializer operator
- * declarations
- */
 class be_visitor_union_serializer_op_ch : public be_visitor_union
 {
+  //
+  // = TITLE
+  //   be_visitor_union_serializer_op_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for union that generates the Serializer operator
+  //   declarations
+  //
 
 public:
-  /// constructor
   be_visitor_union_serializer_op_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_union_serializer_op_ch (void);
+  // destructor
 
-  /// visit union
   virtual int visit_union (be_union *node);
+  // visit union
 
 };
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/serializer_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union/serializer_op_cs.h
index 6a851a58509..f2a19231056 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union/serializer_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union/serializer_op_cs.h
@@ -1,44 +1,49 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    serializer_op_cs.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Union class
- *  This one provides code generation for the TAO::DCPS::Serializer operators
- *  for the union in the client stub.
- *
- *
- *  @author Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    serializer_op_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Union class
+//    This one provides code generation for the TAO::DCPS::Serializer operators
+//    for the union in the client stub.
+//
+// = AUTHOR
+//    Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_UNION_serializer_op_CS_H_
 #define _BE_VISITOR_UNION_serializer_op_CS_H_
 
-/**
- * @class be_visitor_union_serializer_op_cs
- *
- * @brief be_visitor_union_serializer_op_cs
- *
- * This is a concrete visitor for union that generates the Serializer operator
- * implementations
- */
 class be_visitor_union_serializer_op_cs : public be_visitor_union
 {
+  //
+  // = TITLE
+  //   be_visitor_union_serializer_op_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for union that generates the Serializer operator
+  //   implementations
+  //
 
 public:
-  /// constructor
   be_visitor_union_serializer_op_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_union_serializer_op_cs (void);
+  // destructor
 
-  /// visit union
   virtual int visit_union (be_union *node);
+  // visit union
 
   virtual int pre_process (be_decl *);
   virtual int post_process (be_decl *);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/union.h b/TAO/TAO_IDL/be_include/be_visitor_union/union.h
index abb142f401f..5e669ac9327 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union/union.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union/union.h
@@ -1,46 +1,52 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    union.h
- *
- *  $Id$
- *
- *   Visitor for the Union class.
- *   This one is a generic visitor.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    union.h
+//
+// = DESCRIPTION
+//     Visitor for the Union class.
+//     This one is a generic visitor.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_UNION_UNION_H_
 #define _BE_VISITOR_UNION_UNION_H_
 
-/**
- * @class be_visitor_union
- *
- * @brief be_visitor_union
- *
- * This is the base visitor for union
- */
 class be_visitor_union : public be_visitor_scope
 {
+  //
+  // = TITLE
+  //   be_visitor_union
+  //
+  // = DESCRIPTION
+  //   This is the base visitor for union
+  //
+  //
 public:
-  /// constructor
   be_visitor_union (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_union (void);
+  // destructor
 
-  /// visit union. We provide code for this method in the derived class
   virtual int visit_union (be_union *node);
+  // visit union. We provide code for this method in the derived class
 
   // =visit operations on syntactically valid elements in our scope
 
-  /// visit union_branch
   virtual int visit_union_branch (be_union_branch *node);
+  // visit union_branch
 };
 
 #endif /* _BE_VISITOR_UNION_UNION_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/union_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union/union_ch.h
index 64f6918c6aa..86813169ff1 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union/union_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union/union_ch.h
@@ -1,41 +1,47 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    union_ch.h
- *
- *  $Id$
- *
- *   Visitor for the Union class.
- *   This one generates code in the client header.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    union_ch.h
+//
+// = DESCRIPTION
+//     Visitor for the Union class.
+//     This one generates code in the client header.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_UNION_UNION_CH_H_
 #define _BE_VISITOR_UNION_UNION_CH_H_
 
-/**
- * @class be_visitor_union_ch
- *
- * @brief be_visitor_union_ch
- *
- * This is a concrete visitor to generate the client header for union
- */
 class be_visitor_union_ch : public be_visitor_union
 {
+  //
+  // = TITLE
+  //   be_visitor_union_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the client header for union
+  //
+  //
 public:
-  /// constructor
   be_visitor_union_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_union_ch (void);
+  // destructor
 
-  /// visit union. We provide code for this method in the derived class
   virtual int visit_union (be_union *node);
+  // visit union. We provide code for this method in the derived class
 
 };
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/union_ci.h b/TAO/TAO_IDL/be_include/be_visitor_union/union_ci.h
index 44ea708bd3c..d0d138f583d 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union/union_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union/union_ci.h
@@ -1,41 +1,47 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    union_ci.h
- *
- *  $Id$
- *
- *   Visitor for the Union class.
- *   This one generates code in the client inline file.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    union_ci.h
+//
+// = DESCRIPTION
+//     Visitor for the Union class.
+//     This one generates code in the client inline file.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_UNION_UNION_CI_H_
 #define _BE_VISITOR_UNION_UNION_CI_H_
 
-/**
- * @class be_visitor_union_ci
- *
- * @brief be_visitor_union_ci
- *
- * This is a concrete visitor to generate the client inline for union
- */
 class be_visitor_union_ci : public be_visitor_union
 {
+  //
+  // = TITLE
+  //   be_visitor_union_ci
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the client inline for union
+  //
+  //
 public:
-  /// constructor
   be_visitor_union_ci (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_union_ci (void);
+  // destructor
 
-  /// visit union. We provide code for this method in the derived class
   virtual int visit_union (be_union *node);
+  // visit union. We provide code for this method in the derived class
 
 };
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/union_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union/union_cs.h
index 072e838d966..04783afa7d9 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union/union_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union/union_cs.h
@@ -1,41 +1,47 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    union_cs.h
- *
- *  $Id$
- *
- *   Visitor for the Union class.
- *   This one generates code in the client stubs.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    union_cs.h
+//
+// = DESCRIPTION
+//     Visitor for the Union class.
+//     This one generates code in the client stubs.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_UNION_UNION_CS_H_
 #define _BE_VISITOR_UNION_UNION_CS_H_
 
-/**
- * @class be_visitor_union_cs
- *
- * @brief be_visitor_union_cs
- *
- * This is a concrete visitor to generate the client stubs for union
- */
 class be_visitor_union_cs : public be_visitor_union
 {
+  //
+  // = TITLE
+  //   be_visitor_union_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the client stubs for union
+  //
+  //
 public:
-  /// constructor
   be_visitor_union_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_union_cs (void);
+  // destructor
 
-  /// visit union. We provide code for this method in the derived class
   virtual int visit_union (be_union *node);
+  // visit union. We provide code for this method in the derived class
 
 };
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch.h
index 6f184a3696e..860ec5c5363 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union_branch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch.h
@@ -1,17 +1,22 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    be_visitor_union_branch.h
- *
- *  $Id$
- *
- *  Concrete visitor for the base "BE_Union_Branch" node
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_union_branch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the base "BE_Union_Branch" node
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef TAO_BE_VISITOR_UNION_BRANCH_H
 #define TAO_BE_VISITOR_UNION_BRANCH_H
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/cdr_op_ch.h
index cab10a16308..e325b41f912 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/cdr_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/cdr_op_ch.h
@@ -1,60 +1,65 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    cdr_op_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for the base "BE_Union_Branch" node
- *  This generates code for structure members in the client header.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the base "BE_Union_Branch" node
+//    This generates code for structure members in the client header.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_UNION_BRANCH_CDR_OP_CH_H_
 #define _BE_VISITOR_UNION_BRANCH_CDR_OP_CH_H_
 
-/**
- * @class be_visitor_union_branch_cdr_op_ch
- *
- * @brief be_visitor_cdr_op_ch
- *
- * This is a concrete visitor for the be_union_branch node for the client header.
- */
 class be_visitor_union_branch_cdr_op_ch : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //    be_visitor_cdr_op_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for the be_union_branch node for the client header.
+  //
 public:
-  /// constructor
   be_visitor_union_branch_cdr_op_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_union_branch_cdr_op_ch (void);
+  // destructor
 
-  /// visit the union_branch node
   virtual int visit_union_branch (be_union_branch *node);
+  // visit the union_branch node
 
   // =visit operations on all possible data types that a union_branch can be
 
-  /// visit array type
   virtual int visit_array (be_array *node);
+  // visit array type
 
-  /// visit enum type
   virtual int visit_enum (be_enum *node);
+  // visit enum type
 
-  /// visit sequence type
   virtual int visit_sequence (be_sequence *node);
+  // visit sequence type
 
-  /// visit structure type
   virtual int visit_structure (be_structure *node);
+  // visit structure type
 
-  /// visit typedefed type
   virtual int visit_typedef (be_typedef *node);
+  // visit typedefed type
 
-  /// visit union type
   virtual int visit_union (be_union *node);
+  // visit union type
 
 };
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/cdr_op_cs.h
index 920032910f2..65b415d8637 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/cdr_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/cdr_op_cs.h
@@ -1,40 +1,45 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    cdr_op_cs.h
- *
- *  $Id$
- *
- *  Concrete visitor for the base "BE_Union_Branch" node
- *  This generates code for structure members in the client header.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_cs.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the base "BE_Union_Branch" node
+//    This generates code for structure members in the client header.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_UNION_BRANCH_CDR_OP_CS_H_
 #define _BE_VISITOR_UNION_BRANCH_CDR_OP_CS_H_
 
-/**
- * @class be_visitor_union_branch_cdr_op_cs
- *
- * @brief be_visitor_union_branch_cdr_op_cs
- *
- * This is a concrete visitor for the be_union_branch node for the client header.
- */
 class be_visitor_union_branch_cdr_op_cs : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //    be_visitor_union_branch_cdr_op_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for the be_union_branch node for the client header.
+  //
 public:
-  /// constructor
   be_visitor_union_branch_cdr_op_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_union_branch_cdr_op_cs (void);
+  // destructor
 
-  /// visit the union_branch node
   virtual int visit_union_branch (be_union_branch *node);
+  // visit the union_branch node
 
   // =visit operations on all possible data types that a union_branch can be
 
@@ -52,8 +57,8 @@ public:
   virtual int visit_typedef (be_typedef *node);
   virtual int visit_union (be_union *node);
 
-  /// extra code generation for an explicit default case
   virtual int explicit_default (void);
+  // extra code generation for an explicit default case
 
  private:
   int emit_valuetype_common (be_type *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/private_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/private_ch.h
index da32a5bd9b1..ed8ad92aba1 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/private_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/private_ch.h
@@ -1,85 +1,90 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    private_ch.h
- *
- *  $Id$
- *
- *   Visitor for the Union class.
- *   This one generates code for private part of the union class for the union
- *   members in the client header.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    private_ch.h
+//
+// = DESCRIPTION
+//     Visitor for the Union class.
+//     This one generates code for private part of the union class for the union
+//     members in the client header.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_UNION_BRANCH_PRIVATE_CH_H_
 #define _BE_VISITOR_UNION_BRANCH_PRIVATE_CH_H_
 
-/**
- * @class be_visitor_union_branch_private_ch
- *
- * @brief be_visitor_union_branch_private_ch
- *
- * This is a concrete visitor for the be_union_branch node for the client
- * header. This generates the code for the private section of the "union"
- * class
- */
 class be_visitor_union_branch_private_ch : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //    be_visitor_union_branch_private_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for the be_union_branch node for the client
+  //   header. This generates the code for the private section of the "union"
+  //   class
+  //
 public:
-  /// constructor
   be_visitor_union_branch_private_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_union_branch_private_ch (void);
+  // destructor
 
-  /// visit the union_branch node
   virtual int visit_union_branch (be_union_branch *node);
+  // visit the union_branch node
 
   // =visit operations on all possible data types that a union_branch can be
 
-  /// visit array type
   virtual int visit_array (be_array *node);
+  // visit array type
 
-  /// visit enum type
   virtual int visit_enum (be_enum *node);
+  // visit enum type
 
-  /// visit interface type
   virtual int visit_interface (be_interface *node);
+  // visit interface type
 
-  /// visit interface forward type
   virtual int visit_interface_fwd (be_interface_fwd *node);
+  // visit interface forward type
 
-  /// visit valuebox type
   virtual int visit_valuebox (be_valuebox *node);
+  // visit valuebox type
 
-  /// visit interface type
   virtual int visit_valuetype (be_valuetype *node);
+  // visit interface type
 
-  /// visit interface forward type
   virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+  // visit interface forward type
 
-  /// visit predefined type
   virtual int visit_predefined_type (be_predefined_type *node);
+  // visit predefined type
 
-  /// visit sequence type
   virtual int visit_sequence (be_sequence *node);
+  // visit sequence type
 
-  /// visit string type
   virtual int visit_string (be_string *node);
+  // visit string type
 
-  /// visit structure type
   virtual int visit_structure (be_structure *node);
+  // visit structure type
 
-  /// visit typedefed type
   virtual int visit_typedef (be_typedef *node);
+  // visit typedefed type
 
-  /// visit union type
   virtual int visit_union (be_union *node);
+  // visit union type
 
 };
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_assign_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_assign_cs.h
index 4f3569bf0d0..26316a18401 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_assign_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_assign_cs.h
@@ -1,84 +1,89 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    public_assign_cs.h
- *
- *  $Id$
- *
- *   Visitor for the Union class.
- *   This one generates code for the assignment operator of the union class
- *   for the union members in the client stubs.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    public_assign_cs.h
+//
+// = DESCRIPTION
+//     Visitor for the Union class.
+//     This one generates code for the assignment operator of the union class
+//     for the union members in the client stubs.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_UNION_BRANCH_PUBLIC_ASSIGN_CS_H_
 #define _BE_VISITOR_UNION_BRANCH_PUBLIC_ASSIGN_CS_H_
 
-/**
- * @class be_visitor_union_branch_public_assign_cs
- *
- * @brief be_visitor_union_branch_public_assign_cs
- *
- * This is used to generate the body of the assignment operator and the
- * copy constructor of the union class
- */
 class be_visitor_union_branch_public_assign_cs : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //    be_visitor_union_branch_public_assign_cs
+  //
+  // = DESCRIPTION
+  //    This is used to generate the body of the assignment operator and the
+  //    copy constructor of the union class
+  //
 public:
-  /// constructor
   be_visitor_union_branch_public_assign_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_union_branch_public_assign_cs (void);
+  // destructor
 
-  /// visit the union_branch node
   virtual int visit_union_branch (be_union_branch *node);
+  // visit the union_branch node
 
   // =visit operations on all possible data types that a union_branch can be
 
-  /// visit array type
   virtual int visit_array (be_array *node);
+  // visit array type
 
-  /// visit enum type
   virtual int visit_enum (be_enum *node);
+  // visit enum type
 
-  /// visit interface type
   virtual int visit_interface (be_interface *node);
+  // visit interface type
 
-  /// visit interface forward type
   virtual int visit_interface_fwd (be_interface_fwd *node);
+  // visit interface forward type
 
-  /// visit valuebox type
   virtual int visit_valuebox (be_valuebox *node);
+  // visit valuebox type
 
-  /// visit interface type
   virtual int visit_valuetype (be_valuetype *node);
+  // visit interface type
 
-  /// visit interface forward type
   virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+  // visit interface forward type
 
-  /// visit predefined type
   virtual int visit_predefined_type (be_predefined_type *node);
+  // visit predefined type
 
-  /// visit sequence type
   virtual int visit_sequence (be_sequence *node);
+  // visit sequence type
 
-  /// visit string type
   virtual int visit_string (be_string *node);
+  // visit string type
 
-  /// visit structure type
   virtual int visit_structure (be_structure *node);
+  // visit structure type
 
-  /// visit typedefed type
   virtual int visit_typedef (be_typedef *node);
+  // visit typedefed type
 
-  /// visit union type
   virtual int visit_union (be_union *node);
+  // visit union type
 
 private:
   int emit_valuetype_common (be_type *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ch.h
index 88ff98b8298..393d36ae388 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ch.h
@@ -1,85 +1,90 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    public_ch.h
- *
- *  $Id$
- *
- *   Visitor for the Union class.
- *   This one generates code for public part of the union class for the union
- *   members in the client header.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    public_ch.h
+//
+// = DESCRIPTION
+//     Visitor for the Union class.
+//     This one generates code for public part of the union class for the union
+//     members in the client header.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_UNION_BRANCH_PUBLIC_CH_H_
 #define _BE_VISITOR_UNION_BRANCH_PUBLIC_CH_H_
 
-/**
- * @class be_visitor_union_branch_public_ch
- *
- * @brief be_visitor_union_branch_public_ch
- *
- * This is a concrete visitor for the be_union_branch node for the client
- * header. This generates the code for the public section of the "union"
- * class
- */
 class be_visitor_union_branch_public_ch : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //    be_visitor_union_branch_public_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for the be_union_branch node for the client
+  //   header. This generates the code for the public section of the "union"
+  //   class
+  //
 public:
-  /// constructor
   be_visitor_union_branch_public_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_union_branch_public_ch (void);
+  // destructor
 
-  /// visit the union_branch node
   virtual int visit_union_branch (be_union_branch *node);
+  // visit the union_branch node
 
   // =visit operations on all possible data types that a union_branch can be
 
-  /// visit array type
   virtual int visit_array (be_array *node);
+  // visit array type
 
-  /// visit enum type
   virtual int visit_enum (be_enum *node);
+  // visit enum type
 
-  /// visit interface type
   virtual int visit_interface (be_interface *node);
+  // visit interface type
 
-  /// visit interface forward type
   virtual int visit_interface_fwd (be_interface_fwd *node);
+  // visit interface forward type
 
-  /// visit valuebox type
   virtual int visit_valuebox (be_valuebox *node);
+  // visit valuebox type
 
-  /// visit valuetype type
   virtual int visit_valuetype (be_valuetype *node);
+  // visit valuetype type
 
-  /// visit valuetype forward type
   virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+  // visit valuetype forward type
 
-  /// visit predefined type
   virtual int visit_predefined_type (be_predefined_type *node);
+  // visit predefined type
 
-  /// visit sequence type
   virtual int visit_sequence (be_sequence *node);
+  // visit sequence type
 
-  /// visit string type
   virtual int visit_string (be_string *node);
+  // visit string type
 
-  /// visit structure type
   virtual int visit_structure (be_structure *node);
+  // visit structure type
 
-  /// visit typedefed type
   virtual int visit_typedef (be_typedef *node);
+  // visit typedefed type
 
-  /// visit union type
   virtual int visit_union (be_union *node);
+  // visit union type
 };
 
 #endif /* _BE_VISITOR_UNION_BRANCH_PUBLIC_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ci.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ci.h
index 290eb6c8459..47203786b7e 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ci.h
@@ -1,84 +1,89 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    public_ci.h
- *
- *  $Id$
- *
- *   Visitor for the Union class.
- *   This one generates code for public part of the union class for the union
- *   members in the client inline.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    public_ci.h
+//
+// = DESCRIPTION
+//     Visitor for the Union class.
+//     This one generates code for public part of the union class for the union
+//     members in the client inline.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_UNION_BRANCI_PUBLIC_CI_H_
 #define _BE_VISITOR_UNION_BRANCI_PUBLIC_CI_H_
 
-/**
- * @class be_visitor_union_branch_public_ci
- *
- * @brief be_visitor_union_branch_public_ci
- *
- * This visitor is used to generate the accessors for the members of the
- * union
- */
 class be_visitor_union_branch_public_ci : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //    be_visitor_union_branch_public_ci
+  //
+  // = DESCRIPTION
+  //    This visitor is used to generate the accessors for the members of the
+  //    union
+  //
 public:
-  /// constructor
   be_visitor_union_branch_public_ci (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_union_branch_public_ci (void);
+  // destructor
 
-  /// visit the union_branch node
   virtual int visit_union_branch (be_union_branch *node);
+  // visit the union_branch node
 
   // =visit operations on all possible data types that a union_branch can be
 
-  /// visit array type
   virtual int visit_array (be_array *node);
+  // visit array type
 
-  /// visit enum type
   virtual int visit_enum (be_enum *node);
+  // visit enum type
 
-  /// visit interface type
   virtual int visit_interface (be_interface *node);
+  // visit interface type
 
-  /// visit interface forward type
   virtual int visit_interface_fwd (be_interface_fwd *node);
+  // visit interface forward type
 
-  /// visit valuebox type
   virtual int visit_valuebox (be_valuebox *node);
+  // visit valuebox type
 
-  /// visit value type
   virtual int visit_valuetype (be_valuetype *node);
+  // visit value type
 
-  /// visit value forward type
   virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+  // visit value forward type
 
-  /// visit predefined type
   virtual int visit_predefined_type (be_predefined_type *node);
+  // visit predefined type
 
-  /// visit sequence type
   virtual int visit_sequence (be_sequence *node);
+  // visit sequence type
 
-  /// visit string type
   virtual int visit_string (be_string *node);
+  // visit string type
 
-  /// visit structure type
   virtual int visit_structure (be_structure *node);
+  // visit structure type
 
-  /// visit typedefed type
   virtual int visit_typedef (be_typedef *node);
+  // visit typedefed type
 
-  /// visit union type
   virtual int visit_union (be_union *node);
+  // visit union type
 
 private:
   int emit_valuetype_common  (be_type *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_constructor_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_constructor_cs.h
index e49e83143c3..fc42f3d814c 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_constructor_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_constructor_cs.h
@@ -1,61 +1,66 @@
 /* -*- c++ -*- */
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    public_constructor_cs.h
- *
- *  $Id$
- *
- *   Visitor for the Union class.
- *   This one generates code for the constructor of the union class
- *
- *
- *  @author Johnny Willemsen
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    public_constructor_cs.h
+//
+// = DESCRIPTION
+//     Visitor for the Union class.
+//     This one generates code for the constructor of the union class
+//
+// = AUTHOR
+//    Johnny Willemsen
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_UNION_BRANCH_PUBLIC_CONSTRUCTOR_CS_H_
 #define _BE_VISITOR_UNION_BRANCH_PUBLIC_CONSTRUCTOR_CS_H_
 
-/**
- * @class be_visitor_union_branch_public_constructor_cs
- *
- * @brief be_visitor_union_branch_public_constructor_cs
- *
- * This is used to generate the body of the constructor
- */
 class be_visitor_union_branch_public_constructor_cs : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //    be_visitor_union_branch_public_constructor_cs
+  //
+  // = DESCRIPTION
+  //    This is used to generate the body of the constructor
+  //
 public:
-  /// constructor
   be_visitor_union_branch_public_constructor_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_union_branch_public_constructor_cs (void);
+  // destructor
 
-  /// visit the union_branch node
   virtual int visit_union_branch (be_union_branch *node);
+  // visit the union_branch node
 
   // =visit operations on all possible data types that a union_branch can be
 
-  /// visit array type
   virtual int visit_array (be_array *node);
+  // visit array type
 
-  /// visit predefined type
   virtual int visit_predefined_type (be_predefined_type *node);
+  // visit predefined type
 
-  /// visit sequence type
   virtual int visit_sequence (be_sequence *node);
+  // visit sequence type
 
-  /// visit structure type
   virtual int visit_structure (be_structure *node);
+  // visit structure type
 
-  /// visit typedefed type
   virtual int visit_typedef (be_typedef *node);
+  // visit typedefed type
 
-  /// visit union type
   virtual int visit_union (be_union *node);
+  // visit union type
 };
 
 #endif /* _BE_VISITOR_UNION_BRANCH_PUBLIC_CONSTRUCTOR_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_cs.h
index e099c9ba819..f079aeef154 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_cs.h
@@ -1,63 +1,68 @@
 /* -*- c++ -*- */
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    public_cs.h
- *
- *  $Id$
- *
- *   Visitor for the Union class.
- *   This one generates code for public part of the union class for the union
- *   members in the client stubs.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    public_cs.h
+//
+// = DESCRIPTION
+//     Visitor for the Union class.
+//     This one generates code for public part of the union class for the union
+//     members in the client stubs.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_UNION_BRANCS_PUBLIC_CS_H_
 #define _BE_VISITOR_UNION_BRANCS_PUBLIC_CS_H_
 
-/**
- * @class be_visitor_union_branch_public_cs
- *
- * @brief be_visitor_union_branch_public_cs
- *
- * This visitor is used to generate implementation such as typecodes for
- * constructed types
- */
 class be_visitor_union_branch_public_cs : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //    be_visitor_union_branch_public_cs
+  //
+  // = DESCRIPTION
+  //    This visitor is used to generate implementation such as typecodes for
+  //    constructed types
+  //
 public:
-  /// constructor
   be_visitor_union_branch_public_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_union_branch_public_cs (void);
+  // destructor
 
-  /// visit the union_branch node
   virtual int visit_union_branch (be_union_branch *node);
+  // visit the union_branch node
 
   // =visit operations on all possible data types that a union_branch can be
 
-  /// visit array type
   virtual int visit_array (be_array *node);
+  // visit array type
 
-  /// visit enum type
   virtual int visit_enum (be_enum *node);
+  // visit enum type
 
-  /// visit sequence type
   virtual int visit_sequence (be_sequence *node);
+  // visit sequence type
 
-  /// visit string type
   virtual int visit_string (be_string *node);
+  // visit string type
 
-  /// visit structure type
   virtual int visit_structure (be_structure *node);
+  // visit structure type
 
-  /// visit union type
   virtual int visit_union (be_union *node);
+  // visit union type
 };
 
 #endif /* _BE_VISITOR_UNION_BRANCS_PUBLIC_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_reset_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_reset_cs.h
index bf77a714678..9ef1c92d3f0 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_reset_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_reset_cs.h
@@ -1,84 +1,89 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    public_reset_cs.h
- *
- *  $Id$
- *
- *   Visitor for the Union class.
- *   This one generates code for the reset method of the union class
- *   for the union members in the client stubs.
- *
- *
- *  @author Aniruddha Gokhale
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    public_reset_cs.h
+//
+// = DESCRIPTION
+//     Visitor for the Union class.
+//     This one generates code for the reset method of the union class
+//     for the union members in the client stubs.
+//
+// = AUTHOR
+//    Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_UNION_BRANCH_PUBLIC_RESET_CS_H_
 #define _BE_VISITOR_UNION_BRANCH_PUBLIC_RESET_CS_H_
 
-/**
- * @class be_visitor_union_branch_public_reset_cs
- *
- * @brief be_visitor_union_branch_public_reset_cs
- *
- * This is used to generate the body of the resetment operator and the
- * copy constructor of the union class
- */
 class be_visitor_union_branch_public_reset_cs : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //    be_visitor_union_branch_public_reset_cs
+  //
+  // = DESCRIPTION
+  //    This is used to generate the body of the resetment operator and the
+  //    copy constructor of the union class
+  //
 public:
-  /// constructor
   be_visitor_union_branch_public_reset_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_union_branch_public_reset_cs (void);
+  // destructor
 
-  /// visit the union_branch node
   virtual int visit_union_branch (be_union_branch *node);
+  // visit the union_branch node
 
   // =visit operations on all possible data types that a union_branch can be
 
-  /// visit array type
   virtual int visit_array (be_array *node);
+  // visit array type
 
-  /// visit enum type
   virtual int visit_enum (be_enum *node);
+  // visit enum type
 
-  /// visit interface type
   virtual int visit_interface (be_interface *node);
+  // visit interface type
 
-  /// visit interface forward type
   virtual int visit_interface_fwd (be_interface_fwd *node);
+  // visit interface forward type
 
-  /// visit valuebox type
   virtual int visit_valuebox (be_valuebox *node);
+  // visit valuebox type
 
-  /// visit interface type
   virtual int visit_valuetype (be_valuetype *node);
+  // visit interface type
 
-  /// visit interface forward type
   virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+  // visit interface forward type
 
-  /// visit predefined type
   virtual int visit_predefined_type (be_predefined_type *node);
+  // visit predefined type
 
-  /// visit sequence type
   virtual int visit_sequence (be_sequence *node);
+  // visit sequence type
 
-  /// visit string type
   virtual int visit_string (be_string *node);
+  // visit string type
 
-  /// visit structure type
   virtual int visit_structure (be_structure *node);
+  // visit structure type
 
-  /// visit typedefed type
   virtual int visit_typedef (be_typedef *node);
+  // visit typedefed type
 
-  /// visit union type
   virtual int visit_union (be_union *node);
+  // visit union type
 
 };
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/serializer_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/serializer_op_ch.h
index cf80c408427..fa3e88b33ae 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/serializer_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/serializer_op_ch.h
@@ -1,61 +1,66 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    serializer_op_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for the base "BE_Union_Branch" node
- *  This generates TAO::DCPS::Serializer operators code for structure members
- *  in the client header.
- *
- *
- *  @author Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    serializer_op_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the base "BE_Union_Branch" node
+//    This generates TAO::DCPS::Serializer operators code for structure members
+//    in the client header.
+//
+// = AUTHOR
+//    Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_UNION_BRANCH_serializer_op_CH_H_
 #define _BE_VISITOR_UNION_BRANCH_serializer_op_CH_H_
 
-/**
- * @class be_visitor_union_branch_serializer_op_ch
- *
- * @brief be_visitor_serializer_op_ch
- *
- * This is a concrete visitor for the be_union_branch node for the client header.
- */
 class be_visitor_union_branch_serializer_op_ch : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //    be_visitor_serializer_op_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for the be_union_branch node for the client header.
+  //
 public:
-  /// constructor
   be_visitor_union_branch_serializer_op_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_union_branch_serializer_op_ch (void);
+  // destructor
 
-  /// visit the union_branch node
   virtual int visit_union_branch (be_union_branch *node);
+  // visit the union_branch node
 
   // =visit operations on all possible data types that a union_branch can be
 
-  /// visit array type
   virtual int visit_array (be_array *node);
+  // visit array type
 
-  /// visit enum type
   virtual int visit_enum (be_enum *node);
+  // visit enum type
 
-  /// visit sequence type
   virtual int visit_sequence (be_sequence *node);
+  // visit sequence type
 
-  /// visit structure type
   virtual int visit_structure (be_structure *node);
+  // visit structure type
 
-  /// visit typedefed type
   virtual int visit_typedef (be_typedef *node);
+  // visit typedefed type
 
-  /// visit union type
   virtual int visit_union (be_union *node);
+  // visit union type
 
 };
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/serializer_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/serializer_op_cs.h
index 4a30d535253..d03a521a842 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/serializer_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/serializer_op_cs.h
@@ -1,41 +1,46 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    serializer_op_cs.h
- *
- *  $Id$
- *
- *  Concrete visitor for the base "BE_Union_Branch" node
- *  This generates TAO::DCPS::Serializer operators code for structure members
- *  in the client header.
- *
- *
- *  @author Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    serializer_op_cs.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the base "BE_Union_Branch" node
+//    This generates TAO::DCPS::Serializer operators code for structure members
+//    in the client header.
+//
+// = AUTHOR
+//    Scott Harris <harris_s@ociweb.com> based on code by Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_UNION_BRANCH_serializer_op_CS_H_
 #define _BE_VISITOR_UNION_BRANCH_serializer_op_CS_H_
 
-/**
- * @class be_visitor_union_branch_serializer_op_cs
- *
- * @brief be_visitor_union_branch_serializer_op_cs
- *
- * This is a concrete visitor for the be_union_branch node for the client header.
- */
 class be_visitor_union_branch_serializer_op_cs : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //    be_visitor_union_branch_serializer_op_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for the be_union_branch node for the client header.
+  //
 public:
-  /// constructor
   be_visitor_union_branch_serializer_op_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_union_branch_serializer_op_cs (void);
+  // destructor
 
-  /// visit the union_branch node
   virtual int visit_union_branch (be_union_branch *node);
+  // visit the union_branch node
 
   // =visit operations on all possible data types that a union_branch can be
 
@@ -52,8 +57,8 @@ public:
   virtual int visit_typedef (be_typedef *node);
   virtual int visit_union (be_union *node);
 
-  /// extra code generation for an explicit default case
   virtual int explicit_default (void);
+  // extra code generation for an explicit default case
 };
 
 #endif /*  _BE_VISITOR_UNION_BRANCH_serializer_op_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_fwd.h b/TAO/TAO_IDL/be_include/be_visitor_union_fwd.h
index eec35a8a807..68640eb5cbe 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union_fwd.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union_fwd.h
@@ -1,18 +1,23 @@
 /* -*- C++ -*- */
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    be_visitor_union_fwd.h
- *
- *  $Id$
- *
- *  Concrete visitor for the be_union_fwd class
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_union_fwd.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the be_union_fwd class
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef TAO_BE_VISITOR_UNION_FWD_H
 #define TAO_BE_VISITOR_UNION_FWD_H
diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_fwd/union_fwd_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union_fwd/union_fwd_ch.h
index 6f038342d89..54b3875ddc0 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_union_fwd/union_fwd_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_union_fwd/union_fwd_ch.h
@@ -1,30 +1,36 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    union_fwd_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for the be_union_fwd node.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    union_fwd_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the be_union_fwd node.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_INTERFACE_UNION_FWD_CH_H_
 #define _BE_INTERFACE_UNION_FWD_CH_H_
 
-/**
- * @class be_visitor_union_fwd_ch
- *
- * @brief be_visitor_union_fwd_ch
- *
- * This is the visitor for be_union_fwd for the header file
- */
 class be_visitor_union_fwd_ch : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //   be_visitor_union_fwd_ch
+  //
+  // = DESCRIPTION
+  //   This is the visitor for be_union_fwd for the header file
+  //
+  //
 public:
   be_visitor_union_fwd_ch (be_visitor_context *ctx);
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox.h
index cf6a2d0966d..5c76c8bc01e 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuebox.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox.h
@@ -1,18 +1,23 @@
 /* -*- c++ -*- */
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    be_visitor_valuebox.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Valuebox class
- *
- *
- *  @author Gary Maxey
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_valuebox.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Valuebox class
+//
+// = AUTHOR
+//    Gary Maxey
+//
+// ============================================================================
 
 #ifndef TAO_BE_VISITOR_VALUEBOX_H
 #define TAO_BE_VISITOR_VALUEBOX_H
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/any_op_ch.h
index 5abae233416..39c1d82a0a3 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/any_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/any_op_ch.h
@@ -1,42 +1,47 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    any_op_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for the valuebox node.
- *  This one provides code generation for the Any operators
- *
- *
- *  @author Gary Maxey
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    any_op_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the valuebox node.
+//    This one provides code generation for the Any operators
+//
+// = AUTHOR
+//    Gary Maxey
+//
+// ============================================================================
 
 #ifndef _BE_VALUEBOX_ANY_OP_CH_H_
 #define _BE_VALUEBOX_ANY_OP_CH_H_
 
-/**
- * @class be_visitor_valuebox_any_op_ch
- *
- * @brief be_visitor_valuebox_any_op_ch
- *
- * This is a concrete visitor for valueboxes that generates the Any
- * operator declarations.
- */
 class be_visitor_valuebox_any_op_ch : public be_visitor_valuebox
 {
+  //
+  // = TITLE
+  //   be_visitor_valuebox_any_op_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for valueboxes that generates the Any
+  //   operator declarations.
+  //
 
 public:
-  /// constructor
   be_visitor_valuebox_any_op_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_valuebox_any_op_ch (void);
+  // destructor
 
-  /// visit valuebox
   virtual int visit_valuebox (be_valuebox *node);
+  // visit valuebox
 };
 
 #endif /* _BE_VALUEBOX_ANY_OP_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/any_op_cs.h
index f810b519119..997e9a7f1e2 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/any_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/any_op_cs.h
@@ -1,42 +1,47 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    any_op_cs.h
- *
- *  $Id$
- *
- *  Concrete visitor for the valuebox node.
- *  This one provides code generation for the Any operators
- *
- *
- *  @author Gary Maxey
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    any_op_cs.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the valuebox node.
+//    This one provides code generation for the Any operators
+//
+// = AUTHOR
+//    Gary Maxey
+//
+// ============================================================================
 
 #ifndef _BE_VALUEBOX_ANY_OP_CS_H_
 #define _BE_VALUEBOX_ANY_OP_CS_H_
 
-/**
- * @class be_visitor_valuebox_any_op_cs
- *
- * @brief be_visitor_valuebox_any_op_cs
- *
- * This is a concrete visitor for valuebox that generates the Any
- * operator implementations
- */
 class be_visitor_valuebox_any_op_cs : public be_visitor_valuebox
 {
+  //
+  // = TITLE
+  //   be_visitor_valuebox_any_op_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for valuebox that generates the Any
+  //   operator implementations
+  //
 
 public:
-  /// constructor
   be_visitor_valuebox_any_op_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_valuebox_any_op_cs (void);
+  // destructor
 
-  /// visit valuebox
   virtual int visit_valuebox (be_valuebox *node);
+  // visit valuebox
 };
 
 #endif /* _BE_VALUEBOX_ANY_OP_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/cdr_op_ch.h
index 82ede46df14..845698d7d84 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/cdr_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/cdr_op_ch.h
@@ -1,43 +1,48 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    cdr_op_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for valueboxes.
- *  This one provides code generation for the CDR operators.
- *
- *
- *  @author Gary Maxey
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for valueboxes.
+//    This one provides code generation for the CDR operators.
+//
+// = AUTHOR
+//    Gary Maxey
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_VALUEBOX_CDR_OP_CH_H_
 #define _BE_VISITOR_VALUEBOX_CDR_OP_CH_H_
 
-/**
- * @class be_visitor_valuebox_cdr_op_ch
- *
- * @brief be_visitor_valuebox_cdr_op_ch
- *
- * This is a concrete visitor for valuebox that generates the CDR operator
- * declarations
- */
 class be_visitor_valuebox_cdr_op_ch : public be_visitor_valuebox
 {
+  //
+  // = TITLE
+  //   be_visitor_valuebox_cdr_op_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for valuebox that generates the CDR operator
+  //   declarations
+  //
 
 public:
-  /// constructor
   be_visitor_valuebox_cdr_op_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_valuebox_cdr_op_ch (void);
+  // destructor
 
-  /// visit valuebox
   virtual int visit_valuebox (be_valuebox *node);
+  // visit valuebox
 };
 
 #endif /* _BE_VISITOR_VALUEBOX_CDR_OP_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/cdr_op_cs.h
index dada01c7ec4..5b3d301532b 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/cdr_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/cdr_op_cs.h
@@ -1,43 +1,48 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    cdr_op_cs.h
- *
- *  $Id$
- *
- *  Concrete visitor for valueboxes.
- *  This one provides code generation for the CDR operators.
- *
- *
- *  @author Gary Maxey
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_cs.h
+//
+// = DESCRIPTION
+//    Concrete visitor for valueboxes.
+//    This one provides code generation for the CDR operators.
+//
+// = AUTHOR
+//    Gary Maxey
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_VALUEBOX_CDR_OP_CS_H_
 #define _BE_VISITOR_VALUEBOX_CDR_OP_CS_H_
 
-/**
- * @class be_visitor_valuebox_cdr_op_cs
- *
- * @brief be_visitor_valuebox_cdr_op_cs
- *
- * This is a concrete visitor for valuebox that generates the CDR operator
- * implementations
- */
 class be_visitor_valuebox_cdr_op_cs : public be_visitor_valuebox
 {
+  //
+  // = TITLE
+  //   be_visitor_valuebox_cdr_op_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for valuebox that generates the CDR operator
+  //   implementations
+  //
 
 public:
-  /// constructor
   be_visitor_valuebox_cdr_op_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_valuebox_cdr_op_cs (void);
+  // destructor
 
-  /// visit valuebox
   virtual int visit_valuebox (be_valuebox *node);
+  // visit valuebox
 
 };
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/field_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/field_ch.h
index f3d14863aa6..d3fadf4d747 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/field_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/field_ch.h
@@ -1,86 +1,91 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    field_ch.h
- *
- *  $Id$
- *
- *   Visitor for the structure fields in valuebox class.
- *   This one generates code for access to strucuture members
- *   in the client header.
- *
- *   Based on be_visitor_union_branch/public_ch.  In general we
- *   generate the same method signatures as that visitor but cannot
- *   use it directly because a valuebox is not a scope and because
- *   the structure is visited prior to visiting the valuebox.
- *
- *
- *  @author Gary Maxey
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    field_ch.h
+//
+// = DESCRIPTION
+//     Visitor for the structure fields in valuebox class.
+//     This one generates code for access to strucuture members
+//     in the client header.
+//
+//     Based on be_visitor_union_branch/public_ch.  In general we
+//     generate the same method signatures as that visitor but cannot
+//     use it directly because a valuebox is not a scope and because
+//     the structure is visited prior to visiting the valuebox.
+//
+// = AUTHOR
+//    Gary Maxey
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_VALUEBOX_FIELD_CH_H_
 #define _BE_VISITOR_VALUEBOX_FIELD_CH_H_
 
-/**
- * @class be_visitor_valuebox_field_ch
- *
- * @brief be_visitor_valuebox_field_ch
- *
- * inside a valuebox for the client header. This generates the code
- * for the public section of the "valuebox" class
- */
 class be_visitor_valuebox_field_ch : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //    be_visitor_valuebox_field_ch
+  //
+  // = DESCRIPTION This is a concrete visitor for the structure fields
+  //   inside a valuebox for the client header. This generates the code
+  //   for the public section of the "valuebox" class
+  //
 public:
-  /// constructor
   be_visitor_valuebox_field_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_valuebox_field_ch (void);
+  // destructor
 
-  /// visit the union_branch node
   virtual int visit_field (be_field *node);
+  // visit the union_branch node
 
   // =visit operations on all possible data types that a union_branch can be
 
-  /// visit array type
   virtual int visit_array (be_array *node);
+  // visit array type
 
-  /// visit enum type
   virtual int visit_enum (be_enum *node);
+  // visit enum type
 
-  /// visit interface type
   virtual int visit_interface (be_interface *node);
+  // visit interface type
 
-  /// visit interface forward type
   virtual int visit_interface_fwd (be_interface_fwd *node);
+  // visit interface forward type
 
-  /// visit valuetype type
   virtual int visit_valuetype (be_valuetype *node);
+  // visit valuetype type
 
-  /// visit valuetype forward type
   virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
+  // visit valuetype forward type
 
-  /// visit predefined type
   virtual int visit_predefined_type (be_predefined_type *node);
+  // visit predefined type
 
-  /// visit sequence type
   virtual int visit_sequence (be_sequence *node);
+  // visit sequence type
 
-  /// visit string type
   virtual int visit_string (be_string *node);
+  // visit string type
 
-  /// visit structure type
   virtual int visit_structure (be_structure *node);
+  // visit structure type
 
-  /// visit typedefed type
   virtual int visit_typedef (be_typedef *node);
+  // visit typedefed type
 
-  /// visit union type
   virtual int visit_union (be_union *node);
+  // visit union type
 
 private:
   void emit_member_set (be_decl *field,
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/field_ci.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/field_ci.h
index ae6e00ce751..0698ee6c226 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/field_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/field_ci.h
@@ -1,57 +1,62 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    field_ci.h
- *
- *  $Id$
- *
- *   Visitor for the Valuebox class.
- *   This one generates code for accessor and modifier functions of
- *   struct field members.
- *
- *
- *  @author Gary Maxey
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    field_ci.h
+//
+// = DESCRIPTION
+//     Visitor for the Valuebox class.
+//     This one generates code for accessor and modifier functions of
+//     struct field members.
+//
+// = AUTHOR
+//    Gary Maxey
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_VALUEBOX_FIELD_CI_H_
 #define _BE_VISITOR_VALUEBOX_FIELD_CI_H_
 
-/**
- * @class be_visitor_valuebox_field_ci
- *
- * @brief be_visitor_valuebox_field_ci
- *
- * This visitor is used to generate the accessors and modifiers
- * for valuebox struct members.
- */
 class be_visitor_valuebox_field_ci : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //    be_visitor_valuebox_field_ci
+  //
+  // = DESCRIPTION
+  //    This visitor is used to generate the accessors and modifiers
+  //    for valuebox struct members.
+  //
 public:
-  /// constructor
   be_visitor_valuebox_field_ci (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_valuebox_field_ci (void);
+  // destructor
 
-  /// visit the field node
   virtual int visit_field (be_field *node);
+  // visit the field node
 
   // =visit operations on all possible data types that a union_branch can be
 
-  /// visit array type
   virtual int visit_array (be_array *node);
+  // visit array type
 
-  /// visit enum type
   virtual int visit_enum (be_enum *node);
+  // visit enum type
 
-  /// visit interface type
   virtual int visit_interface (be_interface *node);
+  // visit interface type
 
-  /// visit interface forward type
   virtual int visit_interface_fwd (be_interface_fwd *node);
+  // visit interface forward type
 
   virtual int visit_valuetype (be_valuetype *node);
   virtual int visit_eventtype (be_eventtype *node);
@@ -59,23 +64,23 @@ public:
   virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
   virtual int visit_eventtype_fwd (be_eventtype_fwd *node);
 
-  /// visit predefined type
   virtual int visit_predefined_type (be_predefined_type *node);
+  // visit predefined type
 
-  /// visit sequence type
   virtual int visit_sequence (be_sequence *node);
+  // visit sequence type
 
-  /// visit string type
   virtual int visit_string (be_string *node);
+  // visit string type
 
-  /// visit structure type
   virtual int visit_structure (be_structure *node);
+  // visit structure type
 
-  /// visit typedefed type
   virtual int visit_typedef (be_typedef *node);
+  // visit typedefed type
 
-  /// visit union type
   virtual int visit_union (be_union *node);
+  // visit union type
 
 private:
   void emit_member_set (be_decl *field,
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/union_member_ci.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/union_member_ci.h
index d506b544fae..066f4958d94 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/union_member_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/union_member_ci.h
@@ -1,79 +1,84 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    union_member_ci.h
- *
- *  $Id$
- *
- *   Visitor for the Valuebox class.
- *   This one generates code for accessor and modifier functions of
- *   union members.
- *
- *
- *  @author Gary Maxey
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    union_member_ci.h
+//
+// = DESCRIPTION
+//     Visitor for the Valuebox class.
+//     This one generates code for accessor and modifier functions of
+//     union members.
+//
+// = AUTHOR
+//    Gary Maxey
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_VALUEBOX_UNION_MEMBER_CI_H_
 #define _BE_VISITOR_VALUEBOX_UNION_MEMBER_CI_H_
 
-/**
- * @class be_visitor_valuebox_union_member_ci
- *
- * @brief be_visitor_valuebox_union_member_ci
- *
- * This visitor is used to generate the accessors and modifiers
- * for valuebox union members.
- */
 class be_visitor_valuebox_union_member_ci : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //    be_visitor_valuebox_union_member_ci
+  //
+  // = DESCRIPTION
+  //    This visitor is used to generate the accessors and modifiers
+  //    for valuebox union members.
+  //
 public:
-  /// constructor
   be_visitor_valuebox_union_member_ci (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_valuebox_union_member_ci (void);
+  // destructor
 
-  /// visit the field node
   virtual int visit_union_member (be_union_branch *node);
+  // visit the field node
 
   // =visit operations on all possible data types that a union_branch can be
 
-  /// visit array type
   virtual int visit_array (be_array *node);
+  // visit array type
 
-  /// visit enum type
   virtual int visit_enum (be_enum *node);
+  // visit enum type
 
-  /// visit interface type
   virtual int visit_interface (be_interface *node);
+  // visit interface type
 
-  /// visit interface forward type
   virtual int visit_interface_fwd (be_interface_fwd *node);
+  // visit interface forward type
 
   virtual int visit_valuetype (be_valuetype *node);
 
   virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
 
-  /// visit predefined type
   virtual int visit_predefined_type (be_predefined_type *node);
+  // visit predefined type
 
-  /// visit sequence type
   virtual int visit_sequence (be_sequence *node);
+  // visit sequence type
 
-  /// visit string type
   virtual int visit_string (be_string *node);
+  // visit string type
 
-  /// visit structure type
   virtual int visit_structure (be_structure *node);
+  // visit structure type
 
-  /// visit typedefed type
   virtual int visit_typedef (be_typedef *node);
+  // visit typedefed type
 
-  /// visit union type
   virtual int visit_union (be_union *node);
+  // visit union type
 
 private:
   void emit_member_set (be_decl *field,
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox.h
index 15da452e948..ccdfa871776 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox.h
@@ -1,40 +1,46 @@
 /* -*- c++ -*- */
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    valuebox.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Valuebox node.
- *
- *
- *  @author Gary Maxey
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuebox.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Valuebox node.
+//
+// = AUTHOR
+//    Gary Maxey
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_VALUEBOX_H_
 #define _BE_VISITOR_VALUEBOX_H_
 
-/**
- * @class be_visitor_valuebox
- *
- * @brief be_visitor_valuebox
- *
- * This is a concrete visitor to generate code for valueboxes.
- */
 class be_visitor_valuebox : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //   be_visitor_valuebox
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate code for valueboxes.
+  //
+  //
 public:
-  /// constructor
   be_visitor_valuebox (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_valuebox (void);
+  // destructor
 
-  /// visit attribute. We provide code for this method in the derived class
   virtual int visit_valuebox (be_valuebox *node);
+  // visit attribute. We provide code for this method in the derived class
 };
 
 #endif /* _BE_VISITOR_VALUEBOX_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_ch.h
index be1b27e3acc..ca91c292b69 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_ch.h
@@ -1,68 +1,74 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    valuebox_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Valuebox node.
- *  This provides code generation for valueboxes in the client header.
- *
- *
- *  @author Gary Maxey
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuebox_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Valuebox node.
+//    This provides code generation for valueboxes in the client header.
+//
+// = AUTHOR
+//    Gary Maxey
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_VALUEBOX_CH_H_
 #define _BE_VISITOR_VALUEBOX_CH_H_
 
-/**
- * @class be_visitor_valuebox_ch
- *
- * @brief be_visitor_valuebox_ch
- *
- * This is a concrete visitor to generate the client header for valuebox
- */
 class be_visitor_valuebox_ch : public be_visitor_valuebox
 {
+  //
+  // = TITLE
+  //   be_visitor_valuebox_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the client header for valuebox
+  //
+  //
 public:
-  /// constructor
   be_visitor_valuebox_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_valuebox_ch (void);
+  // destructor
 
-  /// visit valuebox.
   virtual int visit_valuebox (be_valuebox *node);
+  // visit valuebox.
 
-  /// visit array.
   virtual int visit_array (be_array *node);
+  // visit array.
 
-  /// visit enum.
   virtual int visit_enum (be_enum *node);
+  // visit enum.
 
-  /// visit interface.
   virtual int visit_interface (be_interface *node);
+  // visit interface.
 
-  /// visit predefined type.
   virtual int visit_predefined_type (be_predefined_type *node);
+  // visit predefined type.
 
-  /// visit sequence.
   virtual int visit_sequence (be_sequence *node);
+  // visit sequence.
 
-  /// visit string.
   virtual int visit_string (be_string *node);
+  // visit string.
 
-  /// visit structure.
   virtual int visit_structure (be_structure *node);
+  // visit structure.
 
-  /// visit typedef.
   virtual int visit_typedef (be_typedef *node);
+  // visit typedef.
 
-  /// visit union.
   virtual int visit_union (be_union *node);
+  // visit union.
 
 private:
   int emit_for_predef_enum(be_type *node,
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_ci.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_ci.h
index 98cdd7cf92a..4e7a3981b7b 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_ci.h
@@ -1,68 +1,74 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    valuebox_ci.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Valuebox node.
- *  This provides code generation for valueboxes in the client inline.
- *
- *
- *  @author Gary Maxey
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuebox_ci.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Valuebox node.
+//    This provides code generation for valueboxes in the client inline.
+//
+// = AUTHOR
+//    Gary Maxey
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_VALUEBOX_CI_H_
 #define _BE_VISITOR_VALUEBOX_CI_H_
 
-/**
- * @class be_visitor_valuebox_ci
- *
- * @brief be_visitor_valuebox_ci
- *
- * This is a concrete visitor to generate the client inline for valuebox
- */
 class be_visitor_valuebox_ci : public be_visitor_valuebox
 {
+  //
+  // = TITLE
+  //   be_visitor_valuebox_ci
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the client inline for valuebox
+  //
+  //
 public:
-  /// constructor
   be_visitor_valuebox_ci (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_valuebox_ci (void);
+  // destructor
 
-  /// visit valuebox.
   virtual int visit_valuebox (be_valuebox *node);
+  // visit valuebox.
 
-  /// visit array.
   virtual int visit_array (be_array *node);
+  // visit array.
 
-  /// visit enum.
   virtual int visit_enum (be_enum *node);
+  // visit enum.
 
-  /// visit interface.
   virtual int visit_interface (be_interface *node);
+  // visit interface.
 
-  /// visit predefined type.
   virtual int visit_predefined_type (be_predefined_type *node);
+  // visit predefined type.
 
-  /// visit sequence.
   virtual int visit_sequence (be_sequence *node);
+  // visit sequence.
 
-  /// visit string.
   virtual int visit_string (be_string *node);
+  // visit string.
 
-  /// visit structure.
   virtual int visit_structure (be_structure *node);
+  // visit structure.
 
-  /// visit typedef.
   virtual int visit_typedef (be_typedef *node);
+  // visit typedef.
 
-  /// visit union.
   virtual int visit_union (be_union *node);
+  // visit union.
 
 private:
   int emit_for_predef_enum (be_type *node,
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_cs.h
index c6129676be8..cfc363a37ca 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_cs.h
@@ -1,68 +1,74 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    valuebox_cs.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Valuebox node.
- *  This provides code generation for valueboxes in the client stubs.
- *
- *
- *  @author Gary Maxey
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuebox_cs.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Valuebox node.
+//    This provides code generation for valueboxes in the client stubs.
+//
+// = AUTHOR
+//    Gary Maxey
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_VALUEBOX_CS_H_
 #define _BE_VISITOR_VALUEBOX_CS_H_
 
-/**
- * @class be_visitor_valuebox_cs
- *
- * @brief be_visitor_valuebox_cs
- *
- * This is a concrete visitor to generate the client stubs for valuebox
- */
 class be_visitor_valuebox_cs : public be_visitor_valuebox
 {
+  //
+  // = TITLE
+  //   be_visitor_valuebox_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the client stubs for valuebox
+  //
+  //
 public:
-  /// constructor
   be_visitor_valuebox_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_valuebox_cs (void);
+  // destructor
 
-  /// visit valuebox.
   virtual int visit_valuebox (be_valuebox *node);
+  // visit valuebox.
 
-  /// visit array.
   virtual int visit_array (be_array *node);
+  // visit array.
 
-  /// visit enum.
   virtual int visit_enum (be_enum *node);
+  // visit enum.
 
-  /// visit interface.
   virtual int visit_interface (be_interface *node);
+  // visit interface.
 
-  /// visit predefined type.
   virtual int visit_predefined_type (be_predefined_type *node);
+  // visit predefined type.
 
-  /// visit sequence.
   virtual int visit_sequence (be_sequence *node);
+  // visit sequence.
 
-  /// visit string.
   virtual int visit_string (be_string *node);
+  // visit string.
 
-  /// visit structure.
   virtual int visit_structure (be_structure *node);
+  // visit structure.
 
-  /// visit typedef.
   virtual int visit_typedef (be_typedef *node);
+  // visit typedef.
 
-  /// visit union.
   virtual int visit_union (be_union *node);
+  // visit union.
 
 private:
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype.h
index b9fbda17149..b0162d0c9bf 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype.h
@@ -1,17 +1,19 @@
 
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    be_visitor_valuetype.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Valuetype class
- *
- *
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_valuetype.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Valuetype class
+//
+// ============================================================================
 
 #ifndef TAO_BE_VISITOR_VALUETYPE_H
 #define TAO_BE_VISITOR_VALUETYPE_H
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/ami_exception_holder_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/ami_exception_holder_ch.h
index d554385c923..139d488f9ac 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/ami_exception_holder_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/ami_exception_holder_ch.h
@@ -1,40 +1,45 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    ami_exception_holder_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Interface node.
- *  This one provides code generation for AMI exception holders
- *  in client headers.
- *
- *
- *  @author Michael Kircher <Michael.Kircher@mchp.siemens.de>
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    ami_exception_holder_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Interface node.
+//    This one provides code generation for AMI exception holders
+//    in client headers.
+//
+// = AUTHOR
+//    Michael Kircher <Michael.Kircher@mchp.siemens.de>
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_VALUETYPE_AMI_EXCEPTION_HOLDER_CH_H_
 #define _BE_VISITOR_VALUETYPE_AMI_EXCEPTION_HOLDER_CH_H_
 
 
-/**
- * @class be_visitor_valuetype_ami_exception_holder_ch
- *
- * @brief be_visitor_valuetype_ami_exception_holder_ch
- *
- * This is a concrete visitor to generate the client header for
- * interface.
- */
 class be_visitor_valuetype_ami_exception_holder_ch : public be_visitor_valuetype
 {
+  //
+  // = TITLE
+  //   be_visitor_valuetype_ami_exception_holder_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the client header for
+  //   interface.
+  //
 public:
-  /// constructor
   be_visitor_valuetype_ami_exception_holder_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_valuetype_ami_exception_holder_ch (void);
+  // destructor
 
   virtual int visit_operation (be_operation *node);
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/ami_exception_holder_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/ami_exception_holder_cs.h
index 37fc1f35823..88a77fdb288 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/ami_exception_holder_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/ami_exception_holder_cs.h
@@ -1,36 +1,42 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    ami_exception_holder_cs.h
- *
- *  $Id$
- *
- *  Visitor to generate code for exception holders.
- *
- *
- *  @author Michael Kircher <Michael.Kircher@mchp.siemens.de>
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    ami_exception_holder_cs.h
+//
+// = DESCRIPTION
+//    Visitor to generate code for exception holders.
+//
+// = AUTHOR
+//    Michael Kircher <Michael.Kircher@mchp.siemens.de>
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_VALUETYPE_AMI_EXCEPTION_HOLDER_CS_H_
 #define _BE_VISITOR_VALUETYPE_AMI_EXCEPTION_HOLDER_CS_H_
 
-/**
- * @class be_visitor_valuetype_ami_exception_holder_cs
- *
- * @brief be_visitor_valuetype_ami_exception_holder_cs
- *
- * This is a concrete visitor to generate the client stubs for interface
- */
 class be_visitor_valuetype_ami_exception_holder_cs : public be_visitor_valuetype
 {
+  //
+  // = TITLE
+  //   be_visitor_valuetype_ami_exception_holder_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the client stubs for interface
+  //
+  //
 public:
-  /// constructor
   be_visitor_valuetype_ami_exception_holder_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_valuetype_ami_exception_holder_cs (void);
+  // destructor
 
   virtual int visit_valuetype (be_valuetype *node);
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_ch.h
index f8ee9fae95b..12a18d278f7 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_ch.h
@@ -1,39 +1,44 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    any_op_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for the valuetype node.
- *  This one provides code generation for the Any operators
- *
- *
- *  @author Jeff Parsons <parsons@cs.wustl.edu>
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    any_op_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the valuetype node.
+//    This one provides code generation for the Any operators
+//
+// = AUTHOR
+//    Jeff Parsons <parsons@cs.wustl.edu>
+//
+// ============================================================================
 
 #ifndef _BE_VALUETYPE_ANY_OP_CH_H_
 #define _BE_VALUETYPE_ANY_OP_CH_H_
 
-/**
- * @class be_visitor_valuetype_any_op_ch
- *
- * @brief be_visitor_valuetype_any_op_ch
- *
- * This is a concrete visitor for valuetypes that generates the Any
- * operator declarations.
- */
 class be_visitor_valuetype_any_op_ch : public be_visitor_valuetype
 {
+  //
+  // = TITLE
+  //   be_visitor_valuetype_any_op_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for valuetypes that generates the Any
+  //   operator declarations.
+  //
 
 public:
-  /// constructor
   be_visitor_valuetype_any_op_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_valuetype_any_op_ch (void);
+  // destructor
 
   virtual int visit_valuetype (be_valuetype *node);
   virtual int visit_eventtype (be_eventtype *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_cs.h
index a2d5a428609..86b86ed0df2 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_cs.h
@@ -1,39 +1,44 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    any_op_cs.h
- *
- *  $Id$
- *
- *  Concrete visitor for the valuetype node.
- *  This one provides code generation for the Any operators
- *
- *
- *  @author Jeff Parsons <parsons@cs.wustl.edu>
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    any_op_cs.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the valuetype node.
+//    This one provides code generation for the Any operators
+//
+// = AUTHOR
+//    Jeff Parsons <parsons@cs.wustl.edu>
+//
+// ============================================================================
 
 #ifndef _BE_VALUETYPE_ANY_OP_CS_H_
 #define _BE_VALUETYPE_ANY_OP_CS_H_
 
-/**
- * @class be_visitor_valuetype_any_op_cs
- *
- * @brief be_visitor_valuetype_any_op_cs
- *
- * This is a concrete visitor for valuetype that generates the Any
- * operator implementations
- */
 class be_visitor_valuetype_any_op_cs : public be_visitor_valuetype
 {
+  //
+  // = TITLE
+  //   be_visitor_valuetype_any_op_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for valuetype that generates the Any
+  //   operator implementations
+  //
 
 public:
-  /// constructor
   be_visitor_valuetype_any_op_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_valuetype_any_op_cs (void);
+  // destructor
 
   virtual int visit_valuetype (be_valuetype *node);
   virtual int visit_eventtype (be_eventtype *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/arglist.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/arglist.h
index 1953d2a48b1..d407c637573 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/arglist.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/arglist.h
@@ -1,18 +1,21 @@
-
-//=============================================================================
-/**
- *  @file    arglist.h
- *
- *  $Id$
- *
- *  Visitor for generating code for IDL (valuetype) operations.
- *  This generates the operation signature.
- *
- *
- *
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    arglist.h
+//
+// = DESCRIPTION
+//    Visitor for generating code for IDL (valuetype) operations.
+//    This generates the operation signature.
+//
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_OBV_OPERATION_ARGLIST_H_
 #define _BE_VISITOR_OBV_OPERATION_ARGLIST_H_
@@ -21,33 +24,34 @@
 // Operation visitor for argument list - generates parameters in the signature
 // ******************************************************************************
 
-/**
- * @class be_visitor_obv_operation_arglist
- *
- * @brief be_visitor_operaion_arglist
- *
- * This is a visitor to generate operation argument list
- */
 class be_visitor_obv_operation_arglist : public be_visitor_scope
 {
+  //
+  // = TITLE
+  //   be_visitor_operaion_arglist
+  //
+  // = DESCRIPTION
+  //   This is a visitor to generate operation argument list
+  //
+  //
 public:
-  /// constructor
   be_visitor_obv_operation_arglist (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_obv_operation_arglist (void);
+  // destructor
 
-  /// special arglist generation for amh_exceptionholders
   bool is_amh_exception_holder (be_operation *node);
+  // special arglist generation for amh_exceptionholders
 
-  /// visit the operation
   int visit_operation (be_operation *node);
+  // visit the operation
 
-  /// visit each argument
   int visit_argument (be_argument *node);
+  // visit each argument
 
-  /// set 'comma' only between arguments
   int post_process (be_decl *bd);
+  // set 'comma' only between arguments
 };
 
 #endif /* _BE_VISITOR_OBV_OPERATION_ARGLIST_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ch.h
index 5c86b72558d..9555c9e0f15 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ch.h
@@ -1,40 +1,45 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    cdr_op_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for valuetypes.
- *  This one provides code generation for the CDR operators.
- *
- *
- *  @author Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for valuetypes.
+//    This one provides code generation for the CDR operators.
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_VALUETYPE_CDR_OP_CH_H_
 #define _BE_VISITOR_VALUETYPE_CDR_OP_CH_H_
 
-/**
- * @class be_visitor_valuetype_cdr_op_ch
- *
- * @brief be_visitor_valuetype_cdr_op_ch
- *
- * This is a concrete visitor for valuetype that generates the CDR operator
- * declarations
- */
 class be_visitor_valuetype_cdr_op_ch : public be_visitor_valuetype
 {
+  //
+  // = TITLE
+  //   be_visitor_valuetype_cdr_op_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for valuetype that generates the CDR operator
+  //   declarations
+  //
 
 public:
-  /// constructor
   be_visitor_valuetype_cdr_op_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_valuetype_cdr_op_ch (void);
+  // destructor
 
   virtual int visit_valuetype (be_valuetype *node);
   virtual int visit_eventtype (be_eventtype *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ci.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ci.h
index 32996c9eb44..4f7fa51bea4 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ci.h
@@ -1,52 +1,57 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    cdr_op_ci.h
- *
- *  $Id$
- *
- *  Concrete visitor for valuetypes.
- *  This one provides code generation for the CDR operators.
- *
- *
- *  @author Torsten Kuepper <kuepper2@lfa.uni-wuppertal.de>
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_ci.h
+//
+// = DESCRIPTION
+//    Concrete visitor for valuetypes.
+//    This one provides code generation for the CDR operators.
+//
+// = AUTHOR
+//    Torsten Kuepper <kuepper2@lfa.uni-wuppertal.de>
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_VALUETYPE_CDR_OP_CI_H_
 #define _BE_VISITOR_VALUETYPE_CDR_OP_CI_H_
 
-/**
- * @class be_visitor_valuetype_cdr_op_ci
- *
- * @brief be_visitor_valuetype_cdr_op_ci
- *
- * This is a concrete visitor for valuetype that generates the CDR operator
- * implementations
- */
 class be_visitor_valuetype_cdr_op_ci : public be_visitor_valuetype
 {
+  //
+  // = TITLE
+  //   be_visitor_valuetype_cdr_op_ci
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for valuetype that generates the CDR operator
+  //   implementations
+  //
 
 public:
-  /// constructor
   be_visitor_valuetype_cdr_op_ci (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_valuetype_cdr_op_ci (void);
+  // destructor
 
-  /// visit valuetype
   virtual int visit_valuetype (be_valuetype *node);
+  // visit valuetype
 
-  /// visit field
   virtual int visit_field (be_field *node);
+  // visit field
 
-  /// visit array
   virtual int visit_array (be_array *node);
+  // visit array
 
-  /// visit sequence
   virtual int visit_sequence (be_sequence *node);
+  // visit sequence
 };
 
 #endif /* _BE_VISITOR_VALUETYPE_CDR_OP_CI_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_cs.h
index 2a6675086d5..e45eb3cc4ed 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_cs.h
@@ -1,49 +1,55 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    cdr_op_cs.h
- *
- *  $Id$
- *
- *  Concrete visitor for valuetypes.
- *  This one provides code generation for the CDR operators.
- *
- *
- *  @author Boris Kolpackov <bosk@ipmce.ru> based on code from Torsten Kuepper <kuepper2@lfa.uni-wuppertal.de>
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    cdr_op_cs.h
+//
+// = DESCRIPTION
+//    Concrete visitor for valuetypes.
+//    This one provides code generation for the CDR operators.
+//
+// = AUTHOR
+//    Boris Kolpackov <bosk@ipmce.ru>
+//    based on code from Torsten Kuepper <kuepper2@lfa.uni-wuppertal.de>
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_VALUETYPE_CDR_OP_CS_H_
 #define _BE_VISITOR_VALUETYPE_CDR_OP_CS_H_
 
-/**
- * @class be_visitor_valuetype_cdr_op_cs
- *
- * @brief be_visitor_valuetype_cdr_op_cs
- *
- * This is a concrete visitor for valuetype that generates the CDR operator
- * implementations
- */
 class be_visitor_valuetype_cdr_op_cs : public be_visitor_valuetype
 {
+  //
+  // = TITLE
+  //   be_visitor_valuetype_cdr_op_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for valuetype that generates the CDR operator
+  //   implementations
+  //
 
 public:
-  /// constructor
   be_visitor_valuetype_cdr_op_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_valuetype_cdr_op_cs (void);
+  // destructor
 
   virtual int visit_valuetype (be_valuetype *node);
   virtual int visit_eventtype (be_eventtype *node);
 
-  /// visit field
   virtual int visit_field (be_field *node);
+  // visit field
 
-  /// visit sequence
   virtual int visit_sequence (be_sequence *node);
+  // visit sequence
 };
 
 #endif /* _BE_VISITOR_VALUETYPE_CDR_OP_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cdr_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cdr_ch.h
index 1b92177f591..04fc6447d39 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cdr_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cdr_ch.h
@@ -1,61 +1,66 @@
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    field_cdr_ch.h
- *
- *  $Id$
- *
- *  Visitor generating code for Field in the client header file.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+//
+// $Id$
+//
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    field_cdr_ch.h
+//
+// = DESCRIPTION
+//    Visitor generating code for Field in the client header file.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_VALUETYPE_FIELD_CDR_CH_H_
 #define _BE_VISITOR_VALUETYPE_FIELD_CDR_CH_H_
 
 #include "be_visitor_scope.h"
 
-/**
- * @class be_visitor_valuetype_field_cdr_ch
- *
- * @brief be_visitor_valuetype_field_cdr_ch
- *
- * This is a concrete visitor for the be_field node for the client header.
- */
 class be_visitor_valuetype_field_cdr_ch : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //    be_visitor_valuetype_field_cdr_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for the be_field node for the client header.
+  //
 public:
-  /// constructor
   be_visitor_valuetype_field_cdr_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_valuetype_field_cdr_ch (void);
+  // destructor
 
-  /// visit the field node
   virtual int visit_field (be_field *node);
+  // visit the field node
 
   // =visit operations on all possible data types that a field can be
 
-  /// visit array type
   virtual int visit_array (be_array *node);
+  // visit array type
 
-  /// visit enum type
   virtual int visit_enum (be_enum *node);
+  // visit enum type
 
-  /// visit sequence type
   virtual int visit_sequence (be_sequence *node);
+  // visit sequence type
 
-  /// visit structure type
   virtual int visit_structure (be_structure *node);
+  // visit structure type
 
-  /// visit typedefed type
   virtual int visit_typedef (be_typedef *node);
+  // visit typedefed type
 
-  /// visit union type
   virtual int visit_union (be_union *node);
+  // visit union type
 
   const char *pre_, *post_;
 };
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cdr_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cdr_cs.h
index ffd5f0d1124..628aeefb8ee 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cdr_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cdr_cs.h
@@ -1,92 +1,98 @@
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    field_cdr_cs.h
- *
- *  $Id$
- *
- *  Visitor generating code for Field in the client stubs file.
- *
- *
- *  @author Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de> derived from be_visitor_field/cdr_op_cs.h
- */
-//=============================================================================
-
+//
+// $Id$
+//
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    field_cdr_cs.h
+//
+// = DESCRIPTION
+//    Visitor generating code for Field in the client stubs file.
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//    derived from be_visitor_field/cdr_op_cs.h
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_VALUETYPE_FIELD_CDR_C_H_
 #define _BE_VISITOR_VALUETYPE_FIELD_CDR_CI_H_
 
 #include "be_visitor_scope.h"
 
-/**
- * @class be_visitor_valuetype_field_cdr_cs
- *
- * @brief be_visitor_valuetype_field_cdr_cs
- *
- * This is a concrete visitor for the be_field node for the client header.
- */
 class be_visitor_valuetype_field_cdr_cs : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //    be_visitor_valuetype_field_cdr_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for the be_field node for the client header.
+  //
 public:
-  /// constructor
   be_visitor_valuetype_field_cdr_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_valuetype_field_cdr_cs (void);
+  // destructor
 
-  /// visit the field node
   virtual int visit_field (be_field *node);
+  // visit the field node
 
   // =visit operations on all possible data types that a field can be
 
-  /// visit array type
   virtual int visit_array (be_array *node);
+  // visit array type
 
-  /// visit enum type
   virtual int visit_enum (be_enum *node);
+  // visit enum type
 
-  /// visit interface type
   virtual int visit_interface (be_interface *node);
+  // visit interface type
 
-  /// visit interface forward type
   virtual int visit_interface_fwd (be_interface_fwd *node);
+  // visit interface forward type
 
-  /// visit valuebox type
   virtual int visit_valuebox (be_valuebox *node);
+  // visit valuebox type
 
   virtual int visit_valuetype (be_valuetype *node);
 
   virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
 
-  /// visit component type
   virtual int visit_component (be_component *node);
+  // visit component type
 
-  /// visit interface forward type
   virtual int visit_component_fwd (be_component_fwd *node);
+  // visit interface forward type
 
-  /// visit eventtype type
   virtual int visit_eventtype (be_eventtype *node);
+  // visit eventtype type
 
-  /// visit eventtype forward type
   virtual int visit_eventtype_fwd (be_eventtype_fwd *node);
+  // visit eventtype forward type
 
-  /// visit predefined type
   virtual int visit_predefined_type (be_predefined_type *node);
+  // visit predefined type
 
-  /// visit sequence type
   virtual int visit_sequence (be_sequence *node);
+  // visit sequence type
 
-  /// visit string type
   virtual int visit_string (be_string *node);
+  // visit string type
 
-  /// visit structure type
   virtual int visit_structure (be_structure *node);
+  // visit structure type
 
-  /// visit typedefed type
   virtual int visit_typedef (be_typedef *node);
+  // visit typedefed type
 
-  /// visit union type
   virtual int visit_union (be_union *node);
+  // visit union type
 
   const char *pre_, *post_;
 
@@ -95,32 +101,32 @@ private:
 
 };
 
-/**
- * @class be_visitor_valuetype_field_cdr_decl
- *
- * @brief be_visitor_cdr_valuetype_field_cdr_decl
- *
- * When generating CDR operators for fields of structures and/or
- * unions it may be necessary to define some local variables (for
- * instance to hold temporary T_forany objects); this visitor
- * generates that code.
- */
 class be_visitor_valuetype_field_cdr_decl : public be_visitor_scope
 {
+  //
+  // = TITLE
+  //   be_visitor_cdr_valuetype_field_cdr_decl
+  //
+  // = DESCRIPTION
+  //   When generating CDR operators for fields of structures and/or
+  //   unions it may be necessary to define some local variables (for
+  //   instance to hold temporary T_forany objects); this visitor
+  //   generates that code.
+  //
 public:
-  /// constructor
   be_visitor_valuetype_field_cdr_decl (be_visitor_context *ctx);
+  // constructor
 
-  /// visit the field node
   virtual int visit_field (be_field *node);
+  // visit the field node
 
   // = visit operations for data types that require a local variable.
 
-  /// visit array type
   virtual int visit_array (be_array *node);
+  // visit array type
 
-  /// visit typedef type
   virtual int visit_typedef (be_typedef *node);
+  // visit typedef type
 };
 
 #endif /*  _BE_VISITOR_VALUETYPE_FIELD_CDR_CI_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ch.h
index 3b6144ead97..05ac5ba7e0c 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ch.h
@@ -1,60 +1,66 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    field_ch.h
- *
- *  $Id$
- *
- *  Visitor generating code for valuetype fields in the valuetype class
- *  (header).
- *
- *
- *  @author Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de> derived from be_visitor_union_branch/public_ch.h
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    field_ch.h
+//
+// = DESCRIPTION
+//    Visitor generating code for valuetype fields in the valuetype class
+//    (header).
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//    derived from be_visitor_union_branch/public_ch.h
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_VALUETYPE_FIELD_CH_H_
 #define _BE_VISITOR_VALUETYPE_FIELD_CH_H_
 
-/**
- * @class be_visitor_valuetype_field_ch
- *
- * @brief be_visitor_field_ch
- *
- * Visitor generating code for valuetype fields in the valuetype class
- * (header).
- */
 class be_visitor_valuetype_field_ch : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //    be_visitor_field_ch
+  //
+  // = DESCRIPTION
+  //    Visitor generating code for valuetype fields in the valuetype class
+  //    (header).
+  //
 public:
-  /// constructor
   be_visitor_valuetype_field_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_valuetype_field_ch (void);
+  // destructor
 
-  /// visit the field node
   virtual int visit_field (be_field *node);
+  // visit the field node
 
   // =visit operations on all possible data types that a valuetype
   //  state member can be.
 
-  /// visit array type
   virtual int visit_array (be_array *node);
+  // visit array type
 
-  /// visit enum type
   virtual int visit_enum (be_enum *node);
+  // visit enum type
 
-  /// visit interface type
   virtual int visit_interface (be_interface *node);
+  // visit interface type
 
-  /// visit interface forward type
   virtual int visit_interface_fwd (be_interface_fwd *node);
+  // visit interface forward type
 
-  /// visit valuebox type
   virtual int visit_valuebox (be_valuebox *node);
+  // visit valuebox type
 
   virtual int visit_valuetype (be_valuetype *node);
   virtual int visit_eventtype (be_eventtype *node);
@@ -62,28 +68,28 @@ public:
   virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
   virtual int visit_eventtype_fwd (be_eventtype_fwd *node);
 
-  /// visit predefined type
   virtual int visit_predefined_type (be_predefined_type *node);
+  // visit predefined type
 
-  /// visit sequence type
   virtual int visit_sequence (be_sequence *node);
+  // visit sequence type
 
-  /// visit string type
   virtual int visit_string (be_string *node);
+  // visit string type
 
-  /// visit structure type
   virtual int visit_structure (be_structure *node);
+  // visit structure type
 
-  /// visit typedefed type
   virtual int visit_typedef (be_typedef *node);
+  // visit typedefed type
 
-  /// visit union type
   virtual int visit_union (be_union *node);
+  // visit union type
 
-  /// print additional material around the field (e.g. virtual before)
   void setenclosings (const char *pre, const char *post);
   const char *pre_op ();
   const char *post_op ();
+  // print additional material around the field (e.g. virtual before)
 
 private:
   const char *pre_op_;
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ci.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ci.h
index dcb72c1aa2c..4803e64cfee 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ci.h
@@ -1,61 +1,66 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    field_ci.h
- *
- *  $Id$
- *
- *   Visitor for the Valuetype class.
- *   This one generates code for accessor and modifier functions of
- *   valuetype state members (in the inline file).
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    field_ci.h
+//
+// = DESCRIPTION
+//     Visitor for the Valuetype class.
+//     This one generates code for accessor and modifier functions of
+//     valuetype state members (in the inline file).
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_VALUETYPE_FIELD_CI_H_
 #define _BE_VISITOR_VALUETYPE_FIELD_CI_H_
 
-/**
- * @class be_visitor_valuetype_field_ci
- *
- * @brief be_visitor_valuetype_field_ci
- *
- * This visitor is used to generate the accessors and modifiers
- * for the members of valuetype
- */
 class be_visitor_valuetype_field_ci : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //    be_visitor_valuetype_field_ci
+  //
+  // = DESCRIPTION
+  //    This visitor is used to generate the accessors and modifiers
+  //    for the members of valuetype
+  //
 public:
-  /// constructor
   be_visitor_valuetype_field_ci (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_valuetype_field_ci (void);
+  // destructor
 
-  /// visit the field node
   virtual int visit_field (be_field *node);
+  // visit the field node
 
   // =visit operations on all possible data types that a union_branch can be
 
-  /// visit array type
   virtual int visit_array (be_array *node);
+  // visit array type
 
-  /// visit structure type
   virtual int visit_structure (be_structure *node);
+  // visit structure type
 
-  /// visit union type
   virtual int visit_union (be_union *node);
+  // visit union type
 
-  /// print additional string before op (e.g. ACE_INLINE)
   void setenclosings (const char *pre);
   const char *pre_op ();
+  // print additional string before op (e.g. ACE_INLINE)
 
-  /// if (in_obv_space_) print OBV_name else print name
   void op_name (be_valuetype *node, TAO_OutStream *os);
+  // if (in_obv_space_) print OBV_name else print name
 
   bool in_obv_space_;
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cs.h
index 225153c6a87..b8ce769a27b 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cs.h
@@ -1,60 +1,66 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    field_cs.h
- *
- *  $Id$
- *
- *   Visitor for the Valuetype class.
- *   This one generates code for accessor and modifier functions of
- *   valuetype state members (in the stub file).
- *
- *
- *  @author Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de> derived from be_visitor_union_branch/public_ci.h
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    field_cs.h
+//
+// = DESCRIPTION
+//     Visitor for the Valuetype class.
+//     This one generates code for accessor and modifier functions of
+//     valuetype state members (in the stub file).
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//    derived from be_visitor_union_branch/public_ci.h
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_VALUETYPE_FIELD_CS_H_
 #define _BE_VISITOR_VALUETYPE_FIELD_CS_H_
 
-/**
- * @class be_visitor_valuetype_field_cs
- *
- * @brief be_visitor_valuetype_field_cs
- *
- * This visitor is used to generate the accessors and modifiers
- * for the members of valuetype
- */
 class be_visitor_valuetype_field_cs : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //    be_visitor_valuetype_field_cs
+  //
+  // = DESCRIPTION
+  //    This visitor is used to generate the accessors and modifiers
+  //    for the members of valuetype
+  //
 public:
-  /// constructor
   be_visitor_valuetype_field_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_valuetype_field_cs (void);
+  // destructor
 
-  /// visit the field node
   virtual int visit_field (be_field *node);
+  // visit the field node
 
   // =visit operations on all possible data types that a union_branch can be
 
-  /// visit array type
   virtual int visit_array (be_array *node);
+  // visit array type
 
-  /// visit enum type
   virtual int visit_enum (be_enum *node);
+  // visit enum type
 
-  /// visit interface type
   virtual int visit_interface (be_interface *node);
+  // visit interface type
 
-  /// visit interface forward type
   virtual int visit_interface_fwd (be_interface_fwd *node);
+  // visit interface forward type
 
-  /// visit valuebox type
   virtual int visit_valuebox (be_valuebox *node);
+  // visit valuebox type
 
   virtual int visit_valuetype (be_valuetype *node);
   virtual int visit_eventtype (be_eventtype *node);
@@ -62,30 +68,30 @@ public:
   virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
   virtual int visit_eventtype_fwd (be_eventtype_fwd *node);
 
-  /// visit predefined type
   virtual int visit_predefined_type (be_predefined_type *node);
+  // visit predefined type
 
-  /// visit sequence type
   virtual int visit_sequence (be_sequence *node);
+  // visit sequence type
 
-  /// visit string type
   virtual int visit_string (be_string *node);
+  // visit string type
 
-  /// visit structure type
   virtual int visit_structure (be_structure *node);
+  // visit structure type
 
-  /// visit typedefed type
   virtual int visit_typedef (be_typedef *node);
+  // visit typedefed type
 
-  /// visit union type
   virtual int visit_union (be_union *node);
+  // visit union type
 
-  /// print additional string before op (e.g. ACE_INLINE)
   void setenclosings (const char *pre);
   const char *pre_op ();
+  // print additional string before op (e.g. ACE_INLINE)
 
-  /// if (in_obv_space_) print OBV_name else print name
   void op_name (be_valuetype *node, TAO_OutStream *os);
+  // if (in_obv_space_) print OBV_name else print name
 
   bool in_obv_space_;
 private:
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_ch.h
index f15cf6d72d9..997f267b315 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_ch.h
@@ -1,40 +1,45 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    marshal_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for valuetypes.
- *  This one provides code generation for marshalling.
- *
- *
- *  @author Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    marshal_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for valuetypes.
+//    This one provides code generation for marshalling.
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_VALUETYPE_MARSHAL_CH_H_
 #define _BE_VISITOR_VALUETYPE_MARSHAL_CH_H_
 
-/**
- * @class be_visitor_valuetype_marshal_ch
- *
- * @brief be_visitor_valuetype_marshal_ch
- *
- * This is a concrete visitor for interface that generates the CDR operator
- * declarations
- */
 class be_visitor_valuetype_marshal_ch : public be_visitor_scope
 {
+  //
+  // = TITLE
+  //   be_visitor_valuetype_marshal_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for interface that generates the CDR operator
+  //   declarations
+  //
 
 public:
-  /// constructor
   be_visitor_valuetype_marshal_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_valuetype_marshal_ch (void);
+  // destructor
 
   virtual int visit_valuetype (be_valuetype *node);
   virtual int visit_eventtype (be_eventtype *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_cs.h
index 011c3d2c596..833658657d1 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_cs.h
@@ -1,40 +1,45 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    marshal_cs.h
- *
- *  $Id$
- *
- *  Concrete visitor for valuetypes.
- *  This one provides code generation for marshalling.
- *
- *
- *  @author Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    marshal_cs.h
+//
+// = DESCRIPTION
+//    Concrete visitor for valuetypes.
+//    This one provides code generation for marshalling.
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_VALUETYPE_MARSHAL_CS_H_
 #define _BE_VISITOR_VALUETYPE_MARSHAL_CS_H_
 
-/**
- * @class be_visitor_valuetype_marshal_cs
- *
- * @brief be_visitor_valuetype_marshal_cs
- *
- * This is a concrete visitor for interface that generates the CDR operator
- * declarations
- */
 class be_visitor_valuetype_marshal_cs : public be_visitor_scope
 {
+  //
+  // = TITLE
+  //   be_visitor_valuetype_marshal_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for interface that generates the CDR operator
+  //   declarations
+  //
 
 public:
-  /// constructor
   be_visitor_valuetype_marshal_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_valuetype_marshal_cs (void);
+  // destructor
 
   virtual int visit_valuetype (be_valuetype *node);
   virtual int visit_eventtype (be_eventtype *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/obv_module.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/obv_module.h
index e34ce20cedc..b4da292f1f1 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/obv_module.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/obv_module.h
@@ -1,40 +1,45 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    obv_module.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Module class
- *  This provides code generation for the module in the header
- *  for the OBV_ namespace
- *
- *
- *  @author Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    module_obv.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Module class
+//    This provides code generation for the module in the header
+//    for the OBV_ namespace
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_VALUETYPE_OBV_MODULE_H_
 #define _BE_VISITOR_VALUETYPE_OBV_MODULE_H_
 
-/**
- * @class be_visitor_obv_module
- *
- * @brief be_visitor_obv_module
- *
- * This is a concrete visitor to generate the header for module
- * OBV_ namespace
- */
 class be_visitor_obv_module : public be_visitor_scope
 {
+  //
+  // = TITLE
+  //   be_visitor_obv_module
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the header for module
+  //   OBV_ namespace
+  //
 public:
-  /// constructor
   be_visitor_obv_module (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_obv_module (void);
+  // destructor
 
   virtual int visit_module (be_module *node);
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype.h
index c07e68b2001..e88c4509dfb 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype.h
@@ -1,111 +1,117 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    valuetype.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Valuetype node.
- *  This one provides the generic visitor for valuetypes from which others
- *  will inherit.
- *
- *
- *  @author Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de> based on interface.h from Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuetype.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Valuetype node.
+//    This one provides the generic visitor for valuetypes from which others
+//    will inherit.
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//    based on interface.h from Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VALUETYPE_VALUETYPE_H_
 #define _BE_VALUETYPE_VALUETYPE_H_
 
 
-/**
- * @class be_visitor_valuetype
- *
- * @brief be_visitor_valuetype
- *
- * This is a concrete visitor for valuetype that abstracts all common tasks
- */
 class be_visitor_valuetype : public be_visitor_scope
 {
+  //
+  // = TITLE
+  //   be_visitor_valuetype
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for valuetype that abstracts all common tasks
+  //
 
 public:
 
-  /// constructor
   be_visitor_valuetype (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_valuetype (void);
+  // destructor
 
 public:
-  /// visit the scope of the valuetype node
-  /// (in public/private field order)
   virtual int visit_valuetype_scope (be_valuetype *node);
+  // visit the scope of the valuetype node
+  // (in public/private field order)
 
   virtual void begin_public ();
   virtual void begin_private ();
 
  // =visit methods on all elements syntactically valid in a Valuetype scope
 
-  /// visit attribute
   virtual int visit_attribute (be_attribute *node);
+  // visit attribute
 
-  /// visit a constant
   virtual int visit_constant (be_constant *node);
+  // visit a constant
 
-  /// visit an enum
   virtual int visit_enum (be_enum *node);
+  // visit an enum
 
-  /// visit exception (not used)
   virtual int visit_exception (be_exception *node);
+  // visit exception (not used)
 
-  /// visit a structure
   virtual int visit_structure (be_structure *node);
+  // visit a structure
 
-  /// visit a forward declared structure
   virtual int visit_structure_fwd (be_structure_fwd *node);
+  // visit a forward declared structure
 
-  /// visit a union
   virtual int visit_union (be_union *node);
+  // visit a union
 
-  /// visit a forward declared union
   virtual int visit_union_fwd (be_union_fwd *node);
+  // visit a forward declared union
 
-  /// visit the typedef node
   virtual int visit_typedef (be_typedef *node);
+  // visit the typedef node
 
-  /// visit a field
   virtual int visit_field (be_field *node);
+  // visit a field
 
   // =helper methods for generation of fields
 
-  /// private data fields for scope
   int gen_pd (be_valuetype *node);
+  // private data fields for scope
 
-  /// private data for field
   int gen_field_pd (be_field *node);
+  // private data for field
 
-  /// generate the _init class definition
   virtual int gen_init_defn (be_valuetype *node);
+  // generate the _init class definition
 
-  /// generate the _init implementation
   virtual int gen_init_impl (be_valuetype *node);
+  // generate the _init implementation
 
-  /// Recursively generate args for the initializing constuctor.
   void gen_obv_init_constructor_args (be_valuetype *node,
                                       unsigned long &index);
+  // Recursively generate args for the initializing constuctor.
 
 protected:
-  /// check is VT needs a RefCounter mix-in in OBV_ class
-  /// suppose that we are deciding for this node
   static bool obv_need_ref_counter (be_valuetype *node);
+  // check is VT needs a RefCounter mix-in in OBV_ class
+  // suppose that we are deciding for this node
 
-  /// recurse down the inheritance tree to see
-  /// if node or one of its OBV_ base class already has RefCounter
   static bool obv_have_ref_counter (be_valuetype *node);
+  // recurse down the inheritance tree to see
+  // if node or one of its OBV_ base class already has RefCounter
 
-  /// Predicate common to _ch and _cs visitors.
   bool is_amh_exception_holder (be_valuetype *node);
+  // Predicate common to _ch and _cs visitors.
 };
 
 #endif /*  _BE_VALUETYPE_VALUETYPE_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ch.h
index bbd2964896a..0af5bed92b0 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ch.h
@@ -1,19 +1,24 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    valuetype_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Valuetype node.
- *  This one provides code generation for valuetypes in the (client) header.
- *
- *
- *  @author Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
- *  @author based on code from Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuetype_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Valuetype node.
+//    This one provides code generation for valuetypes in the (client) header.
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>,
+//    based on code from Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VALUETYPE_VALUETYPE_CH_H_
 #define _BE_VALUETYPE_VALUETYPE_CH_H_
@@ -21,21 +26,22 @@
 // we need derived valuetype visitors for the client and server header files. For
 // the others, they use the default valuetype visitor
 
-/**
- * @class be_visitor_valuetype_ch
- *
- * @brief be_visitor_valuetype_ch
- *
- * This is a concrete visitor to generate the client header for valuetype
- */
 class be_visitor_valuetype_ch : public be_visitor_valuetype
 {
+  //
+  // = TITLE
+  //   be_visitor_valuetype_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the client header for valuetype
+  //
+  //
 public:
-  /// constructor
   be_visitor_valuetype_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_valuetype_ch (void);
+  // destructor
 
   virtual int visit_valuetype (be_valuetype *node);
   virtual int visit_eventtype (be_eventtype *node);
@@ -46,11 +52,11 @@ public:
   void begin_public (void);
   void begin_private (void);
 
-  /// Helper method passed to the template method to generate code for
-  /// the operations of the parents of supported interfaces.
   static int gen_supported_ops (be_interface *node,
                                 be_interface *base,
                                 TAO_OutStream *os);
+  // Helper method passed to the template method to generate code for
+  // the operations of the parents of supported interfaces.
 };
 
 #endif /* _BE_VALUETYPE_VALUETYPE_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ci.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ci.h
index b22baeb7815..08d463d53f7 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ci.h
@@ -1,37 +1,44 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    valuetype_ci.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Valuetype node.
- *  This one provides code generation for valuetypes in the client inline.
- *
- *
- *  @author Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de> based on code from Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuetype_ci.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Valuetype node.
+//    This one provides code generation for valuetypes in the client inline.
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//    based on code from Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VALUETYPE_VALUETYPE_CI_H_
 #define _BE_VALUETYPE_VALUETYPE_CI_H_
 
-/**
- * @class be_visitor_valuetype_ci
- *
- * @brief be_visitor_valuetype_ci
- *
- * This is a concrete visitor to generate the client inline for valuetype
- */
 class be_visitor_valuetype_ci : public be_visitor_valuetype
 {
+  //
+  // = TITLE
+  //   be_visitor_valuetype_ci
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the client inline for valuetype
+  //
+  //
 public:
-  /// constructor
   be_visitor_valuetype_ci (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_valuetype_ci (void);
+  // destructor
 
   virtual int visit_valuetype (be_valuetype *node);
   virtual int visit_eventtype (be_eventtype *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_cs.h
index cd34ca0e8ee..6c1b81a009f 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_cs.h
@@ -1,31 +1,38 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    valuetype_cs.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Valuetype node.
- *  This one provides code generation for valuetypes in the client stubs.
- *
- *
- *  @author Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de> based on code from Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuetype_cs.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Valuetype node.
+//    This one provides code generation for valuetypes in the client stubs.
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//    based on code from Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VALUETYPE_VALUETYPE_CS_H_
 #define _BE_VALUETYPE_VALUETYPE_CS_H_
 
-/**
- * @class be_visitor_valuetype_cs
- *
- * @brief be_visitor_valuetype_cs
- *
- * This is a concrete visitor to generate the client stubs for valuetype
- */
 class be_visitor_valuetype_cs : public be_visitor_valuetype
 {
+  //
+  // = TITLE
+  //   be_visitor_valuetype_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the client stubs for valuetype
+  //
+  //
 public:
   be_visitor_valuetype_cs (be_visitor_context *ctx);
 
@@ -34,12 +41,12 @@ public:
   virtual int visit_valuetype (be_valuetype *node);
   virtual int visit_eventtype (be_eventtype *node);
 
-  /// Called only by AMH exceptions.
   virtual int visit_operation (be_operation *node);
+  // Called only by AMH exceptions.
   
 private:
-  /// Recursive to generate for inherited members.
   void gen_ostream_operator_r (be_valuetype *node, unsigned long &index);
+  // Recursive to generate for inherited members.
 };
 
 #endif /* _BE_VALUETYPE_VALUETYPE_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init.h
index bb563a982f7..1c867521d14 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init.h
@@ -1,40 +1,47 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    valuetype_init.h
- *
- *  $Id$
- *
- *  Coomon visitor for the Valuetype node.
- *  This one provides code generation for valuetype factory construct.
- *
- *
- *
- *  @author Boris Kolpackov <bosk@ipmce.ru>
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuetype_init.h
+//
+// = DESCRIPTION
+//    Coomon visitor for the Valuetype node.
+//    This one provides code generation for valuetype factory construct.
+//
+//
+// = AUTHOR
+//    Boris Kolpackov <bosk@ipmce.ru>
+//
+//
+// ============================================================================
 
 #ifndef _BE_VALUETYPE_VALUETYPE_INIT_H_
 #define _BE_VALUETYPE_VALUETYPE_INIT_H_
 
 
-/**
- * @class be_visitor_valuetype_init
- *
- * @brief be_visitor_valuetype_init
- *
- * This is a common visitor to generate valuetype factory constructs.
- */
 class be_visitor_valuetype_init : public be_visitor_valuetype
 {
+  //
+  // = TITLE
+  //   be_visitor_valuetype_init
+  //
+  // = DESCRIPTION
+  //   This is a common visitor to generate valuetype factory constructs.
+  //
+  //
 
 public:
-  /// constructor
   be_visitor_valuetype_init (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_valuetype_init (void);
+  // destructor
 
 public:
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_arglist_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_arglist_ch.h
index 6e39cee406b..35438202c9b 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_arglist_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_arglist_ch.h
@@ -1,47 +1,53 @@
-
-//=============================================================================
-/**
- *  @file    valuetype_init_arglist_ch.h
- *
- *  $Id$
- *
- *  Visitor for generating code for OBV factory. This generates the
- *  operation signature.
- *
- *
- *  @author Boris Kolpackov <bosk@ipmce.ru>
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuetype_init_arglist_ch.h
+//
+// = DESCRIPTION
+//    Visitor for generating code for OBV factory. This generates the
+//    operation signature.
+//
+// = AUTHOR
+//    Boris Kolpackov <bosk@ipmce.ru>
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_VALUETYPE_INIT_ARGLIST_CH_H_
 #define _BE_VISITOR_VALUETYPE_INIT_ARGLIST_CH_H_
 
 
-/**
- * @class be_visitor_valuetype_init_arglist_ch
- *
- * @brief be_visitor_valuetype_init_arglist_ch
- *
- * This is a visitor to generate factory argument list
- */
 class be_visitor_valuetype_init_arglist_ch : public be_visitor_scope
 {
+  //
+  // = TITLE
+  //   be_visitor_valuetype_init_arglist_ch
+  //
+  // = DESCRIPTION
+  //   This is a visitor to generate factory argument list
+  //
+  //
 public:
-  /// constructor
   be_visitor_valuetype_init_arglist_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_valuetype_init_arglist_ch (void);
+  // destructor
 
-  /// visit factory construct
   virtual int visit_factory (be_factory *node);
+  // visit factory construct
 
-  /// visit each argument
   virtual int visit_argument (be_argument *node);
+  // visit each argument
 
-  /// stuff to o/p after each element of the scope is handled
   virtual int post_process (be_decl *);
+  // stuff to o/p after each element of the scope is handled
 };
 
 #endif /* _BE_VISITOR_VALUETYPE_INIT_ARGLIST_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_ch.h
index 10a6921a9b6..32508516a49 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_ch.h
@@ -1,46 +1,53 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    valuetype_init_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Valuetype node.
- *  This one provides code generation for valuetype factory
- *  in the (client) header.
- *
- *
- *  @author Boris Kolpackov <bosk@ipmce.ru>
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuetype_init_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Valuetype node.
+//    This one provides code generation for valuetype factory
+//    in the (client) header.
+//
+// = AUTHOR
+//    Boris Kolpackov <bosk@ipmce.ru>
+//
+//
+// ============================================================================
 
 #ifndef _BE_VALUETYPE_VALUETYPE_INIT_CH_H_
 #define _BE_VALUETYPE_VALUETYPE_INIT_CH_H_
 
 
-/**
- * @class be_visitor_valuetype_init_ch
- *
- * @brief be_visitor_valuetype_init_ch
- *
- * This is a concrete visitor to generate valuetype factory in
- * the client header
- */
 class be_visitor_valuetype_init_ch : public be_visitor_valuetype_init
 {
+  //
+  // = TITLE
+  //   be_visitor_valuetype_init_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate valuetype factory in
+  //   the client header
+  //
+  //
 public:
-  /// constructor
   be_visitor_valuetype_init_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_valuetype_init_ch (void);
+  // destructor
 
   virtual int visit_valuetype (be_valuetype *node);
   virtual int visit_eventtype (be_eventtype *node);
 
-  /// visit a factory
   virtual int visit_factory (be_factory *node);
+  // visit a factory
 };
 
 #endif /* _BE_VALUETYPE_VALUETYPE_INIT_CH_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_ci.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_ci.h
index 183bf1837e9..142b19ffdcf 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_ci.h
@@ -1,40 +1,47 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    valuetype_init_ci.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Valuetype node.
- *  This one provides code generation for valuetype factory
- *  in the (client) inline.
- *
- *
- *  @author Boris Kolpackov <bosk@ipmce.ru>
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuetype_init_ci.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Valuetype node.
+//    This one provides code generation for valuetype factory
+//    in the (client) inline.
+//
+// = AUTHOR
+//    Boris Kolpackov <bosk@ipmce.ru>
+//
+//
+// ============================================================================
 
 #ifndef _BE_VALUETYPE_VALUETYPE_INIT_CI_H_
 #define _BE_VALUETYPE_VALUETYPE_INIT_CI_H_
 
 
-/**
- * @class be_visitor_valuetype_init_ci
- *
- * @brief be_visitor_valuetype_init_ci
- *
- * This is a concrete visitor to generate valuetype factory in
- * the client header
- */
 class be_visitor_valuetype_init_ci : public be_visitor_valuetype_init
 {
+  //
+  // = TITLE
+  //   be_visitor_valuetype_init_ci
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate valuetype factory in
+  //   the client header
+  //
+  //
 public:
-  /// constructor
   be_visitor_valuetype_init_ci (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_valuetype_init_ci (void);
+  // destructor
 };
 
 #endif /* _BE_VALUETYPE_VALUETYPE_INIT_CI_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_cs.h
index 30b8f187ec2..c604b286fea 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_cs.h
@@ -1,40 +1,47 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    valuetype_init_cs.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Valuetype node.
- *  This one provides code generation for valuetype factory
- *  in the (client) source.
- *
- *
- *  @author Boris Kolpackov <bosk@ipmce.ru>
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuetype_init_cs.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Valuetype node.
+//    This one provides code generation for valuetype factory
+//    in the (client) source.
+//
+// = AUTHOR
+//    Boris Kolpackov <bosk@ipmce.ru>
+//
+//
+// ============================================================================
 
 #ifndef _BE_VALUETYPE_VALUETYPE_INIT_CS_H_
 #define _BE_VALUETYPE_VALUETYPE_INIT_CS_H_
 
 
-/**
- * @class be_visitor_valuetype_init_cs
- *
- * @brief be_visitor_valuetype_init_cs
- *
- * This is a concrete visitor to generate valuetype factory in
- * the client header
- */
 class be_visitor_valuetype_init_cs : public be_visitor_valuetype_init
 {
+  //
+  // = TITLE
+  //   be_visitor_valuetype_init_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate valuetype factory in
+  //   the client header
+  //
+  //
 public:
-  /// constructor
   be_visitor_valuetype_init_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_valuetype_init_cs (void);
+  // destructor
 
   virtual int visit_valuetype (be_valuetype *node);
   virtual int visit_eventtype (be_eventtype *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ch.h
index cc1483c7585..c2ff28d31ef 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ch.h
@@ -1,20 +1,25 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    valuetype_obv_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Valuetype node.
- *  This one provides code generation for valuetype OBV_ class
- *  in the (client) header.
- *
- *
- *  @author Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
- *  @author based on code from Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuetype_obv_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Valuetype node.
+//    This one provides code generation for valuetype OBV_ class
+//    in the (client) header.
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>,
+//    based on code from Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VALUETYPE_VALUETYPE_OBV_CH_H_
 #define _BE_VALUETYPE_VALUETYPE_OBV_CH_H_
@@ -22,22 +27,22 @@
 // we need derived valuetype visitors for the client and server header files. For
 // the others, they use the default valuetype visitor
 
-/**
- * @class be_visitor_valuetype_obv_ch
- *
- * @brief be_visitor_valuetype_obv_ch
- *
- * This is a concrete visitor to generate the header for valuetype
- * OBV_ class
- */
 class be_visitor_valuetype_obv_ch : public be_visitor_valuetype
 {
+  //
+  // = TITLE
+  //   be_visitor_valuetype_obv_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the header for valuetype
+  //   OBV_ class
+  //
 public:
-  /// constructor
   be_visitor_valuetype_obv_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_valuetype_obv_ch (void);
+  // destructor
 
   virtual int visit_valuetype (be_valuetype *node);
   virtual int visit_eventtype (be_eventtype *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ci.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ci.h
index da95b740355..47648bb9e74 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ci.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ci.h
@@ -1,20 +1,25 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    valuetype_obv_ci.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Valuetype node.
- *  This one provides code generation for valuetype OBV_ class
- *  in the (client) header.
- *
- *
- *  @author Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
- *  @author based on code from Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuetype_obv_ci.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Valuetype node.
+//    This one provides code generation for valuetype OBV_ class
+//    in the (client) header.
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>,
+//    based on code from Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VALUETYPE_VALUETYPE_OBV_CI_H_
 #define _BE_VALUETYPE_VALUETYPE_OBV_CI_H_
@@ -22,22 +27,22 @@
 // we need derived valuetype visitors for the client and server header files. For
 // the others, they use the default valuetype visitor
 
-/**
- * @class be_visitor_valuetype_obv_ci
- *
- * @brief be_visitor_valuetype_ci
- *
- * This is a concrete visitor to generate the implementation for valuetype
- * OBV_ class
- */
 class be_visitor_valuetype_obv_ci : public be_visitor_valuetype
 {
+  //
+  // = TITLE
+  //   be_visitor_valuetype_ci
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the implementation for valuetype
+  //   OBV_ class
+  //
 public:
-  /// constructor
   be_visitor_valuetype_obv_ci (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_valuetype_obv_ci (void);
+  // destructor
 
   virtual int visit_valuetype (be_valuetype *node);
   virtual int visit_eventtype (be_eventtype *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_cs.h
index 0ebfb1a088f..05d584190ef 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_cs.h
@@ -1,52 +1,57 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    valuetype_obv_cs.h
- *
- *  $Id$
- *
- *  Visitor generating code for Valuetypes
- *  OBV_ class implementation
- *  (see C++ mapping OMG 20.17)
- *
- *
- *  @author Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
- *  @author derived from interface_ch.cpp from Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuetype_obv_cs.cpp
+//
+// = DESCRIPTION
+//    Visitor generating code for Valuetypes
+//    OBV_ class implementation
+//    (see C++ mapping OMG 20.17)
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>,
+//    derived from interface_ch.cpp from Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VALUETYPE_VALUETYPE_OBV_CS_H_
 #define _BE_VALUETYPE_VALUETYPE_OBV_CS_H_
 
-/**
- * @class be_visitor_valuetype_obv_cs
- *
- * @brief be_visitor_valuetype_obv_cs
- *
- * This is a concrete visitor to generate the implementation for valuetype
- * OBV_ class
- */
 class be_visitor_valuetype_obv_cs : public be_visitor_valuetype
 {
+  //
+  // = TITLE
+  //   be_visitor_valuetype_obv_cs
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the implementation for valuetype
+  //   OBV_ class
+  //
 public:
-  /// constructor
   be_visitor_valuetype_obv_cs (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_valuetype_obv_cs (void);
+  // destructor
 
   virtual int visit_valuetype (be_valuetype *node);
   virtual int visit_eventtype (be_eventtype *node);
   virtual int visit_field (be_field *node);
-
+  
 private:
-  /// Generate member assignments for the initializing constructor.
   void gen_obv_init_constructor_inits (be_valuetype *node);
-
-  /// Called by method above to generate base class constructor call.
+  // Generate member assignments for the initializing constructor.
+  
   void gen_obv_init_base_constructor_args (be_valuetype *node,
                                            unsigned long &index);
+  // Called by method above to generate base class constructor call.
 };
 
 #endif /* _BE_VALUETYPE_VALUETYPE_OBV_CS_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_sh.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_sh.h
index 33b59575fb2..810bc4be474 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_sh.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_sh.h
@@ -1,37 +1,43 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    valuetype_sh.h
- *
- *  $Id$
- *
- *  Concrete visitor for the valuetype node.
- *  This provides for code generation in the server header
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuetype_sh.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the valuetype node.
+//    This provides for code generation in the server header
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_VALUETYPE_VALUETYPE_SH_H_
 #define _BE_VALUETYPE_VALUETYPE_SH_H_
 
-/**
- * @class be_visitor_valuetype_sh
- *
- * @brief be_visitor_valuetype_sh
- *
- * This is a concrete visitor to generate the server header for valuetype
- */
 class be_visitor_valuetype_sh : public be_visitor_valuetype
 {
+  //
+  // = TITLE
+  //   be_visitor_valuetype_sh
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the server header for valuetype
+  //
+  //
 public:
-  /// constructor
   be_visitor_valuetype_sh (be_visitor_context *ctx);
+  // constructor
   
-  /// destructor
   ~be_visitor_valuetype_sh (void);
+  // destructor
   
   virtual int visit_valuetype (be_valuetype *node);
   virtual int visit_eventtype (be_eventtype *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_si.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_si.h
index 698c702d03e..6c01a376559 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_si.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_si.h
@@ -1,37 +1,43 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    valuetype_si.h
- *
- *  $Id$
- *
- *  Concrete visitor for the valuetype node.
- *  This provides for code generation in the server inline
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuetype_si.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the valuetype node.
+//    This provides for code generation in the server inline
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_VALUETYPE_VALUETYPE_SI_H_
 #define _BE_VALUETYPE_VALUETYPE_SI_H_
 
-/**
- * @class be_visitor_valuetype_si
- *
- * @brief be_visitor_valuetype_si
- *
- * This is a concrete visitor to generate the server inline for valuetype
- */
 class be_visitor_valuetype_si : public be_visitor_valuetype
 {
+  //
+  // = TITLE
+  //   be_visitor_valuetype_si
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the server inline for valuetype
+  //
+  //
 public:
-  /// constructor
   be_visitor_valuetype_si (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_valuetype_si (void);
+  // destructor
 
   virtual int visit_valuetype (be_valuetype *node);
   virtual int visit_eventtype (be_eventtype *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ss.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ss.h
index 060eafa0d22..8392afce8e9 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ss.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ss.h
@@ -1,38 +1,43 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    valuetype_ss.h
- *
- *  $Id$
- *
- *  Concrete visitor for the valuetype node.
- *  This provides for code generation in the server skeleton
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuetype_ss.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the valuetype node.
+//    This provides for code generation in the server skeleton
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_VALUETYPE_VALUETYPE_SS_H_
 #define _BE_VALUETYPE_VALUETYPE_SS_H_
 
-/**
- * @class be_visitor_valuetype_ss
- *
- * @brief be_visitor_valuetype_ss
- *
- * This is a concrete visitor to generate the server skeletons for
- * interface
- */
 class be_visitor_valuetype_ss : public be_visitor_valuetype
 {
+  //
+  // = TITLE
+  //   be_visitor_valuetype_ss
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor to generate the server skeletons for
+  //   interface
+  //
 public:
-  /// constructor
   be_visitor_valuetype_ss (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_valuetype_ss (void);
+  // destructor
 
   virtual int visit_valuetype (be_valuetype *node);
   virtual int visit_eventtype (be_eventtype *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd.h
index 88affaabf72..1ca6087d524 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd.h
@@ -1,18 +1,24 @@
 /* -*- C++ -*- */
+//
+// $Id$
+//
 
-//=============================================================================
-/**
- *  @file    be_visitor_valuetype_fwd.h
- *
- *  $Id$
- *
- *  Concrete visitor for the valuetype_fwd class
- *
- *
- *  @author Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de> based on code from Aniruddha Gokhale (be_visitor_interface_fwd.h)
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    be_visitor_valuetype_fwd.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the valuetype_fwd class
+//
+// = AUTHOR
+//    Torsten Kuepper  <kuepper2@lfa.uni-wuppertal.de>
+//    based on code from Aniruddha Gokhale (be_visitor_interface_fwd.h)
+//
+// ============================================================================
 
 #ifndef TAO_BE_VISITOR_VALUETYPE_FWD_H
 #define TAO_BE_VISITOR_VALUETYPE_FWD_H
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/any_op_ch.h
index d7a439c6e3a..099299c684f 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/any_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/any_op_ch.h
@@ -1,39 +1,44 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    any_op_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for the forward declared Valuetype node.
- *  This one provides code generation for the Any operators.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    any_op_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the forward declared Valuetype node.
+//    This one provides code generation for the Any operators.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef _BE_VALUETYPE_FWD_ANY_OP_CH_H_
 #define _BE_VALUETYPE_FWD_ANY_OP_CH_H_
 
-/**
- * @class be_visitor_valuetype_fwd_any_op_ch
- *
- * @brief be_visitor_valuetype_fwd_any_op_ch
- *
- * This is a concrete visitor for forward declared valuetypes that
- * generates the Any operator declaration.
- */
 class be_visitor_valuetype_fwd_any_op_ch : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //   be_visitor_valuetype_fwd_any_op_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for forward declared valuetypes that
+  //   generates the Any operator declaration.
+  //
 
 public:
-  /// constructor
   be_visitor_valuetype_fwd_any_op_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_valuetype_fwd_any_op_ch (void);
+  // destructor
 
   virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
   virtual int visit_eventtype_fwd (be_eventtype_fwd *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/cdr_op_ch.h
index 265be94e53b..5270f9ca665 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/cdr_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/cdr_op_ch.h
@@ -1,42 +1,49 @@
 /* -*- c++ -*- */
-
-//=============================================================================
-/**
- *  @file    cdr_op_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for the valuetype_fwd class
- *  This one provides code generation for the CDR operators
- *  (actually just their declarations) for the valuetype forward
- *  declaration in the client inline.
- *
- *
- *  @author Boris Kolpackov <bosk@ipmce.ru> based on code from Torsten Kuepper based on code from Aniruddha Gokhale & Carlos O'Ryan
- */
-//=============================================================================
-
+//
+// $Id$
+//
+
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuetype_fwd_cdr_op_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the valuetype_fwd class
+//    This one provides code generation for the CDR operators
+//    (actually just their declarations) for the valuetype forward
+//    declaration in the client inline.
+//
+// = AUTHOR
+//    Boris Kolpackov <bosk@ipmce.ru>
+//    based on code from Torsten Kuepper
+//    based on code from Aniruddha Gokhale & Carlos O'Ryan
+//
+// ============================================================================
 
 #ifndef BE_VISITOR_VALUETYPE_FWD_CDR_OP_CH_H
 #define BE_VISITOR_VALUETYPE_FWD_CDR_OP_CH_H
 
-/**
- * @class be_visitor_valuetype_fwd_cdr_op_ch
- *
- * @brief be_visitor_valuetype_fwd_cdr_op_ch
- *
- * This is a concrete visitor for valuetype that generates the CDR
- * operator forward declarations.
- */
 class be_visitor_valuetype_fwd_cdr_op_ch : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //   be_visitor_valuetype_fwd_cdr_op_ch
+  //
+  // = DESCRIPTION
+  //   This is a concrete visitor for valuetype that generates the CDR
+  //   operator forward declarations.
+  //
 
 public:
-  /// constructor
   be_visitor_valuetype_fwd_cdr_op_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_valuetype_fwd_cdr_op_ch (void);
+  // destructor
 
   virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
   virtual int visit_eventtype_fwd (be_eventtype_fwd *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/valuetype_fwd_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/valuetype_fwd_ch.h
index 6020919e8c0..428a645de1c 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/valuetype_fwd_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/valuetype_fwd_ch.h
@@ -1,37 +1,44 @@
+//
+// $Id$
+//
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    valuetype_fwd_ch.h
- *
- *  $Id$
- *
- *  Concrete visitor for the Valuetype Forward node.
- *  This one provides code generation for valuetype forward node.
- *
- *
- *  @author Torsten Kuepper based on code from Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    valuetype_fwd_ch.h
+//
+// = DESCRIPTION
+//    Concrete visitor for the Valuetype Forward node.
+//    This one provides code generation for valuetype forward node.
+//
+// = AUTHOR
+//    Torsten Kuepper
+//    based on code from Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef _BE_VISITOR_VALUETYPE_FWD_CH_H_
 #define _BE_VISITOR_VALUETYPE_FWD_CH_H_
 
-/**
- * @class be_visitor_valuetype_fwd_ch
- *
- * @brief be_visitor_valuetype_fwd_ch
- *
- * This is the visitor for valuetype_fwd for the header file
- */
 class be_visitor_valuetype_fwd_ch : public be_visitor_decl
 {
+  //
+  // = TITLE
+  //   be_visitor_valuetype_fwd_ch
+  //
+  // = DESCRIPTION
+  //   This is the visitor for valuetype_fwd for the header file
+  //
+  //
 public:
-  /// constructor
   be_visitor_valuetype_fwd_ch (be_visitor_context *ctx);
+  // constructor
 
-  /// destructor
   ~be_visitor_valuetype_fwd_ch (void);
+  // destructor
 
   virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
   virtual int visit_eventtype_fwd (be_eventtype_fwd *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_xplicit_pre_proc.h b/TAO/TAO_IDL/be_include/be_visitor_xplicit_pre_proc.h
deleted file mode 100644
index 4ccf5d485f0..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_xplicit_pre_proc.h
+++ /dev/null
@@ -1,79 +0,0 @@
-
-/* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    be_visitor_xplicit_pre_proc.h
- *
- *  $Id$
- *
- *  This visitor creates the explicit home interface
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
-
-#ifndef TAO_BE_VISITOR_XPLICIT_PRE_PROC_H
-#define TAO_BE_VISITOR_XPLICIT_PRE_PROC_H
-
-#include "be_visitor_ccm_pre_proc.h"
-
-/**
- * @class be_visitor_xplicit_pre_proc
- *
- * @brief be_visitor_xplicit_pre_proc
- *
- * Adds home explicit implied IDL code to the AST.
- */
-class be_visitor_xplicit_pre_proc : public be_visitor_ccm_pre_proc
-{
-public:
-  be_visitor_xplicit_pre_proc (be_visitor_context *ctx);
-
-  virtual ~be_visitor_xplicit_pre_proc (void);
-  
-  virtual int visit_home (be_home *node);
-
-  virtual int visit_operation (be_operation *node);
-  virtual int visit_argument (be_argument *node);
-  virtual int visit_factory (be_factory *node);
-  virtual int visit_finder (be_finder *node);
-  
-  virtual int visit_interface (be_interface *node);
-  virtual int visit_valuebox (be_valuebox *node);
-  virtual int visit_valuetype (be_valuetype *node);
-  virtual int visit_eventtype (be_eventtype *node);
-  virtual int visit_structure (be_structure *node);
-  virtual int visit_structure_fwd (be_structure_fwd *node);
-  virtual int visit_exception (be_exception *node);
-  virtual int visit_enum (be_enum *node);
-  virtual int visit_field (be_field *node);
-  virtual int visit_attribute (be_attribute *node);
-  virtual int visit_union (be_union *node);
-  virtual int visit_union_fwd (be_union_fwd *node);
-  virtual int visit_union_branch (be_union_branch *node);
-  virtual int visit_union_label (be_union_label *node);
-  virtual int visit_constant (be_constant *node);
-  virtual int visit_enum_val (be_enum_val *node);
-  virtual int visit_array (be_array *node);
-  virtual int visit_sequence (be_sequence *node);
-  virtual int visit_string (be_string *node);
-  virtual int visit_typedef (be_typedef *node);
-  virtual int visit_native (be_native *node);
-  virtual int visit_predefined_type (be_predefined_type *node);
-
-  // Member accessor
-  be_interface *xplicit (void) const;
-  
-private:
-  void check_and_store (AST_Decl *node);
-  UTL_ScopedName *xplicit_iface_rel_name (AST_Decl *d);
-  
-private:
-  be_interface *xplicit_;
-  AST_Decl *type_holder_;
-  bool ref_type_;
-};
-
-#endif // TAO_BE_VISITOR_XPLICIT_PRE_PROC_H
diff --git a/TAO/TAO_IDL/driver/drv_mcpp_preproc.cpp b/TAO/TAO_IDL/driver/drv_mcpp_preproc.cpp
index 7b61c2a1da9..4b47e58defb 100644
--- a/TAO/TAO_IDL/driver/drv_mcpp_preproc.cpp
+++ b/TAO/TAO_IDL/driver/drv_mcpp_preproc.cpp
@@ -90,6 +90,10 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 #include "mcpp_lib.h"
 
+ACE_RCSID (driver,
+           drv_preproc,
+           "$Id$")
+
 // Storage for preprocessor args.
 unsigned long const DRV_MAX_ARGCOUNT = 1024;
 unsigned long DRV_argcount = 0;
diff --git a/TAO/TAO_IDL/driver/drv_preproc.cpp b/TAO/TAO_IDL/driver/drv_preproc.cpp
index 234fc4f8f55..aae06ad4e98 100644
--- a/TAO/TAO_IDL/driver/drv_preproc.cpp
+++ b/TAO/TAO_IDL/driver/drv_preproc.cpp
@@ -88,6 +88,10 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_fcntl.h"
 
+ACE_RCSID (driver,
+           drv_preproc,
+           "$Id$")
+
 // Storage for preprocessor args.
 unsigned long const DRV_MAX_ARGCOUNT = 1024;
 unsigned long DRV_argcount = 0;
diff --git a/TAO/TAO_IDL/fe/fe_component_header.cpp b/TAO/TAO_IDL/fe/fe_component_header.cpp
index 14a8267af16..8dc219e2115 100644
--- a/TAO/TAO_IDL/fe/fe_component_header.cpp
+++ b/TAO/TAO_IDL/fe/fe_component_header.cpp
@@ -2,16 +2,16 @@
 
 #include "fe_component_header.h"
 
-#include "fe_extern.h"
-#include "global_extern.h"
-#include "nr_extern.h"
+#include "ast_component.h"
+#include "ast_module.h"
+#include "ast_param_holder.h"
 
 #include "utl_err.h"
 #include "utl_namelist.h"
 
-#include "ast_component.h"
-#include "ast_module.h"
-#include "ast_param_holder.h"
+#include "fe_extern.h"
+#include "global_extern.h"
+#include "nr_extern.h"
 
 FE_ComponentHeader::FE_ComponentHeader (UTL_ScopedName *n,
                                         UTL_ScopedName *base_component,
diff --git a/TAO/TAO_IDL/fe/fe_extern.cpp b/TAO/TAO_IDL/fe/fe_extern.cpp
index a03b151e796..efc76471ca2 100644
--- a/TAO/TAO_IDL/fe/fe_extern.cpp
+++ b/TAO/TAO_IDL/fe/fe_extern.cpp
@@ -70,15 +70,16 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
  */
 
 #include "fe_extern.h"
-
+#include "ast_root.h"
 #include "global_extern.h"
 #include "utl_err.h"
 #include "utl_indenter.h"
-
-#include "ast_root.h"
-
 #include "ace/UUID.h"
 
+ACE_RCSID (fe,
+           fe_extern,
+           "$Id$")
+
 extern int tao_yyparse (void);
 
 #ifdef USE_MCPP_BUFFER_LEXING
@@ -94,6 +95,11 @@ FE_yyparse (void)
 {
   int const result = tao_yyparse ();
 
+  if (0 == idl_global->err_count ())
+    {
+      idl_global->root ()->call_add ();
+    }
+    
 #ifdef USE_MCPP_BUFFER_LEXING
   ACE_OS::free (tao_preproc_buffer);
   tao_preproc_buffer_length = 0;
diff --git a/TAO/TAO_IDL/fe/fe_global.cpp b/TAO/TAO_IDL/fe/fe_global.cpp
index a65b88d2ec9..f60767a0ac3 100644
--- a/TAO/TAO_IDL/fe/fe_global.cpp
+++ b/TAO/TAO_IDL/fe/fe_global.cpp
@@ -2,4 +2,10 @@
 
 #include "global_extern.h"
 
+
+ACE_RCSID (fe,
+           fe_global,
+           "$Id$")
+
+
 IDL_GlobalData *idl_global = 0;
diff --git a/TAO/TAO_IDL/fe/fe_home_header.cpp b/TAO/TAO_IDL/fe/fe_home_header.cpp
index 05b8f624e9d..2d03c261d58 100644
--- a/TAO/TAO_IDL/fe/fe_home_header.cpp
+++ b/TAO/TAO_IDL/fe/fe_home_header.cpp
@@ -2,15 +2,15 @@
 
 #include "fe_home_header.h"
 
-#include "global_extern.h"
-#include "utl_err.h"
-#include "fe_extern.h"
-
 #include "ast_home.h"
-#include "ast_component.h"
 #include "ast_valuetype.h"
 #include "ast_param_holder.h"
 
+#include "utl_err.h"
+
+#include "fe_extern.h"
+#include "global_extern.h"
+
 FE_HomeHeader::FE_HomeHeader (UTL_ScopedName *n,
                               UTL_ScopedName *base_home,
                               UTL_NameList *supports,
diff --git a/TAO/TAO_IDL/fe/fe_init.cpp b/TAO/TAO_IDL/fe/fe_init.cpp
index b615a45709c..11d2e1c0a3f 100644
--- a/TAO/TAO_IDL/fe/fe_init.cpp
+++ b/TAO/TAO_IDL/fe/fe_init.cpp
@@ -64,18 +64,20 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 */
 
-#include "ace/Env_Value_T.h"
-#include "ace/UUID.h"
-
+#include "ast_module.h"
+#include "ast_predefined_type.h"
+#include "ast_generator.h"
+#include "ast_root.h"
 #include "utl_scoped_name.h"
 #include "utl_identifier.h"
 #include "global_extern.h"
 #include "fe_extern.h"
+#include "ace/Env_Value_T.h"
+#include "ace/UUID.h"
 
-#include "ast_module.h"
-#include "ast_predefined_type.h"
-#include "ast_generator.h"
-#include "ast_root.h"
+ACE_RCSID (fe,
+           fe_init,
+           "$Id$")
 
 const size_t LOCAL_ESCAPES_BUFFER_SIZE = 1024;
 
diff --git a/TAO/TAO_IDL/fe/fe_interface_header.cpp b/TAO/TAO_IDL/fe/fe_interface_header.cpp
index 9fe86ad65c4..79d069bc72f 100644
--- a/TAO/TAO_IDL/fe/fe_interface_header.cpp
+++ b/TAO/TAO_IDL/fe/fe_interface_header.cpp
@@ -70,7 +70,12 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 #include "fe_interface_header.h"
 
-#include "ace/streams.h"
+#include "ast_interface_fwd.h"
+#include "ast_valuetype.h"
+#include "ast_component.h"
+#include "ast_home.h"
+#include "ast_module.h"
+#include "ast_param_holder.h"
 
 #include "utl_namelist.h"
 #include "utl_err.h"
@@ -79,12 +84,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "global_extern.h"
 #include "nr_extern.h"
 
-#include "ast_interface_fwd.h"
-#include "ast_valuetype.h"
-#include "ast_component.h"
-#include "ast_home.h"
-#include "ast_module.h"
-#include "ast_param_holder.h"
+#include "ace/streams.h"
 
 #undef  INCREMENT
 #define INCREMENT 512
diff --git a/TAO/TAO_IDL/fe/fe_obv_header.cpp b/TAO/TAO_IDL/fe/fe_obv_header.cpp
index 86af8bd11c8..db9195e7f73 100644
--- a/TAO/TAO_IDL/fe/fe_obv_header.cpp
+++ b/TAO/TAO_IDL/fe/fe_obv_header.cpp
@@ -2,6 +2,10 @@
 
 #include "fe_obv_header.h"
 
+#include "ast_valuetype.h"
+#include "ast_module.h"
+#include "ast_param_holder.h"
+
 #include "utl_err.h"
 #include "utl_namelist.h"
 
@@ -9,10 +13,6 @@
 #include "nr_extern.h"
 #include "global_extern.h"
 
-#include "ast_valuetype.h"
-#include "ast_module.h"
-#include "ast_param_holder.h"
-
 // @@@ (JP) Here are the rules for interface inheritance and
 // value type inheritance and supports, straight from Jonathan
 // Biggar <jon@floorboard.com> as of 3/28/02. The following was
diff --git a/TAO/TAO_IDL/fe/fe_private.cpp b/TAO/TAO_IDL/fe/fe_private.cpp
index d83e6b31ed7..d80fb132ee6 100644
--- a/TAO/TAO_IDL/fe/fe_private.cpp
+++ b/TAO/TAO_IDL/fe/fe_private.cpp
@@ -67,4 +67,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "fe_private.h"
 #include "utl_strlist.h"
 
+ACE_RCSID (fe, 
+           fe_private, 
+           "$Id$")
+
 UTL_StrList *DRV_global_pragmas = 0;
diff --git a/TAO/TAO_IDL/fe/idl.ll b/TAO/TAO_IDL/fe/idl.ll
index c1b93bf665b..e3f8828b285 100644
--- a/TAO/TAO_IDL/fe/idl.ll
+++ b/TAO/TAO_IDL/fe/idl.ll
@@ -67,8 +67,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
  * idl.ll - Lexical scanner for IDL 3.1
  */
 
-#include "global_extern.h"
-#include "nr_extern.h"
 #include "utl_strlist.h"
 #include "utl_exprlist.h"
 #include "utl_labellist.h"
@@ -85,8 +83,10 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "fe_obv_header.h"
 #include "fe_component_header.h"
 #include "fe_home_header.h"
+#include "global_extern.h"
 #include "fe_private.h"
 #include "fe_extern.h"
+#include "nr_extern.h"
 #include "y.tab.h"
 
 static char *           idl_wstring_escape_reader (char *);
@@ -498,14 +498,12 @@ idl_parse_line_and_file (char *buf)
 
   UTL_String *fname = idl_global->filename ();
   bool in_main_file = false;
-
-  bool is_real_filename =
-    fname->compare (idl_global->real_filename ())
-    || same_file (fname->get_string(),
-                  idl_global->real_filename ()->get_string());
-
+  bool is_real_filename 
+    = fname->compare (idl_global->real_filename ())
+      || same_file (fname->get_string(), 
+                    idl_global->real_filename ()->get_string()); 
+  
   bool is_main_filename = false;
-
   if (!is_real_filename)
     {
 #if defined (ACE_OPENVMS)
@@ -518,11 +516,11 @@ idl_parse_line_and_file (char *buf)
       is_main_filename = idl_global->path_cmp (idl_global->main_filename ()->get_string (),
                                                full_fname) == 0;
 #else
-      is_main_filename =
-        fname->compare (idl_global->main_filename ())
-        || same_file (fname->get_string(),
-                      idl_global->main_filename ()->get_string());
-#endif
+      is_main_filename
+        = fname->compare (idl_global->main_filename ())
+          || same_file (fname->get_string(),
+                        idl_global->main_filename ()->get_string());
+#endif    
     }
 
   if (is_real_filename || is_main_filename)
@@ -536,10 +534,12 @@ idl_parse_line_and_file (char *buf)
   // by the preprocessor.
   if (!(idl_global->in_main_file ()) && idl_global->import ())
     {
-      ACE_NEW (nm,
-               UTL_String (
-                 idl_global->stripped_preproc_include (
-                   fname->get_string ())));
+      ACE_NEW (
+          nm,
+          UTL_String (
+              idl_global->stripped_preproc_include (fname->get_string ())
+            )
+        );
 
       // This call also manages the #pragma prefix.
       idl_global->store_include_file_name (nm);
@@ -619,8 +619,8 @@ idl_store_pragma (char *buf)
           // associated with this file, otherwise we add the prefix.
           char *ext_id = idl_global->filename ()->get_string ();
           char *int_id = 0;
-          int const status =
-            idl_global->file_prefixes ().find (ext_id, int_id);
+          int status = idl_global->file_prefixes ().find (ext_id,
+                                                          int_id);
 
           if (status == 0)
             {
@@ -778,20 +778,15 @@ idl_store_pragma (char *buf)
     {
       char *tmp = idl_get_pragma_string (buf);
 
-      // Split up data type and key strings
+      // split up data type and key strings
       char *sample_type = tmp;
-
       while (*tmp && !isspace (*tmp))
-        {
-          ++tmp;
-        }
-
+        tmp++;
       while (isspace (*tmp))
         {
           *tmp = '\0';
           tmp++;
         }
-
       char *key = tmp;
 
       if (!idl_global->add_dcps_data_key (sample_type, key))
@@ -808,16 +803,6 @@ idl_store_pragma (char *buf)
     {
       idl_global->dcps_gen_zero_copy_read (true);
     }
-  else if (ACE_OS::strncmp (buf + 8, "ciao lem", 8) == 0)
-    {
-      char *tmp = idl_get_pragma_string (buf);
-      idl_global->add_ciao_lem_file_names (tmp);
-    }
-  else if (ACE_OS::strncmp (buf + 8, "ndds typesupport", 15) == 0)
-    {
-      char *tmp = idl_get_pragma_string (buf);
-      idl_global->add_ciao_rti_ts_file_names (tmp);
-    }
 }
 
 /*
@@ -831,12 +816,12 @@ idl_atoi(char *s, long b)
   // Skip over the dash and possibly spaces after the dash
   while (*s == '-' || *s == ' ' || *s == '\t')
     {
-      ++s;
+      s++;
     }
 
   if (b == 8 && *s == '0')
     {
-      ++s;
+      s++;
     }
   else if (b == 16 && *s == '0' && (*(s + 1) == 'x' || *(s + 1) == 'X'))
     {
@@ -876,7 +861,7 @@ idl_atoui(char *s, long b)
 
   if (b == 8 && *s == '0')
     {
-      ++s;
+      s++;
     }
   else if (b == 16 && *s == '0' && (*(s + 1) == 'x' || *(s + 1) == 'X'))
     {
@@ -919,36 +904,36 @@ idl_atof (char *s)
   if (*s == '-')
     {
       neg = 1;
-
+ 
       // Skip over the dash and possibly spaces after the dash
       while (*s == '-' || *s == ' ' || *s == '\t')
         {
-          ++s;
+          s++;
         }
     }
 
   while (*s >= '0' && *s <= '9')
     {
       d = (d * 10) + *s - '0';
-      ++s;
+      s++;
     }
 
   if (*s == '.')
     {
-      ++s;
+      s++;
       e = 10;
 
       while (*s >= '0' && *s <= '9')
         {
           d += (*s - '0') / (e * 1.0);
           e *= 10;
-          ++s;
+          s++;
         }
     }
 
   if (*s == 'e' || *s == 'E')
     {
-      ++s;
+      s++;
 
       if (*s == '-')
         {
@@ -957,7 +942,7 @@ idl_atof (char *s)
         }
       else if (*s == '+')
         {
-          ++s;
+          s++;
         }
 
       e = 0;
@@ -965,7 +950,7 @@ idl_atof (char *s)
       while (*s >= '0' && *s <= '9')
         {
           e = (e * 10) + *s - '0';
-          ++s;
+          s++;
         }
 
       if (e > 0)
@@ -995,11 +980,13 @@ idl_atof (char *s)
  * Convert (some) escaped characters into their ascii values
  */
 static char
-idl_escape_reader (char *str)
+idl_escape_reader(
+    char *str
+  )
 {
   if (str[0] != '\\')
     {
-      return str[0];
+            return str[0];
     }
 
   switch (str[1])
diff --git a/TAO/TAO_IDL/fe/idl.yy b/TAO/TAO_IDL/fe/idl.yy
index 32403433206..a979f815d3f 100644
--- a/TAO/TAO_IDL/fe/idl.yy
+++ b/TAO/TAO_IDL/fe/idl.yy
@@ -71,18 +71,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 /* Declarations */
 
 %{
-#include "utl_identifier.h"
-#include "utl_err.h"
-#include "utl_string.h"
-#include "utl_strlist.h"
-#include "utl_namelist.h"
-#include "utl_exprlist.h"
-#include "utl_labellist.h"
-#include "utl_decllist.h"
-
-#include "global_extern.h"
-#include "nr_extern.h"
-
 #include "ast_argument.h"
 #include "ast_array.h"
 #include "ast_attribute.h"
@@ -115,7 +103,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "ast_sequence.h"
 #include "ast_string.h"
 #include "ast_factory.h"
-#include "ast_finder.h"
 #include "ast_exception.h"
 #include "ast_param_holder.h"
 #include "ast_visitor_tmpl_module_inst.h"
@@ -129,6 +116,18 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "fe_home_header.h"
 #include "fe_utils.h"
 
+#include "utl_identifier.h"
+#include "utl_err.h"
+#include "utl_string.h"
+#include "utl_strlist.h"
+#include "utl_namelist.h"
+#include "utl_exprlist.h"
+#include "utl_labellist.h"
+#include "utl_decllist.h"
+
+#include "global_extern.h"
+#include "nr_extern.h"
+
 #if (defined(apollo) || defined(hpux)) && defined(__cplusplus)
 extern  "C" int yywrap();
 #endif  // (defined(apollo) || defined(hpux)) && defined(__cplusplus)
@@ -744,10 +743,6 @@ template_module_ref
           delete $2;
           $2 = 0;
 
-          ast_visitor_context ctx;
-          ctx.template_params (ref->template_params ());
-          ast_visitor_tmpl_module_ref v (&ctx);
-
           // The implied IDL resulting from this reference is
           // created here, in the template module scope. Upon
           // instantiation of the enclosing template module, the
@@ -1671,7 +1666,7 @@ interface_forward :
                                         AST_PredefinedType::PT_pseudo,
                                         &n
                                       );
-
+              (void) s->add_predefined_type (pdt);
               s->add_to_scope (pdt);
 
               $1->destroy ();
@@ -5040,7 +5035,7 @@ component_header :
         IDL_COMPONENT
         id
         {
-//      component_header: IDL_COMPONENT id
+//      id
           idl_global->set_parse_state (IDL_GlobalData::PS_ComponentIDSeen);
         }
         component_inheritance_spec
@@ -5867,23 +5862,37 @@ factory_decl :
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           UTL_ScopedName n ($2,
                             0);
+          AST_Operation *o = 0;
           idl_global->set_parse_state (IDL_GlobalData::PS_OpIDSeen);
 
           /*
            * Create a node representing a factory operation
            * and add it to the enclosing scope.
            */
-          AST_Factory *f = idl_global->gen ()->create_factory (&n);
-          (void) s->fe_add_factory (f);
+          if (s != 0)
+            {
+              AST_Home *h = AST_Home::narrow_from_scope (s);
+              
+              o =
+                idl_global->gen ()->create_operation (
+                                        h->managed_component (),
+                                        AST_Operation::OP_noflags,
+                                        &n,
+                                        false,
+                                        false
+                                      );
+                                      
+              h->factories ().enqueue_tail (o);
+            }
 
           $2->destroy ();
           delete $2;
           $2 = 0;
 
           /*
-           * Push the factory scope onto the scopes stack.
+           * Push the operation scope onto the scopes stack.
            */
-          idl_global->scopes ().push (f);
+          idl_global->scopes ().push (o);
         }
         init_parameter_list
         {
@@ -5894,18 +5903,24 @@ factory_decl :
         {
 //      opt_raises
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
+          AST_Operation *o = 0;
           idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted);
 
           /*
-           * Add exceptions and context to the factory.
+           * Add exceptions and context to the operation.
            */
-          if ($6 != 0)
+          if (s != 0 && s->scope_node_type () == AST_Decl::NT_op)
             {
-              (void) s->fe_add_exceptions ($6);
+              o = AST_Operation::narrow_from_scope (s);
+
+              if ($6 != 0 && o != 0)
+                {
+                  (void) o->fe_add_exceptions ($6);
+                }
             }
 
           /*
-           * Done with this factory. Pop its scope from the scopes stack.
+           * Done with this operation. Pop its scope from the scopes stack.
            */
           idl_global->scopes ().pop ();
         }
@@ -5919,18 +5934,28 @@ finder_decl :
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           UTL_ScopedName n ($2,
                             0);
-
+          AST_Operation *o = 0;
           idl_global->set_parse_state (IDL_GlobalData::PS_OpIDSeen);
 
           /*
-           * Create a node representing a home finder
+           * Create a node representing a finder operation
            * and add it to the enclosing scope.
            */
-          AST_Finder *f =
-            idl_global->gen ()->create_finder (&n);
-
-          (void) s->fe_add_finder (f);
-
+          if (s != 0)
+            {
+              AST_Home *h = AST_Home::narrow_from_scope (s);
+              
+              o =
+                idl_global->gen ()->create_operation (
+                                        h->managed_component (),
+                                        AST_Operation::OP_noflags,
+                                        &n,
+                                        false,
+                                        false
+                                      );
+                                      
+              h->finders ().enqueue_tail (o);
+            }
 
           $2->destroy ();
           delete $2;
@@ -5939,7 +5964,7 @@ finder_decl :
           /*
            * Push the operation scope onto the scopes stack.
            */
-          idl_global->scopes ().push (f);
+          idl_global->scopes ().push (o);
         }
         init_parameter_list
         {
@@ -5950,14 +5975,20 @@ finder_decl :
         {
 //      opt_raises
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
+          AST_Operation *o = 0;
           idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted);
 
           /*
-           * Add exceptions and context to the finder.
+           * Add exceptions and context to the operation.
            */
-          if ($6 != 0)
+          if (s != 0 && s->scope_node_type () == AST_Decl::NT_op)
             {
-              (void) s->fe_add_exceptions ($6);
+              o = AST_Operation::narrow_from_scope (s);
+
+              if ($6 != 0 && o != 0)
+                {
+                  (void) o->fe_add_exceptions ($6);
+                }
             }
 
           /*
@@ -6729,11 +6760,11 @@ actual_parameter
           UTL_ScopedName *sn = ex->n ();
           AST_Decl *d = 0;
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
-
+          
           if (sn != 0)
             {
               d = s->lookup_by_name (sn, true);
-
+              
               if (d == 0)
                 {
                   idl_global->err ()->lookup_error (sn);
@@ -6742,12 +6773,12 @@ actual_parameter
               else
                 {
                   AST_Decl::NodeType nt = d->node_type ();
-
+                  
                   if (nt == AST_Decl::NT_enum_val)
                     {
                       $1->evaluate (
                         AST_Expression::EK_const);
-
+                
                       $<dcval>$ =
                         idl_global->gen ()->create_constant (
                           $1->ev ()->et,
@@ -6764,7 +6795,7 @@ actual_parameter
             {
               $1->evaluate (
                 AST_Expression::EK_const);
-
+                
               $<dcval>$ =
                 idl_global->gen ()->create_constant (
                   $1->ev ()->et,
@@ -6849,9 +6880,9 @@ connector_body
 // connector_body " '{'
           idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorSqSeen);
         }
-        connector_exports
+        at_least_one_connector_export
         {
-//        connector_exports
+//        at_least_one_connector_export
           idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorBodySeen);
         }
         '}'
diff --git a/TAO/TAO_IDL/fe/lex.yy.cpp b/TAO/TAO_IDL/fe/lex.yy.cpp
index 725ae56b567..96d9e4a8dbd 100644
--- a/TAO/TAO_IDL/fe/lex.yy.cpp
+++ b/TAO/TAO_IDL/fe/lex.yy.cpp
@@ -16,7 +16,7 @@
 /* First, we deal with  platform-specific or compiler-specific issues. */
 
 /* begin standard C headers. */
-#include "ace/OS_NS_stdio.h"
+#include "ace/os_include/os_stdio.h"
 
 /* end standard C headers. */
 
@@ -987,8 +987,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
  * idl.ll - Lexical scanner for IDL 3.1
  */
 
-#include "global_extern.h"
-#include "nr_extern.h"
 #include "utl_strlist.h"
 #include "utl_exprlist.h"
 #include "utl_labellist.h"
@@ -1005,8 +1003,10 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "fe_obv_header.h"
 #include "fe_component_header.h"
 #include "fe_home_header.h"
+#include "global_extern.h"
 #include "fe_private.h"
 #include "fe_extern.h"
+#include "nr_extern.h"
 #include "y.tab.h"
 
 static char *           idl_wstring_escape_reader (char *);
@@ -1129,7 +1129,7 @@ static int input (void );
                 int c = '*'; \
                 size_t n; \
                 for ( n = 0; n < max_size && \
-                             (c = ACE_OS::getc( tao_yyin )) != EOF && c != '\n'; ++n ) \
+                             (c = getc( tao_yyin )) != EOF && c != '\n'; ++n ) \
                         buf[n] = (char) c; \
                 if ( c == '\n' ) \
                         buf[n++] = (char) c; \
@@ -2984,14 +2984,12 @@ idl_parse_line_and_file (char *buf)
 
   UTL_String *fname = idl_global->filename ();
   bool in_main_file = false;
-
-  bool is_real_filename =
-    fname->compare (idl_global->real_filename ())
-    || same_file (fname->get_string(),
-                  idl_global->real_filename ()->get_string());
+  bool is_real_filename
+    = fname->compare (idl_global->real_filename ())
+      || same_file (fname->get_string(),
+                    idl_global->real_filename ()->get_string());
 
   bool is_main_filename = false;
-
   if (!is_real_filename)
     {
 #if defined (ACE_OPENVMS)
@@ -3004,10 +3002,10 @@ idl_parse_line_and_file (char *buf)
       is_main_filename = idl_global->path_cmp (idl_global->main_filename ()->get_string (),
                                                full_fname) == 0;
 #else
-      is_main_filename =
-        fname->compare (idl_global->main_filename ())
-        || same_file (fname->get_string(),
-                      idl_global->main_filename ()->get_string());
+      is_main_filename
+        = fname->compare (idl_global->main_filename ())
+          || same_file (fname->get_string(),
+                        idl_global->main_filename ()->get_string());
 #endif
     }
 
@@ -3022,10 +3020,12 @@ idl_parse_line_and_file (char *buf)
   // by the preprocessor.
   if (!(idl_global->in_main_file ()) && idl_global->import ())
     {
-      ACE_NEW (nm,
-               UTL_String (
-                 idl_global->stripped_preproc_include (
-                   fname->get_string ())));
+      ACE_NEW (
+          nm,
+          UTL_String (
+              idl_global->stripped_preproc_include (fname->get_string ())
+            )
+        );
 
       // This call also manages the #pragma prefix.
       idl_global->store_include_file_name (nm);
@@ -3105,8 +3105,7 @@ idl_store_pragma (char *buf)
           // associated with this file, otherwise we add the prefix.
           char *ext_id = idl_global->filename ()->get_string ();
           char *int_id = 0;
-          int const status =
-            idl_global->file_prefixes ().find (ext_id, int_id);
+          int const status = idl_global->file_prefixes ().find (ext_id, int_id);
 
           if (status == 0)
             {
@@ -3160,7 +3159,7 @@ idl_store_pragma (char *buf)
   else if (ACE_OS::strncmp (buf + 8, "version", 7) == 0)
     {
       char *tmp = buf + 16;
-
+      
       while (*tmp == ' ' || *tmp == '\t')
         {
           ++tmp;
@@ -3264,20 +3263,15 @@ idl_store_pragma (char *buf)
     {
       char *tmp = idl_get_pragma_string (buf);
 
-      // Split up data type and key strings
+      // split up data type and key strings
       char *sample_type = tmp;
-
       while (*tmp && !isspace (*tmp))
-        {
-          ++tmp;
-        }
-
+        ++tmp;
       while (isspace (*tmp))
         {
           *tmp = '\0';
-          tmp++;
+          ++tmp;
         }
-
       char *key = tmp;
 
       if (!idl_global->add_dcps_data_key (sample_type, key))
@@ -3299,11 +3293,6 @@ idl_store_pragma (char *buf)
       char *tmp = idl_get_pragma_string (buf);
       idl_global->add_ciao_lem_file_names (tmp);
     }
-  else if (ACE_OS::strncmp (buf + 8, "ndds typesupport", 15) == 0)
-    {
-      char *tmp = idl_get_pragma_string (buf);
-      idl_global->add_ciao_rti_ts_file_names (tmp);
-    }
 }
 
 /*
@@ -3312,7 +3301,7 @@ idl_store_pragma (char *buf)
 static ACE_CDR::Long
 idl_atoi(char *s, long b)
 {
-  long    r = 0;
+  long r = 0;
 
   // Skip over the dash and possibly spaces after the dash
   while (*s == '-' || *s == ' ' || *s == '\t')
@@ -3439,11 +3428,11 @@ idl_atof (char *s)
       if (*s == '-')
         {
             negexp = 1;
-            s++;
+            ++s;
         }
       else if (*s == '+')
         {
-          ++s;
+          s++;
         }
 
       e = 0;
@@ -3451,7 +3440,7 @@ idl_atof (char *s)
       while (*s >= '0' && *s <= '9')
         {
           e = (e * 10) + *s - '0';
-          ++s;
+          s++;
         }
 
       if (e > 0)
@@ -3481,11 +3470,11 @@ idl_atof (char *s)
  * Convert (some) escaped characters into their ascii values
  */
 static char
-idl_escape_reader (char *str)
+idl_escape_reader(char *str)
 {
   if (str[0] != '\\')
     {
-      return str[0];
+            return str[0];
     }
 
   switch (str[1])
diff --git a/TAO/TAO_IDL/fe/y.tab.cpp b/TAO/TAO_IDL/fe/y.tab.cpp
index a83341700ec..bdd00020072 100644
--- a/TAO/TAO_IDL/fe/y.tab.cpp
+++ b/TAO/TAO_IDL/fe/y.tab.cpp
@@ -241,18 +241,6 @@
 /* Copy the first part of user declarations.  */
 
 
-#include "utl_identifier.h"
-#include "utl_err.h"
-#include "utl_string.h"
-#include "utl_strlist.h"
-#include "utl_namelist.h"
-#include "utl_exprlist.h"
-#include "utl_labellist.h"
-#include "utl_decllist.h"
-
-#include "global_extern.h"
-#include "nr_extern.h"
-
 #include "ast_argument.h"
 #include "ast_array.h"
 #include "ast_attribute.h"
@@ -285,7 +273,6 @@
 #include "ast_sequence.h"
 #include "ast_string.h"
 #include "ast_factory.h"
-#include "ast_finder.h"
 #include "ast_exception.h"
 #include "ast_param_holder.h"
 #include "ast_visitor_tmpl_module_inst.h"
@@ -299,6 +286,18 @@
 #include "fe_home_header.h"
 #include "fe_utils.h"
 
+#include "utl_identifier.h"
+#include "utl_err.h"
+#include "utl_string.h"
+#include "utl_strlist.h"
+#include "utl_namelist.h"
+#include "utl_exprlist.h"
+#include "utl_labellist.h"
+#include "utl_decllist.h"
+
+#include "global_extern.h"
+#include "nr_extern.h"
+
 #if (defined(apollo) || defined(hpux)) && defined(__cplusplus)
 extern  "C" int tao_yywrap();
 #endif  // (defined(apollo) || defined(hpux)) && defined(__cplusplus)
@@ -602,16 +601,16 @@ union tao_yyalloc
 /* TAO_YYFINAL -- State number of the termination state.  */
 #define TAO_YYFINAL  3
 /* TAO_YYLAST -- Last index in TAO_YYTABLE.  */
-#define TAO_YYLAST   1236
+#define TAO_YYLAST   1234
 
 /* TAO_YYNTOKENS -- Number of terminals.  */
 #define TAO_YYNTOKENS  106
 /* TAO_YYNNTS -- Number of nonterminals.  */
-#define TAO_YYNNTS  380
+#define TAO_YYNNTS  381
 /* TAO_YYNRULES -- Number of rules.  */
-#define TAO_YYNRULES  562
+#define TAO_YYNRULES  563
 /* TAO_YYNRULES -- Number of states.  */
-#define TAO_YYNSTATES  806
+#define TAO_YYNSTATES  808
 
 /* TAO_YYTRANSLATE(TAO_YYLEX) -- Bison symbol number corresponding to TAO_YYLEX.  */
 #define TAO_YYUNDEFTOK  2
@@ -719,8 +718,8 @@ static const tao_yytype_uint16 tao_yyprhs[] =
     1311,  1316,  1317,  1320,  1326,  1329,  1333,  1334,  1336,  1337,
     1338,  1339,  1340,  1350,  1353,  1356,  1357,  1358,  1362,  1363,
     1367,  1371,  1375,  1378,  1382,  1383,  1385,  1388,  1389,  1390,
-    1396,  1397,  1398,  1404,  1407,  1408,  1409,  1413,  1414,  1418,
-    1419,  1423,  1424
+    1396,  1397,  1398,  1404,  1407,  1410,  1411,  1412,  1416,  1417,
+    1421,  1422,  1426,  1427
 };
 
 /* TAO_YYRHS -- A `-1'-separated list of the rules' RHS.  */
@@ -866,71 +865,72 @@ static const tao_yytype_int16 tao_yyrhs[] =
       -1,    69,   194,     3,    -1,   472,   471,    -1,   471,    91,
      472,    -1,    -1,   205,    -1,   474,   477,    -1,    -1,    -1,
       71,   475,     3,   476,   389,    -1,    -1,    -1,    86,   478,
-     480,   479,    87,    -1,   480,   481,    -1,    -1,    -1,   400,
-     482,    85,    -1,    -1,   402,   483,    85,    -1,    -1,   316,
-     484,    85,    -1,    -1,   469,   485,    85,    -1
+     480,   479,    87,    -1,   482,   481,    -1,   481,   482,    -1,
+      -1,    -1,   400,   483,    85,    -1,    -1,   402,   484,    85,
+      -1,    -1,   316,   485,    85,    -1,    -1,   469,   486,    85,
+      -1
 };
 
 /* TAO_YYRLINE[TAO_YYN] -- source line where rule number TAO_YYN was defined.  */
 static const tao_yytype_uint16 tao_yyrline[] =
 {
-       0,   357,   357,   360,   361,   365,   368,   371,   377,   382,
-     381,   392,   391,   402,   401,   412,   411,   422,   421,   432,
-     431,   442,   441,   452,   451,   462,   461,   472,   471,   482,
-     481,   492,   491,   502,   501,   512,   511,   526,   525,   538,
-     573,   578,   537,   594,   602,   617,   627,   649,   653,   601,
-     672,   676,   677,   681,   682,   687,   693,   686,   772,   778,
-     771,   849,   850,   855,   894,   899,   854,   917,   916,   930,
-     968,   999,  1033,  1032,  1044,  1051,  1052,  1053,  1054,  1058,
-    1069,  1074,  1118,  1123,  1073,  1152,  1191,  1196,  1150,  1215,
-    1213,  1255,  1254,  1268,  1274,  1281,  1288,  1295,  1321,  1348,
-    1413,  1414,  1418,  1419,  1420,  1426,  1425,  1436,  1435,  1448,
-    1449,  1454,  1453,  1464,  1463,  1474,  1473,  1484,  1483,  1494,
-    1493,  1504,  1503,  1514,  1513,  1524,  1523,  1537,  1550,  1548,
-    1576,  1583,  1594,  1593,  1621,  1619,  1646,  1658,  1704,  1732,
-    1763,  1768,  1773,  1778,  1762,  1849,  1850,  1851,  1852,  1853,
-    1854,  1855,  1867,  1872,  1941,  1943,  1945,  1946,  1960,  1961,
-    1975,  1976,  1989,  1990,  2000,  2013,  2014,  2024,  2037,  2038,
-    2048,  2058,  2071,  2072,  2082,  2092,  2105,  2156,  2157,  2166,
-    2171,  2178,  2186,  2191,  2196,  2202,  2207,  2212,  2220,  2292,
-    2291,  2301,  2306,  2311,  2316,  2343,  2352,  2351,  2422,  2423,
-    2427,  2435,  2436,  2464,  2465,  2466,  2467,  2468,  2469,  2470,
-    2471,  2475,  2476,  2477,  2481,  2482,  2483,  2487,  2488,  2492,
-    2505,  2503,  2531,  2538,  2539,  2543,  2556,  2554,  2582,  2589,
-    2606,  2625,  2626,  2630,  2635,  2640,  2648,  2653,  2658,  2666,
-    2671,  2676,  2684,  2698,  2703,  2711,  2719,  2727,  2735,  2744,
-    2743,  2759,  2793,  2798,  2758,  2817,  2820,  2821,  2825,  2825,
-    2835,  2840,  2834,  2903,  2902,  2917,  2916,  2931,  2936,  2941,
-    2946,  2993,  2998,  2930,  3022,  3030,  3044,  3054,  3062,  3063,
-    3171,  3174,  3175,  3180,  3185,  3179,  3221,  3220,  3234,  3245,
-    3265,  3273,  3272,  3288,  3293,  3287,  3310,  3309,  3362,  3386,
-    3411,  3416,  3449,  3454,  3410,  3480,  3485,  3483,  3490,  3494,
-    3531,  3536,  3529,  3611,  3666,  3676,  3665,  3691,  3696,  3689,
-    3737,  3763,  3773,  3778,  3771,  3808,  3833,  3842,  3841,  3877,
-    3888,  3908,  3916,  3921,  3915,  3983,  3984,  3989,  3994,  3999,
-    4004,  3988,  4073,  4078,  4083,  4088,  4072,  4166,  4171,  4201,
-    4206,  4165,  4224,  4229,  4282,  4287,  4222,  4324,  4330,  4337,
-    4344,  4345,  4357,  4363,  4405,  4356,  4427,  4426,  4437,  4436,
-    4449,  4454,  4452,  4459,  4464,  4469,  4463,  4510,  4509,  4520,
-    4519,  4532,  4537,  4535,  4542,  4547,  4552,  4546,  4599,  4607,
-    4608,  4609,  4714,  4719,  4724,  4733,  4738,  4732,  4750,  4758,
-    4763,  4757,  4775,  4783,  4788,  4782,  4800,  4808,  4813,  4807,
-    4825,  4832,  4845,  4843,  4869,  4876,  4905,  4943,  4944,  4948,
-    4978,  5018,  5023,  4977,  5042,  5047,  5040,  5090,  5089,  5100,
-    5107,  5108,  5113,  5112,  5123,  5122,  5133,  5132,  5143,  5142,
-    5153,  5152,  5163,  5162,  5173,  5172,  5184,  5274,  5281,  5307,
-    5413,  5423,  5429,  5435,  5508,  5581,  5656,  5655,  5705,  5710,
-    5715,  5720,  5725,  5730,  5704,  5785,  5784,  5795,  5802,  5809,
-    5817,  5822,  5816,  5834,  5835,  5839,  5841,  5840,  5851,  5850,
-    5865,  5889,  5863,  5917,  5945,  5915,  5971,  5972,  5973,  5977,
-    5978,  5982,  6010,  6041,  6086,  6091,  6039,  6108,  6118,  6137,
-    6149,  6148,  6188,  6238,  6243,  6186,  6260,  6265,  6273,  6278,
-    6283,  6288,  6293,  6298,  6303,  6308,  6313,  6318,  6327,  6362,
-    6361,  6383,  6390,  6414,  6432,  6443,  6463,  6470,  6481,  6486,
-    6505,  6510,  6480,  6525,  6532,  6537,  6544,  6543,  6552,  6551,
-    6562,  6631,  6681,  6697,  6711,  6718,  6778,  6783,  6788,  6782,
-    6848,  6853,  6847,  6872,  6873,  6878,  6877,  6888,  6887,  6898,
-    6897,  6908,  6907
+       0,   355,   355,   358,   359,   363,   366,   369,   375,   380,
+     379,   390,   389,   400,   399,   410,   409,   420,   419,   430,
+     429,   440,   439,   450,   449,   460,   459,   470,   469,   480,
+     479,   490,   489,   500,   499,   510,   509,   524,   523,   536,
+     571,   576,   535,   592,   600,   615,   625,   647,   651,   599,
+     670,   674,   675,   679,   680,   685,   691,   684,   749,   755,
+     748,   826,   827,   832,   871,   876,   831,   894,   893,   907,
+     945,   976,  1010,  1009,  1021,  1028,  1029,  1030,  1031,  1035,
+    1046,  1051,  1095,  1100,  1050,  1129,  1168,  1173,  1127,  1192,
+    1190,  1232,  1231,  1245,  1251,  1258,  1265,  1272,  1298,  1325,
+    1390,  1391,  1395,  1396,  1397,  1403,  1402,  1413,  1412,  1425,
+    1426,  1431,  1430,  1441,  1440,  1451,  1450,  1461,  1460,  1471,
+    1470,  1481,  1480,  1491,  1490,  1501,  1500,  1514,  1527,  1525,
+    1553,  1560,  1571,  1570,  1598,  1596,  1623,  1635,  1681,  1709,
+    1740,  1745,  1750,  1755,  1739,  1826,  1827,  1828,  1829,  1830,
+    1831,  1832,  1844,  1849,  1918,  1920,  1922,  1923,  1937,  1938,
+    1952,  1953,  1966,  1967,  1977,  1990,  1991,  2001,  2014,  2015,
+    2025,  2035,  2048,  2049,  2059,  2069,  2082,  2133,  2134,  2143,
+    2148,  2155,  2163,  2168,  2173,  2179,  2184,  2189,  2197,  2269,
+    2268,  2278,  2283,  2288,  2293,  2320,  2329,  2328,  2399,  2400,
+    2404,  2412,  2413,  2441,  2442,  2443,  2444,  2445,  2446,  2447,
+    2448,  2452,  2453,  2454,  2458,  2459,  2460,  2464,  2465,  2469,
+    2482,  2480,  2508,  2515,  2516,  2520,  2533,  2531,  2559,  2566,
+    2583,  2602,  2603,  2607,  2612,  2617,  2625,  2630,  2635,  2643,
+    2648,  2653,  2661,  2675,  2680,  2688,  2696,  2704,  2712,  2721,
+    2720,  2736,  2770,  2775,  2735,  2794,  2797,  2798,  2802,  2802,
+    2812,  2817,  2811,  2880,  2879,  2894,  2893,  2908,  2913,  2918,
+    2923,  2970,  2975,  2907,  2999,  3007,  3021,  3031,  3039,  3040,
+    3148,  3151,  3152,  3157,  3162,  3156,  3198,  3197,  3211,  3222,
+    3242,  3250,  3249,  3265,  3270,  3264,  3287,  3286,  3339,  3363,
+    3388,  3393,  3426,  3431,  3387,  3457,  3462,  3460,  3467,  3471,
+    3508,  3513,  3506,  3588,  3643,  3653,  3642,  3668,  3673,  3666,
+    3714,  3740,  3750,  3755,  3748,  3785,  3810,  3819,  3818,  3854,
+    3865,  3885,  3893,  3898,  3892,  3960,  3961,  3966,  3971,  3976,
+    3981,  3965,  4050,  4055,  4060,  4065,  4049,  4143,  4148,  4178,
+    4183,  4142,  4201,  4206,  4259,  4264,  4199,  4301,  4307,  4314,
+    4321,  4322,  4334,  4340,  4382,  4333,  4404,  4403,  4414,  4413,
+    4426,  4431,  4429,  4436,  4441,  4446,  4440,  4487,  4486,  4497,
+    4496,  4509,  4514,  4512,  4519,  4524,  4529,  4523,  4576,  4584,
+    4585,  4586,  4691,  4696,  4701,  4710,  4715,  4709,  4727,  4735,
+    4740,  4734,  4752,  4760,  4765,  4759,  4777,  4785,  4790,  4784,
+    4802,  4809,  4822,  4820,  4846,  4853,  4882,  4920,  4921,  4925,
+    4955,  4995,  5000,  4954,  5019,  5024,  5017,  5067,  5066,  5077,
+    5084,  5085,  5090,  5089,  5100,  5099,  5110,  5109,  5120,  5119,
+    5130,  5129,  5140,  5139,  5150,  5149,  5161,  5251,  5258,  5284,
+    5390,  5400,  5406,  5412,  5485,  5558,  5633,  5632,  5682,  5687,
+    5692,  5697,  5702,  5707,  5681,  5762,  5761,  5772,  5779,  5786,
+    5794,  5799,  5793,  5811,  5812,  5816,  5818,  5817,  5828,  5827,
+    5842,  5878,  5840,  5912,  5948,  5910,  5980,  5981,  5982,  5986,
+    5987,  5991,  6019,  6050,  6095,  6100,  6048,  6117,  6127,  6146,
+    6158,  6157,  6197,  6247,  6252,  6195,  6269,  6274,  6282,  6287,
+    6292,  6297,  6302,  6307,  6312,  6317,  6322,  6327,  6336,  6371,
+    6370,  6392,  6399,  6423,  6441,  6452,  6472,  6479,  6490,  6495,
+    6514,  6519,  6489,  6534,  6541,  6546,  6553,  6552,  6561,  6560,
+    6571,  6640,  6690,  6706,  6720,  6727,  6787,  6792,  6797,  6791,
+    6857,  6862,  6856,  6877,  6881,  6882,  6887,  6886,  6897,  6896,
+    6907,  6906,  6917,  6916
 };
 #endif
 
@@ -1034,7 +1034,8 @@ static const char *const tao_yytname[] =
   "@180", "extended_port_decl", "at_least_one_actual_parameter",
   "actual_parameters", "actual_parameter", "connector_decl",
   "connector_header", "@181", "@182", "connector_body", "@183", "@184",
-  "connector_exports", "connector_export", "@185", "@186", "@187", "@188", 0
+  "at_least_one_connector_export", "connector_exports", "connector_export",
+  "@185", "@186", "@187", "@188", 0
 };
 #endif
 
@@ -1115,8 +1116,8 @@ static const tao_yytype_uint16 tao_yyr1[] =
      453,   453,   455,   455,   456,   457,   457,   458,   460,   461,
      462,   463,   459,   464,   465,   465,   467,   466,   468,   466,
      469,   469,   470,   471,   471,   472,   473,   475,   476,   474,
-     478,   479,   477,   480,   480,   482,   481,   483,   481,   484,
-     481,   485,   481
+     478,   479,   477,   480,   481,   481,   483,   482,   484,   482,
+     485,   482,   486,   482
 };
 
 /* TAO_YYR2[TAO_YYN] -- Number of symbols composing right hand side of rule TAO_YYN.  */
@@ -1177,8 +1178,8 @@ static const tao_yytype_uint8 tao_yyr2[] =
        4,     0,     2,     5,     2,     3,     0,     1,     0,     0,
        0,     0,     9,     2,     2,     0,     0,     3,     0,     3,
        3,     3,     2,     3,     0,     1,     2,     0,     0,     5,
-       0,     0,     5,     2,     0,     0,     3,     0,     3,     0,
-       3,     0,     3
+       0,     0,     5,     2,     2,     0,     0,     3,     0,     3,
+       0,     3,     0,     3
 };
 
 /* TAO_YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -1215,232 +1216,234 @@ static const tao_yytype_uint16 tao_yydefact[] =
       64,    24,    82,   234,   241,   236,   238,     0,    96,   313,
      310,   317,   322,    16,    10,   252,     0,    18,    12,    14,
       26,   421,    28,   470,   457,    30,    96,     0,     0,    32,
-      34,   554,     0,     0,     0,     0,    86,   427,   425,   467,
+      34,     0,     0,     0,     0,     0,    86,   427,   425,   467,
      133,     0,     0,   429,     4,   517,     0,   522,     0,   518,
      173,   174,   175,     0,     0,     0,     0,     0,     0,     0,
        0,     0,     0,     0,    59,   542,     0,   110,   101,   237,
      315,     0,    90,     0,     0,     0,   258,   268,   431,   474,
-     501,   494,   503,   551,   142,   229,   197,   222,   223,   224,
-     230,   302,   349,   110,     0,    96,   465,   460,   135,   530,
-     549,     0,    41,     0,    46,   519,   178,   157,   159,   161,
-     163,   164,   166,   167,   169,   170,   171,     0,     0,    73,
-     130,     0,     0,     0,    95,   188,   311,   318,   323,   253,
-     257,     0,     0,   422,     0,   110,   101,   337,   342,     0,
-     452,     0,     0,   559,   335,   336,   555,   557,     0,   561,
-       0,   553,     0,     0,   219,     0,   257,     0,   428,   426,
-       0,    96,     0,     3,     0,     0,     0,     0,    60,   543,
-     127,   125,   357,   358,     0,   109,   117,   111,   121,   119,
-     123,     0,   113,   115,   362,   107,   105,     0,   100,   102,
-     103,     0,   316,     0,     0,     0,     0,   258,   263,   260,
-     259,   233,   279,   274,   275,   276,   277,   269,   278,     0,
-       0,     0,   442,     0,   430,   432,   434,   436,   438,   440,
-     444,     0,     0,   475,     0,   473,   476,   478,     0,     0,
-       0,     0,   448,   447,     0,   451,   450,     0,     0,     0,
-       0,     0,     0,     0,   552,   143,   332,   328,   331,   220,
-     309,   303,   308,   258,     0,   466,   461,   536,   538,   531,
-     535,    42,   523,    47,   520,   128,     0,    66,     0,     0,
-       0,     0,     0,   361,   391,   388,   389,   390,   352,   360,
-       0,     0,     0,     0,     0,    84,   104,   312,   319,   324,
-     254,   256,     0,     0,     0,     0,     0,     0,     0,   423,
-       0,     0,     0,     0,     0,     0,   480,   483,   472,     0,
-       0,     0,     0,   338,   343,   446,   540,   541,   560,   556,
-     558,   449,   562,     0,     0,   329,     0,     0,   305,     0,
-      88,     0,     0,     0,     0,   533,     0,     0,   126,   118,
-     112,   122,   120,   124,     0,   114,   116,   363,   108,   106,
-     264,   261,   270,   455,   453,   454,   443,   433,   435,   437,
-     439,   441,   445,     0,     0,   477,   479,   496,   505,     0,
-       0,   144,   333,   330,   221,   304,   306,   351,   462,   537,
-     539,   532,   534,     0,    53,    39,    48,    52,     0,   129,
-     353,     0,     0,     0,   366,   481,   484,   339,   344,   228,
-       0,     0,     0,    55,     0,     0,    54,     0,   364,   262,
-     271,     0,     0,   398,   398,     0,   402,   225,   334,   307,
-     463,     0,    49,    51,   379,   354,   398,     0,   367,   374,
-       0,   373,   395,   482,   485,   340,   399,   345,   226,   469,
-       0,     0,     0,   398,   365,   286,   293,   291,   272,   282,
-     283,   290,     0,   369,   370,     0,   398,     0,   406,     0,
-       0,   464,   527,     0,   526,   378,   392,   393,   394,     0,
-     384,   385,   355,     0,     0,     0,     0,     0,     0,   288,
-     375,   371,   396,   341,   400,   403,   346,   227,   468,    56,
-     524,   380,   381,     0,   410,   287,   294,   292,   273,   281,
-     296,   284,   289,     0,     0,     0,     0,     0,     0,     0,
-     382,   386,   407,   356,     0,     0,     0,   376,   372,     0,
-       0,   404,    57,   525,     0,     0,     0,   295,   297,   285,
-     397,   401,     0,   383,   387,   408,     0,     0,   405,   414,
-       0,   411,   409,   412,     0,   413
+     501,   494,   503,   337,   342,     0,   452,     0,     0,   560,
+     335,   336,   556,   558,     0,   562,   551,   555,   142,   229,
+     197,   222,   223,   224,   230,   302,   349,   110,     0,    96,
+     465,   460,   135,   530,   549,     0,    41,     0,    46,   519,
+     178,   157,   159,   161,   163,   164,   166,   167,   169,   170,
+     171,     0,     0,    73,   130,     0,     0,     0,    95,   188,
+     311,   318,   323,   253,   257,     0,     0,   422,     0,   110,
+     101,     0,     0,   448,   447,     0,   451,   450,     0,     0,
+       0,     0,     0,     0,     0,     0,   553,     0,     0,   219,
+       0,   257,     0,   428,   426,     0,    96,     0,     3,     0,
+       0,     0,     0,    60,   543,   127,   125,   357,   358,     0,
+     109,   117,   111,   121,   119,   123,     0,   113,   115,   362,
+     107,   105,     0,   100,   102,   103,     0,   316,     0,     0,
+       0,     0,   258,   263,   260,   259,   233,   279,   274,   275,
+     276,   277,   269,   278,     0,     0,     0,   442,     0,   430,
+     432,   434,   436,   438,   440,   444,     0,     0,   475,     0,
+     473,   476,   478,     0,     0,   338,   391,   388,   389,   390,
+     343,   446,   540,   541,   561,   557,   559,   449,   563,   552,
+     554,   143,   332,   328,   331,   220,   309,   303,   308,   258,
+       0,   466,   461,   536,   538,   531,   535,    42,   523,    47,
+     520,   128,     0,    66,     0,     0,     0,     0,     0,   361,
+     352,   360,     0,     0,     0,     0,     0,    84,   104,   312,
+     319,   324,   254,   256,     0,     0,     0,     0,     0,     0,
+       0,   423,     0,     0,     0,     0,     0,     0,   480,   483,
+     472,     0,     0,     0,     0,     0,     0,     0,     0,   329,
+       0,     0,   305,     0,    88,     0,     0,     0,     0,   533,
+       0,     0,   126,   118,   112,   122,   120,   124,     0,   114,
+     116,   363,   108,   106,   264,   261,   270,   455,   453,   454,
+     443,   433,   435,   437,   439,   441,   445,     0,     0,   477,
+     479,   496,   505,   339,   344,   228,   144,   333,   330,   221,
+     304,   306,   351,   462,   537,   539,   532,   534,     0,    53,
+      39,    48,    52,     0,   129,   353,     0,     0,     0,   366,
+     481,   484,     0,   402,   225,     0,     0,     0,    55,     0,
+       0,    54,     0,   364,   262,   271,     0,     0,   398,   398,
+     340,   399,   345,   226,   334,   307,   463,     0,    49,    51,
+     379,   354,   398,     0,   367,   374,     0,   373,   395,   482,
+     485,   398,     0,   406,     0,   469,     0,     0,     0,   398,
+     365,   286,   293,   291,   272,   282,   283,   290,     0,   369,
+     370,     0,   341,   400,   403,   346,   227,     0,   464,   527,
+       0,   526,   378,   392,   393,   394,     0,   384,   385,   355,
+       0,     0,     0,     0,     0,     0,   288,   375,   371,   396,
+       0,     0,   468,    56,   524,   380,   381,     0,   410,   287,
+     294,   292,   273,   281,   296,   284,   289,     0,     0,     0,
+       0,   404,     0,     0,   382,   386,   407,   356,     0,     0,
+       0,   376,   372,     0,   401,     0,    57,   525,     0,     0,
+       0,   295,   297,   285,   397,     0,   383,   387,   408,   405,
+       0,   414,     0,   411,   409,   412,     0,   413
 };
 
 /* TAO_YYDEFGOTO[NTERM-NUM].  */
 static const tao_yytype_int16 tao_yydefgoto[] =
 {
-      -1,     1,     2,    25,   362,    26,   164,   168,   169,   163,
+      -1,     1,     2,    25,   376,    26,   164,   168,   169,   163,
      167,   114,   109,   118,   170,   172,   174,   178,   179,    77,
-      27,    79,    28,   108,   304,   424,    29,    30,   110,   308,
-     426,   596,   664,   646,   665,   647,   648,   681,   768,    31,
-     111,   377,    32,    33,   117,   327,   434,    34,    80,    35,
-     135,   326,    36,    37,    38,   119,   328,   447,    39,   204,
-     353,   514,    40,   268,    41,    97,   259,   332,    42,    43,
-     382,   448,   449,   544,   543,   381,   435,   529,   540,   541,
-     528,   531,   530,   532,   526,   379,   430,   597,   243,   209,
-     301,   103,    44,   436,    78,   292,   412,   583,   184,   244,
-     385,   246,   247,   248,   249,   250,   251,   252,   253,   254,
-     386,   437,    81,   195,   293,   459,   138,   139,   140,   141,
-      47,   346,   414,   586,   347,   658,   677,   719,   348,   349,
+      27,    79,    28,   108,   304,   439,    29,    30,   110,   308,
+     441,   600,   669,   651,   670,   652,   653,   687,   772,    31,
+     111,   391,    32,    33,   117,   327,   449,    34,    80,    35,
+     135,   326,    36,    37,    38,   119,   328,   462,    39,   204,
+     367,   530,    40,   268,    41,    97,   259,   332,    42,    43,
+     396,   463,   464,   556,   555,   395,   450,   545,   552,   553,
+     544,   547,   546,   548,   542,   393,   445,   601,   243,   209,
+     301,   103,    44,   451,    78,   292,   427,   587,   184,   244,
+     399,   246,   247,   248,   249,   250,   251,   252,   253,   254,
+     400,   452,    81,   195,   293,   474,   138,   139,   140,   141,
+      47,   360,   429,   590,   361,   634,   664,   704,   362,   363,
      142,   143,   144,   145,   146,   147,   148,   149,   150,   151,
-      48,    82,    49,   165,   336,   456,   389,   457,   551,   391,
-     460,   553,   652,   552,    50,    83,    51,   276,   392,   554,
-     653,   687,   736,   467,   708,   737,   709,   738,   776,   733,
-     710,   739,   711,   735,   734,   774,   761,   775,    52,    53,
-      54,    84,   294,   415,   587,   511,   588,   661,   512,   157,
-     333,   453,   158,   267,   383,   159,   334,   454,   160,   161,
-     335,   455,   162,   350,   413,   507,   585,   508,   584,   660,
-     438,   404,   490,   629,   675,   716,   405,   491,   630,   676,
-     718,   439,    85,   295,   416,   589,   440,   604,   667,   703,
-     754,   441,   538,   451,   542,   651,   686,   655,   671,   672,
-     690,   714,   764,   691,   712,   763,   685,   701,   702,   729,
-     752,   784,   730,   753,   785,   539,   731,   693,   715,   765,
-     697,   717,   766,   746,   767,   792,   773,   786,   797,   800,
-     801,   804,   442,   443,    58,    59,    60,   171,   338,   473,
-      61,   207,   355,   298,   354,   393,   474,   560,   561,   562,
-     563,   564,   558,   565,   517,   494,   518,   408,   496,   477,
-     478,   479,    62,   173,    63,   100,   299,   421,   591,   662,
-     699,   357,   420,   721,   284,   339,   484,   394,   485,   569,
-     570,   486,   623,   673,   487,   624,   674,    64,    65,    66,
-      67,    68,   287,   395,   571,    69,    70,    71,   176,   286,
-      72,   288,   396,   572,    73,   227,   228,   309,   427,   229,
-     723,   750,   724,    74,   105,   302,   422,   594,   519,   595,
-     520,   592,   593,   409,   255,   325,   256,    75,    76,   106,
-     303,   181,   291,   410,   343,   411,   500,   501,   499,   503
+      48,    82,    49,   165,   336,   471,   403,   472,   563,   405,
+     475,   565,   657,   564,    50,    83,    51,   276,   406,   566,
+     658,   693,   743,   482,   714,   744,   715,   745,   780,   740,
+     716,   746,   717,   742,   741,   778,   765,   779,    52,    53,
+      54,    84,   294,   430,   591,   527,   592,   666,   528,   157,
+     333,   468,   158,   267,   397,   159,   334,   469,   160,   161,
+     335,   470,   162,   364,   428,   523,   589,   524,   588,   665,
+     453,   350,   411,   585,   662,   701,   351,   412,   586,   663,
+     703,   454,    85,   295,   431,   593,   455,   608,   672,   709,
+     758,   456,   550,   466,   554,   656,   692,   660,   676,   677,
+     696,   720,   768,   697,   718,   767,   691,   707,   708,   736,
+     756,   788,   737,   757,   789,   510,   738,   699,   721,   769,
+     682,   702,   750,   725,   751,   785,   777,   790,   800,   802,
+     803,   806,   457,   458,    58,    59,    60,   171,   338,   488,
+      61,   207,   369,   298,   368,   407,   489,   572,   573,   574,
+     575,   576,   570,   577,   352,   415,   353,   354,   417,   492,
+     493,   494,    62,   173,    63,   100,   299,   436,   595,   667,
+     705,   371,   435,   728,   284,   339,   499,   408,   500,   581,
+     582,   501,   627,   678,   502,   628,   679,    64,    65,    66,
+      67,    68,   287,   409,   583,    69,    70,    71,   176,   286,
+      72,   288,   410,   584,    73,   227,   228,   309,   442,   229,
+     730,   754,   731,    74,   105,   302,   437,   598,   535,   599,
+     536,   596,   597,   355,   255,   325,   256,    75,    76,   106,
+     303,   181,   291,   425,   356,   426,   357,   421,   422,   420,
+     424
 };
 
 /* TAO_YYPACT[STATE-NUM] -- Index in TAO_YYTABLE of the portion describing
    STATE-NUM.  */
-#define TAO_YYPACT_NINF -613
+#define TAO_YYPACT_NINF -565
 static const tao_yytype_int16 tao_yypact[] =
 {
-    -613,    45,  1087,  -613,  -613,  -613,  -613,  -613,  -613,  -613,
-    -613,  -613,  -613,    95,   113,    43,    48,  -613,    95,    95,
-    -613,    33,    33,  -613,  -613,  -613,  -613,    55,  -613,   618,
-      61,    77,  -613,  -613,   -31,  -613,  -613,  -613,  -613,  -613,
-    -613,   164,  -613,  -613,  -613,  -613,  -613,  -613,    86,  -613,
-     114,  -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,
-    -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,    50,
-    -613,  -613,  -613,    50,  -613,  -613,   100,   109,   482,    33,
-      95,   421,    95,    95,    95,    95,  -613,  -613,  -613,     5,
-      95,     9,  -613,    54,    95,  -613,    50,    95,   120,   144,
-      95,  -613,    67,  -613,    75,   195,   239,  -613,   159,   166,
-     691,    32,  -613,  -613,   168,   198,  -613,   169,   171,   172,
-      65,  -613,    56,  -613,  -613,  -613,  -613,  -613,  -613,  -613,
-    -613,  -613,  -613,  -613,  -613,  -613,   177,  -613,  -613,  -613,
-    -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,
-    -613,  -613,  -613,  -613,   114,  -613,  -613,  -613,    79,  -613,
-     183,  -613,   184,   174,   179,   189,  -613,   192,   193,   200,
-     208,   212,   209,   215,   224,  -613,  -613,  -613,   225,   227,
-    -613,  -613,  -613,   177,  -613,  -613,  -613,  -613,  -613,  -613,
-    -613,  -613,  -613,   177,  -613,  -613,  -613,  -613,  -613,  -613,
-    -613,  -613,   229,  -613,   242,  -613,  -613,   240,  -613,    95,
-    -613,  -613,  -613,  -613,  -613,  -613,  -613,   482,  -613,  -613,
-    -613,  -613,   241,  -613,  -613,  -613,  -613,   312,  -613,  -613,
-    -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,    47,
-      47,    47,    32,   177,  -613,  -613,   244,   247,   248,     1,
-      57,    93,  -613,  -613,  -613,   253,  -613,  -613,  -613,  -613,
-    -613,  -613,  -613,  -613,  -613,   336,  -613,   257,   299,  -613,
-    -613,  -613,  -613,  -613,  -613,  -613,   245,  -613,  -613,  -613,
-    -613,  -613,  -613,  -613,  -613,  -613,   299,   262,   263,  -613,
-    -613,  -613,    95,    95,   264,   265,  -613,  -613,  -613,   266,
-    -613,    95,   268,   240,  -613,  -613,   352,  -613,   269,   271,
-    -613,  -613,  -613,   256,    32,    32,    32,    32,    32,    32,
-      32,    32,    32,    32,  -613,   276,    33,  -613,  -613,  -613,
-    -613,    33,  -613,    32,    32,    32,  -613,  -613,  -613,  -613,
-    -613,  -613,  -613,   237,  -613,   267,  -613,  -613,  -613,  -613,
-    -613,  -613,  -613,  -613,    33,   299,  -613,  -613,  -613,  -613,
-    -613,  1165,  -613,   279,  -613,  -613,  -613,   247,   248,     1,
-      57,    57,    93,    93,  -613,  -613,  -613,    95,    32,  -613,
-     177,   946,   772,   308,  -613,  -613,  -613,  -613,  -613,  -613,
-    -613,   395,   194,   235,   888,  -613,  -613,  -613,  -613,    38,
-     302,    33,    33,  -613,  -613,  -613,  -613,  -613,    38,  -613,
-     283,  -613,   284,   278,   289,   383,  -613,   981,   177,  -613,
-      33,   299,    92,   300,   304,   386,   306,   691,  -613,  -613,
-     303,  -613,  -613,  -613,   310,  -613,  -613,  -613,  -613,  -613,
-    -613,   520,  -613,  -613,  -613,  -613,  -613,   313,  -613,  -613,
-    -613,   314,  -613,   328,   337,   338,   341,   356,  -613,  -613,
-    -613,   385,   177,  -613,  -613,  -613,  -613,  -613,  -613,    33,
-      33,    33,  -613,   361,  -613,  -613,  -613,  -613,  -613,  -613,
-    -613,    95,    95,  -613,   367,  -613,  -613,  -613,  1039,   830,
-     364,   572,  -613,   177,    95,  -613,  -613,    34,    37,   316,
-     370,   371,    95,   372,  -613,  -613,  -613,  -613,  -613,  -613,
-    -613,  -613,  -613,   373,   374,   177,  -613,  -613,  -613,  -613,
-    -613,  -613,  -613,  -613,  -613,  -613,   377,  -613,   378,   379,
-     380,   381,   382,  -613,   177,  -613,  -613,  -613,  -613,  -613,
-     387,   389,   455,   395,   395,  -613,  -613,  -613,  -613,  -613,
-    -613,  -613,   392,    95,   368,    52,    52,    52,   393,  -613,
-     394,   397,   398,   399,   402,   403,  -613,  -613,  -613,   415,
-     417,   416,   419,  -613,  -613,  -613,  -613,  -613,  -613,  -613,
-    -613,  -613,  -613,    32,    32,   278,    95,   424,   426,   425,
-    -613,   404,   435,   436,   437,    92,  1140,    33,  -613,  -613,
-    -613,  -613,  -613,  -613,   456,  -613,  -613,  -613,  -613,  -613,
-    -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,
-    -613,  -613,  -613,   420,   420,  -613,  -613,  -613,  -613,   572,
-      95,  -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,
-    -613,  -613,  -613,    33,  -613,  -613,  -613,  -613,   442,   177,
-    -613,   420,   462,   463,   445,  -613,  -613,  -613,  -613,  -613,
-     443,   383,    33,   177,   454,   220,  -613,   448,  -613,  -613,
-    -613,   449,   516,   515,   515,    95,   500,   465,  -613,  -613,
-     177,   469,  -613,  -613,   458,  -613,   515,    74,  -613,  -613,
-     461,  -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,   499,
-     556,   464,   176,   515,  -613,  -613,  -613,  -613,  -613,  -613,
-    -613,  -613,   572,  -613,   474,   466,   515,   467,   504,    95,
-      33,  -613,  -613,   481,  -613,  -613,  -613,  -613,  -613,   468,
-    -613,  -613,  -613,   487,    32,   484,   489,    51,   421,   130,
-    -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,   177,  -613,
-     486,  -613,   501,   572,   539,  -613,  -613,  -613,  -613,  -613,
-    -613,  -613,  -613,    95,   516,    33,    33,   491,    95,   556,
-    -613,  -613,  -613,  -613,   505,    95,   509,  -613,  -613,   493,
-     496,  -613,  -613,  -613,   176,    95,   503,  -613,  -613,  -613,
-    -613,  -613,    33,  -613,  -613,  -613,   498,   527,  -613,  -613,
-     506,   512,  -613,  -613,   531,  -613
+    -565,    66,  1085,  -565,  -565,  -565,  -565,  -565,  -565,  -565,
+    -565,  -565,  -565,    72,    93,    48,   105,  -565,    72,    72,
+    -565,    40,    40,  -565,  -565,  -565,  -565,    59,  -565,   292,
+      -7,    22,  -565,  -565,   -45,  -565,  -565,  -565,  -565,  -565,
+    -565,   219,  -565,  -565,  -565,  -565,  -565,  -565,    70,  -565,
+     135,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,
+    -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,    81,
+    -565,  -565,  -565,    81,  -565,  -565,    75,    92,   731,    40,
+      72,   482,    72,    72,    72,    72,  -565,  -565,  -565,    36,
+      72,    85,  -565,   110,    72,  -565,    81,    72,   118,   121,
+      72,  -565,    25,  -565,    64,   205,   210,  -565,   129,   156,
+     408,    39,  -565,  -565,   161,   200,  -565,   182,   202,   199,
+      45,  -565,    77,  -565,  -565,  -565,  -565,  -565,  -565,  -565,
+    -565,  -565,  -565,  -565,  -565,  -565,   214,  -565,  -565,  -565,
+    -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,
+    -565,  -565,  -565,  -565,   135,  -565,  -565,  -565,    19,  -565,
+     209,  -565,   212,   220,   225,   228,  -565,   232,   233,   236,
+     239,   243,   245,   247,   252,  -565,  -565,  -565,   253,   257,
+    -565,  -565,  -565,   214,  -565,  -565,  -565,  -565,  -565,  -565,
+    -565,  -565,  -565,   214,  -565,  -565,  -565,  -565,  -565,  -565,
+    -565,  -565,   258,  -565,   260,  -565,  -565,   259,  -565,    72,
+    -565,  -565,  -565,  -565,  -565,  -565,  -565,   731,  -565,  -565,
+    -565,  -565,   262,  -565,  -565,  -565,  -565,   352,  -565,  -565,
+    -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,    54,
+      54,    54,    39,   214,  -565,  -565,   264,   266,   261,    43,
+      97,    69,  -565,  -565,  -565,   269,  -565,  -565,  -565,  -565,
+    -565,  -565,  -565,  -565,  -565,   353,  -565,   274,   316,  -565,
+    -565,  -565,  -565,  -565,  -565,  -565,   265,  -565,  -565,  -565,
+    -565,  -565,  -565,  -565,  -565,  -565,   316,   278,   279,  -565,
+    -565,   149,    72,    72,   280,   284,  -565,  -565,  -565,   282,
+    -565,    72,   290,   259,  -565,  -565,   377,  -565,   293,   303,
+    -565,  -565,  -565,   281,    39,    39,    39,    39,    39,    39,
+      39,    39,    39,    39,  -565,   305,    40,  -565,  -565,  -565,
+    -565,    40,  -565,    39,    39,    39,  -565,  -565,  -565,  -565,
+    -565,  -565,  -565,  -565,  -565,    79,   323,    40,    40,  -565,
+    -565,  -565,  -565,  -565,    79,  -565,  -565,  -565,  -565,   294,
+    -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,    40,   316,
+    -565,  -565,  -565,  -565,  -565,  1163,  -565,   308,  -565,  -565,
+    -565,   266,   261,    43,    97,    97,    69,    69,  -565,  -565,
+    -565,    72,    39,  -565,   214,   944,   770,   575,  -565,  -565,
+    -565,  -565,  -565,  -565,  -565,   246,    80,   271,   886,  -565,
+    -565,   368,   648,  -565,   214,    72,  -565,  -565,    62,    65,
+     298,   322,   324,    72,   326,   314,   149,   321,   304,   325,
+     414,  -565,   979,   214,  -565,    40,   316,   -19,   331,   334,
+     420,   338,   408,  -565,  -565,   336,  -565,  -565,  -565,   343,
+    -565,  -565,  -565,  -565,  -565,  -565,   173,  -565,  -565,  -565,
+    -565,  -565,   346,  -565,  -565,  -565,   340,  -565,   345,   349,
+     354,   357,   358,  -565,  -565,  -565,   438,   214,  -565,  -565,
+    -565,  -565,  -565,  -565,    40,    40,    40,  -565,   360,  -565,
+    -565,  -565,  -565,  -565,  -565,  -565,    72,    72,  -565,   363,
+    -565,  -565,  -565,  1037,   828,  -565,   214,  -565,  -565,  -565,
+    -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,
+    -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,   364,
+     366,   214,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,
+    -565,  -565,   369,  -565,   373,   374,   375,   382,   383,  -565,
+    -565,  -565,   388,   389,   473,   246,   246,  -565,  -565,  -565,
+    -565,  -565,  -565,  -565,   392,    72,   376,    71,    71,    71,
+     393,  -565,   395,   396,   397,   402,   404,   419,  -565,  -565,
+    -565,   424,   425,   426,   427,   648,    72,    39,    39,   304,
+      72,   428,   421,   429,  -565,   445,   442,   443,   444,   -19,
+    1138,    40,  -565,  -565,  -565,  -565,  -565,  -565,   529,  -565,
+    -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,
+    -565,  -565,  -565,  -565,  -565,  -565,  -565,   431,   431,  -565,
+    -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,
+    -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,    40,  -565,
+    -565,  -565,  -565,   449,   214,  -565,   431,   452,   453,   503,
+    -565,  -565,    72,   485,   450,   437,   414,    40,   214,   456,
+     399,  -565,   446,  -565,  -565,  -565,   441,   510,   508,   508,
+    -565,  -565,  -565,  -565,  -565,  -565,   214,   459,  -565,  -565,
+     447,  -565,   508,    51,  -565,  -565,   448,  -565,  -565,  -565,
+    -565,   508,   451,   487,    72,   498,   555,   457,   175,   508,
+    -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,   648,  -565,
+     468,   461,  -565,  -565,  -565,  -565,  -565,    40,  -565,  -565,
+     472,  -565,  -565,  -565,  -565,  -565,   463,  -565,  -565,  -565,
+     479,    39,   477,   481,    63,   482,   191,  -565,  -565,  -565,
+      40,   467,   214,  -565,   480,  -565,   483,   648,   531,  -565,
+    -565,  -565,  -565,  -565,  -565,  -565,  -565,    72,   510,    40,
+     469,  -565,    72,   555,  -565,  -565,  -565,  -565,   489,    72,
+     490,  -565,  -565,   492,  -565,    40,  -565,  -565,   175,    72,
+     478,  -565,  -565,  -565,  -565,   493,  -565,  -565,  -565,  -565,
+     507,  -565,   494,   511,  -565,  -565,   523,  -565
 };
 
 /* TAO_YYPGOTO[NTERM-NUM].  */
 static const tao_yytype_int16 tao_yypgoto[] =
 {
-    -613,  -613,   311,   246,  -613,  -530,  -613,  -613,  -613,  -613,
-    -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,
-    -528,  -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,
-    -613,  -613,  -613,  -613,  -613,   -55,  -613,  -613,  -613,  -613,
-    -613,  -613,  -613,  -613,  -613,  -613,  -613,   186,  -613,  -613,
-     161,  -613,  -613,  -613,   592,  -613,  -613,  -613,  -613,  -613,
-    -613,  -613,   601,  -613,   199,  -613,  -613,  -255,  -613,  -613,
-     223,  -613,  -613,  -613,  -613,  -309,  -348,  -613,  -613,  -613,
-    -613,  -613,  -613,  -613,  -613,  -316,  -613,  -613,   -18,  -613,
-    -613,   -13,  -613,     8,  -613,  -613,  -613,  -613,   406,    44,
-     -97,  -613,   307,   315,   317,   -98,   -81,   -90,    -4,  -613,
-    -302,    16,  -613,  -613,  -613,   -33,   243,  -413,  -613,  -613,
-    -613,    76,  -613,  -613,  -557,   -47,  -613,  -613,   -12,  -613,
-     -61,  -613,  -613,   -56,   -48,   -57,   -54,   -53,  -613,  -613,
-     -34,  -613,   -30,  -613,  -613,  -613,  -613,   216,   295,  -613,
-    -321,  -613,  -613,  -613,   -28,  -613,   -25,  -613,  -613,  -613,
-    -613,  -613,  -613,  -613,  -613,  -613,  -103,  -613,  -613,  -613,
-    -613,  -613,  -104,  -613,  -613,  -613,  -613,  -613,  -613,  -613,
-     -39,  -613,  -613,  -613,  -613,  -613,  -613,  -613,   -21,  -613,
-    -613,  -613,  -613,  -613,  -613,   -69,  -613,  -613,  -613,   -66,
-    -613,  -613,  -613,  -613,  -613,  -613,  -613,    62,  -613,  -613,
-    -305,  -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,
-    -613,    17,  -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,
-    -613,  -613,  -613,  -613,  -613,  -613,  -613,  -566,  -613,  -613,
-    -613,  -613,  -613,  -128,  -613,  -613,  -613,  -613,  -613,  -613,
-    -613,  -613,  -136,  -613,  -613,  -464,  -613,  -612,  -613,  -613,
-    -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,
-    -613,  -613,    18,    24,  -613,  -613,  -613,  -613,  -613,  -613,
-    -613,  -613,  -613,   346,  -613,  -613,  -613,  -613,  -613,  -613,
-    -613,  -613,  -613,  -613,  -304,   249,  -300,  -613,  -613,  -613,
-    -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,
-    -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,
-    -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,
-    -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,   577,  -613,
-    -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,   226,
-    -613,  -613,  -118,  -613,  -613,  -613,  -613,  -613,  -613,  -613,
-      59,  -613,  -613,   272,  -613,  -613,   277,  -613,  -613,  -613,
-    -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613,  -613
+    -565,  -565,   299,   229,  -565,  -564,  -565,  -565,  -565,  -565,
+    -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,
+    -561,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,
+    -565,  -565,  -565,  -565,  -565,   -64,  -565,  -565,  -565,  -565,
+    -565,  -565,  -565,  -565,  -565,  -565,  -565,   263,  -565,  -565,
+     132,  -565,  -565,  -565,   589,  -565,  -565,  -565,  -565,  -565,
+    -565,  -565,   592,  -565,   267,  -565,  -565,  -258,  -565,  -565,
+     198,  -565,  -565,  -565,  -565,  -307,  -358,  -565,  -565,  -565,
+    -565,  -565,  -565,  -565,  -565,  -313,  -565,  -565,   -20,  -565,
+    -565,   -13,  -565,    12,  -565,  -565,  -565,  -565,   394,    23,
+     -99,  -565,   295,   301,   297,   -28,   -12,   -71,    35,  -565,
+    -304,    14,  -565,  -565,  -565,   -33,   222,  -383,  -565,  -565,
+    -565,    52,  -565,  -565,  -563,   -41,  -565,  -565,   -10,  -565,
+     -55,  -565,  -565,   -44,   -43,   -54,   -53,   -52,  -565,  -565,
+     -34,  -565,   -32,  -565,  -565,  -565,  -565,   192,   286,  -565,
+    -264,  -565,  -565,  -565,   -30,  -565,   -26,  -565,  -565,  -565,
+    -565,  -565,  -565,  -565,  -565,  -565,  -120,  -565,  -565,  -565,
+    -565,  -565,  -121,  -565,  -565,  -565,  -565,  -565,  -565,  -565,
+     -37,  -565,  -565,  -565,  -565,  -565,  -565,  -565,   -40,  -565,
+    -565,  -565,  -565,  -565,  -565,   -68,  -565,  -565,  -565,   -65,
+    -565,  -565,  -565,  -565,  -565,  -565,  -565,    38,  -565,  -565,
+    -254,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,
+    -565,    15,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,
+    -565,  -565,  -565,  -565,  -565,  -565,  -565,  -552,  -565,  -565,
+    -565,  -565,  -565,  -139,  -565,  -565,  -565,  -565,  -565,  -565,
+    -565,  -565,  -158,  -565,  -565,  -437,  -565,  -406,  -565,  -565,
+    -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,
+    -565,  -565,    18,    20,  -565,  -565,  -565,  -565,  -565,  -565,
+    -565,  -565,  -565,   328,  -565,  -565,  -565,  -565,  -565,  -565,
+    -565,  -565,  -565,  -565,  -375,   283,  -374,  -565,  -565,  -565,
+    -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,
+    -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,
+    -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,
+    -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,   559,  -565,
+    -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,  -565,   193,
+    -565,  -565,  -140,  -565,  -565,  -565,  -565,  -565,  -565,  -565,
+      37,  -565,  -565,   227,  -565,  -565,   248,  -565,  -565,  -565,
+    -565,  -565,  -565,  -565,  -565,  -565,   213,  -565,  -565,  -565,
+    -565
 };
 
 /* TAO_YYTABLE[TAO_YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
@@ -1450,258 +1453,258 @@ static const tao_yytype_int16 tao_yypgoto[] =
 #define TAO_YYTABLE_NINF -505
 static const tao_yytype_int16 tao_yytable[] =
 {
-      87,    88,   156,   102,   104,    98,    99,   152,   137,   191,
-      45,   153,   192,   154,   245,   384,   155,   185,    46,    55,
-      56,   188,   186,   136,   189,   190,    57,   574,   535,   634,
-     187,   340,   387,   388,   450,    86,    86,   576,   403,   406,
-     577,    86,   156,   407,   417,     3,   483,   152,   196,     7,
-      86,   153,   705,   154,  -137,    86,   155,   492,   656,   115,
-     183,   193,   694,   136,   265,   266,   644,   194,   645,   197,
-     198,   199,   200,   263,   704,   705,   264,   202,   535,   706,
-     707,   205,   317,   318,   206,   668,   488,   208,   472,   475,
-    -138,   732,    17,   476,  -139,   115,    90,    17,    86,   115,
-     419,    94,   706,   707,   743,   230,   231,   232,   233,   234,
-     235,   236,   101,   101,   211,   237,   238,   211,   101,     7,
-     230,   231,   232,   233,   234,   235,   236,   101,   239,   240,
-     237,   238,   211,   241,   242,   644,   166,   645,  -280,   -97,
-     115,   450,   210,   107,   115,   313,   112,   211,   191,   242,
-     212,   192,   399,   319,   320,   211,   185,   400,   706,   707,
-     188,   186,   113,   189,   190,   657,   516,    86,   269,   187,
-     270,  -298,   120,   121,   122,   123,   124,   125,   126,   127,
-     128,   129,   130,   131,     9,    10,   180,    11,   132,   133,
-     134,   321,   322,   323,   182,   116,   300,    86,   213,   183,
-      89,    91,   461,   121,   122,  -419,   777,   125,   126,   127,
-     128,   726,   727,   728,    93,    96,   535,    11,   788,   370,
-     371,     4,   608,   609,     5,     6,     7,     8,   794,  -491,
-     175,   374,   375,   376,   175,   310,   311,   312,   372,   373,
-       9,    10,   214,    11,   101,   215,   258,    12,   740,   -98,
-     201,   216,   203,   257,   115,   260,   261,   211,   262,   273,
-      13,    14,    15,    16,   274,   397,   398,   397,   398,    17,
-      18,   271,   272,    19,   101,   275,    20,   277,   278,   344,
-     345,   245,   632,    21,    22,   279,   469,   470,   358,   771,
-      23,    24,   643,   280,   282,   399,   471,   399,   281,   535,
-     400,   283,   400,   401,   402,   401,   402,   -50,   380,   285,
-     289,    86,   290,   380,  -492,   307,   120,   121,   122,   123,
-     124,   125,   126,   127,   128,   129,   130,   131,   296,   306,
-     297,   463,   132,   133,   134,   464,   418,   314,   465,   466,
-     535,   315,   324,   316,   329,   330,   331,   337,   341,   342,
-     351,   352,   156,   468,   359,   363,   356,   152,   364,   366,
-     495,   153,   365,   154,   428,   136,   155,   378,   425,    45,
-     504,  -327,   536,   136,   462,   537,   505,    46,    55,    56,
-     509,   493,   506,   497,   498,    57,   510,    -8,   101,   522,
-     493,   521,   523,   263,   525,   573,   458,   527,    86,   546,
-     545,   578,   515,   120,   121,   122,   123,   124,   125,   126,
-     127,   128,   129,   130,   131,     9,    10,   547,    11,   132,
-     133,   134,   536,   534,    86,   537,   548,   549,   550,   120,
-     121,   122,   123,   124,   125,   126,   127,   128,   129,   130,
-     131,     9,    10,  -255,    11,   132,   133,   134,   559,   779,
-     780,   555,   556,   557,   568,   579,   580,   582,   607,   650,
-    -350,   590,   598,   599,   600,   601,   602,   603,   566,   567,
-     638,   612,   605,   534,   606,   101,   796,   610,   616,   617,
-    -368,   575,   618,   619,   620,    86,   245,   621,   622,   581,
+      87,   102,   104,    88,   156,    98,    99,   152,   137,   153,
+     191,   154,   245,   192,    45,   155,    46,    55,   398,   551,
+      56,   136,    57,   185,   188,   189,   190,   639,   340,   507,
+     401,   402,   490,   491,   186,   187,   649,   349,   465,   650,
+    -137,   345,    86,    86,   156,   115,   346,   152,   196,   153,
+     498,   154,   711,   263,     7,   155,   264,    86,   183,   193,
+     432,   136,   533,   534,   711,   512,     3,   194,   513,   197,
+     198,   199,   200,   507,    86,    86,   661,   202,   112,   712,
+     713,   205,    86,    86,   206,   265,   266,   208,   476,   121,
+     122,   712,   713,   125,   126,   127,   128,    17,   413,     7,
+     210,    90,   503,    11,   673,   211,   649,   113,   269,   650,
+     270,   434,   230,   231,   232,   233,   234,   235,   236,   101,
+     101,  -138,   237,   238,   317,   318,   115,   230,   231,   232,
+     233,   234,   235,   236,   101,   239,   240,   237,   238,   212,
+     241,   242,   211,   313,   211,   211,   465,   107,   633,   191,
+    -280,   211,   192,   487,    17,  -298,   242,   166,    94,   101,
+     101,   180,   185,   188,   189,   190,   116,   321,   322,   323,
+    -139,   115,   349,   186,   187,   115,    86,   182,   532,   343,
+     344,   120,   121,   122,   123,   124,   125,   126,   127,   128,
+     129,   130,   131,   319,   320,   -97,   300,   183,   133,   134,
+     115,   175,   507,  -419,   781,   175,  -491,   549,   213,   345,
+     733,   734,   735,   214,   346,   215,   792,   347,   348,   712,
+     713,   201,    86,   203,   533,   534,   797,   120,   121,   122,
+     123,   124,   125,   126,   127,   128,   129,   130,   131,     9,
+      10,   216,    11,   132,   133,   134,   257,   473,   258,    86,
+     388,   389,   390,   101,   120,   121,   122,   123,   124,   125,
+     126,   127,   128,   129,   130,   131,     9,    10,   260,    11,
+     132,   133,   134,   700,   310,   311,   312,    89,    91,   358,
+     359,   747,    93,    96,   637,   262,   710,   261,   372,   384,
+     385,   612,   613,   245,   211,   722,   -44,   271,   -44,   101,
+     272,   343,   344,   739,   -98,   273,   394,   386,   387,   115,
+     274,   394,   -44,   -44,   275,   -44,   -44,   277,   278,   -44,
+     775,   279,   484,   485,   280,   414,   101,   418,   419,   281,
+     282,   345,   486,   283,   414,   507,   346,   285,   289,   347,
+     348,   -44,   290,  -492,   508,   -44,   296,   509,   433,   297,
+     306,   478,   479,   480,   481,   307,   316,   314,   324,   -44,
+     315,   329,   330,   331,   341,   342,   365,   337,   156,   483,
+     366,   152,   370,   153,   507,   154,   373,   136,   443,   155,
+     377,   416,   378,   514,   380,   136,   477,    45,   508,    46,
+      55,   509,   506,    56,   379,    57,   392,   440,  -327,   505,
+       4,   519,   511,     5,     6,     7,     8,   515,   522,   516,
+     517,   518,   217,   521,   218,   531,   525,   526,    -8,     9,
+      10,   537,    11,   538,   539,   558,    12,   541,   219,   220,
+     543,   221,   222,   557,   559,   223,   506,   770,   560,    13,
+      14,    15,    16,   561,   562,  -255,   263,   571,    17,    18,
+     580,  -350,    19,   594,   602,    20,   783,   224,   603,   604,
+     605,   225,    21,    22,   567,   568,   569,   606,   607,    23,
+      24,   648,   795,   609,   610,   226,   611,   614,   620,   616,
+     621,   622,   623,   578,   579,    86,   -50,   624,   245,   625,
      120,   121,   122,   123,   124,   125,   126,   127,   128,   129,
-     625,   101,   626,   627,   156,   156,   628,   133,   134,   152,
-     152,   635,   637,   153,   153,   154,   154,   636,   155,   155,
-     639,   640,   654,    86,   641,   136,   136,   666,   120,   121,
-     122,   123,   124,   125,   126,   127,   128,   129,   130,   131,
-     345,   682,   613,   614,   615,   133,   134,   669,   678,   670,
-     684,   689,   688,   692,   533,   696,   698,   700,   720,   722,
-     536,  -377,   101,   537,   713,   741,   745,   725,   742,   744,
-     749,   751,   755,   345,   757,    86,   758,   769,   772,   649,
-     120,   121,   122,   123,   124,   125,   126,   127,   128,   129,
-     130,   131,   770,   781,   789,   787,   790,   133,   134,   791,
-     101,   798,   799,   803,    45,   795,   805,   423,    95,   802,
-     683,   534,    46,    55,    56,   361,    92,    87,   659,   489,
-      57,   367,   -44,   305,   -44,   663,   452,   631,   695,   611,
-     368,   390,   513,   369,   759,   762,   778,   756,   -44,   -44,
-     679,   -44,   -44,   536,   680,   -44,   537,   633,   793,   360,
-     177,   783,   101,   524,   642,   429,     0,   502,     0,     0,
-       0,     0,    87,   659,     0,   480,     0,   -44,     0,     0,
-       0,   -44,     0,    45,     0,     0,     0,     0,     0,     0,
-       0,    46,    55,    56,   536,   -44,     0,   537,     0,    57,
-       0,     0,     0,     0,   534,   217,     0,   218,     0,   156,
-       0,     0,   748,     0,   152,   760,    87,   747,   153,     0,
-     154,   219,   220,   155,   221,   222,     0,     0,   223,     0,
-     136,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   534,     0,     0,     0,     0,
-     224,     0,     0,     0,   225,     0,     0,   380,   380,     0,
-     345,     0,     0,     0,     0,   782,     0,     0,   226,     0,
-       0,     0,   345,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   345,   431,   380,  -359,     5,     0,     0,     8,
-    -359,  -359,  -359,  -359,  -359,  -359,  -359,  -359,  -359,  -359,
-    -359,  -359,     9,    10,     0,    11,     0,  -359,  -359,    12,
-       0,     0,   397,   398,   432,   433,  -359,     0,     0,     0,
-       0,     0,    13,     0,     0,     0,   444,   445,   446,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-       0,   431,     0,  -359,     5,    21,    22,     8,  -359,  -359,
+     130,   131,     9,    10,   626,    11,   132,   133,   134,   629,
+     630,   643,   641,   631,   632,   640,   642,   508,   156,   156,
+     509,   152,   152,   153,   153,   154,   154,   644,   645,   155,
+     155,   646,   655,   659,   671,   136,   136,   674,  -368,   675,
+     681,   683,   684,   688,   694,   695,   698,   706,   690,   724,
+    -377,   719,   359,   723,   617,   618,   619,   727,   729,   748,
+     732,   753,   101,   749,   759,   506,   755,   761,   762,   771,
+     776,   773,   784,    87,   774,   793,   635,   359,    86,   791,
+     798,   654,   801,   120,   121,   122,   123,   124,   125,   126,
+     127,   128,   129,   130,   131,   794,   799,   804,   807,   132,
+     133,   134,   805,   375,   438,    95,   689,    92,   504,   381,
+     636,   305,    45,   383,    46,    55,   382,   615,    56,   467,
+      57,   680,   404,   529,   763,   766,   685,   638,   668,   782,
+     796,   374,   177,   787,   495,   540,   647,   423,     0,   520,
+     444,     0,   760,     0,     0,     0,     0,   686,     0,    87,
+     508,    86,   635,   509,     0,   101,   120,   121,   122,   123,
+     124,   125,   126,   127,   128,   129,   130,   131,     0,     0,
+       0,     0,     0,   133,   134,     0,     0,     0,     0,     0,
+       0,     0,    45,     0,    46,    55,     0,     0,    56,   508,
+      57,    87,   509,     0,   726,     0,     0,     0,   506,     0,
+       0,     0,     0,     0,     0,     0,     0,   752,   156,     0,
+       0,   152,   764,   153,     0,   154,     0,     0,     0,   155,
+       0,     0,     0,     0,     0,   136,     0,     0,   101,     0,
+     394,     0,     0,     0,    86,     0,     0,   506,     0,   120,
+     121,   122,   123,   124,   125,   126,   127,   128,   129,   394,
+       0,     0,     0,     0,   359,     0,   133,   134,     0,   786,
+       0,     0,     0,     0,     0,   394,   359,     0,     0,     0,
+       0,   446,     0,  -359,     5,     0,   359,     8,  -359,  -359,
     -359,  -359,  -359,  -359,  -359,  -359,  -359,  -359,  -359,  -359,
-       9,    10,  -359,    11,     0,  -359,  -359,    12,     0,   -83,
-     397,   398,   432,   433,  -359,     0,     0,     0,     0,     0,
-      13,     0,     0,     0,   444,   445,   446,     0,     0,     0,
-       0,     0,     0,     0,     0,     0,     0,     0,     0,   431,
+       9,    10,     0,    11,     0,  -359,  -359,    12,     0,     0,
+     343,   344,   447,   448,  -359,     0,     0,     0,     0,     0,
+      13,   101,     0,     0,   459,   460,   461,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,     0,     0,   446,
        0,  -359,     5,    21,    22,     8,  -359,  -359,  -359,  -359,
     -359,  -359,  -359,  -359,  -359,  -359,  -359,  -359,     9,    10,
-    -359,    11,     0,  -359,  -359,    12,     0,  -504,   397,   398,
-     432,   433,  -359,     0,     0,     0,     0,     0,    13,     0,
-       0,     0,   481,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,   482,     0,     0,     0,     0,   431,     0,  -359,
+    -359,    11,     0,  -359,  -359,    12,     0,   -83,   343,   344,
+     447,   448,  -359,     0,     0,     0,     0,     0,    13,     0,
+       0,     0,   459,   460,   461,     0,     0,     0,     0,     0,
+       0,     0,     0,     0,     0,     0,     0,   446,     0,  -359,
        5,    21,    22,     8,  -359,  -359,  -359,  -359,  -359,  -359,
     -359,  -359,  -359,  -359,  -359,  -359,     9,    10,  -359,    11,
-       0,  -359,  -359,    12,     0,  -471,   397,   398,   432,   433,
-    -359,     0,   431,     0,  -359,     5,    13,     0,     8,  -359,
-    -359,  -359,  -359,  -359,  -359,  -359,  -359,  -359,  -359,  -359,
-    -359,     9,    10,     0,    11,     0,  -359,  -359,    12,    21,
-      22,   397,   398,   432,   433,  -359,     0,     0,     0,     0,
-       0,    13,     0,     0,     0,     0,  -359,     0,     0,     0,
-       0,     0,     0,   -65,     0,     0,     0,     0,     0,     0,
-     431,     0,  -359,     5,    21,    22,     8,  -359,  -359,  -359,
+       0,  -359,  -359,    12,     0,  -504,   343,   344,   447,   448,
+    -359,     0,     0,     0,     0,     0,    13,     0,     0,     0,
+     496,     0,     0,     0,     0,     0,     0,     0,     0,     0,
+     497,     0,     0,     0,     0,   446,     0,  -359,     5,    21,
+      22,     8,  -359,  -359,  -359,  -359,  -359,  -359,  -359,  -359,
+    -359,  -359,  -359,  -359,     9,    10,  -359,    11,     0,  -359,
+    -359,    12,     0,  -471,   343,   344,   447,   448,  -359,     0,
+     446,     0,  -359,     5,    13,     0,     8,  -359,  -359,  -359,
     -359,  -359,  -359,  -359,  -359,  -359,  -359,  -359,  -359,     9,
-      10,  -359,    11,     0,  -359,  -359,    12,     0,   -87,   397,
-     398,   432,   433,  -359,     0,     0,     0,     0,     0,    13,
-       0,     0,     0,     0,     0,     0,     0,    -2,     4,     0,
-       0,     5,     6,     7,     8,     0,     0,     0,     0,     0,
-       0,     0,    21,    22,     0,     0,     0,     9,    10,     0,
-      11,     0,     0,     0,    12,     0,     0,     0,     0,  -359,
-       0,     0,     0,     0,     0,     0,  -495,    13,    14,    15,
-      16,     0,     0,     0,     0,     0,    17,    18,     0,     0,
-      19,     4,     0,    20,     5,     6,     7,     8,     0,     0,
-      21,    22,     0,     0,     0,     0,     0,    23,    24,     0,
-       9,    10,     0,    11,     0,     0,     4,    12,     0,     5,
+      10,     0,    11,     0,  -359,  -359,    12,    21,    22,   343,
+     344,   447,   448,  -359,     0,     0,     0,     0,     0,    13,
+       0,     0,     0,     0,  -359,     0,     0,     0,     0,     0,
+       0,   -65,     0,     0,     0,     0,     0,     0,   446,     0,
+    -359,     5,    21,    22,     8,  -359,  -359,  -359,  -359,  -359,
+    -359,  -359,  -359,  -359,  -359,  -359,  -359,     9,    10,  -359,
+      11,     0,  -359,  -359,    12,     0,   -87,   343,   344,   447,
+     448,  -359,     0,     0,     0,     0,     0,    13,     0,     0,
+       0,     0,     0,     0,     0,    -2,     4,     0,     0,     5,
        6,     7,     8,     0,     0,     0,     0,     0,     0,     0,
-      13,    14,    15,    16,     0,     9,    10,     0,    11,    17,
-      18,     0,    12,    19,     0,     0,    20,     0,     0,     0,
-       0,     0,     0,    21,    22,    13,    14,    15,    16,     0,
-      23,    24,   643,     0,    17,    18,     0,     0,    19,     0,
-       0,    20,     0,     0,     0,     0,     0,     0,    21,    22,
-       0,     0,     0,     0,     0,    23,    24
+      21,    22,     0,     0,     0,     9,    10,     0,    11,     0,
+       0,     0,    12,     0,     0,     0,     0,  -359,     0,     0,
+       0,     0,     0,     0,  -495,    13,    14,    15,    16,     0,
+       0,     0,     0,     0,    17,    18,     0,     0,    19,     4,
+       0,    20,     5,     6,     7,     8,     0,     0,    21,    22,
+       0,     0,     0,     0,     0,    23,    24,     0,     9,    10,
+       0,    11,     0,     0,     4,    12,     0,     5,     6,     7,
+       8,     0,     0,     0,     0,     0,     0,     0,    13,    14,
+      15,    16,     0,     9,    10,     0,    11,    17,    18,     0,
+      12,    19,     0,     0,    20,     0,     0,     0,     0,     0,
+       0,    21,    22,    13,    14,    15,    16,     0,    23,    24,
+     648,     0,    17,    18,     0,     0,    19,     0,     0,    20,
+       0,     0,     0,     0,     0,     0,    21,    22,     0,     0,
+       0,     0,     0,    23,    24
 };
 
 static const tao_yytype_int16 tao_yycheck[] =
 {
-      13,    13,    41,    21,    22,    18,    19,    41,    41,    78,
-       2,    41,    78,    41,   111,   331,    41,    78,     2,     2,
-       2,    78,    78,    41,    78,    78,     2,   491,   441,   586,
-      78,   286,   334,   335,   382,     3,     3,     3,   343,   343,
-       3,     3,    81,   343,   353,     0,   394,    81,    81,     6,
-       3,    81,     1,    81,    85,     3,    81,    19,   624,    90,
-      78,    79,   674,    81,     8,     9,   596,    80,   596,    82,
-      83,    84,    85,     8,   686,     1,    11,    90,   491,    28,
-      29,    94,    81,    82,    97,   651,   395,   100,   393,   393,
-      85,   703,    49,   393,    85,    90,    53,    49,     3,    90,
-     355,    53,    28,    29,   716,    73,    74,    75,    76,    77,
-      78,    79,    80,    80,    80,    83,    84,    80,    80,     6,
-      73,    74,    75,    76,    77,    78,    79,    80,    96,    97,
-      83,    84,    80,   101,   102,   665,    22,   665,    87,    85,
-      90,   489,    75,    88,    90,   242,    85,    80,   217,   102,
-      75,   217,    60,    96,    97,    80,   217,    65,    28,    29,
-     217,   217,    85,   217,   217,   629,   421,     3,    89,   217,
-      91,    85,     8,     9,    10,    11,    12,    13,    14,    15,
-      16,    17,    18,    19,    20,    21,    86,    23,    24,    25,
-      26,    98,    99,   100,    85,    34,   209,     3,     3,   217,
-      14,    15,     8,     9,    10,    85,   763,    13,    14,    15,
-      16,    35,    36,    37,    15,    16,   629,    23,   775,   317,
-     318,     1,   543,   544,     4,     5,     6,     7,   785,    85,
-      69,   321,   322,   323,    73,   239,   240,   241,   319,   320,
-      20,    21,     3,    23,    80,    86,    48,    27,   712,    85,
-      89,    85,    91,    85,    90,    86,    85,    80,    86,    85,
-      40,    41,    42,    43,    85,    30,    31,    30,    31,    49,
-      50,    88,    88,    53,    80,    86,    56,    85,    85,   292,
-     293,   378,   584,    63,    64,    85,    51,    52,   301,   753,
-      70,    71,    72,    85,    85,    60,    61,    60,    86,   712,
-      65,    86,    65,    68,    69,    68,    69,    87,   326,    85,
-      85,     3,    85,   331,    85,     3,     8,     9,    10,    11,
-      12,    13,    14,    15,    16,    17,    18,    19,    86,    88,
-      90,   392,    24,    25,    26,   392,   354,    93,   392,   392,
-     753,    94,    89,    95,     8,    88,    47,   102,    86,    86,
-      86,    86,   391,   392,    86,     3,    90,   391,    89,   103,
-      58,   391,    91,   391,   377,   383,   391,    91,    89,   361,
-      87,   104,   441,   391,   392,   441,    92,   361,   361,   361,
-      91,   399,   104,   401,   402,   361,     3,    87,    80,     3,
-     408,    87,    86,     8,    91,    31,     1,    87,     3,    85,
-      87,    85,   420,     8,     9,    10,    11,    12,    13,    14,
-      15,    16,    17,    18,    19,    20,    21,    89,    23,    24,
-      25,    26,   491,   441,     3,   491,    89,    89,    87,     8,
-       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
-      19,    20,    21,    87,    23,    24,    25,    26,    87,   765,
-     766,   469,   470,   471,    87,    85,    85,    85,     3,     3,
-      87,    87,    85,    85,    85,    85,    85,    85,   481,   482,
-      66,   103,    85,   491,    85,    80,   792,    85,    85,    85,
-      35,   494,    85,    85,    85,     3,   583,    85,    85,   502,
-       8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
-      85,    80,    85,    87,   543,   544,    87,    25,    26,   543,
-     544,    87,    87,   543,   544,   543,   544,    91,   543,   544,
-      85,    85,   102,     3,    87,   543,   544,    85,     8,     9,
-      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
-     553,    87,   555,   556,   557,    25,    26,    85,   105,    86,
-     102,    35,   103,    38,    34,    55,    91,    88,    59,     3,
-     629,   103,    80,   629,   103,    91,    62,   103,   102,   102,
-      89,   103,    85,   586,    90,     3,    87,    91,    39,   597,
-       8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
-      18,    19,    91,   102,    85,    90,   103,    25,    26,   103,
-      80,   103,    75,    91,   596,   102,    75,   361,    16,   103,
-     665,   629,   596,   596,   596,   304,    15,   630,   630,   396,
-     596,   314,     4,   217,     6,   643,   383,   583,   675,   553,
-     315,   336,   416,   316,   737,   739,   764,   734,    20,    21,
-     661,    23,    24,   712,   662,    27,   712,   585,   784,   303,
-      73,   769,    80,   427,   595,   378,    -1,   408,    -1,    -1,
-      -1,    -1,   675,   675,    -1,   393,    -1,    49,    -1,    -1,
-      -1,    53,    -1,   665,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,   665,   665,   665,   753,    67,    -1,   753,    -1,   665,
-      -1,    -1,    -1,    -1,   712,     4,    -1,     6,    -1,   738,
-      -1,    -1,   720,    -1,   738,   738,   719,   719,   738,    -1,
-     738,    20,    21,   738,    23,    24,    -1,    -1,    27,    -1,
-     738,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,   753,    -1,    -1,    -1,    -1,
-      49,    -1,    -1,    -1,    53,    -1,    -1,   765,   766,    -1,
-     763,    -1,    -1,    -1,    -1,   768,    -1,    -1,    67,    -1,
-      -1,    -1,   775,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,   785,     1,   792,     3,     4,    -1,    -1,     7,
+      13,    21,    22,    13,    41,    18,    19,    41,    41,    41,
+      78,    41,   111,    78,     2,    41,     2,     2,   331,   456,
+       2,    41,     2,    78,    78,    78,    78,   590,   286,   412,
+     334,   335,   407,   407,    78,    78,   600,   291,   396,   600,
+      85,    60,     3,     3,    81,    90,    65,    81,    81,    81,
+     408,    81,     1,     8,     6,    81,    11,     3,    78,    79,
+     367,    81,   437,   437,     1,     3,     0,    80,     3,    82,
+      83,    84,    85,   456,     3,     3,   628,    90,    85,    28,
+      29,    94,     3,     3,    97,     8,     9,   100,     8,     9,
+      10,    28,    29,    13,    14,    15,    16,    49,    19,     6,
+      75,    53,   409,    23,   656,    80,   670,    85,    89,   670,
+      91,   369,    73,    74,    75,    76,    77,    78,    79,    80,
+      80,    85,    83,    84,    81,    82,    90,    73,    74,    75,
+      76,    77,    78,    79,    80,    96,    97,    83,    84,    75,
+     101,   102,    80,   242,    80,    80,   504,    88,   585,   217,
+      87,    80,   217,   407,    49,    85,   102,    22,    53,    80,
+      80,    86,   217,   217,   217,   217,    34,    98,    99,   100,
+      85,    90,   426,   217,   217,    90,     3,    85,   436,    30,
+      31,     8,     9,    10,    11,    12,    13,    14,    15,    16,
+      17,    18,    19,    96,    97,    85,   209,   217,    25,    26,
+      90,    69,   585,    85,   767,    73,    85,    34,     3,    60,
+      35,    36,    37,     3,    65,    86,   779,    68,    69,    28,
+      29,    89,     3,    91,   599,   599,   789,     8,     9,    10,
+      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
+      21,    85,    23,    24,    25,    26,    85,     1,    48,     3,
+     321,   322,   323,    80,     8,     9,    10,    11,    12,    13,
+      14,    15,    16,    17,    18,    19,    20,    21,    86,    23,
+      24,    25,    26,   679,   239,   240,   241,    14,    15,   292,
+     293,   718,    15,    16,   588,    86,   692,    85,   301,   317,
+     318,   555,   556,   392,    80,   701,     4,    88,     6,    80,
+      88,    30,    31,   709,    85,    85,   326,   319,   320,    90,
+      85,   331,    20,    21,    86,    23,    24,    85,    85,    27,
+     757,    85,    51,    52,    85,   345,    80,   347,   348,    86,
+      85,    60,    61,    86,   354,   718,    65,    85,    85,    68,
+      69,    49,    85,    85,   412,    53,    86,   412,   368,    90,
+      88,   406,   406,   406,   406,     3,    95,    93,    89,    67,
+      94,     8,    88,    47,    86,    86,    86,   102,   405,   406,
+      86,   405,    90,   405,   757,   405,    86,   397,   391,   405,
+       3,    58,    89,    85,   103,   405,   406,   375,   456,   375,
+     375,   456,   412,   375,    91,   375,    91,    89,   104,    31,
+       1,    87,   415,     4,     5,     6,     7,    85,   104,    85,
+     423,    85,     4,    92,     6,   435,    91,     3,    87,    20,
+      21,    87,    23,     3,    86,    85,    27,    91,    20,    21,
+      87,    23,    24,    87,    89,    27,   456,   750,    89,    40,
+      41,    42,    43,    89,    87,    87,     8,    87,    49,    50,
+      87,    87,    53,    87,    85,    56,   769,    49,    85,    85,
+      85,    53,    63,    64,   484,   485,   486,    85,    85,    70,
+      71,    72,   785,    85,    85,    67,     3,    85,    85,   103,
+      85,    85,    85,   496,   497,     3,    87,    85,   587,    85,
        8,     9,    10,    11,    12,    13,    14,    15,    16,    17,
-      18,    19,    20,    21,    -1,    23,    -1,    25,    26,    27,
-      -1,    -1,    30,    31,    32,    33,    34,    -1,    -1,    -1,
-      -1,    -1,    40,    -1,    -1,    -1,    44,    45,    46,    -1,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,     1,    -1,     3,     4,    63,    64,     7,     8,     9,
+      18,    19,    20,    21,    85,    23,    24,    25,    26,    85,
+      85,    66,    91,    87,    87,    87,    87,   585,   555,   556,
+     585,   555,   556,   555,   556,   555,   556,    85,    85,   555,
+     556,    87,     3,   102,    85,   555,   556,    85,    35,    86,
+      55,    91,   105,    87,   103,    35,    38,    88,   102,    62,
+     103,   103,   565,   102,   567,   568,   569,    59,     3,    91,
+     103,    89,    80,   102,    85,   585,   103,    90,    87,   102,
+      39,    91,   103,   586,    91,    85,   586,   590,     3,    90,
+     102,   601,    75,     8,     9,    10,    11,    12,    13,    14,
+      15,    16,    17,    18,    19,   103,   103,   103,    75,    24,
+      25,    26,    91,   304,   375,    16,   670,    15,   410,   314,
+     587,   217,   600,   316,   600,   600,   315,   565,   600,   397,
+     600,   662,   336,   431,   744,   746,   666,   589,   648,   768,
+     788,   303,    73,   773,   407,   442,   599,   354,    -1,   426,
+     392,    -1,   741,    -1,    -1,    -1,    -1,   667,    -1,   662,
+     718,     3,   662,   718,    -1,    80,     8,     9,    10,    11,
+      12,    13,    14,    15,    16,    17,    18,    19,    -1,    -1,
+      -1,    -1,    -1,    25,    26,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,   670,    -1,   670,   670,    -1,    -1,   670,   757,
+     670,   704,   757,    -1,   704,    -1,    -1,    -1,   718,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,   727,   745,    -1,
+      -1,   745,   745,   745,    -1,   745,    -1,    -1,    -1,   745,
+      -1,    -1,    -1,    -1,    -1,   745,    -1,    -1,    80,    -1,
+     750,    -1,    -1,    -1,     3,    -1,    -1,   757,    -1,     8,
+       9,    10,    11,    12,    13,    14,    15,    16,    17,   769,
+      -1,    -1,    -1,    -1,   767,    -1,    25,    26,    -1,   772,
+      -1,    -1,    -1,    -1,    -1,   785,   779,    -1,    -1,    -1,
+      -1,     1,    -1,     3,     4,    -1,   789,     7,     8,     9,
       10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
-      20,    21,    80,    23,    -1,    25,    26,    27,    -1,    87,
+      20,    21,    -1,    23,    -1,    25,    26,    27,    -1,    -1,
       30,    31,    32,    33,    34,    -1,    -1,    -1,    -1,    -1,
-      40,    -1,    -1,    -1,    44,    45,    46,    -1,    -1,    -1,
+      40,    80,    -1,    -1,    44,    45,    46,    -1,    -1,    -1,
       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,     1,
       -1,     3,     4,    63,    64,     7,     8,     9,    10,    11,
       12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
       80,    23,    -1,    25,    26,    27,    -1,    87,    30,    31,
       32,    33,    34,    -1,    -1,    -1,    -1,    -1,    40,    -1,
-      -1,    -1,    44,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    54,    -1,    -1,    -1,    -1,     1,    -1,     3,
+      -1,    -1,    44,    45,    46,    -1,    -1,    -1,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    -1,     1,    -1,     3,
        4,    63,    64,     7,     8,     9,    10,    11,    12,    13,
       14,    15,    16,    17,    18,    19,    20,    21,    80,    23,
       -1,    25,    26,    27,    -1,    87,    30,    31,    32,    33,
-      34,    -1,     1,    -1,     3,     4,    40,    -1,     7,     8,
-       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
-      19,    20,    21,    -1,    23,    -1,    25,    26,    27,    63,
-      64,    30,    31,    32,    33,    34,    -1,    -1,    -1,    -1,
-      -1,    40,    -1,    -1,    -1,    -1,    80,    -1,    -1,    -1,
-      -1,    -1,    -1,    87,    -1,    -1,    -1,    -1,    -1,    -1,
-       1,    -1,     3,     4,    63,    64,     7,     8,     9,    10,
+      34,    -1,    -1,    -1,    -1,    -1,    40,    -1,    -1,    -1,
+      44,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
+      54,    -1,    -1,    -1,    -1,     1,    -1,     3,     4,    63,
+      64,     7,     8,     9,    10,    11,    12,    13,    14,    15,
+      16,    17,    18,    19,    20,    21,    80,    23,    -1,    25,
+      26,    27,    -1,    87,    30,    31,    32,    33,    34,    -1,
+       1,    -1,     3,     4,    40,    -1,     7,     8,     9,    10,
       11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
-      21,    80,    23,    -1,    25,    26,    27,    -1,    87,    30,
+      21,    -1,    23,    -1,    25,    26,    27,    63,    64,    30,
       31,    32,    33,    34,    -1,    -1,    -1,    -1,    -1,    40,
-      -1,    -1,    -1,    -1,    -1,    -1,    -1,     0,     1,    -1,
-      -1,     4,     5,     6,     7,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    63,    64,    -1,    -1,    -1,    20,    21,    -1,
-      23,    -1,    -1,    -1,    27,    -1,    -1,    -1,    -1,    80,
-      -1,    -1,    -1,    -1,    -1,    -1,    87,    40,    41,    42,
-      43,    -1,    -1,    -1,    -1,    -1,    49,    50,    -1,    -1,
-      53,     1,    -1,    56,     4,     5,     6,     7,    -1,    -1,
-      63,    64,    -1,    -1,    -1,    -1,    -1,    70,    71,    -1,
-      20,    21,    -1,    23,    -1,    -1,     1,    27,    -1,     4,
+      -1,    -1,    -1,    -1,    80,    -1,    -1,    -1,    -1,    -1,
+      -1,    87,    -1,    -1,    -1,    -1,    -1,    -1,     1,    -1,
+       3,     4,    63,    64,     7,     8,     9,    10,    11,    12,
+      13,    14,    15,    16,    17,    18,    19,    20,    21,    80,
+      23,    -1,    25,    26,    27,    -1,    87,    30,    31,    32,
+      33,    34,    -1,    -1,    -1,    -1,    -1,    40,    -1,    -1,
+      -1,    -1,    -1,    -1,    -1,     0,     1,    -1,    -1,     4,
        5,     6,     7,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      40,    41,    42,    43,    -1,    20,    21,    -1,    23,    49,
-      50,    -1,    27,    53,    -1,    -1,    56,    -1,    -1,    -1,
-      -1,    -1,    -1,    63,    64,    40,    41,    42,    43,    -1,
-      70,    71,    72,    -1,    49,    50,    -1,    -1,    53,    -1,
-      -1,    56,    -1,    -1,    -1,    -1,    -1,    -1,    63,    64,
-      -1,    -1,    -1,    -1,    -1,    70,    71
+      63,    64,    -1,    -1,    -1,    20,    21,    -1,    23,    -1,
+      -1,    -1,    27,    -1,    -1,    -1,    -1,    80,    -1,    -1,
+      -1,    -1,    -1,    -1,    87,    40,    41,    42,    43,    -1,
+      -1,    -1,    -1,    -1,    49,    50,    -1,    -1,    53,     1,
+      -1,    56,     4,     5,     6,     7,    -1,    -1,    63,    64,
+      -1,    -1,    -1,    -1,    -1,    70,    71,    -1,    20,    21,
+      -1,    23,    -1,    -1,     1,    27,    -1,     4,     5,     6,
+       7,    -1,    -1,    -1,    -1,    -1,    -1,    -1,    40,    41,
+      42,    43,    -1,    20,    21,    -1,    23,    49,    50,    -1,
+      27,    53,    -1,    -1,    56,    -1,    -1,    -1,    -1,    -1,
+      -1,    63,    64,    40,    41,    42,    43,    -1,    70,    71,
+      72,    -1,    49,    50,    -1,    -1,    53,    -1,    -1,    56,
+      -1,    -1,    -1,    -1,    -1,    -1,    63,    64,    -1,    -1,
+      -1,    -1,    -1,    70,    71
 };
 
 /* TAO_YYSTOS[STATE-NUM] -- The (internal number of the) accessing
@@ -1742,53 +1745,53 @@ static const tao_yytype_uint16 tao_yystos[] =
      214,   214,   214,   206,    93,    94,    95,    81,    82,    96,
       97,    98,    99,   100,    89,   471,   157,   151,   162,     8,
       88,    47,   173,   296,   302,   306,   250,   102,   384,   421,
-     173,    86,    86,   480,   197,   197,   227,   230,   234,   235,
-     309,    86,    86,   166,   390,   388,    90,   417,   197,    86,
-     389,   108,   110,     3,    89,    91,   103,   208,   209,   210,
-     211,   211,   212,   212,   213,   213,   213,   147,    91,   191,
-     194,   181,   176,   300,   191,   206,   216,   216,   216,   252,
-     254,   255,   264,   391,   423,   439,   448,    30,    31,    60,
-      65,    68,    69,   316,   317,   322,   400,   402,   403,   469,
-     479,   481,   202,   310,   228,   289,   330,   181,   194,   173,
-     418,   413,   462,   109,   131,    89,   136,   454,   197,   472,
-     192,     1,    32,    33,   152,   182,   199,   217,   316,   327,
-     332,   337,   378,   379,    44,    45,    46,   163,   177,   178,
-     182,   339,   222,   297,   303,   307,   251,   253,     1,   221,
-     256,     8,   194,   236,   241,   242,   243,   269,   286,    51,
-      52,    61,   316,   385,   392,   400,   402,   405,   406,   407,
-     469,    44,    54,   182,   422,   424,   427,   430,   181,   176,
-     318,   323,    19,   194,   401,    58,   404,   194,   194,   484,
-     482,   483,   401,   485,    87,    92,   104,   311,   313,    91,
-       3,   291,   294,   253,   167,   194,   173,   400,   402,   464,
-     466,    87,     3,    86,   455,    91,   190,    87,   186,   183,
-     188,   187,   189,    34,   194,   223,   301,   305,   338,   361,
-     184,   185,   340,   180,   179,    87,    85,    89,    89,    89,
-      87,   254,   259,   257,   265,   194,   194,   194,   398,    87,
-     393,   394,   395,   396,   397,   399,   197,   197,    87,   425,
-     426,   440,   449,    31,   361,   197,     3,     3,    85,    85,
-      85,   197,    85,   203,   314,   312,   229,   290,   292,   331,
-      87,   414,   467,   468,   463,   465,   137,   193,    85,    85,
-      85,    85,    85,    85,   333,    85,    85,     3,   256,   256,
-      85,   227,   103,   197,   197,   197,    85,    85,    85,    85,
-      85,    85,    85,   428,   431,    85,    85,    87,    87,   319,
-     324,   205,   216,   313,   230,    87,    91,    87,    66,    85,
-      85,    87,   466,    72,   111,   126,   139,   141,   142,   194,
-       3,   341,   258,   266,   102,   343,   343,   361,   231,   234,
-     315,   293,   415,   194,   138,   140,    85,   334,   343,    85,
-      86,   344,   345,   429,   432,   320,   325,   232,   105,   294,
-     194,   143,    87,   141,   102,   352,   342,   267,   103,    35,
-     346,   349,    38,   363,   363,   231,    55,   366,    91,   416,
-      88,   353,   354,   335,   363,     1,    28,    29,   270,   272,
-     276,   278,   350,   103,   347,   364,   321,   367,   326,   233,
-      59,   419,     3,   456,   458,   103,    35,    36,    37,   355,
-     358,   362,   363,   275,   280,   279,   268,   271,   273,   277,
-     361,    91,   102,   363,   102,    62,   369,   234,   194,    89,
-     457,   103,   356,   359,   336,    85,   206,    90,    87,   272,
-     221,   282,   278,   351,   348,   365,   368,   370,   144,    91,
-      91,   361,    39,   372,   281,   283,   274,   230,   349,   191,
-     191,   102,   197,   458,   357,   360,   373,    90,   230,    85,
-     103,   103,   371,   358,   230,   102,   191,   374,   103,    75,
-     375,   376,   103,    91,   377,    75
+     173,    86,    86,    30,    31,    60,    65,    68,    69,   316,
+     317,   322,   400,   402,   403,   469,   480,   482,   197,   197,
+     227,   230,   234,   235,   309,    86,    86,   166,   390,   388,
+      90,   417,   197,    86,   389,   108,   110,     3,    89,    91,
+     103,   208,   209,   210,   211,   211,   212,   212,   213,   213,
+     213,   147,    91,   191,   194,   181,   176,   300,   191,   206,
+     216,   216,   216,   252,   254,   255,   264,   391,   423,   439,
+     448,   318,   323,    19,   194,   401,    58,   404,   194,   194,
+     485,   483,   484,   401,   486,   479,   481,   202,   310,   228,
+     289,   330,   181,   194,   173,   418,   413,   462,   109,   131,
+      89,   136,   454,   197,   472,   192,     1,    32,    33,   152,
+     182,   199,   217,   316,   327,   332,   337,   378,   379,    44,
+      45,    46,   163,   177,   178,   182,   339,   222,   297,   303,
+     307,   251,   253,     1,   221,   256,     8,   194,   236,   241,
+     242,   243,   269,   286,    51,    52,    61,   316,   385,   392,
+     400,   402,   405,   406,   407,   469,    44,    54,   182,   422,
+     424,   427,   430,   181,   176,    31,   194,   223,   301,   305,
+     361,   197,     3,     3,    85,    85,    85,   197,    85,    87,
+     482,    92,   104,   311,   313,    91,     3,   291,   294,   253,
+     167,   194,   173,   400,   402,   464,   466,    87,     3,    86,
+     455,    91,   190,    87,   186,   183,   188,   187,   189,    34,
+     338,   361,   184,   185,   340,   180,   179,    87,    85,    89,
+      89,    89,    87,   254,   259,   257,   265,   194,   194,   194,
+     398,    87,   393,   394,   395,   396,   397,   399,   197,   197,
+      87,   425,   426,   440,   449,   319,   324,   203,   314,   312,
+     229,   290,   292,   331,    87,   414,   467,   468,   463,   465,
+     137,   193,    85,    85,    85,    85,    85,    85,   333,    85,
+      85,     3,   256,   256,    85,   227,   103,   197,   197,   197,
+      85,    85,    85,    85,    85,    85,    85,   428,   431,    85,
+      85,    87,    87,   361,   231,   234,   205,   216,   313,   230,
+      87,    91,    87,    66,    85,    85,    87,   466,    72,   111,
+     126,   139,   141,   142,   194,     3,   341,   258,   266,   102,
+     343,   343,   320,   325,   232,   315,   293,   415,   194,   138,
+     140,    85,   334,   343,    85,    86,   344,   345,   429,   432,
+     231,    55,   366,    91,   105,   294,   194,   143,    87,   141,
+     102,   352,   342,   267,   103,    35,   346,   349,    38,   363,
+     363,   321,   367,   326,   233,   416,    88,   353,   354,   335,
+     363,     1,    28,    29,   270,   272,   276,   278,   350,   103,
+     347,   364,   363,   102,    62,   369,   234,    59,   419,     3,
+     456,   458,   103,    35,    36,    37,   355,   358,   362,   363,
+     275,   280,   279,   268,   271,   273,   277,   361,    91,   102,
+     368,   370,   194,    89,   457,   103,   356,   359,   336,    85,
+     206,    90,    87,   272,   221,   282,   278,   351,   348,   365,
+     191,   102,   144,    91,    91,   361,    39,   372,   281,   283,
+     274,   230,   349,   191,   103,   371,   197,   458,   357,   360,
+     373,    90,   230,    85,   103,   191,   358,   230,   102,   103,
+     374,    75,   375,   376,   103,    91,   377,    75
 };
 
 #define tao_yyerrok                (tao_yyerrstatus = 0)
@@ -3075,7 +3078,7 @@ tao_yyreduce:
           (tao_yyvsp[(2) - (8)].idlist)->destroy ();
           delete (tao_yyvsp[(2) - (8)].idlist);
           (tao_yyvsp[(2) - (8)].idlist) = 0;
-
+           
           ast_visitor_context ctx;
           ctx.template_params (ref->template_params ());
           ast_visitor_tmpl_module_ref v (&ctx);
@@ -3085,7 +3088,7 @@ tao_yyreduce:
           // instantiation of the enclosing template module, the
           // visitor copies this implied IDL to the instantiated
           // module scope. The extra copy is less than ideal, but
-          // otherwise we have ugly lookup issues when the
+          // otherwise we have ugly lookup issues when the 
           // referenced template module's contents are referenced
           // using the aliased scoped name.
           if (v.visit_template_module_ref (tmr) != 0)
@@ -4100,7 +4103,7 @@ tao_yyreduce:
                                         AST_PredefinedType::PT_pseudo,
                                         &n
                                       );
-
+              (void) s->add_predefined_type (pdt);
               s->add_to_scope (pdt);
 
               (tao_yyvsp[(1) - (1)].idval)->destroy ();
@@ -7769,7 +7772,7 @@ tao_yyreduce:
   case 424:
 
     {
-//      component_header: IDL_COMPONENT id
+//      id
           idl_global->set_parse_state (IDL_GlobalData::PS_ComponentIDSeen);
         }
     break;
@@ -8690,23 +8693,37 @@ tao_yyreduce:
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           UTL_ScopedName n ((tao_yyvsp[(2) - (2)].idval),
                             0);
+          AST_Operation *o = 0;
           idl_global->set_parse_state (IDL_GlobalData::PS_OpIDSeen);
 
           /*
            * Create a node representing a factory operation
            * and add it to the enclosing scope.
            */
-          AST_Factory *f = idl_global->gen ()->create_factory (&n);
-          (void) s->fe_add_factory (f);
+          if (s != 0)
+            {
+              AST_Home *h = AST_Home::narrow_from_scope (s);
+              
+              o =
+                idl_global->gen ()->create_operation (
+                                        h->managed_component (),
+                                        AST_Operation::OP_noflags,
+                                        &n,
+                                        false,
+                                        false
+                                      );
+                                      
+              h->factories ().enqueue_tail (o);
+            }
 
           (tao_yyvsp[(2) - (2)].idval)->destroy ();
           delete (tao_yyvsp[(2) - (2)].idval);
           (tao_yyvsp[(2) - (2)].idval) = 0;
 
           /*
-           * Push the factory scope onto the scopes stack.
+           * Push the operation scope onto the scopes stack.
            */
-          idl_global->scopes ().push (f);
+          idl_global->scopes ().push (o);
         }
     break;
 
@@ -8723,18 +8740,24 @@ tao_yyreduce:
     {
 //      opt_raises
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
+          AST_Operation *o = 0;
           idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted);
 
           /*
-           * Add exceptions and context to the factory.
+           * Add exceptions and context to the operation.
            */
-          if ((tao_yyvsp[(6) - (6)].nlval) != 0)
+          if (s != 0 && s->scope_node_type () == AST_Decl::NT_op)
             {
-              (void) s->fe_add_exceptions ((tao_yyvsp[(6) - (6)].nlval));
+              o = AST_Operation::narrow_from_scope (s);
+
+              if ((tao_yyvsp[(6) - (6)].nlval) != 0 && o != 0)
+                {
+                  (void) o->fe_add_exceptions ((tao_yyvsp[(6) - (6)].nlval));
+                }
             }
 
           /*
-           * Done with this factory. Pop its scope from the scopes stack.
+           * Done with this operation. Pop its scope from the scopes stack.
            */
           idl_global->scopes ().pop ();
         }
@@ -8747,18 +8770,27 @@ tao_yyreduce:
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           UTL_ScopedName n ((tao_yyvsp[(2) - (2)].idval),
                             0);
-
+          AST_Operation *o = 0;
           idl_global->set_parse_state (IDL_GlobalData::PS_OpIDSeen);
 
           /*
-           * Create a node representing a home finder
+           * Create a node representing a finder operation
            * and add it to the enclosing scope.
            */
-          AST_Finder *f =
-            idl_global->gen ()->create_finder (&n);
-
-          (void) s->fe_add_finder (f);
-
+          if (s != 0)
+            {
+              AST_Home *h = AST_Home::narrow_from_scope (s);
+              
+              o =
+                idl_global->gen ()->create_operation (
+                  h->managed_component (),
+                  AST_Operation::OP_noflags,
+                  &n,
+                  false,
+                  false);
+                                      
+              h->finders ().enqueue_tail (o);
+            }
 
           (tao_yyvsp[(2) - (2)].idval)->destroy ();
           delete (tao_yyvsp[(2) - (2)].idval);
@@ -8767,7 +8799,7 @@ tao_yyreduce:
           /*
            * Push the operation scope onto the scopes stack.
            */
-          idl_global->scopes ().push (f);
+          idl_global->scopes ().push (o);
         }
     break;
 
@@ -8784,14 +8816,20 @@ tao_yyreduce:
     {
 //      opt_raises
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
+          AST_Operation *o = 0;
           idl_global->set_parse_state (IDL_GlobalData::PS_OpRaiseCompleted);
 
           /*
-           * Add exceptions and context to the finder.
+           * Add exceptions and context to the operation.
            */
-          if ((tao_yyvsp[(6) - (6)].nlval) != 0)
+          if (s != 0 && s->scope_node_type () == AST_Decl::NT_op)
             {
-              (void) s->fe_add_exceptions ((tao_yyvsp[(6) - (6)].nlval));
+              o = AST_Operation::narrow_from_scope (s);
+
+              if ((tao_yyvsp[(6) - (6)].nlval) != 0 && o != 0)
+                {
+                  (void) o->fe_add_exceptions ((tao_yyvsp[(6) - (6)].nlval));
+                }
             }
 
           /*
@@ -9723,7 +9761,7 @@ tao_yyreduce:
               parent =
                 AST_Connector::narrow_from_decl (d);
 
-              if (parent == 0)
+              if (parent == 0 && so_far_so_good)
                 {
                   idl_global->err ()->error1 (
                     UTL_Error::EIDL_CONNECTOR_EXPECTED,
@@ -9762,7 +9800,7 @@ tao_yyreduce:
   case 551:
 
     {
-//        connector_exports
+//        at_least_one_connector_export
           idl_global->set_parse_state (IDL_GlobalData::PS_ConnectorBodySeen);
         }
     break;
@@ -9778,7 +9816,7 @@ tao_yyreduce:
         }
     break;
 
-  case 555:
+  case 556:
 
     {
 // connector_export : provides_decl
@@ -9786,7 +9824,7 @@ tao_yyreduce:
         }
     break;
 
-  case 556:
+  case 557:
 
     {
 //        ';'
@@ -9794,7 +9832,7 @@ tao_yyreduce:
         }
     break;
 
-  case 557:
+  case 558:
 
     {
 //        | uses_decl
@@ -9802,7 +9840,7 @@ tao_yyreduce:
         }
     break;
 
-  case 558:
+  case 559:
 
     {
 //        ';'
@@ -9810,7 +9848,7 @@ tao_yyreduce:
         }
     break;
 
-  case 559:
+  case 560:
 
     {
 //      | attribute
@@ -9818,7 +9856,7 @@ tao_yyreduce:
         }
     break;
 
-  case 560:
+  case 561:
 
     {
 //        ';'
@@ -9826,7 +9864,7 @@ tao_yyreduce:
         }
     break;
 
-  case 561:
+  case 562:
 
     {
 //      | extended_port_decl
@@ -9834,7 +9872,7 @@ tao_yyreduce:
         }
     break;
 
-  case 562:
+  case 563:
 
     {
 //        ';'
diff --git a/TAO/TAO_IDL/include/ast_argument.h b/TAO/TAO_IDL/include/ast_argument.h
index 602be943cc9..abbf34a0a7b 100644
--- a/TAO/TAO_IDL/include/ast_argument.h
+++ b/TAO/TAO_IDL/include/ast_argument.h
@@ -84,10 +84,16 @@ public:
       dir_INOUT = 0x04
     };
 
+  // Operations.
+
+  // Constructor(s).
+  AST_Argument (void);
+
   AST_Argument (Direction direction,
                 AST_Type *ft,
                 UTL_ScopedName *n);
 
+  // Destructor.
   virtual ~AST_Argument (void);
 
   // Data Accessors.
@@ -105,8 +111,6 @@ public:
   
   // Cleanup.
   virtual void destroy (void);
-  
-  static AST_Decl::NodeType const NT;
 
 private:
   const Direction pd_direction;
diff --git a/TAO/TAO_IDL/include/ast_array.h b/TAO/TAO_IDL/include/ast_array.h
index 5ba744a4fe0..ef0b1d9651c 100644
--- a/TAO/TAO_IDL/include/ast_array.h
+++ b/TAO/TAO_IDL/include/ast_array.h
@@ -82,12 +82,18 @@ class ast_visitor;
 class TAO_IDL_FE_Export AST_Array : public virtual AST_ConcreteType
 {
 public:
+  // Operations.
+
+  // Constructor(s).
+  AST_Array (void);
+
   AST_Array (UTL_ScopedName *n,
              ACE_CDR::ULong ndims,
              UTL_ExprList *dims,
              bool local,
              bool abstract);
 
+  // Destructor.
   virtual ~AST_Array (void);
 
   // Data Accessors.
@@ -119,8 +125,6 @@ public:
   // Visiting.
   virtual int ast_accept (ast_visitor *visitor);
   
-  static AST_Decl::NodeType const NT;
-  
 protected:
   virtual int compute_size_type (void);
   // Compute the size type if it is unknown.
diff --git a/TAO/TAO_IDL/include/ast_attribute.h b/TAO/TAO_IDL/include/ast_attribute.h
index abdcbdc85ce..161dfe94a7b 100644
--- a/TAO/TAO_IDL/include/ast_attribute.h
+++ b/TAO/TAO_IDL/include/ast_attribute.h
@@ -76,12 +76,18 @@ class UTL_NameList;
 class TAO_IDL_FE_Export AST_Attribute : public virtual AST_Field
 {
 public:
+  // Operations.
+
+  // Constructor(s).
+  AST_Attribute (void);
+
   AST_Attribute (bool readonly,
                  AST_Type *ft,
                  UTL_ScopedName *n,
                  bool local,
                  bool abstract);
 
+  // Destructor.
   virtual ~AST_Attribute (void);
 
   // Data Accessors.
@@ -107,8 +113,6 @@ public:
   UTL_ExceptList *be_add_get_exceptions (UTL_ExceptList *t);
   UTL_ExceptList *be_add_set_exceptions (UTL_ExceptList *t);
 
-  static AST_Decl::NodeType const NT;
-  
 private:
   // Data.
 
diff --git a/TAO/TAO_IDL/include/ast_component.h b/TAO/TAO_IDL/include/ast_component.h
index 820be69593f..c234196aeff 100644
--- a/TAO/TAO_IDL/include/ast_component.h
+++ b/TAO/TAO_IDL/include/ast_component.h
@@ -19,6 +19,8 @@ class TAO_IDL_FE_Export AST_Component
   : public virtual AST_Interface
 {
 public:
+  AST_Component (void);
+
   AST_Component (UTL_ScopedName *n,
                  AST_Component *base_component,
                  AST_Type **supports,
@@ -67,9 +69,6 @@ public:
   // Visiting.
   virtual int ast_accept (ast_visitor *visitor);
 
-  static AST_Decl::NodeType const NT;
-  typedef AST_ComponentFwd FWD_TYPE;
-  
 protected:
   virtual AST_Provides *fe_add_provides (AST_Provides *p);
 
diff --git a/TAO/TAO_IDL/include/ast_component_fwd.h b/TAO/TAO_IDL/include/ast_component_fwd.h
index 7b2f355925a..3b5186f506b 100644
--- a/TAO/TAO_IDL/include/ast_component_fwd.h
+++ b/TAO/TAO_IDL/include/ast_component_fwd.h
@@ -11,6 +11,8 @@
 class TAO_IDL_FE_Export AST_ComponentFwd : public virtual AST_InterfaceFwd
 {
 public:
+  AST_ComponentFwd (void);
+
   AST_ComponentFwd (AST_Interface *dummy,
                     UTL_ScopedName *n);
 
@@ -28,8 +30,6 @@ public:
 
   // Visiting.
   virtual int ast_accept (ast_visitor *visitor);
-
-  static AST_Decl::NodeType const NT;
 };
 
 #endif           // _AST_COMPONENT_FWD_AST_COMPONENT_FWD_HH
diff --git a/TAO/TAO_IDL/include/ast_concrete_type.h b/TAO/TAO_IDL/include/ast_concrete_type.h
index 44e961be886..65344dc2bec 100644
--- a/TAO/TAO_IDL/include/ast_concrete_type.h
+++ b/TAO/TAO_IDL/include/ast_concrete_type.h
@@ -75,15 +75,22 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 class TAO_IDL_FE_Export AST_ConcreteType : public virtual AST_Type
 {
 public:
+  // Operations.
+
+  // Constructor(s).
+  AST_ConcreteType (void);
+
   AST_ConcreteType (AST_Decl::NodeType nt,
                     UTL_ScopedName *n);
 
+  // Destructor.
   virtual ~AST_ConcreteType (void);
   
   // Cleanup.
   virtual void destroy (void);
 
   // Narrowing.
+
   DEF_NARROW_FROM_DECL(AST_ConcreteType);
 };
 
diff --git a/TAO/TAO_IDL/include/ast_connector.h b/TAO/TAO_IDL/include/ast_connector.h
index 33c39f352e8..f3cca4b475c 100644
--- a/TAO/TAO_IDL/include/ast_connector.h
+++ b/TAO/TAO_IDL/include/ast_connector.h
@@ -33,8 +33,6 @@ public:
 
   // Visiting.
   virtual int ast_accept (ast_visitor *visitor);
-
-  static AST_Decl::NodeType const NT;
 };
 
 #endif // AST_CONNECTOR_H
diff --git a/TAO/TAO_IDL/include/ast_constant.h b/TAO/TAO_IDL/include/ast_constant.h
index 9a291f565f3..aee9aed5b9f 100644
--- a/TAO/TAO_IDL/include/ast_constant.h
+++ b/TAO/TAO_IDL/include/ast_constant.h
@@ -84,6 +84,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 class TAO_IDL_FE_Export AST_Constant : public virtual AST_Decl
 {
 public:
+  AST_Constant (void);
+
   AST_Constant (AST_Expression::ExprType et,
                 AST_Decl::NodeType nt,
                 AST_Expression *ev,
@@ -125,8 +127,6 @@ public:
   // Cleanup.
   virtual void destroy (void);
 
-  static AST_Decl::NodeType const NT;
-
 protected:
   AST_Expression *pd_constant_value;
   // The value.
diff --git a/TAO/TAO_IDL/include/ast_consumes.h b/TAO/TAO_IDL/include/ast_consumes.h
index df6f3b0fe9f..58ef62049d6 100644
--- a/TAO/TAO_IDL/include/ast_consumes.h
+++ b/TAO/TAO_IDL/include/ast_consumes.h
@@ -30,8 +30,6 @@ public:
   
   // Cleanup.
   virtual void destroy (void);
-
-  static AST_Decl::NodeType const NT;
 };
 
 #endif // AST_CONSUMES_H
diff --git a/TAO/TAO_IDL/include/ast_decl.h b/TAO/TAO_IDL/include/ast_decl.h
index 58aa779927a..5187a98fc9f 100644
--- a/TAO/TAO_IDL/include/ast_decl.h
+++ b/TAO/TAO_IDL/include/ast_decl.h
@@ -95,6 +95,7 @@ class ast_visitor;
 class TAO_IDL_FE_Export COMMON_Base
 {
 public:
+
   COMMON_Base (bool local = false,
                bool abstract = false);
 
@@ -110,6 +111,9 @@ public:
   // A no-op, overridden in the child classes.
   virtual void destroy (void);
 
+        // Narrowing.
+
+
 protected:
   bool is_local_;
   bool is_abstract_;
@@ -148,14 +152,13 @@ public:
       , NT_native                   // Denotes a native type
                                     // dependent on the programming
                                     // language
-      , NT_factory                  // Denotes a OBV or home factory construct
-      , NT_finder                   // Denotes a home finder construct
+      , NT_factory                  // Denotes a OBV factory construct
       , NT_component                // Denotes a CORBA component
       , NT_component_fwd            // Denotes a forward declared component
       , NT_home                     // Denotes a CORBA component home
       , NT_eventtype                // Denotes a CCM event source or sink
       , NT_eventtype_fwd            // Denotes a forward declared CCM event
-      , NT_valuebox                 // Denotes a value box
+      , NT_valuebox                 // Denotes an value box
       , NT_type                     // Template interface parameter
       , NT_fixed                    // Denotes (unsupported) fixed type
       , NT_porttype                 // Denotes a port type
@@ -170,6 +173,11 @@ public:
       , NT_param_holder             // Denotes a template param placeholder
   };
 
+  // Operations.
+
+  // Constructor(s).
+  AST_Decl (void);
+
   AST_Decl (NodeType type,
             UTL_ScopedName *n,
             bool anonymous = false);
@@ -253,6 +261,9 @@ public:
   Identifier *original_local_name (void);
   void original_local_name (Identifier *);
 
+  bool added (void);
+  void set_added (bool is_it);
+
   // Narrowing.
 
   DEF_NARROW_FROM_DECL(AST_Decl);
@@ -346,6 +357,9 @@ private:
   Identifier *pd_original_local_name;
   // _cxx_ removed if any.
 
+  bool pd_added;
+  // Already added.
+
   char *full_name_;
   // Our full scoped name.
 
diff --git a/TAO/TAO_IDL/include/ast_emits.h b/TAO/TAO_IDL/include/ast_emits.h
index d1aba825406..c9fc200dfce 100644
--- a/TAO/TAO_IDL/include/ast_emits.h
+++ b/TAO/TAO_IDL/include/ast_emits.h
@@ -30,8 +30,6 @@ public:
   
   // Cleanup.
   virtual void destroy (void);
-
-  static AST_Decl::NodeType const NT;
 };
 
 #endif // AST_EMITS_H
diff --git a/TAO/TAO_IDL/include/ast_enum.h b/TAO/TAO_IDL/include/ast_enum.h
index 61e6fd49fb8..d1df0ba3b1c 100644
--- a/TAO/TAO_IDL/include/ast_enum.h
+++ b/TAO/TAO_IDL/include/ast_enum.h
@@ -72,11 +72,11 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 class AST_EnumVal;
 
-class TAO_IDL_FE_Export AST_Enum
-  : public virtual AST_ConcreteType,
-    public virtual UTL_Scope
+class TAO_IDL_FE_Export AST_Enum : public virtual AST_ConcreteType,
+                                   public virtual UTL_Scope
 {
 public:
+  AST_Enum (void);
   AST_Enum (UTL_ScopedName *n,
             bool local,
             bool abstract);
@@ -109,8 +109,6 @@ public:
   // Visiting.
   virtual int ast_accept (ast_visitor *visitor);
 
-  static AST_Decl::NodeType const NT;
-
 private:
   friend int tao_yyparse (void);
 
diff --git a/TAO/TAO_IDL/include/ast_enum_val.h b/TAO/TAO_IDL/include/ast_enum_val.h
index 862ff167f26..80af9da9230 100644
--- a/TAO/TAO_IDL/include/ast_enum_val.h
+++ b/TAO/TAO_IDL/include/ast_enum_val.h
@@ -74,12 +74,19 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 class TAO_IDL_FE_Export AST_EnumVal : public virtual AST_Constant
 {
 public:
+  // Operations.
+
+  // Constructor(s).
+  AST_EnumVal (void);
+
   AST_EnumVal (ACE_CDR::ULong v,
                UTL_ScopedName *n);
 
+  // Destructor.
   virtual ~AST_EnumVal (void);
 
   // Narrowing.
+
   DEF_NARROW_FROM_DECL(AST_EnumVal);
 
   // AST Dumping.
@@ -87,8 +94,6 @@ public:
 
   // Visiting.
   virtual int ast_accept (ast_visitor *visitor);
-
-  static AST_Decl::NodeType const NT;
 };
 
 #endif           // _AST_ENUM_VAL_AST_ENUM_VAL_HH
diff --git a/TAO/TAO_IDL/include/ast_eventtype.h b/TAO/TAO_IDL/include/ast_eventtype.h
index c002947fd6d..fad9ed9e40d 100644
--- a/TAO/TAO_IDL/include/ast_eventtype.h
+++ b/TAO/TAO_IDL/include/ast_eventtype.h
@@ -9,6 +9,8 @@
 class TAO_IDL_FE_Export AST_EventType : public virtual AST_ValueType
 {
 public:
+  AST_EventType (void);
+
   AST_EventType (UTL_ScopedName *n,
                  AST_Type **inherits,
                  long n_inherits,
@@ -37,9 +39,6 @@ public:
 
   // Visiting.
   virtual int ast_accept (ast_visitor *visitor);
-
-  static AST_Decl::NodeType const NT;
-  typedef AST_EventTypeFwd FWD_TYPE;
 };
 
 #endif           // _AST_VALUETYPE_AST_EVENTTYPE_HH
diff --git a/TAO/TAO_IDL/include/ast_eventtype_fwd.h b/TAO/TAO_IDL/include/ast_eventtype_fwd.h
index 1d7f9fe27d8..b7f2729b69d 100644
--- a/TAO/TAO_IDL/include/ast_eventtype_fwd.h
+++ b/TAO/TAO_IDL/include/ast_eventtype_fwd.h
@@ -11,6 +11,8 @@
 class TAO_IDL_FE_Export AST_EventTypeFwd : public virtual AST_ValueTypeFwd
 {
 public:
+  AST_EventTypeFwd (void);
+
   AST_EventTypeFwd (AST_Interface *dummy,
                     UTL_ScopedName *n);
 
@@ -28,8 +30,6 @@ public:
 
   // Visiting.
   virtual int ast_accept (ast_visitor *visitor);
-
-  static AST_Decl::NodeType const NT;
 };
 
 #endif           // _AST_VALUETYPE_FWD_AST_EVENTTYPE_FWD_HH
diff --git a/TAO/TAO_IDL/include/ast_exception.h b/TAO/TAO_IDL/include/ast_exception.h
index f70a512353c..7ea88871915 100644
--- a/TAO/TAO_IDL/include/ast_exception.h
+++ b/TAO/TAO_IDL/include/ast_exception.h
@@ -80,6 +80,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 class TAO_IDL_FE_Export AST_Exception : public virtual AST_Structure
 {
 public:
+  AST_Exception (void);
+
   AST_Exception (UTL_ScopedName *n,
                  bool local,
                  bool abstract);
@@ -103,7 +105,15 @@ public:
   // Cleanup.
   virtual void destroy (void);
 
-  static AST_Decl::NodeType const NT;
+private:
+  friend int tao_yyparse (void);
+
+  // Scope Management Protocol.
+  virtual AST_Field *fe_add_field (AST_Field *f);
+  virtual AST_Union *fe_add_union (AST_Union *u);
+  virtual AST_Structure *fe_add_structure (AST_Structure *s);
+  virtual AST_Enum *fe_add_enum (AST_Enum *e);
+  virtual AST_EnumVal *fe_add_enum_val (AST_EnumVal *v);
 };
 
 #endif           // _AST_EXCEPTION_AST_EXCEPTION_HH
diff --git a/TAO/TAO_IDL/include/ast_extended_port.h b/TAO/TAO_IDL/include/ast_extended_port.h
index 2874e565b0f..f44748286c7 100644
--- a/TAO/TAO_IDL/include/ast_extended_port.h
+++ b/TAO/TAO_IDL/include/ast_extended_port.h
@@ -31,8 +31,6 @@ public:
 
   // Visiting.
   virtual int ast_accept (ast_visitor *visitor);
-
-  static AST_Decl::NodeType const NT;
 };
 
 #endif /* AST_EXTENDED_PORT_H */
diff --git a/TAO/TAO_IDL/include/ast_factory.h b/TAO/TAO_IDL/include/ast_factory.h
index 1f9fc6bcfbd..f11092b7f3d 100644
--- a/TAO/TAO_IDL/include/ast_factory.h
+++ b/TAO/TAO_IDL/include/ast_factory.h
@@ -67,8 +67,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #ifndef _AST_FACTORY_AST_FACTORY_HH
 #define _AST_FACTORY_AST_FACTORY_HH
 
-// Representation of OBV and component home factory
-// construct declaration.
+// Representation of OBV factory construct declaration.
 
 #include "ast_decl.h"
 #include "utl_scope.h"
@@ -80,10 +79,19 @@ class TAO_IDL_FE_Export AST_Factory : public virtual AST_Decl,
                                       public virtual UTL_Scope
 {
 public:
+
+  // Constructor(s).
+  AST_Factory (void);
+
   AST_Factory (UTL_ScopedName *n);
 
+  // Destructor.
   virtual ~AST_Factory (void);
 
+  // Data Accessors.
+
+  // Public operations.
+
   UTL_ExceptList *exceptions (void);
   // Return exception list.
 
@@ -115,8 +123,6 @@ public:
   // Method to add exceptions.
   UTL_ExceptList *be_add_exceptions (UTL_ExceptList *t);
 
-  static AST_Decl::NodeType const NT;
-
 protected:
   // Data.
 
diff --git a/TAO/TAO_IDL/include/ast_field.h b/TAO/TAO_IDL/include/ast_field.h
index 8641de10063..3c5f9de1e35 100644
--- a/TAO/TAO_IDL/include/ast_field.h
+++ b/TAO/TAO_IDL/include/ast_field.h
@@ -91,6 +91,11 @@ public:
       vis_PRIVATE
     };
 
+  // Operations.
+
+  // Constructor(s).
+  AST_Field (void);
+
   AST_Field (AST_Type *field_type,
              UTL_ScopedName *n,
              Visibility vis = vis_NA);
@@ -127,8 +132,6 @@ public:
   // Cleanup.
   virtual void destroy (void);
 
-  static AST_Decl::NodeType const NT;
-
 protected:
   // Data.
 
diff --git a/TAO/TAO_IDL/include/ast_finder.h b/TAO/TAO_IDL/include/ast_finder.h
deleted file mode 100644
index 8e6b55f3688..00000000000
--- a/TAO/TAO_IDL/include/ast_finder.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-#ifndef TAO_IDL_AST_FINDER_H
-#define TAO_IDL_AST_FINDER_H
-
-// Representation of component home finder construct declaration.
-
-#include "ast_factory.h"
-
-class TAO_IDL_FE_Export AST_Finder : public virtual AST_Factory
-{
-public:
-
-  AST_Finder (UTL_ScopedName *n);
-
-  virtual ~AST_Finder (void);
-  // Narrowing.
-
-  DEF_NARROW_FROM_DECL(AST_Finder);
-  DEF_NARROW_FROM_SCOPE(AST_Finder);
-
-  // AST Dumping.
-  virtual void dump (ACE_OSTREAM_TYPE &o);
-
-  // Cleanup function.
-  virtual void destroy (void);
-
-  // Visiting.
-  virtual int ast_accept (ast_visitor *visitor);
-
-  static AST_Decl::NodeType const NT;
-};
-
-#endif // TAO_IDL_AST_FINDER_H
diff --git a/TAO/TAO_IDL/include/ast_generator.h b/TAO/TAO_IDL/include/ast_generator.h
index 291dd6efabc..fa342900cad 100644
--- a/TAO/TAO_IDL/include/ast_generator.h
+++ b/TAO/TAO_IDL/include/ast_generator.h
@@ -92,7 +92,6 @@ class AST_Template_Module;
 class AST_Template_Module_Inst;
 class AST_Template_Module_Ref;
 class AST_Param_Holder;
-class AST_Finder;
 
 // Defines base class for node generators.
 
@@ -347,12 +346,9 @@ public:
   // Create a node representing a native.
   virtual AST_Native *create_native (UTL_ScopedName *n);
 
-  // Create a node representing an OBV or home factory construct.
+  // Create a node representing an OBV factory construct.
   virtual AST_Factory *create_factory (UTL_ScopedName *n);
 
-  // Create a node representing an home finder construct.
-  virtual AST_Finder *create_finder (UTL_ScopedName *n);
-
   // Create a node representing a valuebox.
   virtual AST_ValueBox *create_valuebox (UTL_ScopedName *n,
                                          AST_Type *boxed_type);
diff --git a/TAO/TAO_IDL/include/ast_home.h b/TAO/TAO_IDL/include/ast_home.h
index 4d7f38ae283..1dafeaeda0a 100644
--- a/TAO/TAO_IDL/include/ast_home.h
+++ b/TAO/TAO_IDL/include/ast_home.h
@@ -5,6 +5,7 @@
 #define _AST_HOME_AST_HOME_HH
 
 #include "ast_interface.h"
+#include "ace/Unbounded_Queue.h"
 
 class AST_Home;
 class AST_Component;
@@ -13,6 +14,8 @@ class AST_ValueType;
 class TAO_IDL_FE_Export AST_Home : public virtual AST_Interface
 {
 public:
+  AST_Home (void);
+
   AST_Home (UTL_ScopedName *n,
             AST_Home *base_home,
             AST_Component *managed_component,
@@ -43,6 +46,12 @@ public:
   AST_Component *managed_component (void) const;
 
   AST_Type *primary_key (void) const;
+  
+  typedef ACE_Unbounded_Queue<AST_Operation *> INIT_LIST;
+
+  INIT_LIST &factories (void);
+
+  INIT_LIST &finders (void);
 
   // Cleanup function.
   virtual void destroy (void);
@@ -58,21 +67,12 @@ public:
   // Visiting.
   virtual int ast_accept (ast_visitor *visitor);
 
-  static AST_Decl::NodeType const NT;
-  
-private:
-  // Scope Management Protocol.
-  
-  friend int tao_yyparse (void);
-  friend class ast_visitor_tmpl_module_inst;
-
-  virtual AST_Factory *fe_add_factory (AST_Factory *f);
-  virtual AST_Finder *fe_add_finder (AST_Finder *f);
-
 private:
   AST_Home *pd_base_home;
   AST_Component *pd_managed_component;
   AST_Type *pd_primary_key;
+  INIT_LIST pd_factories;
+  INIT_LIST pd_finders;
   bool owns_primary_key_;
 };
 
diff --git a/TAO/TAO_IDL/include/ast_interface.h b/TAO/TAO_IDL/include/ast_interface.h
index 1f6e97c0042..2e59a7444a5 100644
--- a/TAO/TAO_IDL/include/ast_interface.h
+++ b/TAO/TAO_IDL/include/ast_interface.h
@@ -78,6 +78,8 @@ class TAO_IDL_FE_Export AST_Interface : public virtual AST_Type,
                                         public virtual UTL_Scope
 {
 public:
+  AST_Interface (void);
+
   AST_Interface (UTL_ScopedName *n,
                  AST_Type **ih,
                  long nih,
@@ -151,9 +153,6 @@ public:
   // Visiting.
   virtual int ast_accept (ast_visitor *visitor);
 
-  static AST_Decl::NodeType const NT;
-  typedef AST_InterfaceFwd FWD_TYPE;
-
 protected:
   // Data.
 
@@ -204,6 +203,8 @@ protected:
 
   virtual AST_Attribute *fe_add_attribute (AST_Attribute *a);
 
+  virtual AST_Field *fe_add_field (AST_Field *o);
+
   virtual AST_Operation *fe_add_operation (AST_Operation *o);
 
   virtual AST_Union *fe_add_union (AST_Union *u);
@@ -224,7 +225,8 @@ protected:
 
   // Lookup based on the local name, override of UTL_Scope definition.
   // This version checks for redefinitions of attributes or operations.
-  AST_Decl *lookup_for_add (AST_Decl *d);
+  AST_Decl *lookup_for_add (AST_Decl *d,
+                            bool treat_as_ref);
 
   void redef_clash_populate_r (AST_Type *t);
   // Populate the insert queue with our parents, and, if we are a
diff --git a/TAO/TAO_IDL/include/ast_interface_fwd.h b/TAO/TAO_IDL/include/ast_interface_fwd.h
index 0722940a66d..925f55bbc70 100644
--- a/TAO/TAO_IDL/include/ast_interface_fwd.h
+++ b/TAO/TAO_IDL/include/ast_interface_fwd.h
@@ -76,6 +76,8 @@ class AST_Interface;
 class TAO_IDL_FE_Export AST_InterfaceFwd : public virtual AST_Type
 {
 public:
+  AST_InterfaceFwd (void);
+
   AST_InterfaceFwd (AST_Interface *dummy,
                     UTL_ScopedName *n);
 
@@ -106,8 +108,6 @@ public:
   // Visiting.
   virtual int ast_accept (ast_visitor *visitor);
 
-  static AST_Decl::NodeType const NT;
-
 private:
   AST_Interface *pd_full_definition;
   // The interface this is a forward declaration of.
diff --git a/TAO/TAO_IDL/include/ast_mirror_port.h b/TAO/TAO_IDL/include/ast_mirror_port.h
index 60d926ecc33..1b7834d5914 100644
--- a/TAO/TAO_IDL/include/ast_mirror_port.h
+++ b/TAO/TAO_IDL/include/ast_mirror_port.h
@@ -28,8 +28,6 @@ public:
 
   // Visiting.
   virtual int ast_accept (ast_visitor *visitor);
-
-  static AST_Decl::NodeType const NT;
 };
 
 #endif /* AST_MIRROR_PORT_H */
diff --git a/TAO/TAO_IDL/include/ast_module.h b/TAO/TAO_IDL/include/ast_module.h
index 8c0a9acc51f..d919f8d55f6 100644
--- a/TAO/TAO_IDL/include/ast_module.h
+++ b/TAO/TAO_IDL/include/ast_module.h
@@ -81,11 +81,17 @@ class TAO_IDL_FE_Export AST_Module : public virtual AST_Decl,
                                      public virtual UTL_Scope
 {
 public:
+  // Operations.
+
+  // Constructor(s) and destructor.
+  AST_Module (void);
+
   AST_Module (UTL_ScopedName *n);
 
   virtual ~AST_Module (void);
 
   // Narrowing.
+
   DEF_NARROW_FROM_DECL(AST_Module);
   DEF_NARROW_FROM_SCOPE(AST_Module);
 
@@ -108,7 +114,7 @@ public:
   // Has this node been referenced here already?
   // Override of method in UTL_Scope.
   virtual bool referenced (AST_Decl *e,
-                           Identifier *id = 0);
+                               Identifier *id = 0);
 
   // Add decls from previous opening of this module to the
   // 'previous' set of this module, along with the argument's
@@ -128,8 +134,6 @@ public:
   // Visiting.
   virtual int ast_accept (ast_visitor *visitor);
 
-  static AST_Decl::NodeType const NT;
-
 private:
   friend void fe_populate_global_scope (AST_Module *m);
   friend int tao_yyparse (void);
diff --git a/TAO/TAO_IDL/include/ast_native.h b/TAO/TAO_IDL/include/ast_native.h
index 7b831c8f419..719e2a67915 100644
--- a/TAO/TAO_IDL/include/ast_native.h
+++ b/TAO/TAO_IDL/include/ast_native.h
@@ -15,14 +15,24 @@
 class TAO_IDL_FE_Export AST_Native : public virtual AST_Exception
 {
 public:
+  // Operations.
+
+  // Constructor(s).
+
+  AST_Native (void);
+  // Default constructor.
+
   AST_Native (UTL_ScopedName *n);
+  // Constructor that initializes the scoped name.
 
   virtual ~AST_Native (void);
+  // Destructor.
   
-  // Cleanup.
   virtual void destroy (void);
+  // Cleanup.
 
   // Narrowing.
+
   DEF_NARROW_FROM_DECL(AST_Native);
 
   // AST Dumping.
@@ -30,8 +40,6 @@ public:
 
   // Visiting.
   virtual int ast_accept (ast_visitor *visitor);
-
-  static AST_Decl::NodeType const NT;
 };
 
 #endif /* AST_NATIVE_H */
diff --git a/TAO/TAO_IDL/include/ast_operation.h b/TAO/TAO_IDL/include/ast_operation.h
index 75fae11e3de..d1aef80a39a 100644
--- a/TAO/TAO_IDL/include/ast_operation.h
+++ b/TAO/TAO_IDL/include/ast_operation.h
@@ -85,12 +85,16 @@ public:
      , OP_idempotent            // Operation is idempotent.
   };
 
+  // Constructor(s).
+  AST_Operation (void);
+
   AST_Operation (AST_Type *return_type,
                  Flags flags,
                  UTL_ScopedName *n,
                  bool local,
                  bool abstract);
 
+  // Destructor.
   virtual ~AST_Operation (void);
 
   // Data Accessors.
@@ -145,8 +149,6 @@ public:
   // Method to add exceptions
   UTL_ExceptList *be_add_exceptions (UTL_ExceptList *t);
 
-  static AST_Decl::NodeType const NT;
-
 protected:
   // Data.
 
diff --git a/TAO/TAO_IDL/include/ast_param_holder.h b/TAO/TAO_IDL/include/ast_param_holder.h
index 0f8fcb8a6a9..e3358fe273b 100644
--- a/TAO/TAO_IDL/include/ast_param_holder.h
+++ b/TAO/TAO_IDL/include/ast_param_holder.h
@@ -31,8 +31,6 @@ public:
   // Visiting.
   virtual int ast_accept (ast_visitor *visitor);
 
-  static AST_Decl::NodeType const NT;
-
 private:
   FE_Utils::T_Param_Info *info_;
 };
diff --git a/TAO/TAO_IDL/include/ast_porttype.h b/TAO/TAO_IDL/include/ast_porttype.h
index 27306bcc055..feabf056b20 100644
--- a/TAO/TAO_IDL/include/ast_porttype.h
+++ b/TAO/TAO_IDL/include/ast_porttype.h
@@ -35,8 +35,6 @@ public:
 
   // Visiting.
   virtual int ast_accept (ast_visitor *visitor);
-
-  static AST_Decl::NodeType const NT;
   
 protected:
   virtual AST_Provides *fe_add_provides (AST_Provides *p);
diff --git a/TAO/TAO_IDL/include/ast_predefined_type.h b/TAO/TAO_IDL/include/ast_predefined_type.h
index d5a4860fd4f..e076bbe1ee4 100644
--- a/TAO/TAO_IDL/include/ast_predefined_type.h
+++ b/TAO/TAO_IDL/include/ast_predefined_type.h
@@ -98,6 +98,11 @@ public:
       , PT_pseudo       // Predefined type for pseudo objects
     };
 
+  // Operations.
+
+  // Constructor(s).
+  AST_PredefinedType (void);
+
   AST_PredefinedType (PredefinedType t,
                       UTL_ScopedName *n);
 
@@ -107,6 +112,7 @@ public:
   PredefinedType pt (void);
 
   // Narrowing
+
   DEF_NARROW_FROM_DECL(AST_PredefinedType);
 
   // AST Dumping
@@ -118,8 +124,6 @@ public:
   // Cleanup.
   virtual void destroy (void);
 
-  static AST_Decl::NodeType const NT;
-
 protected:
   virtual int compute_size_type (void);
   // Compute the size type if it is unknown.
diff --git a/TAO/TAO_IDL/include/ast_provides.h b/TAO/TAO_IDL/include/ast_provides.h
index 8d4b5546092..244954fb32f 100644
--- a/TAO/TAO_IDL/include/ast_provides.h
+++ b/TAO/TAO_IDL/include/ast_provides.h
@@ -28,8 +28,6 @@ public:
 
   // Cleanup.
   virtual void destroy (void);
-
-  static AST_Decl::NodeType const NT;
 };
 
 #endif // AST_PROVIDES_H
diff --git a/TAO/TAO_IDL/include/ast_publishes.h b/TAO/TAO_IDL/include/ast_publishes.h
index a6208a1f59f..ceb225e7b80 100644
--- a/TAO/TAO_IDL/include/ast_publishes.h
+++ b/TAO/TAO_IDL/include/ast_publishes.h
@@ -30,8 +30,6 @@ public:
   
   // Cleanup.
   virtual void destroy (void);
-
-  static AST_Decl::NodeType const NT;
 };
 
 #endif // AST_PUBLISHES_H
diff --git a/TAO/TAO_IDL/include/ast_root.h b/TAO/TAO_IDL/include/ast_root.h
index 06560ecbac6..133c5c2c642 100644
--- a/TAO/TAO_IDL/include/ast_root.h
+++ b/TAO/TAO_IDL/include/ast_root.h
@@ -74,6 +74,8 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 class TAO_IDL_FE_Export AST_Root : public virtual AST_Module
 {
 public:
+  AST_Root (void);
+
   AST_Root (UTL_ScopedName *n);
 
   virtual ~AST_Root (void);
@@ -97,8 +99,6 @@ public:
   // Final cleanup.
   void fini (void);
 
-  static AST_Decl::NodeType const NT;
-
 private:
   friend class FE_Declarator;
   friend int tao_yyparse (void);
diff --git a/TAO/TAO_IDL/include/ast_sequence.h b/TAO/TAO_IDL/include/ast_sequence.h
index f0a9e7dfedb..42646602968 100644
--- a/TAO/TAO_IDL/include/ast_sequence.h
+++ b/TAO/TAO_IDL/include/ast_sequence.h
@@ -73,9 +73,13 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 class AST_Expression;
 class AST_Type;
 
+// A sequence is a combination of a maximum size and a base type.
+
 class TAO_IDL_FE_Export AST_Sequence : public virtual AST_ConcreteType
 {
 public:
+  AST_Sequence (void);
+
   AST_Sequence (AST_Expression *max_size,
                 AST_Type *bt,
                 UTL_ScopedName *n,
@@ -117,8 +121,6 @@ public:
   // Visiting.
   virtual int ast_accept (ast_visitor *visitor);
 
-  static AST_Decl::NodeType const NT;
-
 private:
   // Data.
   AST_Expression *pd_max_size;
diff --git a/TAO/TAO_IDL/include/ast_string.h b/TAO/TAO_IDL/include/ast_string.h
index 76b73c2e00b..a786dd9f60a 100644
--- a/TAO/TAO_IDL/include/ast_string.h
+++ b/TAO/TAO_IDL/include/ast_string.h
@@ -78,6 +78,11 @@ class AST_Expression;
 class TAO_IDL_FE_Export AST_String : public virtual AST_ConcreteType
 {
 public:
+  // Operations.
+
+  // Constructor(s) and destructor
+  AST_String (void);
+
   AST_String (AST_Decl::NodeType nt,
               UTL_ScopedName *n,
               AST_Expression *max_size,
@@ -90,6 +95,7 @@ public:
   long width (void);
 
   // Narrowing.
+
   DEF_NARROW_FROM_DECL(AST_String);
 
   // AST Dumping.
@@ -101,8 +107,6 @@ public:
   // Cleanup.
   virtual void destroy (void);
 
-  static AST_Decl::NodeType const NT;
-
 private:
   // Data.
 
diff --git a/TAO/TAO_IDL/include/ast_structure.h b/TAO/TAO_IDL/include/ast_structure.h
index 7539b64c5a7..d93f06a388b 100644
--- a/TAO/TAO_IDL/include/ast_structure.h
+++ b/TAO/TAO_IDL/include/ast_structure.h
@@ -81,11 +81,12 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "utl_scope.h"
 #include "ace/Unbounded_Queue.h"
 
-class TAO_IDL_FE_Export AST_Structure
-  : public virtual AST_ConcreteType,
-    public virtual UTL_Scope
+class TAO_IDL_FE_Export AST_Structure : public virtual AST_ConcreteType,
+                                        public virtual UTL_Scope
 {
 public:
+  AST_Structure (void);
+
   AST_Structure (UTL_ScopedName *n,
                  bool local,
                  bool abstract);
@@ -150,11 +151,6 @@ public:
 
   // Visiting.
   virtual int ast_accept (ast_visitor *visitor);
-  
-  // Accessor for the member.
-  ACE_Unbounded_Queue<AST_Field *> &fields (void);
-
-  static AST_Decl::NodeType const NT;
 
 protected:
   friend int tao_yyparse (void);
diff --git a/TAO/TAO_IDL/include/ast_structure_fwd.h b/TAO/TAO_IDL/include/ast_structure_fwd.h
index 20a7ec23306..75db243bc69 100644
--- a/TAO/TAO_IDL/include/ast_structure_fwd.h
+++ b/TAO/TAO_IDL/include/ast_structure_fwd.h
@@ -13,6 +13,8 @@ class AST_Structure;
 class TAO_IDL_FE_Export AST_StructureFwd : public virtual AST_Type
 {
 public:
+  AST_StructureFwd (void);
+
   AST_StructureFwd (AST_Structure *full_defn,
                     UTL_ScopedName *n);
 
@@ -37,8 +39,6 @@ public:
   // Visiting.
   virtual int ast_accept (ast_visitor *visitor);
 
-  static AST_Decl::NodeType const NT;
-
 private:
   AST_Structure *pd_full_definition;
   // The structure this is a forward declaration of.
diff --git a/TAO/TAO_IDL/include/ast_template_module.h b/TAO/TAO_IDL/include/ast_template_module.h
index 41a51e9fda1..618efcb3fd2 100644
--- a/TAO/TAO_IDL/include/ast_template_module.h
+++ b/TAO/TAO_IDL/include/ast_template_module.h
@@ -46,8 +46,6 @@ public:
   AST_Template_Module_Ref *fe_add_template_module_ref (
     AST_Template_Module_Ref *m);
 
-  static AST_Decl::NodeType const NT;
-
 protected:
   FE_Utils::T_PARAMLIST_INFO * template_params_;
   
diff --git a/TAO/TAO_IDL/include/ast_template_module_inst.h b/TAO/TAO_IDL/include/ast_template_module_inst.h
index ebe5e3c0d6c..2d40c1c6e10 100644
--- a/TAO/TAO_IDL/include/ast_template_module_inst.h
+++ b/TAO/TAO_IDL/include/ast_template_module_inst.h
@@ -35,8 +35,6 @@ public:
 
   // Visiting.
   virtual int ast_accept (ast_visitor *visitor);
-
-  static AST_Decl::NodeType const NT;
   
 private:
   FE_Utils::T_ARGLIST * template_args_;
diff --git a/TAO/TAO_IDL/include/ast_template_module_ref.h b/TAO/TAO_IDL/include/ast_template_module_ref.h
index f592554ab39..66c21b14391 100644
--- a/TAO/TAO_IDL/include/ast_template_module_ref.h
+++ b/TAO/TAO_IDL/include/ast_template_module_ref.h
@@ -35,8 +35,6 @@ public:
   // Visiting.
   virtual int ast_accept (ast_visitor *visitor);
 
-  static AST_Decl::NodeType const NT;
-
 private:
   UTL_StrList * param_refs_;
 };
diff --git a/TAO/TAO_IDL/include/ast_type.h b/TAO/TAO_IDL/include/ast_type.h
index 0dda0c76988..d857b679292 100644
--- a/TAO/TAO_IDL/include/ast_type.h
+++ b/TAO/TAO_IDL/include/ast_type.h
@@ -88,6 +88,10 @@ public:
   // Indicates if we are fixed size or variable. Most useful for structs,
   // unions, and arrays.
 
+  // Operations.
+
+  AST_Type (void);
+
   AST_Type (AST_Decl::NodeType nt,
             UTL_ScopedName *n);
 
diff --git a/TAO/TAO_IDL/include/ast_typedef.h b/TAO/TAO_IDL/include/ast_typedef.h
index e5ce4633bd4..711ac151be7 100644
--- a/TAO/TAO_IDL/include/ast_typedef.h
+++ b/TAO/TAO_IDL/include/ast_typedef.h
@@ -115,8 +115,6 @@ public:
   // Cleanup.
   virtual void destroy (void);
 
-  static AST_Decl::NodeType const NT;
-
 protected:
   virtual int compute_size_type (void);
   // Compute the size type if it is unknown.
diff --git a/TAO/TAO_IDL/include/ast_union.h b/TAO/TAO_IDL/include/ast_union.h
index 9be71f68e60..ca030315a1f 100644
--- a/TAO/TAO_IDL/include/ast_union.h
+++ b/TAO/TAO_IDL/include/ast_union.h
@@ -80,11 +80,17 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 class TAO_IDL_FE_Export AST_Union : public virtual AST_Structure
 {
 public:
+  // Operations.
+
+  // Constructor(s).
+  AST_Union (void);
+
   AST_Union (AST_ConcreteType *disc_type,
              UTL_ScopedName *n,
              bool local,
              bool abstract);
 
+  // Destructor.
   virtual ~AST_Union (void);
 
   // This also calls the base class version.
@@ -100,6 +106,7 @@ public:
   AST_Expression::ExprType udisc_type (void);
 
   // Narrowing.
+
   DEF_NARROW_FROM_DECL(AST_Union);
   DEF_NARROW_FROM_SCOPE(AST_Union);
 
@@ -137,15 +144,10 @@ public:
   // Visiting.
   virtual int ast_accept (ast_visitor *visitor);
 
-  static AST_Decl::NodeType const NT;
-
 protected:
   virtual int compute_size_type (void);
   // Compute the size type if it is unknown.
 
-  virtual AST_UnionBranch *fe_add_union_branch (AST_UnionBranch *b);
-  // Moved out of private section so it can be called from subclass.
-  
 private:
   // Data.
 
@@ -179,6 +181,8 @@ private:
 
   virtual AST_Union *fe_add_union (AST_Union *u);
 
+  virtual AST_UnionBranch *fe_add_union_branch (AST_UnionBranch *b);
+
   virtual AST_Structure *fe_add_structure (AST_Structure *s);
 
   virtual AST_Enum *fe_add_enum (AST_Enum *e);
diff --git a/TAO/TAO_IDL/include/ast_union_branch.h b/TAO/TAO_IDL/include/ast_union_branch.h
index 55f74848e89..ef4a2f4ea22 100644
--- a/TAO/TAO_IDL/include/ast_union_branch.h
+++ b/TAO/TAO_IDL/include/ast_union_branch.h
@@ -81,6 +81,11 @@ class AST_Union;
 class TAO_IDL_FE_Export AST_UnionBranch : public virtual AST_Field
 {
 public:
+  // Operations.
+
+  // Constructor(s) and destructor.
+  AST_UnionBranch (void);
+
   AST_UnionBranch (UTL_LabelList *ll,
                    AST_Type *ft,
                    UTL_ScopedName *n);
@@ -117,8 +122,6 @@ public:
   // Cleanup.
   virtual void destroy (void);
 
-  static AST_Decl::NodeType const NT;
-
 private:
   // list of labels.
   UTL_LabelList *pd_ll;
diff --git a/TAO/TAO_IDL/include/ast_union_fwd.h b/TAO/TAO_IDL/include/ast_union_fwd.h
index 361af5dbdb1..a731f4ad768 100644
--- a/TAO/TAO_IDL/include/ast_union_fwd.h
+++ b/TAO/TAO_IDL/include/ast_union_fwd.h
@@ -13,6 +13,8 @@ class AST_Union;
 class TAO_IDL_FE_Export AST_UnionFwd : public virtual AST_StructureFwd
 {
 public:
+  AST_UnionFwd (void);
+
   AST_UnionFwd (AST_Union *dummy,
                 UTL_ScopedName *n);
 
@@ -30,8 +32,6 @@ public:
 
   // Visiting.
   virtual int ast_accept (ast_visitor *visitor);
-
-  static AST_Decl::NodeType const NT;
 };
 
 #endif           // _AST_UNION_FWD_AST_UNION_FWD_HH
diff --git a/TAO/TAO_IDL/include/ast_union_label.h b/TAO/TAO_IDL/include/ast_union_label.h
index ac25a7ca945..580c90d2a2f 100644
--- a/TAO/TAO_IDL/include/ast_union_label.h
+++ b/TAO/TAO_IDL/include/ast_union_label.h
@@ -85,6 +85,8 @@ public:
       , UL_label 
     };
 
+  AST_UnionLabel (void);
+
   AST_UnionLabel (UnionLabel lk,
                   AST_Expression *lv);
 
diff --git a/TAO/TAO_IDL/include/ast_uses.h b/TAO/TAO_IDL/include/ast_uses.h
index 0d3b7f00eba..48bc0dd6794 100644
--- a/TAO/TAO_IDL/include/ast_uses.h
+++ b/TAO/TAO_IDL/include/ast_uses.h
@@ -30,8 +30,6 @@ public:
   
   // Cleanup.
   virtual void destroy (void);
-
-  static AST_Decl::NodeType const NT;
   
 private:
   bool is_multiple_;
diff --git a/TAO/TAO_IDL/include/ast_valuebox.h b/TAO/TAO_IDL/include/ast_valuebox.h
index 450d42c29b6..7cdfc40d51c 100644
--- a/TAO/TAO_IDL/include/ast_valuebox.h
+++ b/TAO/TAO_IDL/include/ast_valuebox.h
@@ -9,6 +9,10 @@
 class TAO_IDL_FE_Export AST_ValueBox :  public virtual AST_ConcreteType
 {
 public:
+
+  // Constructor(s) and destructor.
+  AST_ValueBox (void);
+
   AST_ValueBox (UTL_ScopedName *n,
                 AST_Type       *boxed_type);
   
@@ -18,6 +22,7 @@ public:
   AST_Type            *boxed_type (void) const;
    
   // Narrowing.
+
   DEF_NARROW_FROM_DECL(AST_ValueBox);
 
   // AST Dumping.
@@ -29,8 +34,6 @@ public:
   // Cleanup.
   virtual void destroy (void);
 
-  static AST_Decl::NodeType const NT;
-
 protected:
   AST_Type                    *pd_boxed_type;
 };
diff --git a/TAO/TAO_IDL/include/ast_valuetype.h b/TAO/TAO_IDL/include/ast_valuetype.h
index d9400bfb8bd..bacd756a3ab 100644
--- a/TAO/TAO_IDL/include/ast_valuetype.h
+++ b/TAO/TAO_IDL/include/ast_valuetype.h
@@ -6,10 +6,11 @@
 
 #include "ast_interface.h"
 
-class TAO_IDL_FE_Export AST_ValueType
-  : public virtual AST_Interface
+class TAO_IDL_FE_Export AST_ValueType : public virtual AST_Interface
 {
 public:
+  AST_ValueType (void);
+
   AST_ValueType (UTL_ScopedName *n,
                  AST_Type **inherits,
                  long n_inherits,
@@ -68,9 +69,6 @@ public:
   // Visiting.
   virtual int ast_accept (ast_visitor *visitor);
 
-  static AST_Decl::NodeType const NT;
-  typedef AST_ValueTypeFwd FWD_TYPE;
-
 protected:
   AST_Type **pd_supports;
   long pd_n_supports;
@@ -82,8 +80,6 @@ protected:
 
 protected:
   virtual AST_Factory *fe_add_factory (AST_Factory *f);
-  virtual AST_Field *fe_add_field (AST_Field *o);
-
   bool derived_from_primary_key_base (const AST_ValueType *node,
                                       const AST_ValueType *pk_base) const;
   AST_ValueType *lookup_primary_key_base (void) const;
diff --git a/TAO/TAO_IDL/include/ast_valuetype_fwd.h b/TAO/TAO_IDL/include/ast_valuetype_fwd.h
index e77ebafae5f..2d525efbc01 100644
--- a/TAO/TAO_IDL/include/ast_valuetype_fwd.h
+++ b/TAO/TAO_IDL/include/ast_valuetype_fwd.h
@@ -11,6 +11,8 @@
 class TAO_IDL_FE_Export AST_ValueTypeFwd : public virtual AST_InterfaceFwd
 {
 public:
+  AST_ValueTypeFwd (void);
+
   AST_ValueTypeFwd (AST_Interface *dummy,
                     UTL_ScopedName *n);
 
@@ -28,8 +30,6 @@ public:
 
   // Visiting.
   virtual int ast_accept (ast_visitor *visitor);
-
-  static AST_Decl::NodeType const NT;
 };
 
 #endif           // _AST_INTERFACE_FWD_AST_VALUETYPE_FWD_HH
diff --git a/TAO/TAO_IDL/include/ast_visitor.h b/TAO/TAO_IDL/include/ast_visitor.h
index ceb9ef5a7b8..d14253e0914 100644
--- a/TAO/TAO_IDL/include/ast_visitor.h
+++ b/TAO/TAO_IDL/include/ast_visitor.h
@@ -1,18 +1,21 @@
+// $Id$
 
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    ast_visitor.h
- *
- *  $Id$
- *
- *  The abstract AST visitor base class.
- *
- *
- *  @author Jeff Parsons <parsons@cs.wustl.edu>
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO_IDL_FE_DLL
+//
+// = FILENAME
+//    ast_visitor.h
+//
+// = DESCRIPTION
+//    The abstract AST visitor base class.
+//
+// = AUTHOR
+//    Jeff Parsons <parsons@cs.wustl.edu>
+//
+// ============================================================================
 
 #ifndef TAO_IDL_FE_DLL_AST_VISITOR_H
 #define TAO_IDL_FE_DLL_AST_VISITOR_H
@@ -47,7 +50,6 @@ class AST_EventType;
 class AST_EventTypeFwd;
 class AST_Home;
 class AST_Factory;
-class AST_Finder;
 class AST_Structure;
 class AST_StructureFwd;
 class AST_Exception;
@@ -71,20 +73,20 @@ class AST_Root;
 class AST_Native;
 class AST_Param_Holder;
 
-/**
- * @class ast_visitor
- *
- * @brief ast_visitor.
- *
- * To implement BE processing we use the "Visitor Pattern", this
- * is the abstract "Visitor". This class is the abstract base class
- * for visitors that traverse the AST_<node> classes. Other abstract
- * classes for C++ code generation, Java code generation, or IfR
- * administration, for example, can be derived from this class and
- * be the root of their own subtree of specialized visitor classes.
- */
 class TAO_IDL_FE_Export ast_visitor
 {
+  //
+  // = TITLE
+  //    ast_visitor.
+  //
+  // = DESCRIPTION
+  //    To implement BE processing we use the "Visitor Pattern", this
+  //    is the abstract "Visitor". This class is the abstract base class
+  //    for visitors that traverse the AST_<node> classes. Other abstract
+  //    classes for C++ code generation, Java code generation, or IfR
+  //    administration, for example, can be derived from this class and
+  //    be the root of their own subtree of specialized visitor classes.
+  //
 public:
   virtual ~ast_visitor (void);
 
@@ -116,7 +118,6 @@ public:
   virtual int visit_eventtype (AST_EventType *node) = 0;
   virtual int visit_eventtype_fwd (AST_EventTypeFwd *node) = 0;
   virtual int visit_factory (AST_Factory *node) = 0;
-  virtual int visit_finder (AST_Finder *node) = 0;
   virtual int visit_structure (AST_Structure *node) = 0;
   virtual int visit_structure_fwd (AST_StructureFwd *node) = 0;
   virtual int visit_exception (AST_Exception *node) = 0;
diff --git a/TAO/TAO_IDL/include/ast_visitor_context.h b/TAO/TAO_IDL/include/ast_visitor_context.h
index dbab0020f3a..8b1b995f32f 100644
--- a/TAO/TAO_IDL/include/ast_visitor_context.h
+++ b/TAO/TAO_IDL/include/ast_visitor_context.h
@@ -1,22 +1,27 @@
+//
+// $Id$
+//
 
 /* -*- C++ -*- */
-//=============================================================================
-/**
- *  @file    ast_visitor_context.h
- *
- *  $Id$
- *
- *  This class serves to provide the necessary context information to the
- *  visitor as it generates code. This may include the scope inside which the
- *  code is generated, the output file that is being used, and others. This
- *  context information will be passed to the abstract/concrete visitor
- *  factory which in turn will use it to construct the right visitor.
- *
- *
- *  @author Jeff Parsons & Aniruddha Gokhale
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO_IDL_FE
+//
+// = FILENAME
+//    ast_visitor_context.h
+//
+// = DESCRIPTION
+//    This class serves to provide the necessary context information to the
+//    visitor as it generates code. This may include the scope inside which the
+//    code is generated, the output file that is being used, and others. This
+//    context information will be passed to the abstract/concrete visitor
+//    factory which in turn will use it to construct the right visitor.
+//
+// = AUTHOR
+//    Jeff Parsons & Aniruddha Gokhale
+//
+// ============================================================================
 
 #ifndef AST_VISITOR_CONTEXT_H
 #define AST_VISITOR_CONTEXT_H
diff --git a/TAO/TAO_IDL/include/ast_visitor_reifying.h b/TAO/TAO_IDL/include/ast_visitor_reifying.h
index 507078f1732..a57b1e2532a 100644
--- a/TAO/TAO_IDL/include/ast_visitor_reifying.h
+++ b/TAO/TAO_IDL/include/ast_visitor_reifying.h
@@ -1,21 +1,26 @@
+//
+// $Id$
+//
 
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    ast_visitor_reifying.h
- *
- *  $Id$
- *
- *  This visitor visits an AST_Param_Holder, finds the corresponding
- *  template argument, looks up or creates the type, and stores
- *  it for retrieval and use in the template module
- *  instantiation visitor
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    ast_visitor_reifying.h
+//
+// = DESCRIPTION
+//    This visitor visits an AST_Param_Holder, finds the corresponding
+//    template argument, looks up or creates the type, and stores
+//    it for retrieval and use in the template module
+//    instantiation visitor
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef TAO_AST_VISITOR_REIFYING_H
 #define TAO_AST_VISITOR_REIFYING_H
@@ -28,20 +33,20 @@ class AST_Decl;
 class AST_Param_Holder;
 class ast_visitor_context;
 
-/**
- * @class ast_visitor_reifying
- *
- * @brief ast_visitor_reifying
- *
- * Reifies a template argument that has been substituted for
- * a template parameter reference. Complete reification may
- * include further reification, for example of array
- * dimensions, sequence bound or (w)string bound
- * for addition to the scope of the template module
- * instantiation.
- */
 class ast_visitor_reifying : public ast_visitor
 {
+  //
+  // = TITLE
+  //   ast_visitor_reifying
+  //
+  // = DESCRIPTION
+  //   Reifies a template argument that has been substituted for
+  //   a template parameter reference. Complete reification may
+  //   include further reification, for example of array
+  //   dimensions, sequence bound or (w)string bound
+  //   for addition to the scope of the template module
+  //   instantiation.
+  //
 public:
   ast_visitor_reifying (ast_visitor_context *ctx);
 
@@ -71,7 +76,6 @@ public:
   virtual int visit_connector (AST_Connector *node);
   virtual int visit_eventtype_fwd (AST_EventTypeFwd *node);
   virtual int visit_factory (AST_Factory *node);
-  virtual int visit_finder (AST_Finder *node);
   virtual int visit_structure (AST_Structure *node);
   virtual int visit_structure_fwd (AST_StructureFwd *node);
   virtual int visit_expression (AST_Expression *node);
diff --git a/TAO/TAO_IDL/include/ast_visitor_tmpl_module_inst.h b/TAO/TAO_IDL/include/ast_visitor_tmpl_module_inst.h
index fbe95c55a63..49992a55099 100644
--- a/TAO/TAO_IDL/include/ast_visitor_tmpl_module_inst.h
+++ b/TAO/TAO_IDL/include/ast_visitor_tmpl_module_inst.h
@@ -1,21 +1,26 @@
+//
+// $Id$
+//
 
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    ast_visitor_tmpl_module_inst.h
- *
- *  $Id$
- *
- *  This visitor creates nodes resulting
- *  from the instantiation of a template module, or from a
- *  reference to one inside another, and adds these nodes
- *  to the AST.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    ast_visitor_tmpl_module_inst.h
+//
+// = DESCRIPTION
+//    This visitor creates nodes resulting
+//    from the instantiation of a template module, or from a
+//    reference to one inside another, and adds these nodes
+//    to the AST.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef TAO_AST_VISITOR_TMPL_MODULE_INST_H
 #define TAO_AST_VISITOR_TMPL_MODULE_INST_H
@@ -27,16 +32,16 @@ class UTL_ExceptList;
 class UTL_NameList;
 class ast_visitor_context;
 
-/**
- * @class ast_visitor_tmpl_module_inst
- *
- * @brief ast_visitor_tmpl_module_inst
- *
- * Adds implied IDL code to the AST related to the
- * instantiation or alias of a template module.
- */
 class ast_visitor_tmpl_module_inst : public ast_visitor
 {
+  //
+  // = TITLE
+  //   ast_visitor_tmpl_module_inst
+  //
+  // = DESCRIPTION
+  //   Adds implied IDL code to the AST related to the
+  //   instantiation or alias of a template module.
+  //
 public:
   ast_visitor_tmpl_module_inst (ast_visitor_context *ctx,
                                 bool ref_only = false);
@@ -93,7 +98,6 @@ public:
   virtual int visit_structure (AST_Structure *node);
   virtual int visit_field (AST_Field *node);
   virtual int visit_factory (AST_Factory *node);
-  virtual int visit_finder (AST_Finder *node);
   
 private:
   // If arg is a param holder, return the matching template arg,
@@ -116,10 +120,6 @@ private:
   // eventtype or a valuetype.
   bool for_eventtype_;
   
-  // Flag to branch in visit_factory() where we create a
-  // finder or a factory.
-  bool for_finder_;
-  
   // Flag to short_circuit reifying if we are the base class of
   // ast_visitor_tmpl_module_ref.
   bool ref_only_;
diff --git a/TAO/TAO_IDL/include/ast_visitor_tmpl_module_ref.h b/TAO/TAO_IDL/include/ast_visitor_tmpl_module_ref.h
index efd09595c90..c2a0d41e8ef 100644
--- a/TAO/TAO_IDL/include/ast_visitor_tmpl_module_ref.h
+++ b/TAO/TAO_IDL/include/ast_visitor_tmpl_module_ref.h
@@ -1,19 +1,24 @@
+//
+// $Id$
+//
 
 /* -*- c++ -*- */
-//=============================================================================
-/**
- *  @file    ast_visitor_tmpl_module_ref.h
- *
- *  $Id$
- *
- *  This visitor creates nodes resulting from the reference
- *  to one inside another, and adds these nodes to the AST.
- *
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
+// ============================================================================
+//
+// = LIBRARY
+//    TAO IDL
+//
+// = FILENAME
+//    ast_visitor_tmpl_module_ref.h
+//
+// = DESCRIPTION
+//    This visitor creates nodes resulting from the reference
+//    to one inside another, and adds these nodes to the AST.
+//
+// = AUTHOR
+//    Jeff Parsons
+//
+// ============================================================================
 
 #ifndef TAO_AST_VISITOR_TMPL_MODULE_REF_H
 #define TAO_AST_VISITOR_TMPL_MODULE_REF_H
diff --git a/TAO/TAO_IDL/include/idl_global.h b/TAO/TAO_IDL/include/idl_global.h
index 7b0b0f47ba5..15fc71d1060 100644
--- a/TAO/TAO_IDL/include/idl_global.h
+++ b/TAO/TAO_IDL/include/idl_global.h
@@ -76,13 +76,11 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 #include "ast_expression.h"
 #include "ast_predefined_type.h"
+#include "ast_component.h"
 #include "utl_stack.h"
 #include "fe_utils.h"
 
 class AST_Root;
-class AST_ValueType;
-class AST_Component;
-class AST_Uses;
 class AST_Generator;
 class UTL_Error;
 class UTL_String;
@@ -313,7 +311,6 @@ public:
   bool boolean_seq_seen_;
   bool char_seq_seen_;
   bool component_seen_;
-  bool connector_seen_;
   bool double_seq_seen_;
   bool enum_seen_;
   bool exception_seen_;
@@ -597,11 +594,7 @@ public:
 
   void add_ciao_lem_file_names (const char *s);
   ACE_Unbounded_Queue<char *> & ciao_lem_file_names (void);
-  // Accessor/mutator for the ciao_lem_file_names_ member.
-
-  void add_ciao_rti_ts_file_names (const char *s);
-  ACE_Unbounded_Queue<char *> & ciao_rti_ts_file_names (void);
-  // Accessor/mutator for the ciao_rti_ts_file_names_ member.
+  // Accessor/mutator for the ciao_lem_file_names__ member.
 
   FILE * open_included_file (char const * filename,
                              char const *& directory);
@@ -824,9 +817,7 @@ private:
 
   ACE_Unbounded_Queue<char *> ciao_lem_file_names_;
   // Files parsed with ciao lem pragma
-
-  ACE_Unbounded_Queue<char *> ciao_rti_ts_file_names_;
-  // Files parsed with rti typesupport pragma
 };
 
+
 #endif  //_IDL_IDL_GLOBAL_HH
diff --git a/TAO/TAO_IDL/include/utl_scope.h b/TAO/TAO_IDL/include/utl_scope.h
index 418d19e50ce..3dd7943b7ab 100644
--- a/TAO/TAO_IDL/include/utl_scope.h
+++ b/TAO/TAO_IDL/include/utl_scope.h
@@ -120,7 +120,6 @@ class AST_Typedef;
 class AST_Array;
 class AST_Native;
 class AST_Factory;
-class AST_Finder;
 class AST_PortType;
 class AST_Provides;
 class AST_Uses;
@@ -155,6 +154,76 @@ public:
   // Destructor.
   virtual ~UTL_Scope (void);
 
+  // Scope Management Protocol.
+  virtual AST_PredefinedType *add_predefined_type (AST_PredefinedType *t);
+
+  virtual AST_Module *add_module (AST_Module *m);
+
+  virtual AST_Interface *add_interface (AST_Interface *i);
+
+  virtual AST_InterfaceFwd *add_interface_fwd (AST_InterfaceFwd *i);
+
+  virtual AST_ValueType *add_valuetype (AST_ValueType *i);
+
+  virtual AST_ValueTypeFwd *add_valuetype_fwd (AST_ValueTypeFwd *i);
+
+  virtual AST_EventType *add_eventtype (AST_EventType *i);
+
+  virtual AST_EventTypeFwd *add_eventtype_fwd (AST_EventTypeFwd *i);
+
+  virtual AST_Component *add_component (AST_Component *i);
+
+  virtual AST_ComponentFwd *add_component_fwd (AST_ComponentFwd *i);
+
+  virtual AST_Home *add_home (AST_Home *i);
+
+  virtual AST_Constant *add_constant (AST_Constant *c);
+
+  virtual AST_Exception *add_exception (AST_Exception *e);
+
+  virtual AST_Attribute *add_attribute (AST_Attribute *a);
+
+  virtual AST_Operation *add_operation (AST_Operation *o);
+
+  virtual AST_Argument *add_argument (AST_Argument *a);
+
+  virtual AST_Union *add_union (AST_Union *u);
+
+  virtual AST_UnionFwd *add_union_fwd (AST_UnionFwd *u);
+
+  virtual AST_UnionBranch *add_union_branch (AST_UnionBranch *b);
+
+  virtual AST_Structure *add_structure (AST_Structure *s);
+
+  virtual AST_StructureFwd *add_structure_fwd (AST_StructureFwd *s);
+
+  virtual AST_Field *add_field (AST_Field *f);
+
+  virtual AST_Enum *add_enum (AST_Enum *e);
+
+  virtual AST_EnumVal *add_enum_val (AST_EnumVal *v);
+
+  virtual AST_Typedef *add_typedef (AST_Typedef *t);
+
+  virtual UTL_StrList *add_context (UTL_StrList *c);
+
+  virtual UTL_NameList *add_exceptions (UTL_NameList *e);
+
+  virtual AST_Sequence *add_sequence (AST_Sequence *s);
+
+  virtual AST_String *add_string (AST_String *s);
+
+  virtual AST_Array *add_array (AST_Array *a);
+
+  virtual AST_Native *add_native (AST_Native *n);
+
+  virtual AST_Factory *add_factory (AST_Factory *f);
+
+  virtual AST_PortType *add_porttype (AST_PortType *p);
+
+  // Call back end add_XXX functions for this scope.
+  virtual AST_Decl *call_add (void);
+
   // Data Accessors.
   AST_Decl::NodeType scope_node_type (void)
   {
@@ -260,7 +329,8 @@ protected:
                                        bool treat_as_ref);
 
   // Lookup based on the local name.
-  AST_Decl *lookup_for_add (AST_Decl *d);
+  AST_Decl *lookup_for_add (AST_Decl *d,
+                            bool treat_as_ref);
 
   // Is there a (case-insensitive) clash between a local name
   // and an IDL keyword?
@@ -315,26 +385,7 @@ protected:
   friend class AST_Enum;
   friend class IDL_GlobalData;
 
-  /// Scope Management Protocol.
-  
-  /// Common code for most basic adding action.
-  AST_Decl *fe_add_decl (AST_Decl *d);
-  
-  /// Specialized for types that reference another type.
-  AST_Field *fe_add_ref_decl (AST_Field *d);
-  
-  template<typename DECL>
-  DECL *fe_add_full_intf_decl (DECL *t);
-  
-  template<typename FULL_DECL>
-  typename FULL_DECL::FWD_TYPE *fe_add_fwd_intf_decl (
-    typename FULL_DECL::FWD_TYPE *t);
-    
-  AST_Structure *fe_add_full_struct_type (AST_Structure *t);
-  AST_StructureFwd *fe_add_fwd_struct_type (AST_StructureFwd *t);
-  
-  /// No-op base class version of the specialized adding actions.
-  
+  // Scope Management Protocol.
   virtual
   AST_PredefinedType *fe_add_predefined_type (
     AST_PredefinedType *t);
@@ -442,9 +493,6 @@ protected:
 
   virtual
   AST_Factory *fe_add_factory (AST_Factory *f);
-  
-  virtual
-  AST_Finder *fe_add_finder (AST_Finder *f);
 
   virtual
   AST_ValueBox *fe_add_valuebox (AST_ValueBox *vb);
@@ -472,27 +520,6 @@ protected:
 
   virtual
   AST_Mirror_Port *fe_add_mirror_port (AST_Mirror_Port *mp);
-  
-private:
-  /// Checks called from fe_add_decl() specific to interfaces
-  /// (and its subtypes) and operations respectively.
-  bool inherited_op_attr_clash (AST_Decl *t);
-  bool arg_specific_error (AST_Decl *t);
-  
-  /// Encapsulates the vagaries of adding fields vs decls to
-  /// structs/unions vs other types.
-  void smart_local_add (AST_Decl *t);
-  
-  /// Quick check on the head of a name to see if it's global.
-  bool is_global_name (Identifier *i);
-
-  /// Helper function for lookup_by_name(). Iterates doing local
-  /// lookups of subsequent components of a scoped name.
-  AST_Decl *
-  iter_lookup_by_name_local (AST_Decl *d,
-                             UTL_ScopedName *e,
-                             long index,
-                             bool full_def_only = false);
 };
 
 // Active iterator for a UTL_Scope node
@@ -534,12 +561,4 @@ private:
   long il;
 };
 
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "utl_tmpl/UTL_Scope_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("utl_tmpl/UTL_Scope_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
 #endif           // _UTL_SCOPE_UTL_SCOPE_HH
diff --git a/TAO/TAO_IDL/include/utl_tmpl/UTL_Scope_T.cpp b/TAO/TAO_IDL/include/utl_tmpl/UTL_Scope_T.cpp
deleted file mode 100644
index 676f0c3d0cd..00000000000
--- a/TAO/TAO_IDL/include/utl_tmpl/UTL_Scope_T.cpp
+++ /dev/null
@@ -1,191 +0,0 @@
-// $Id$
-
-#ifndef TAO_IDL_UTL_SCOPE_T_CPP
-#define TAO_IDL_UTL_SCOPE_T_CPP
-
-#include "utl_scope.h"
-
-#include "nr_extern.h"
-#include "global_extern.h"
-
-#include "utl_err.h"
-
-#include "ast_interface_fwd.h"
-
-template<typename DECL>
-DECL *
-UTL_Scope::fe_add_full_intf_decl (DECL *t)
-{
-  if (t->redef_clash ())
-    {
-      return 0;
-    }
-
-  AST_Decl *predef = 0;
-  DECL *fwd = 0;
-
-  // Already defined?
-  if ((predef = this->lookup_for_add (t)) != 0)
-    {
-      // Treat fwd declared interfaces specially
-      if (predef->node_type () == DECL::NT)
-        {
-          fwd = DECL::narrow_from_decl (predef);
-
-          if (fwd == 0)
-            {
-              return 0;
-            }
-
-          // Forward declared and not defined yet.
-          if (!fwd->is_defined ())
-            {
-              if (fwd->defined_in () != this)
-                {
-                  idl_global->err ()->error3 (UTL_Error::EIDL_SCOPE_CONFLICT,
-                                              fwd,
-                                              t,
-                                              ScopeAsDecl (this));
-
-                  return 0;
-                }
-            }
-          // OK, not illegal redef of forward declaration. Now check whether.
-          // it has been referenced already.
-          else if (this->referenced (predef, t->local_name ()))
-            {
-              idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
-                                          t,
-                                          ScopeAsDecl (this),
-                                          predef);
-
-              return 0;
-            }
-
-        }
-      else if (!can_be_redefined (predef))
-        {
-          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
-                                      t,
-                                      ScopeAsDecl (this),
-                                      predef);
-
-          return 0;
-        }
-      else if (referenced (predef, t->local_name ()) && !t->is_defined ())
-        {
-          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
-                                      t,
-                                      ScopeAsDecl (this),
-                                      predef);
-
-          return 0;
-        }
-      else if (t->has_ancestor (predef))
-        {
-          idl_global->err ()->redefinition_in_scope (t, predef);
-
-          return 0;
-        }
-    }
-
-  // Add it to scope
-  this->add_to_scope (t);
-
-  // We do this for interfaces, valuetypes and components in
-  // a different place than we do for structs and unions,
-  // since fwd declared structs and unions must be defined in
-  // the same translation unit.
-  AST_InterfaceFwd *fd = t->fwd_decl ();
-
-  if (0 != fd)
-    {
-      fd->set_as_defined ();
-    }
-
-  // Add it to set of locally referenced symbols
-  this->add_to_referenced (t,
-                           false,
-                           t->local_name ());
-  return t;
-}
-
-template<typename FULL_DECL>
-typename FULL_DECL::FWD_TYPE *
-UTL_Scope::fe_add_fwd_intf_decl (typename FULL_DECL::FWD_TYPE *t)
-{
-  AST_Decl *d = 0;
-
-  // Already defined and cannot be redefined? Or already used?
-  if ((d = this->lookup_for_add (t)) != 0)
-    {
-      AST_Decl::NodeType nt = d->node_type ();
-
-      // There used to be another check here ANDed with the one below:
-      // d->defined_in () == this. But lookup_for_add() calls only
-      // lookup_by_name_local(), which does not bump up the scope,
-      // and look_in_previous() for modules. If look_in_previous()
-      // finds something, the scopes will NOT be the same pointer
-      // value, but the result is what we want.
-      if (nt == FULL_DECL::NT)
-        {
-          FULL_DECL *itf = FULL_DECL::narrow_from_decl (d);
-
-          if (itf == 0)
-            {
-              return 0;
-            }
-
-          // If the lookup found the full_definition member of another
-          // interface_fwd, don't reset this full_definition. Otherwise
-          // reset the member and set is_defined_ on i so it itf won't
-          // get destroyed twice.
-          if (itf->is_defined ())
-            {
-              if (!t->is_defined ())
-                {
-                  FULL_DECL *prev_fd =
-                    FULL_DECL::narrow_from_decl (t->full_definition ());
-
-                  prev_fd->destroy ();
-                  // No need to delete prev_fd, the call to
-                  // set_full_definition() below will do it.
-                }
-
-              t->set_full_definition (itf);
-              t->set_as_defined ();
-            }
-        }
-
-      if (!can_be_redefined (d)) {
-
-          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
-                                      t,
-                                      ScopeAsDecl (this),
-                                      d);
-          return 0;
-        }
-
-      // No need to call referenced() for forward declared interafces,
-      // they can be redeclared after referencing.
-
-      if (t->has_ancestor (d))
-        {
-          idl_global->err ()->redefinition_in_scope  (t, d);
-          return 0;
-        }
-    }
-
-  // Add it to scope
-  this->add_to_scope (t);
-
-  // Add it to set of locally referenced symbols
-  this->add_to_referenced (t,
-                           false,
-                           t->local_name ());
-
-  return t;
-}
-
-#endif // TAO_IDL_UTL_SCOPE_T_CPP
-
diff --git a/TAO/TAO_IDL/narrow/narrow.cpp b/TAO/TAO_IDL/narrow/narrow.cpp
index b0ee22b687a..038d038a7c3 100644
--- a/TAO/TAO_IDL/narrow/narrow.cpp
+++ b/TAO/TAO_IDL/narrow/narrow.cpp
@@ -74,22 +74,22 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "ast_home.h"
 #include "ast_operation.h"
 #include "ast_factory.h"
-#include "ast_finder.h"
 #include "ast_exception.h"
 #include "ast_union.h"
 #include "ast_enum.h"
 #include "ast_interface_fwd.h"
 #include "utl_scope.h"
 
+ACE_RCSID (narrow, 
+           narrow, 
+           "$Id$")
+
 // Narrowing functions for AST
 
 TAO_IDL_FE_Export AST_Decl *
 ScopeAsDecl (UTL_Scope *s)
 {
-  if (s == 0)
-    {
-      return 0;
-    }
+  if (s == 0) return 0;
 
   switch (s->scope_node_type ())
   {
@@ -115,8 +115,6 @@ ScopeAsDecl (UTL_Scope *s)
       return AST_Operation::narrow_from_scope (s);
     case AST_Decl::NT_factory:
       return AST_Factory::narrow_from_scope (s);
-    case AST_Decl::NT_finder:
-      return AST_Finder::narrow_from_scope (s);
     case AST_Decl::NT_except:
       return AST_Exception::narrow_from_scope (s);
     case AST_Decl::NT_union:
@@ -136,55 +134,48 @@ ScopeAsDecl (UTL_Scope *s)
 TAO_IDL_FE_Export UTL_Scope *
 DeclAsScope (AST_Decl *d)
 {
-  if (d == 0)
-    {
-      return 0;
-    }
-
-  switch (d->node_type ())
-  {
-    case AST_Decl::NT_interface_fwd:
-      /*
-       * Resolve forward declared interface by looking at full_definition()
-       * field and iterating
-       */
-      d = (AST_InterfaceFwd::narrow_from_decl (d))->full_definition ();
-      /*
-       * Fall through
-       */
-    case AST_Decl::NT_interface:
-      return AST_Interface::narrow_from_decl (d);
-    case AST_Decl::NT_valuetype:
-      return AST_ValueType::narrow_from_decl (d);
-    case AST_Decl::NT_eventtype:
-      return AST_EventType::narrow_from_decl (d);
-    case AST_Decl::NT_component:
-      return AST_Component::narrow_from_decl (d);
-    case AST_Decl::NT_porttype:
-      return AST_PortType::narrow_from_decl (d);
-    case AST_Decl::NT_connector:
-      return AST_Connector::narrow_from_decl (d);
-    case AST_Decl::NT_home:
-      return AST_Home::narrow_from_decl (d);
-    case AST_Decl::NT_module:
-      return AST_Module::narrow_from_decl (d);
-    case AST_Decl::NT_root:
-      return AST_Root::narrow_from_decl (d);
-    case AST_Decl::NT_except:
-      return AST_Exception::narrow_from_decl (d);
-    case AST_Decl::NT_union:
-      return AST_Union::narrow_from_decl (d);
-    case AST_Decl::NT_struct:
-      return AST_Structure::narrow_from_decl (d);
-    case AST_Decl::NT_enum:
-      return AST_Enum::narrow_from_decl (d);
-    case AST_Decl::NT_op:
-      return AST_Operation::narrow_from_decl (d);
-    case AST_Decl::NT_factory:
-      return AST_Factory::narrow_from_decl (d);
-    case AST_Decl::NT_finder:
-      return AST_Finder::narrow_from_decl (d);
-    default:
-      return 0;
-  }
+   if (d == 0) return 0;
+
+   switch (d->node_type ())
+   {
+     case AST_Decl::NT_interface_fwd:
+        /*
+         * Resolve forward declared interface by looking at full_definition()
+         * field and iterating
+         */
+        d = (AST_InterfaceFwd::narrow_from_decl (d))->full_definition ();
+        /*
+         * Fall through
+         */
+     case AST_Decl::NT_interface:
+        return AST_Interface::narrow_from_decl (d);
+     case AST_Decl::NT_valuetype:
+        return AST_ValueType::narrow_from_decl (d);
+     case AST_Decl::NT_eventtype:
+        return AST_EventType::narrow_from_decl (d);
+     case AST_Decl::NT_component:
+        return AST_Component::narrow_from_decl (d);
+     case AST_Decl::NT_porttype:
+        return AST_PortType::narrow_from_decl (d);
+     case AST_Decl::NT_home:
+        return AST_Home::narrow_from_decl (d);
+     case AST_Decl::NT_module:
+        return AST_Module::narrow_from_decl (d);
+     case AST_Decl::NT_root:
+        return AST_Root::narrow_from_decl (d);
+     case AST_Decl::NT_except:
+        return AST_Exception::narrow_from_decl (d);
+     case AST_Decl::NT_union:
+        return AST_Union::narrow_from_decl (d);
+     case AST_Decl::NT_struct:
+        return AST_Structure::narrow_from_decl (d);
+     case AST_Decl::NT_enum:
+        return AST_Enum::narrow_from_decl (d);
+     case AST_Decl::NT_op:
+        return AST_Operation::narrow_from_decl (d);
+     case AST_Decl::NT_factory:
+        return AST_Factory::narrow_from_decl (d);
+     default:
+        return 0;
+   }
 }
diff --git a/TAO/TAO_IDL/tao_idl_fe.mpc b/TAO/TAO_IDL/tao_idl_fe.mpc
index eb3a58d9bf1..3cbb26717f0 100644
--- a/TAO/TAO_IDL/tao_idl_fe.mpc
+++ b/TAO/TAO_IDL/tao_idl_fe.mpc
@@ -34,9 +34,8 @@ project(TAO_IDL_GEN) {
     "	    -e 's/ECHO/TAO_YY_ECHO/' \\"
     "	    -e 's/fread\([^\)]*\)/static_cast<int> (&)/g' \\"
     "	    -e 's/\\$$Hea''der.*\\$$/$$I''d$$/' \\"
-    "	    -e 's@#include <stdio\.h>@#include \"ace/OS_NS_stdio.h\"@' \\"
+    "	    -e 's@#include <stdio\.h>@#include \"ace/os_include/os_stdio.h\"@' \\"
     "	    -e 's@#include <unistd\.h>@#include \"ace/os_include/os_ctype.h\"@' \\"
-    "     -e 's@c = getc@c = ACE_OS::getc@' \\"
     "	    -e '/#include </d' \\"
     "	> fe/lex.yy.cpp"
     "	(cd fe; patch < lex.yy.cpp.diff)"
diff --git a/TAO/TAO_IDL/util/utl_decllist.cpp b/TAO/TAO_IDL/util/utl_decllist.cpp
index 0dc139ff8e3..2afa0aeddde 100644
--- a/TAO/TAO_IDL/util/utl_decllist.cpp
+++ b/TAO/TAO_IDL/util/utl_decllist.cpp
@@ -77,6 +77,10 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "utl_decllist.h"
 #include "fe_declarator.h"
 
+ACE_RCSID (util,
+           utl_decllist,
+           "$Id$")
+
 /*
  * Constructor(s)
  */
diff --git a/TAO/TAO_IDL/util/utl_err.cpp b/TAO/TAO_IDL/util/utl_err.cpp
index 74adf33c822..6b310af010b 100644
--- a/TAO/TAO_IDL/util/utl_err.cpp
+++ b/TAO/TAO_IDL/util/utl_err.cpp
@@ -1278,7 +1278,8 @@ UTL_Error::redef_error (const char *b, const char *n)
 
 // Report two or more spellings for an identifier.
 void
-UTL_Error::name_case_error (char *b, char *n)
+UTL_Error::name_case_error (char *b,
+                            char *n)
 {
   idl_error_header (EIDL_NAME_CASE_ERROR,
                     idl_global->lineno (),
diff --git a/TAO/TAO_IDL/util/utl_global.cpp b/TAO/TAO_IDL/util/utl_global.cpp
index 68e14650cbd..650955807fa 100644
--- a/TAO/TAO_IDL/util/utl_global.cpp
+++ b/TAO/TAO_IDL/util/utl_global.cpp
@@ -71,7 +71,6 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "ast_structure.h"
 #include "ast_sequence.h"
 #include "ast_valuetype.h"
-#include "ast_component.h"
 #include "ast_uses.h"
 #include "utl_identifier.h"
 #include "utl_indenter.h"
@@ -236,7 +235,6 @@ IDL_GlobalData::reset_flag_seen (void)
   boolean_seq_seen_ = false;
   char_seq_seen_ = false;
   component_seen_ = false;
-  connector_seen_ = false;
   double_seq_seen_ = false;
   enum_seen_ = false;
   exception_seen_ = false;
@@ -1310,18 +1308,6 @@ IDL_GlobalData::ciao_lem_file_names (void)
   return this->ciao_lem_file_names_;
 }
 
-void
-IDL_GlobalData::add_ciao_rti_ts_file_names (const char *s)
-{
-  this->ciao_rti_ts_file_names_.enqueue_tail (ACE::strnew (s));
-}
-
-ACE_Unbounded_Queue<char *> &
-IDL_GlobalData::ciao_rti_ts_file_names (void)
-{
-  return this->ciao_rti_ts_file_names_;
-}
-
 ACE_Hash_Map_Manager<char *, char *, ACE_Null_Mutex> &
 IDL_GlobalData::file_prefixes (void)
 {
diff --git a/TAO/TAO_IDL/util/utl_identifier.cpp b/TAO/TAO_IDL/util/utl_identifier.cpp
index 2829ee62d9e..55f8e6a0d6d 100644
--- a/TAO/TAO_IDL/util/utl_identifier.cpp
+++ b/TAO/TAO_IDL/util/utl_identifier.cpp
@@ -73,6 +73,10 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 // FUZZ: disable check_for_streams_include
 #include "ace/streams.h"
 
+ACE_RCSID (util,
+           utl_identifier,
+           "$Id$")
+
 Identifier::Identifier (void)
   : pv_string (0),
     escaped_ (false)
diff --git a/TAO/TAO_IDL/util/utl_scope.cpp b/TAO/TAO_IDL/util/utl_scope.cpp
index 84305c6222a..ec5dabfb5e2 100644
--- a/TAO/TAO_IDL/util/utl_scope.cpp
+++ b/TAO/TAO_IDL/util/utl_scope.cpp
@@ -105,10 +105,9 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "ast_factory.h"
 #include "ast_visitor.h"
 #include "ast_generator.h"
-#include "ast_extern.h"
 
-#include "fe_extern.h"
 #include "nr_extern.h"
+#include "fe_extern.h"
 #include "global_extern.h"
 
 #include "ace/OS_NS_strings.h"
@@ -119,6 +118,141 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #undef  INCREMENT
 #define INCREMENT 64
 
+// Static variables.
+static Identifier *_global_scope_name = 0;
+static Identifier *_global_scope_root_name = 0;
+
+// Static functions.
+
+// Determines if a name is global.
+static long
+is_global_name (Identifier *i)
+{
+  long comp_result = 0;
+
+  if (i == 0)
+    {
+      return comp_result;
+    }
+
+  if (_global_scope_name == 0)
+    {
+      ACE_NEW_RETURN (_global_scope_name,
+                      Identifier ("::"),
+                      0);
+    }
+
+  if (_global_scope_root_name == 0)
+    {
+      ACE_NEW_RETURN (_global_scope_root_name,
+                      Identifier (""),
+                      0);
+    }
+
+  comp_result = i->compare (_global_scope_name);
+
+  if (comp_result == 0)
+    {
+      comp_result = i->compare (_global_scope_root_name);
+    }
+
+  return comp_result;
+}
+
+// Helper function for lookup_by_name. Iterates doing local lookups of
+// subsequent components of a scoped name.
+static AST_Decl *
+iter_lookup_by_name_local (AST_Decl *d,
+                           UTL_ScopedName *e,
+                           long index,
+                           bool full_def_only = false)
+{
+  AST_Typedef *td = AST_Typedef::narrow_from_decl (d);
+  AST_Decl *result = 0;
+
+  // Remove all the layers of typedefs.
+  while (d != 0 && d->node_type () == AST_Decl::NT_typedef)
+    {
+      if (td == 0)
+        {
+          return 0;
+        }
+
+      d = td->base_type ();
+    }
+    
+  if (d == 0)
+    {
+      return 0;
+    }
+
+  // Try to convert the AST_Decl to a UTL_Scope.
+  UTL_Scope *sc = DeclAsScope (d);
+
+  if (sc == 0)
+    {
+      return 0;
+    }
+
+  if (index < static_cast<long> (sc->nmembers ()))
+    {
+      // Look up the first component of the scoped name.
+      result = sc->lookup_by_name_local (e->head (),
+                                         index,
+                                         full_def_only);
+    }
+  else
+    {
+      return 0;
+    }
+
+  UTL_ScopedName *sn = (UTL_ScopedName *) e->tail ();
+
+  if (result == 0)
+    {
+      if (sn == 0)
+        {
+          result = UTL_Scope::match_param (e);
+        }
+
+      return result;
+    }
+  else
+    {
+      if (sn == 0)
+        {
+          // We're done.
+          return result;
+        }
+      else
+        {
+          // Look up the next component of the scoped name.
+          result = iter_lookup_by_name_local (result,
+                                              sn,
+                                              0,
+                                              full_def_only);
+        }
+
+      if (result != 0)
+        {
+          // We're done.
+          return result;
+        }
+      else
+        {
+          // Maybe we're on the wrong branch of reopened
+          // and/or nested modules, so let's see if there's
+          // another branch. If 'index' gets as high as the
+          // number of members in the scope, the call above
+          // to lookup_by_name_local will catch it and return 0.
+          return iter_lookup_by_name_local (d,
+                                            e,
+                                            index + 1,
+                                            full_def_only);
+        }
+    }
+}
+
 //  Constructors.
 
 UTL_Scope::UTL_Scope (void)
@@ -162,13 +296,71 @@ UTL_Scope::~UTL_Scope (void)
 {
 }
 
+// Private operations.
+
+static AST_Decl *
+add_type (AST_Type *type)
+{
+  AST_Decl *result = 0;
+  UTL_Scope *scope = 0;
+
+  switch (type->node_type())
+    {
+    case AST_Decl::NT_array:
+      result =
+        idl_global->root ()->add_array (AST_Array::narrow_from_decl (type));
+      break;
+    case AST_Decl::NT_enum:
+      result =
+        type->defined_in ()->add_enum (AST_Enum::narrow_from_decl (type));
+      scope = AST_Enum::narrow_from_decl (type);
+      break;
+    case AST_Decl::NT_sequence:
+      result =
+        idl_global->root ()->add_sequence (
+                                 AST_Sequence::narrow_from_decl (type)
+                               );
+      break;
+    case AST_Decl::NT_string:
+    case AST_Decl::NT_wstring:
+      result =
+        idl_global->root ()->add_string (AST_String::narrow_from_decl (type));
+      break;
+    case AST_Decl::NT_struct:
+      result =
+        type->defined_in ()->add_structure (
+                                 AST_Structure::narrow_from_decl (type)
+                               );
+      scope = AST_Structure::narrow_from_decl (type);
+      break;
+    case AST_Decl::NT_union:
+      result =
+        type->defined_in ()->add_union (AST_Union::narrow_from_decl (type));
+      scope = AST_Union::narrow_from_decl (type);
+      break;
+    default:
+      // For non-complex types, like predefined types
+      // no additional add needed, assume everything is ok.
+      result = (AST_Decl *) 1;
+      break;
+    }
+
+  if (scope != 0)
+    {
+      result = scope->call_add ();
+    }
+
+  return result;
+}
+
 // Protected operations.
 
 // Special version of lookup which only looks at the local name instead of
 // the fully scoped name, when doing lookups. This version is intended to
-// be used only by the frontend add_xxx functions.
+// be used only by the CFE add_xxx functions.
 AST_Decl *
-UTL_Scope::lookup_for_add (AST_Decl *d)
+UTL_Scope::lookup_for_add (AST_Decl *d,
+                           bool)
 {
   if (d == 0)
     {
@@ -182,7 +374,8 @@ UTL_Scope::lookup_for_add (AST_Decl *d)
       return 0;
     }
 
-  return this->lookup_by_name_local (id, 0);
+  return this->lookup_by_name_local (id,
+                                     0);
 }
 
 int
@@ -388,208 +581,467 @@ UTL_Scope::check_for_predef_seq (AST_Decl *d)
 
 // Public operations.
 
-// Protected Front End Scope Management Protocol.
+// Scope Management Protocol.
 //
-// All members of the protocol defined in UTL_Scope simply return NULL
-// and don't do a thing. This ensures that runtime errors will discover
-// operations which should have been redefined to allow certain kinds of
-// AST nodes to appear in a given context.
+// All members of the protocol defined in UTL_Scope simply return the node
+// and don't do a thing. These members are simply dummies to retain
+// compatibility with pre-two-pass compiler back-ends.
 
-AST_Decl *
-UTL_Scope::fe_add_decl (AST_Decl *t)
+AST_PredefinedType *
+UTL_Scope::add_predefined_type (AST_PredefinedType *p)
 {
-  AST_Decl *d = 0;
+  if (p == 0)
+    {
+      return 0;
+    }
 
-  // Already defined and cannot be redefined? Or already used?
-  if ((d = this->lookup_for_add (t)) != 0)
+  p->set_added (true);
+  return p;
+}
+
+AST_Module *
+UTL_Scope::add_module (AST_Module *m)
+{
+  if (m == 0)
     {
-      if (!can_be_redefined (d))
-        {
-          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
-                                      t,
-                                      ScopeAsDecl (this),
-                                      d);
-          return 0;
-        }
+      return 0;
+    }
 
-      if (this->referenced (d, t->local_name ()))
-        {
-          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
-                                      t,
-                                      ScopeAsDecl (this),
-                                      d);
-          return 0;
-        }
+  m->set_added (true);
+  return m;
+}
 
-      if (t->has_ancestor (d))
-        {
-          idl_global->err ()->redefinition_in_scope (t, d);
-          return 0;
-        }
+AST_Interface *
+UTL_Scope::add_interface (AST_Interface *i)
+{
+  if (i == 0)
+    {
+      return 0;
     }
-  else if (this->inherited_op_attr_clash (t))
+
+  i->set_added (true);
+  return i;
+}
+
+AST_InterfaceFwd *
+UTL_Scope::add_interface_fwd (AST_InterfaceFwd *i)
+{
+  if (i == 0)
     {
       return 0;
     }
-    
-  if (this->arg_specific_error (t))
+
+  i->set_added (true);
+  return i;
+}
+
+AST_ValueType *
+UTL_Scope::add_valuetype (AST_ValueType *i)
+{
+  if (i == 0)
     {
       return 0;
     }
-  
-  this->smart_local_add (t);
 
-  // Add it to set of locally referenced symbols, unless it is
-  // a home, in which case it will clash when the equivalent
-  // interface is created.
-  if (t->node_type () != AST_Decl::NT_home)
+  i->set_added (true);
+  return i;
+}
+
+AST_ValueTypeFwd *
+UTL_Scope::add_valuetype_fwd (AST_ValueTypeFwd *i)
+{
+  if (i == 0)
     {
-      this->add_to_referenced (t,
-                               false,
-                               t->local_name ());
+      return 0;
     }
 
-  return t;
+  i->set_added (true);
+  return i;
 }
 
-AST_Field *
-UTL_Scope::fe_add_ref_decl (AST_Field *t)
+AST_EventType *
+UTL_Scope::add_eventtype (AST_EventType *i)
 {
-  AST_Decl *d = this->fe_add_decl (t);
+  if (i == 0)
+    {
+      return 0;
+    }
 
-  if (d != 0)
+  i->set_added (true);
+  return i;
+}
+
+AST_EventTypeFwd *
+UTL_Scope::add_eventtype_fwd (AST_EventTypeFwd *i)
+{
+  if (i == 0)
     {
-      AST_Type *ft = t->field_type ();
-      UTL_ScopedName *mru = ft->last_referenced_as ();
+      return 0;
+    }
 
-      if (mru != 0)
-        {
-          this->add_to_referenced (ft,
-                                   false,
-                                   mru->first_component ());
-        }
+  i->set_added (true);
+  return i;
+}
+
+AST_Component *
+UTL_Scope::add_component (AST_Component *i)
+{
+  if (i == 0)
+    {
+      return 0;
     }
-    
-  /// Catches struct/union/exception which all maintain a queue
-  /// for fields as distinct from decls and enum values.  
-  AST_Structure *s = AST_Structure::narrow_from_scope (this);
-  
-  if (s != 0)
+
+  i->set_added (true);
+  return i;
+}
+
+AST_ComponentFwd *
+UTL_Scope::add_component_fwd (AST_ComponentFwd *i)
+{
+  if (i == 0)
     {
-      s->fields ().enqueue_tail (t);
+      return 0;
     }
 
-  return AST_Field::narrow_from_decl (d);
+  i->set_added (true);
+  return i;
 }
 
-AST_Structure *
-UTL_Scope::fe_add_full_struct_type (AST_Structure *t)
+AST_Home *
+UTL_Scope::add_home (AST_Home *i)
 {
-  AST_Decl *predef = 0;
+  if (i == 0)
+    {
+      return 0;
+    }
+
+  i->set_added (true);
+  return i;
+}
 
-  if ((predef = this->lookup_for_add (t)) != 0)
+AST_Exception *
+UTL_Scope::add_exception (AST_Exception *e)
+{
+  if (e == 0)
     {
-      if (!can_be_redefined (predef))
-        {
-          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
-                                      t,
-                                      ScopeAsDecl (this),
-                                      predef);
+      return 0;
+    }
 
-          return 0;
-        }
-      else if (referenced (predef, t->local_name ())
-               && !t->is_defined ())
-        {
-          idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
-                                      t,
-                                      ScopeAsDecl (this),
-                                      predef);
+  e->set_added (true);
+  return e;
+}
 
-          return 0;
-        }
+AST_Constant *
+UTL_Scope::add_constant (AST_Constant *c)
+{
+  if (c == 0)
+    {
+      return 0;
     }
 
-  AST_Decl::NodeType nt = ScopeAsDecl (this)->node_type ();
-  
-  /// Decls inside a struct or union are also referenced by
-  /// fields, and so must be handled differently.
-  if (nt == AST_Decl::NT_struct
-      || nt == AST_Decl::NT_union
-      || nt == AST_Decl::NT_except)
+  c->set_added (true);
+  return c;
+}
+
+UTL_StrList *
+UTL_Scope::add_context (UTL_StrList *c)
+{
+  return c;
+}
+
+UTL_NameList *
+UTL_Scope::add_exceptions (UTL_NameList *e)
+{
+  return e;
+}
+
+AST_Attribute *
+UTL_Scope::add_attribute (AST_Attribute *a)
+{
+  if (a == 0)
+    {
+      return 0;
+    }
+
+  a->set_added (true);
+
+  if (!a->field_type ()->added ())
+    {
+      return add_type (a->field_type ()) ? a : 0;
+    }
+  else
+    {
+      return a;
+    }
+}
+
+AST_Operation *
+UTL_Scope::add_operation (AST_Operation *o)
+{
+  if (o == 0)
+    {
+      return 0;
+    }
+
+  o->set_added (true);
+
+  if (!o->return_type ()->added ())
     {
-      this->add_to_local_types (t);
+      return add_type (o->return_type ()) ? o : 0;
     }
   else
     {
-      this->add_to_scope (t);
+      return o;
+    }
+}
+
+AST_Argument *
+UTL_Scope::add_argument (AST_Argument *a)
+{
+  if (a == 0)
+    {
+      return 0;
     }
 
-  // Add it to set of locally referenced symbols.
-  this->add_to_referenced (t,
-                           false,
-                           t->local_name ());
+  a->set_added (true);
+
+  if (!a->field_type ()->added ())
+    {
+      return add_type (a->field_type ()) ? a : 0;
+    }
+  else
+    {
+      return a;
+    }
+}
+
+AST_Union *
+UTL_Scope::add_union (AST_Union *u)
+{
+  if (u == 0)
+    {
+      return 0;
+    }
+
+  u->set_added (true);
+  return u;
+}
+
+AST_UnionFwd *
+UTL_Scope::add_union_fwd (AST_UnionFwd *u)
+{
+  if (u == 0)
+    {
+      return 0;
+    }
+
+  u->set_added (true);
+  return u;
+}
+
+AST_UnionBranch *
+UTL_Scope::add_union_branch (AST_UnionBranch *u)
+{
+  if (u == 0)
+    {
+      return 0;
+    }
+
+  u->set_added (true);
+
+  if (!u->field_type ()->added ())
+    {
+      return add_type (u->field_type ()) ? u : 0;
+    }
+  else
+    {
+      return u;
+    }
+}
+
+AST_Structure *
+UTL_Scope::add_structure (AST_Structure *s)
+{
+  if (s == 0)
+    {
+      return 0;
+    }
 
-  return t;
+  s->set_added (true);
+  return s;
 }
 
 AST_StructureFwd *
-UTL_Scope::fe_add_fwd_struct_type (AST_StructureFwd *t)
+UTL_Scope::add_structure_fwd (AST_StructureFwd *s)
 {
-  AST_Decl *d = 0;
+  if (s == 0)
+    {
+      return 0;
+    }
+
+  s->set_added (true);
+  return s;
+}
 
-  // Already defined and cannot be redefined? Or already used?
-  if ((d = this->lookup_for_add (t)) != 0)
+AST_Field *
+UTL_Scope::add_field (AST_Field *f)
+{
+  if (f == 0)
     {
-      AST_Decl::NodeType nt = d->node_type ();
+      return 0;
+    }
 
-      // There used to be another check here ANDed with the one below:
-      // d->defined_in () == this. But lookup_for_add() calls only
-      // lookup_by_name_local(), which does not bump up the scope,
-      // and look_in_previous() for modules. If look_in_previous()
-      // finds something, the scopes will NOT be the same pointer
-      // value, but the result is what we want.
-      if (nt == AST_Decl::NT_struct)
-        {
-          AST_Structure *s = AST_Structure::narrow_from_decl (d);
-          t->set_full_definition (s);
-        }
-      else
-        {
-          if (!can_be_redefined (d))
-            {
-              idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
-                                          t,
-                                          ScopeAsDecl (this),
-                                          d);
-              return 0;
-            }
+  f->set_added (true);
 
-          if (this->referenced (d, t->local_name ()))
-            {
-              idl_global->err ()->error3 (UTL_Error::EIDL_DEF_USE,
-                                          t,
-                                          ScopeAsDecl (this),
-                                          d);
-              return 0;
-            }
-        }
+  if (!f->field_type ()->added ())
+    {
+      return add_type (f->field_type ()) ? f : 0;
+    }
+  else
+    {
+      return f;
+    }
+}
+
+AST_Enum *
+UTL_Scope::add_enum (AST_Enum *e)
+{
+  if (e == 0)
+    {
+      return 0;
+    }
+
+  e->set_added (true);
+  return e;
+}
+
+AST_EnumVal *
+UTL_Scope::add_enum_val (AST_EnumVal *e)
+{
+  if (e == 0)
+    {
+      return 0;
     }
 
-  // Add it to scope
-  this->add_to_scope (t);
+  e->set_added (true);
+  return e;
+}
+
+AST_Typedef *
+UTL_Scope::add_typedef (AST_Typedef *t)
+{
+  if (t == 0)
+    {
+      return 0;
+    }
+
+  t->set_added (true);
+  if (!t->base_type ()->added ())
+    {
+      return add_type (t->base_type ()) ? t : 0;
+    }
+  else
+    {
+      return t;
+    }
+}
+
+AST_Sequence *
+UTL_Scope::add_sequence (AST_Sequence *s)
+{
+  if (s == 0)
+    {
+      return 0;
+    }
 
-  // Add it to set of locally referenced symbols
-  this->add_to_referenced (t,
-                           false,
-                           t->local_name ());
+  s->set_added (true);
 
-  // Must check later that all struct and union forward declarations
-  // are defined in the same IDL file.
-  AST_record_fwd_decl (t);
-  return t;
+  if (!s->base_type ()->added ())
+    {
+      return add_type (s->base_type ()) ? s : 0;
+    }
+  else
+    {
+      return s;
+    }
+}
+
+AST_String *
+UTL_Scope::add_string (AST_String *s)
+{
+  if (s == 0)
+    {
+      return 0;
+    }
+
+  s->set_added (true);
+  return s;
 }
 
+AST_Array *
+UTL_Scope::add_array (AST_Array *a)
+{
+  if (a == 0)
+    {
+      return 0;
+    }
+
+  a->set_added (true);
+
+  if (!a->base_type ()->added ())
+    {
+      return add_type (a->base_type ()) ? a : 0;
+    }
+  else
+    {
+      return a;
+    }
+}
+
+AST_Native *
+UTL_Scope::add_native (AST_Native *n)
+{
+  if (n == 0)
+    {
+      return 0;
+    }
+
+  n->set_added (true);
+  return n;
+}
+
+AST_Factory *
+UTL_Scope::add_factory (AST_Factory *f)
+{
+  // We don't invite any new types so there is nothing actually to add
+  if (f == 0)
+    {
+      return 0;
+    }
+
+  f->set_added (true);
+  return f;
+}
+
+AST_PortType *
+UTL_Scope::add_porttype (AST_PortType *p)
+{
+  if (p == 0)
+    {
+      return 0;
+    }
+
+  p->set_added (true);
+  return p;
+}
+
+// Protected Front End Scope Management Protocol.
+//
+// All members of the protocol defined in UTL_Scope simply return NULL
+// and don't do a thing. This ensures that runtime errors will discover
+// operations which should have been redefined to allow certain kinds of
+// AST nodes to appear in a given context.
+
 AST_PredefinedType *
 UTL_Scope::fe_add_predefined_type (AST_PredefinedType *)
 {
@@ -800,12 +1252,6 @@ UTL_Scope::fe_add_factory (AST_Factory *)
   return 0;
 }
 
-AST_Finder *
-UTL_Scope::fe_add_finder (AST_Finder *)
-{
-  return 0;
-}
-
 AST_PortType *
 UTL_Scope::fe_add_porttype (AST_PortType *)
 {
@@ -860,6 +1306,117 @@ UTL_Scope::fe_add_connector (AST_Connector *)
   return 0;
 }
 
+// This is the second pass of the front end
+// It calls the public add protocol on everything in scope.
+// It calls the add_xx functions of the most derived AST_Node.
+
+AST_Decl *
+UTL_Scope::call_add (void)
+{
+  AST_Decl *result = 0;
+  AST_Decl *decl = 0;
+
+  UTL_ScopeActiveIterator i (this,
+                             UTL_Scope::IK_decls);
+  UTL_Scope *scope = 0;
+
+  while (!i.is_done ())
+    {
+      decl = i.item ();
+      scope = 0;
+
+      switch (decl->node_type ())
+        {
+        case AST_Decl::NT_argument:
+          result = add_argument (AST_Argument::narrow_from_decl (decl));
+          break;
+        case AST_Decl::NT_array:
+          result = add_array (AST_Array::narrow_from_decl (decl));
+          break;
+        case AST_Decl::NT_attr:
+          result = add_attribute (AST_Attribute::narrow_from_decl (decl));
+          break;
+        case AST_Decl::NT_const:
+          result = add_constant (AST_Constant::narrow_from_decl (decl));
+          break;
+        case AST_Decl::NT_enum:
+          scope = AST_Enum::narrow_from_decl (decl);
+          result = add_enum (AST_Enum::narrow_from_decl (decl));
+          break;
+        case AST_Decl::NT_enum_val:
+          result = add_enum_val (AST_EnumVal::narrow_from_decl (decl));
+          break;
+        case AST_Decl::NT_except:
+          scope = AST_Exception::narrow_from_decl (decl);
+          result = add_exception (AST_Exception::narrow_from_decl (decl));
+          break;
+        case AST_Decl::NT_field:
+          result = add_field (AST_Field::narrow_from_decl (decl));
+          break;
+        case AST_Decl::NT_interface:
+          scope = AST_Interface::narrow_from_decl (decl);
+          result = add_interface (AST_Interface::narrow_from_decl (decl));
+          break;
+        case AST_Decl::NT_interface_fwd:
+          result =
+            add_interface_fwd (AST_InterfaceFwd::narrow_from_decl (decl));
+          break;
+        case AST_Decl::NT_module:
+          scope = AST_Module::narrow_from_decl (decl);
+          result = add_module (AST_Module::narrow_from_decl (decl));
+          break;
+        case AST_Decl::NT_native:
+          result = add_native (AST_Native::narrow_from_decl (decl));
+          break;
+        case AST_Decl::NT_op:
+          result = add_operation (AST_Operation::narrow_from_decl (decl));
+          scope = AST_Operation::narrow_from_decl (decl);
+          break;
+        case AST_Decl::NT_pre_defined:
+          result =
+            add_predefined_type (AST_PredefinedType::narrow_from_decl (decl));
+          break;
+        case AST_Decl::NT_sequence:
+          result = add_sequence (AST_Sequence::narrow_from_decl (decl));
+          break;
+        case AST_Decl::NT_string:
+        case AST_Decl::NT_wstring:
+          result = add_string (AST_String::narrow_from_decl (decl));
+          break;
+        case AST_Decl::NT_struct:
+          result = add_structure (AST_Structure::narrow_from_decl (decl));
+          scope = AST_Structure::narrow_from_decl (decl);
+          break;
+        case AST_Decl::NT_typedef:
+          result = add_typedef (AST_Typedef::narrow_from_decl (decl));
+          break;
+        case AST_Decl::NT_union:
+          result = add_union (AST_Union::narrow_from_decl (decl));
+          scope = AST_Union::narrow_from_decl (decl);
+          break;
+        case AST_Decl::NT_union_branch:
+          result =
+            add_union_branch (AST_UnionBranch::narrow_from_decl (decl));
+          break;
+        case AST_Decl::NT_factory:
+          result = add_factory (AST_Factory::narrow_from_decl (decl));
+          scope = AST_Factory::narrow_from_decl (decl);
+          break;
+        default:
+          return 0;
+        }
+
+      if (scope != 0)
+        {
+          scope->call_add ();
+        }
+
+      i.next ();
+    }
+
+  return result;
+}
+
 // Private lookup mechanism.
 
 // For dealing with lookups of 'Object' and 'TypeCode'.
@@ -1178,11 +1735,9 @@ UTL_Scope::lookup_by_name_local (Identifier *e,
             {
               AST_Decl::NodeType nt = d->node_type ();
 
-              // Special case for forward declared types,
+              // Special case for forward declared interfaces,
               // In this case, we want to return
-              // the full definition member, whether defined yet or not.
-              // NOTE: corresponding full_definition fe_add_* methods
-              // depend on the behavior below!
+              // the full definition member, whether defined yet or not
               if (nt == AST_Decl::NT_interface_fwd
                   || nt == AST_Decl::NT_valuetype_fwd
                   || nt == AST_Decl::NT_component_fwd
@@ -1287,7 +1842,7 @@ UTL_Scope::lookup_by_name (UTL_ScopedName *e,
     }
 
   // If name starts with "::" or "" start lookup in global scope.
-  if (this->is_global_name (e->head ()))
+  if (is_global_name (e->head ()))
     {
      // Get parent scope.
       d = ScopeAsDecl (this);
@@ -1511,10 +2066,10 @@ UTL_Scope::lookup_by_name (UTL_ScopedName *e,
 
       if (sn != 0)
         {
-          d = this->iter_lookup_by_name_local (d,
-                                               sn,
-                                               0,
-                                               full_def_only);
+          d = iter_lookup_by_name_local (d,
+                                         sn,
+                                         0,
+                                         full_def_only);
         }
 
       // If the start of the scoped name is an interface, and the
@@ -1709,6 +2264,7 @@ UTL_Scope::replace_scope (AST_Decl *old_decl,
           break;
         }
     }
+
 }
 
 
@@ -1952,11 +2508,8 @@ UTL_Scope::referenced (AST_Decl *e,
           // scope, then it's a type name for something else
           // that was, and it can appear any number of times
           // in this scope without a clash.
-          AST_Decl::NodeType nt = e->node_type ();
-          
           if (id->compare (*name_tmp) == true
-              && nt != AST_Decl::NT_module
-              && nt != AST_Decl::NT_param_holder
+              && e->node_type () != AST_Decl::NT_module
               && e->defined_in () == this)
             {
               idl_global->err ()->redef_error (id->get_string (),
@@ -2154,221 +2707,7 @@ UTL_Scope::destroy (void)
   this->pd_referenced_used = 0;
 }
 
-bool
-UTL_Scope::inherited_op_attr_clash (AST_Decl *t)
-{
-  AST_Interface *i = AST_Interface::narrow_from_scope (this);
-  
-  if (i == 0)
-    {
-      return false;
-    }
-    
-  AST_Decl *d = i->look_in_inherited (t->name (), false);
-  
-  if (d != 0)
-    {
-      AST_Decl::NodeType nt = d->node_type ();
-      
-      if (nt == AST_Decl::NT_attr || nt == AST_Decl::NT_op)
-        {
-          idl_global->err ()->error3 (UTL_Error::EIDL_REDEF,
-                                      t,
-                                      i,
-                                      d);
-          return true;
-        }
-    }
-    
-  return false;
-}
-
-bool
-UTL_Scope::arg_specific_error (AST_Decl *t)
-{
-  AST_Operation *op = AST_Operation::narrow_from_scope (this);
-  
-  if (op == 0)
-    {
-      return false;
-    }
-    
-  AST_Argument *arg = AST_Argument::narrow_from_decl (t);
-  AST_Argument::Direction d = arg->direction ();
-  AST_Operation::Flags flag = op->flags ();
-  
-  /// Cannot add OUT or INOUT argument to oneway operation.
-  if ((d == AST_Argument::dir_OUT || d == AST_Argument::dir_INOUT)
-      && flag == AST_Operation::OP_oneway)
-    {
-      idl_global->err ()->error2 (UTL_Error::EIDL_ONEWAY_CONFLICT,
-                                  t,
-                                  op);
-      return true;
-    }
-
-  AST_Type *arg_type = arg->field_type ();
-
-  /// This error is not caught in y.tab.cpp so we check for it here.
-  if (arg_type->node_type () == AST_Decl::NT_array
-      && arg_type->anonymous ())
-    {
-      idl_global->err ()->syntax_error (idl_global->parse_state ());
-      return true;
-    }
-    
-  return false;
-}
-
-void
-UTL_Scope::smart_local_add (AST_Decl *t)
-{
-  /// Catches struct, union * exception
-  AST_Structure *s = AST_Structure::narrow_from_scope (this);
-  
-  /// Catches AST_Field and AST_UnionBranch.
-  AST_Field *f = AST_Field::narrow_from_decl (t);
-  
-  /// Decls inside a struct/union/exception are also referenced by
-  /// fields, and so must be handled differently.
-  if (s != 0 && f == 0)
-    {
-      this->add_to_local_types (t);
-    }
-  else
-    {
-      this->add_to_scope (t);
-    }
-    
-  AST_Union *u = AST_Union::narrow_from_scope (this);
-  AST_UnionBranch *ub = AST_UnionBranch::narrow_from_decl (t);
-  
-  // If we have an enum discriminator, add the label names to
-  // the name_referenced list before we add the union branch,
-  // so a branch name clash with a label name will be caught.
-  if (u != 0 && ub != 0)
-    {
-      if (u->udisc_type () == AST_Expression::EV_enum)
-        {
-          ub->add_labels (u);
-        }
-      else
-        {
-          ub->coerce_labels (u);
-        }
-    }
-}
-
-/// Determines if a name is global.
-bool
-UTL_Scope::is_global_name (Identifier *i)
-{
-  if (i == 0)
-    {
-      return false;
-    }
-    
-  ACE_CString cmp (i->get_string (), 0, false);
-  
-  if (cmp == "" || cmp == "::")
-    {
-      return true;
-    }
-
-  return false;
-}
 
-AST_Decl *
-UTL_Scope::iter_lookup_by_name_local (AST_Decl *d,
-                                      UTL_ScopedName *e,
-                                      long index,
-                                      bool full_def_only)
-{
-  AST_Typedef *td = AST_Typedef::narrow_from_decl (d);
-  AST_Decl *result = 0;
-
-  // Remove all the layers of typedefs.
-  while (d != 0 && d->node_type () == AST_Decl::NT_typedef)
-    {
-      if (td == 0)
-        {
-          return 0;
-        }
-
-      d = td->base_type ();
-    }
-    
-  if (d == 0)
-    {
-      return 0;
-    }
-
-  // Try to convert the AST_Decl to a UTL_Scope.
-  UTL_Scope *sc = DeclAsScope (d);
-
-  if (sc == 0)
-    {
-      return 0;
-    }
-
-  if (index < static_cast<long> (sc->nmembers ()))
-    {
-      // Look up the first component of the scoped name.
-      result = sc->lookup_by_name_local (e->head (),
-                                         index,
-                                         full_def_only);
-    }
-  else
-    {
-      return 0;
-    }
-
-  UTL_ScopedName *sn = (UTL_ScopedName *) e->tail ();
-
-  if (result == 0)
-    {
-      if (sn == 0)
-        {
-          result = UTL_Scope::match_param (e);
-        }
-
-      return result;
-    }
-  else
-    {
-      if (sn == 0)
-        {
-          // We're done.
-          return result;
-        }
-      else
-        {
-          // Look up the next component of the scoped name.
-          result = iter_lookup_by_name_local (result,
-                                              sn,
-                                              0,
-                                              full_def_only);
-        }
-
-      if (result != 0)
-        {
-          // We're done.
-          return result;
-        }
-      else
-        {
-          // Maybe we're on the wrong branch of reopened
-          // and/or nested modules, so let's see if there's
-          // another branch. If 'index' gets as high as the
-          // number of members in the scope, the call above
-          // to lookup_by_name_local will catch it and return 0.
-          return this->iter_lookup_by_name_local (d,
-                                                  e,
-                                                  index + 1,
-                                                  full_def_only);
-        }
-    }
-}
 
 IMPL_NARROW_FROM_SCOPE(UTL_Scope)
 
diff --git a/TAO/TAO_IDL/util/utl_stack.cpp b/TAO/TAO_IDL/util/utl_stack.cpp
index aac41c094af..71877c2b695 100644
--- a/TAO/TAO_IDL/util/utl_stack.cpp
+++ b/TAO/TAO_IDL/util/utl_stack.cpp
@@ -68,6 +68,10 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "utl_scope.h"
 #include "global_extern.h"
 
+ACE_RCSID (util,
+           utl_stack,
+           "$Id$")
+
 #undef  INCREMENT
 #define  INCREMENT  64
 
diff --git a/TAO/TAO_IDL/util/utl_string.cpp b/TAO/TAO_IDL/util/utl_string.cpp
index 603e799b9a7..e413fc8a18b 100644
--- a/TAO/TAO_IDL/util/utl_string.cpp
+++ b/TAO/TAO_IDL/util/utl_string.cpp
@@ -74,6 +74,10 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 
 #include "ace/OS_NS_ctype.h"
 
+ACE_RCSID (util,
+           utl_string,
+           "$Id$")
+
 UTL_String::UTL_String (void)
   : p_str (0),
     c_str (0),
diff --git a/TAO/TAO_IDL/util/utl_strlist.cpp b/TAO/TAO_IDL/util/utl_strlist.cpp
index c7fc4c52574..004c415fd5f 100644
--- a/TAO/TAO_IDL/util/utl_strlist.cpp
+++ b/TAO/TAO_IDL/util/utl_strlist.cpp
@@ -81,6 +81,10 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
 #include "ace/OS_Memory.h"
 #include "ace/OS_NS_string.h"
 
+ACE_RCSID (util,
+           utl_strlist,
+           "$Id$")
+
 UTL_StrList::UTL_StrList (UTL_String *s,
                           UTL_StrList *cdr)
   : UTL_List(cdr),
diff --git a/TAO/TAO_IDL/util/utl_tmpl/utl_decllist.cpp b/TAO/TAO_IDL/util/utl_tmpl/utl_decllist.cpp
index 0116602df2d..5718467af2a 100644
--- a/TAO/TAO_IDL/util/utl_tmpl/utl_decllist.cpp
+++ b/TAO/TAO_IDL/util/utl_tmpl/utl_decllist.cpp
@@ -59,6 +59,8 @@
 #include <idl.hh>
 #include <idl_extern.hh>
 
+ACE_RCSID(utl_tmpl, utl_decllist, "$Id$")
+
 /*
  * Constructor(s)
  */
diff --git a/TAO/TAO_IDL/util/utl_tmpl/utl_exceptlist.cpp b/TAO/TAO_IDL/util/utl_tmpl/utl_exceptlist.cpp
index 39d46d2d344..df8597a16e2 100644
--- a/TAO/TAO_IDL/util/utl_tmpl/utl_exceptlist.cpp
+++ b/TAO/TAO_IDL/util/utl_tmpl/utl_exceptlist.cpp
@@ -59,6 +59,8 @@
 #include <idl.hh>
 #include <idl_extern.hh>
 
+ACE_RCSID(utl_tmpl, utl_exceptlist, "$Id$")
+
 /*
  * Constructor(s)
  */
diff --git a/TAO/TAO_IDL/util/utl_tmpl/utl_exprlist.cpp b/TAO/TAO_IDL/util/utl_tmpl/utl_exprlist.cpp
index be8121f117b..30ed3559e2f 100644
--- a/TAO/TAO_IDL/util/utl_tmpl/utl_exprlist.cpp
+++ b/TAO/TAO_IDL/util/utl_tmpl/utl_exprlist.cpp
@@ -59,6 +59,8 @@
 #include <idl.hh>
 #include <idl_extern.hh>
 
+ACE_RCSID(utl_tmpl, utl_exprlist, "$Id$")
+
 /*
  * Constructor(s)
  */
diff --git a/TAO/TAO_IDL/util/utl_tmpl/utl_idlist.cpp b/TAO/TAO_IDL/util/utl_tmpl/utl_idlist.cpp
index 959cb5e316c..3f4780aa82e 100644
--- a/TAO/TAO_IDL/util/utl_tmpl/utl_idlist.cpp
+++ b/TAO/TAO_IDL/util/utl_tmpl/utl_idlist.cpp
@@ -59,6 +59,8 @@
 #include        <idl.hh>
 #include        <idl_extern.hh>
 
+ACE_RCSID(utl_tmpl, utl_idlist, "$Id$")
+
 /*
  * Constructor(s)
  */
diff --git a/TAO/TAO_IDL/util/utl_tmpl/utl_list.cpp b/TAO/TAO_IDL/util/utl_tmpl/utl_list.cpp
index eae6ae3ce14..3788926b7dd 100644
--- a/TAO/TAO_IDL/util/utl_tmpl/utl_list.cpp
+++ b/TAO/TAO_IDL/util/utl_tmpl/utl_list.cpp
@@ -60,6 +60,8 @@
 #include  <utl_list.hh>
 #include  <bool.hh>
 
+ACE_RCSID(utl_tmpl, utl_list, "$Id$")
+
 /*
  * Constructor(s)
  */
diff --git a/TAO/TAO_IDL/util/utl_tmpl/utl_namelist.cpp b/TAO/TAO_IDL/util/utl_tmpl/utl_namelist.cpp
index d85829d7f7f..8ce376d9c31 100644
--- a/TAO/TAO_IDL/util/utl_tmpl/utl_namelist.cpp
+++ b/TAO/TAO_IDL/util/utl_tmpl/utl_namelist.cpp
@@ -59,6 +59,8 @@
 #include <idl.hh>
 #include <idl_extern.hh>
 
+ACE_RCSID(utl_tmpl, utl_namelist, "$Id$")
+
 typedef UTL_List<UTL_NameList, UTL_ScopedName> _dummy_;
 
 /*
diff --git a/TAO/TAO_IDL/util/utl_tmpl/utl_strlist.cpp b/TAO/TAO_IDL/util/utl_tmpl/utl_strlist.cpp
index 2ed424a8cee..76461aaaad2 100644
--- a/TAO/TAO_IDL/util/utl_tmpl/utl_strlist.cpp
+++ b/TAO/TAO_IDL/util/utl_tmpl/utl_strlist.cpp
@@ -59,6 +59,8 @@
 #include        <idl.hh>
 #include        <idl_extern.hh>
 
+ACE_RCSID(utl_tmpl, utl_strlist, "$Id$")
+
 /*
  * Constructor(s)
  */
diff --git a/TAO/bin/tao_orb_tests.lst b/TAO/bin/tao_orb_tests.lst
index acb06795063..0274d563c57 100644
--- a/TAO/bin/tao_orb_tests.lst
+++ b/TAO/bin/tao_orb_tests.lst
@@ -171,9 +171,6 @@ TAO/tests/Bug_3748_Regression/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MI
 TAO/tests/Bug_3755_Regression/run_test.pl: !STATIC !CORBA_E_COMPACT !CORBA_E_MICRO !ST
 TAO/tests/Bug_3766_Regression/run_test.pl:
 TAO/tests/Bug_3790_Regression/run_test.pl:
-TAO/tests/Bug_3821_Regression/run_test.pl:
-TAO/tests/Bug_3826_Regression/run_test.pl:
-TAO/tests/Bug_3827_Regression/run_test.pl:
 TAO/tests/DIOP/run_test.pl: !ST !NO_DIOP !ACE_FOR_TAO !CORBA_E_MICRO
 TAO/tests/DIOP/run_test_ipv6.pl: IPV6 !ST !NO_DIOP !ACE_FOR_TAO !CORBA_E_MICRO
 TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/run_test.pl: !MINIMUM !CORBA_E_COMPACT !CORBA_E_MICRO !ST
diff --git a/TAO/configure.ac b/TAO/configure.ac
index c04ab636622..5f1224d8229 100644
--- a/TAO/configure.ac
+++ b/TAO/configure.ac
@@ -44,6 +44,7 @@ AC_PREREQ([2.58])
 AC_CONFIG_SRCDIR([tao/TAO_Internal.cpp])
 
 AC_CONFIG_AUX_DIR([../aux_config])
+AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_MACRO_DIR([../m4])
 
 dnl Check what platform we are running on.
diff --git a/TAO/docs/compiler.html b/TAO/docs/compiler.html
index f1c6a85c686..0d923625408 100644
--- a/TAO/docs/compiler.html
+++ b/TAO/docs/compiler.html
@@ -79,11 +79,6 @@ these files:) <P>
       with empty function bodies for facet, supported and inherited operations,
       as well as factory functions to create component and home executors.
       These files were formerly generated by the CIAO CIDL compiler.
-  <LI> <B><EM>Connector implementation files</EM></B>, <EM>i.e.</EM>, <tt>*_conn.h</tt>,
-      and <tt>*_conn.cpp</tt>. Optionally generated files containing connector implementation classes
-      with complete function bodies. The function implementations are specialized
-      for DDS at present, but will be configurable to other connection mechanisms
-      in the future.
   <LI> <B><EM>Export header files</EM></B>, <EM>i.e.</EM>, <tt>*_export.h</tt>.
       Optionally generated files defining export/import macros as well as 
       corresponding macros related to singletons and tracing, all in terms of
@@ -396,30 +391,6 @@ also receives other options that are specific to it.<p>
         macro.</td>
   </tr>
 
-  <tr><a name="conn_export_macro"></a>
-    <td></td>
-    
-    <td><tt>conn_export_macro=</tt><i>macro_name</i></td>
-    
-    <td>The compiler will emit <i>macro_name</i> right after each <tt>class</tt>
-        or <tt>extern</tt> keyword in the generated CIAO connector implmentation header
-        (*_conn.h) files, if such
-        code is being generated (see <tt>-Gcn</tt> option below). These macros
-        are needed for Windows and newer versions of gcc, which require special directives to
-        export symbols from DLLs - otherwise the definition is just a space.&nbsp;</td>
-  </tr>
-
-  <tr><a name="conn_export_include"></a>
-    <td></td>
-    
-    <td><tt>conn_export_include=</tt><i>include_path</i></td>
-    
-    <td>The compiler will generate code to include <i>include_path</i> at the
-        top of the CIAO connector implementation header (*_conn.h) file, if this file is being generated
-        (see <tt>-Gcn</tt> option below). This is usually a good place to define the export
-        macro.</td>
-  </tr>
-
   <tr><a name="export_macro">
     <td></td>
 
@@ -431,9 +402,8 @@ also receives other options that are specific to it.<p>
         <tt>-Wb,anyop_export_macro=</tt><i>macro_name</i>.<br>
         <tt>-Wb,svnt_export_macro=</tt><i>macro_name</i><br>
         <tt>-Wb,exec_export_macro=</tt><i>macro_name</i><br>
-        <tt>-Wb,conn_export_macro=</tt><i>macro_name</i><br>
-        This option is useful when building a single DLL
-        or when some code generation is suppressed or not triggered
+        This option is useful when building a DLL containing both stubs and
+        skeletons, or when skeleton file generation is suppressed
         (see option <tt>-SS</tt> below). </td>
   </tr>
 
@@ -448,9 +418,8 @@ also receives other options that are specific to it.<p>
         <tt>-Wb,anyop_export_include=</tt><i>include_path</i>.<br>
         <tt>-Wb,svnt_export_include=</tt><i>include_path</i><br>
         <tt>-Wb,exec_export_include=</tt><i>include_path</i><br>
-        <tt>-Wb,conn_export_include=</tt><i>include_path</i><br>
-        This option goes with the previous option to build a DLL containing
-        all code generation, or when some code generation is suppressed
+        This option goes with the previous option to build DLL containing
+        both stubs and skeletons, or when skeleton file generation is suppressed
         (see option <tt>-SS</tt> below).</td>
   </tr>
 
@@ -943,14 +912,6 @@ also receives other options that are specific to it.<p>
     to be filled in by the developer.</td>
   </tr>
 
-  <tr><a name="Gcn">
-    <td><tt>-Gcn</tt></td>
-
-    <td>Generate CIAO connector implementation code for connector IDL declarations</td>
-    <td>Generate a complete implementation for each connector. Specialized at present
-    for DDS connectors.</td>
-  </tr>
-
   <tr><a name="Glem">
     <td><tt>-Glem</tt></td>
 
@@ -1015,13 +976,6 @@ also receives other options that are specific to it.<p>
     <td>This is the file specified in <tt>-Wb,exec_export_include=<i>include_path</i></tt></td>
   </tr>
 
-  <tr><a name="Gxhcn">
-    <td><tt>-Gxhcn</tt></td>
-
-    <td>Generate the connector export header file</td>
-    <td>This is the file specified in <tt>-Wb,conn_export_include=<i>include_path</i></tt></td>
-  </tr>
-
   <tr><a name="Sa">
     <td><tt>-Sa</tt></td>
 
diff --git a/TAO/examples/mfc/server.cpp b/TAO/examples/mfc/server.cpp
index 437d2d218f5..15304d7172a 100644
--- a/TAO/examples/mfc/server.cpp
+++ b/TAO/examples/mfc/server.cpp
@@ -61,7 +61,7 @@ spawn_my_orb_thread (void *)
       // Initializing the NamingService
       W32_Test_Impl myservant;
       W32_Test_Interface_var orb_servant =
-        myservant._this ();
+        myservant._this (ACE_TRY_CHECK);
 
       CORBA::String_var ior =
         the_orb->object_to_string (orb_servant.in ());
diff --git a/ACE/m4/tao.m4 b/TAO/m4/tao.m4
index 1441e8b5316..1441e8b5316 100644
--- a/ACE/m4/tao.m4
+++ b/TAO/m4/tao.m4
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
index 8e980c90a93..4dadcf226da 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
@@ -17,7 +17,7 @@
 #include "ast_eventtype_fwd.h"
 #include "ast_exception.h"
 #include "ast_expression.h"
-#include "ast_finder.h"
+#include "ast_factory.h"
 #include "ast_field.h"
 #include "ast_home.h"
 #include "ast_interface.h"
@@ -52,13 +52,16 @@
 
 #include "ace/Vector_T.h"
 
-ifr_adding_visitor::ifr_adding_visitor (
-      AST_Decl *scope,
-      bool in_reopened,
-      bool allow_duplicate_typedefs)
+ACE_RCSID (IFR_Service,
+           ifr_adding_visitor,
+           "$Id$")
+
+ifr_adding_visitor::ifr_adding_visitor (AST_Decl *scope,
+                                        bool in_reopened,
+          bool allow_duplicate_typedefs)
   : scope_ (scope),
-    in_reopened_ (in_reopened),
-    allow_duplicate_typedefs_ (allow_duplicate_typedefs)
+  in_reopened_ (in_reopened),
+  allow_duplicate_typedefs_ (allow_duplicate_typedefs)
 {
 }
 
@@ -579,7 +582,7 @@ ifr_adding_visitor::visit_valuetype (AST_ValueType *node)
 
   try
     {
-      // Is this valuetype already in the respository?
+      // Is this interface already in the respository?
       CORBA::Contained_var prev_def =
         be_global->repository ()->lookup_id (node->repoID ());
 
@@ -1623,6 +1626,12 @@ ifr_adding_visitor::visit_home (AST_Home *node)
 }
 
 int
+ifr_adding_visitor::visit_factory (AST_Factory *)
+{
+  return 0;
+}
+
+int
 ifr_adding_visitor::visit_structure (AST_Structure *node)
 {
   if (node->imported () && !be_global->do_included_files ())
@@ -3900,7 +3909,6 @@ ifr_adding_visitor::fill_exceptions (CORBA::ExceptionDefSeq &result,
           return;
         }
       case AST_Decl::NT_factory:
-      case AST_Decl::NT_finder:
         {
           AST_Factory *f = AST_Factory::narrow_from_decl (node);
           this->fill_exceptions (result,
@@ -3948,10 +3956,10 @@ ifr_adding_visitor::fill_exceptions (CORBA::ExceptionDefSeq &result,
 
 void
 ifr_adding_visitor::fill_params (CORBA::ParDescriptionSeq &result,
-                                 UTL_Scope *node)
+                                 AST_Operation *node)
 {
   AST_Argument *arg = 0;
-  CORBA::ULong n_args = static_cast<CORBA::ULong> (node->nmembers ());
+  CORBA::ULong n_args = static_cast<CORBA::ULong> (node->argument_count ());
   result.length (n_args);
   CORBA::ULong index = 0;
   CORBA::Contained_var holder;
@@ -3980,33 +3988,26 @@ void
 ifr_adding_visitor::visit_all_factories (AST_Home *node,
                                          CORBA::ComponentIR::HomeDef_ptr h)
 {
+  AST_Operation **tmp = 0;
   CORBA::Contained_var contained;
   CORBA::ComponentIR::FactoryDef_var new_def;
 
-  for (UTL_ScopeActiveIterator h_iter (node,
-                                       UTL_Scope::IK_decls);
-       !h_iter.is_done ();
-       h_iter.next ())
+  for (ACE_Unbounded_Queue_Iterator<AST_Operation *> i (node->factories ());
+       ! i.done ();
+       i.advance ())
     {
-      AST_Decl *d = h_iter.item ();
-      AST_Decl::NodeType nt = d->node_type ();
-      
-      if (nt != AST_Decl::NT_factory)
-        {
-          continue;
-        }
-        
-      AST_Factory *f = AST_Factory::narrow_from_decl (d);
-      
+      i.next (tmp);
       CORBA::ParDescriptionSeq params;
-      this->fill_params (params, f);
+      this->fill_params (params,
+                         *tmp);
 
       CORBA::ExceptionDefSeq exceptions;
-      this->fill_exceptions (exceptions, f);
+      this->fill_exceptions (exceptions,
+                             *tmp);
 
-      new_def = h->create_factory (f->repoID (),
-                                   f->local_name ()->get_string (),
-                                   f->version (),
+      new_def = h->create_factory ((*tmp)->repoID (),
+                                   (*tmp)->local_name ()->get_string (),
+                                   (*tmp)->version (),
                                    params,
                                    exceptions);
     }
@@ -4016,31 +4017,26 @@ void
 ifr_adding_visitor::visit_all_finders (AST_Home *node,
                                        CORBA::ComponentIR::HomeDef_ptr h)
 {
-  AST_Finder *f = 0;
+  AST_Operation **tmp = 0;
   CORBA::Contained_var contained;
   CORBA::ComponentIR::FinderDef_var new_def;
 
-  for (UTL_ScopeActiveIterator h_iter (node,
-                                       UTL_Scope::IK_decls);
-       !h_iter.is_done ();
-       h_iter.next ())
+  for (ACE_Unbounded_Queue_Iterator<AST_Operation *> i (node->finders ());
+       ! i.done ();
+       i.advance ())
     {
-      f = AST_Finder::narrow_from_decl (h_iter.item ());
-      
-      if (f == 0)
-        {
-          continue;
-        }
-
+      i.next (tmp);
       CORBA::ParDescriptionSeq params;
-      this->fill_params (params, f);
+      this->fill_params (params,
+                         *tmp);
 
       CORBA::ExceptionDefSeq exceptions;
-      this->fill_exceptions (exceptions, f);
+      this->fill_exceptions (exceptions,
+                             *tmp);
 
-      new_def = h->create_finder (f->repoID (),
-                                  f->local_name ()->get_string (),
-                                  f->version (),
+      new_def = h->create_finder ((*tmp)->repoID (),
+                                  (*tmp)->local_name ()->get_string (),
+                                  (*tmp)->version (),
                                   params,
                                   exceptions);
     }
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.h b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.h
index bc42e852620..79668d18cfc 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.h
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.h
@@ -64,6 +64,7 @@ public:
   virtual int visit_eventtype (AST_EventType *node);
   virtual int visit_eventtype_fwd (AST_EventTypeFwd *node);
   virtual int visit_home (AST_Home *node);
+  virtual int visit_factory (AST_Factory *node);
   virtual int visit_structure (AST_Structure *node);
   virtual int visit_structure_fwd (AST_StructureFwd *node);
   virtual int visit_exception (AST_Exception *node);
@@ -160,7 +161,7 @@ protected:
                         UTL_ExceptList *list);
 
   void fill_params (CORBA::ParDescriptionSeq &result,
-                    UTL_Scope *node);
+                    AST_Operation *node);
 
   void visit_all_factories (AST_Home *node,
                             CORBA::ComponentIR::HomeDef_ptr h);
diff --git a/TAO/orbsvcs/IFR_Service/ifr_visitor.cpp b/TAO/orbsvcs/IFR_Service/ifr_visitor.cpp
index 523ee0e5ea9..70febf0d065 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_visitor.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_visitor.cpp
@@ -205,12 +205,6 @@ ifr_visitor::visit_factory (AST_Factory *)
 }
 
 int
-ifr_visitor::visit_finder (AST_Finder *)
-{
-  return 0;
-}
-
-int
 ifr_visitor::visit_structure (AST_Structure *)
 {
   return 0;
diff --git a/TAO/orbsvcs/IFR_Service/ifr_visitor.h b/TAO/orbsvcs/IFR_Service/ifr_visitor.h
index a280bd84101..3352e32f1b4 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_visitor.h
+++ b/TAO/orbsvcs/IFR_Service/ifr_visitor.h
@@ -57,6 +57,7 @@ public:
   virtual int visit_template_module (AST_Template_Module *node);
   virtual int visit_template_module_inst (AST_Template_Module_Inst *node);
   virtual int visit_template_module_ref (AST_Template_Module_Ref *node);
+  virtual int visit_param_holder(AST_Param_Holder *node);
   virtual int visit_porttype (AST_PortType *node);
   virtual int visit_provides (AST_Provides *node);
   virtual int visit_uses (AST_Uses *node);
@@ -70,7 +71,6 @@ public:
   virtual int visit_eventtype_fwd (AST_EventTypeFwd *node);
   virtual int visit_home (AST_Home *node);
   virtual int visit_factory (AST_Factory *node);
-  virtual int visit_finder (AST_Finder *node);
   virtual int visit_structure (AST_Structure *node);
   virtual int visit_structure_fwd (AST_StructureFwd *node);
   virtual int visit_exception (AST_Exception *node);
@@ -92,7 +92,6 @@ public:
   virtual int visit_typedef (AST_Typedef *node);
   virtual int visit_root (AST_Root *node);
   virtual int visit_native (AST_Native *node);
-  virtual int visit_param_holder (AST_Param_Holder *node);
 
   ACE_Lock &lock (void) const;
   // Accessor for our lock.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h
index e2fc37d122f..403ef6b351c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h
@@ -47,10 +47,10 @@ public:
   /// This version initializes the base from our members
   void init ();
 
-  /// Populate @a qos_properties with all properties from this object. Returns -1 on error.
+  /// Populate <qos_properties> with all properties from this object. Returns -1 on error.
   int copy (TAO_Notify_QoSProperties& qos_properties);
 
-  /// Populate @a qos_properties with properties that can be transfered.Returns -1 on error.
+  /// Populate <qos_properties> with properties that can be transfered.Returns -1 on error.
   int transfer (TAO_Notify_QoSProperties& qos_properties);
 
   ///= Accessors
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.h
index 9e81adf589c..2ccc88017aa 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.h
@@ -58,7 +58,7 @@ namespace TAO_Notify
     * \param id numeric id for this object
     * \param type string containing the unique type name for this class of objects
     * \param attrs a collection of name/value attributes
-    * \param changed true if this object's attributes have changed.
+    * \param change true if this object's attributes have changed.
     * \return bool want_all_children.  If true even changed children should be saved.
     */
     virtual bool begin_object (CORBA::Long id,
@@ -75,7 +75,9 @@ namespace TAO_Notify
     * \param type the type name for the class of the deleted child.
     *
     */
-    virtual void delete_child (CORBA::Long id, const ACE_CString & type)
+    virtual void delete_child (
+      CORBA::Long id,
+      const ACE_CString & type)
     {
       ACE_UNUSED_ARG (id);
       ACE_UNUSED_ARG (type);
@@ -86,7 +88,8 @@ namespace TAO_Notify
     * This function should be called to end the scope of the current object
     * and commit it to the persistent store.
     */
-    virtual void end_object (CORBA::Long id, const ACE_CString &type) = 0;
+    virtual void end_object (CORBA::Long id,
+      const ACE_CString &type) = 0;
 
     /**
      * \brief Close the saver.
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set_Find.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set_Find.h
index 3ca4fe41bde..6f68524d8ac 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set_Find.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set_Find.h
@@ -22,7 +22,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/PortableGroup/portablegroup_export.h"
-#include "orbsvcs/PortableGroup/PG_Property_Set.h"
 
 #include "ace/Hash_Map_Manager.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h
index 3a485b98b72..0ff525189cf 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.h
@@ -39,7 +39,7 @@ class TAO_Acceptor;
  *  MIOP protocol.
  */
 template<typename CONNECTION_HANDLER>
-class TAO_UIPMC_Transport : public TAO_Transport
+class TAO_PortableGroup_Export TAO_UIPMC_Transport : public TAO_Transport
 {
 public:
 
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
index 5a1ad3a040b..0636b60f017 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
@@ -91,8 +91,6 @@ TAO::SSLIOP::Connection_Handler::open (void *)
     this->orb_core ()->orb_params ()->sock_rcvbuf_size ();
   protocol_properties.no_delay_ =
     this->orb_core ()->orb_params ()->nodelay ();
-  protocol_properties.keep_alive_ =
-    this->orb_core ()->orb_params ()->sock_keepalive (); 
 
   TAO_Protocols_Hooks *tph = this->orb_core ()->get_protocols_hooks ();
 
@@ -128,20 +126,6 @@ TAO::SSLIOP::Connection_Handler::open (void *)
     return -1;
 #endif /* ! ACE_LACKS_TCP_NODELAY */
 
-  //support ORBKeepalive in SSL mode 
-  if (protocol_properties.keep_alive_)
-    {
-      if (this->peer ().
-          set_option (SOL_SOCKET,
-                      SO_KEEPALIVE,
-                      (void *) &protocol_properties.keep_alive_,
-                      sizeof (protocol_properties.keep_alive_)) == -1
-          && errno != ENOTSUP)
-        {
-          return -1;
-        }
-    } 
-
   if (this->transport ()->wait_strategy ()->non_blocking ())
     {
       if (this->peer ().enable (ACE_NONBLOCK) == -1)
diff --git a/TAO/orbsvcs/orbsvcs/Time_Utilities.h b/TAO/orbsvcs/orbsvcs/Time_Utilities.h
index 8c6e8b99ac4..08cebddfe64 100644
--- a/TAO/orbsvcs/orbsvcs/Time_Utilities.h
+++ b/TAO/orbsvcs/orbsvcs/Time_Utilities.h
@@ -51,15 +51,15 @@ public:
   //@{
   // We interpret an ACE_hrtime_t as nanoseconds.
 
-  /// @brief Convert relative high-resolution time to a TimeBase::TimeT.
+  /// @brief Convert relative high-resolution time to a <TimeBase::TimeT>.
   static void hrtime_to_TimeT (TimeBase::TimeT &lhs,
                                ACE_hrtime_t rhs);
 
-  /// @brief Convert relative TimeBase::TimeT to a high-resolution time.
+  /// @brief Convert relative <TimeBase::TimeT> to a high-resolution time.
   static void TimeT_to_hrtime (ACE_hrtime_t &lhs,
                                const TimeBase::TimeT &rhs);
 
-  /// @brief Convert relative TimeBase::TimeT to a high-resolution time.
+  /// @brief Convert relative <TimeBase::TimeT> to a high-resolution time.
   static ACE_hrtime_t to_hrtime (const TimeBase::TimeT &t);
   //@}
 
@@ -68,35 +68,35 @@ public:
    * @name ACE_Time_Value conversion routines
    */
   //@{
-  // Recall that ACE_Time_Values are <seconds, useconds> pairs.
+  // Recall that <ACE_Time_Value>s are <seconds, useconds> pairs.
 
-  /// @brief Convert relative ACE_Time_Value to a TimeBase::TimeT.
+  /// @brief Convert relative <ACE_Time_Value> to a <TimeBase::TimeT>.
   static void Time_Value_to_TimeT (TimeBase::TimeT& lhs,
                                    const ACE_Time_Value& rhs);
 
-  /// @brief Convert relative TimeBase::TimeT to a ACE_Time_Value.
+  /// @brief Convert relative <TimeBase::TimeT> to a <ACE_Time_Value>.
   static void TimeT_to_Time_Value (ACE_Time_Value& lrs,
                                    const TimeBase::TimeT& rhs);
 
-  /// @brief Convert relative ACE_Time_Value to a TimeBase::TimeT
+  /// @brief Convert relative <ACE_Time_Value> to a <TimeBase::TimeT>
   static TimeBase::TimeT to_TimeT (const ACE_Time_Value& rhs);
 
-  /// @brief Convert relative TimeBase::TimeT to a ACE_Time_Value.
+  /// @brief Convert relative <TimeBase::TimeT> to a <ACE_Time_Value>.
   static ACE_Time_Value to_Time_Value (const TimeBase::TimeT &rhs);
 
 
-  /// @brief Convert absolute ACE_Time_Value to a TimeBase::TimeT
+  /// @brief Convert absolute <ACE_Time_Value> to a <TimeBase::TimeT>
   static void Absolute_Time_Value_to_TimeT (TimeBase::TimeT& lhs,
                                             const ACE_Time_Value& rhs);
 
-  /// @brief Convert absolute TimeBase::TimeT to a ACE_Time_Value
+  /// @brief Convert absolute <TimeBase::TimeT> to a <ACE_Time_Value>
   static void Absolute_TimeT_to_Time_Value (ACE_Time_Value& lrs,
                                             const TimeBase::TimeT& rhs);
 
-  /// @brief Convert absolute ACE_Time_Value to a TimeBase::TimeT
+  /// @brief Convert absolute <ACE_Time_Value> to a <TimeBase::TimeT>
   static TimeBase::TimeT to_Absolute_TimeT (const ACE_Time_Value& rhs);
 
-  /// @brief Convert absolute TimeBase::TimeT to a ACE_Time_Value.
+  /// @brief Convert absolute <TimeBase::TimeT> to a <ACE_Time_Value>.
   static ACE_Time_Value to_Absolute_Time_Value (const TimeBase::TimeT &rhs);
   //@}
 
diff --git a/TAO/orbsvcs/orbsvcs/Time_Utilities.inl b/TAO/orbsvcs/orbsvcs/Time_Utilities.inl
index 49315926748..403e98b3224 100644
--- a/TAO/orbsvcs/orbsvcs/Time_Utilities.inl
+++ b/TAO/orbsvcs/orbsvcs/Time_Utilities.inl
@@ -1,4 +1,5 @@
 // -*- C++ -*-
+//
 // $Id$
 
 #include "ace/Time_Value.h"
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp
index 28a91e0e0e1..73c4980cb04 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp
@@ -530,7 +530,7 @@ YY_MALLOC_DECL
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
-#define TAO_TRADER_ECHO { size_t __dum_ret = fwrite( yytext, yyleng, 1, yyout ); (void) __dum_ret; }
+#define TAO_TRADER_ECHO (void) fwrite( yytext, yyleng, 1, yyout )
 #endif
  //FUZZ: enable check_for_lack_ACE_OS
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Full_Profile/run_test.pl
index 152b75c34c7..18f699a4882 100755
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/run_test.pl
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/run_test.pl
@@ -18,7 +18,7 @@ my $cl = PerlACE::TestTarget::create_target (3) || die "Create target 3 failed\n
 
 # amount of delay between running the servers
 
-$sleeptime = 10;
+$sleeptime = 2;
 
 $nsiorfile = "ns.ior";
 $inputfile = "test_input";
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Pluggable/run_test.pl
index 1591969296e..1459ac398ad 100755
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/run_test.pl
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/run_test.pl
@@ -17,7 +17,7 @@ my $sv = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n
 my $cl = PerlACE::TestTarget::create_target (3) || die "Create target 3 failed\n";
 
 # amount of delay between running the servers
-$sleeptime = 10;
+$sleeptime = 2;
 
 $nsiorfile = "ns.ior";
 $inputfile = "test_input";
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl
index 3d26e83d6a4..3d4dcd48b7f 100755
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/run_test.pl
@@ -17,7 +17,7 @@ my $sv = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n
 my $cl = PerlACE::TestTarget::create_target (3) || die "Create target 3 failed\n";
 
 # amount of delay between running the servers
-$sleeptime = 10;
+$sleeptime = 2;
 
 $nsiorfile = "ns.ior";
 $inputfile = "test_input";
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl
index 3d26e83d6a4..3d4dcd48b7f 100755
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/run_test.pl
@@ -17,7 +17,7 @@ my $sv = PerlACE::TestTarget::create_target (2) || die "Create target 2 failed\n
 my $cl = PerlACE::TestTarget::create_target (3) || die "Create target 3 failed\n";
 
 # amount of delay between running the servers
-$sleeptime = 10;
+$sleeptime = 2;
 
 $nsiorfile = "ns.ior";
 $inputfile = "test_input";
diff --git a/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp b/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp
index b70ca157c86..e50f7fa9654 100644
--- a/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/lex.CC_command.cpp
@@ -546,7 +546,7 @@ ACE_CC_YY_MALLOC_DECL
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
-#define ACE_CC_ECHO { size_t __dum_ret = fwrite( ace_cc_yytext, ace_cc_yyleng, 1, ace_cc_yyout ); (void) __dum_ret; }
+#define ACE_CC_ECHO (void) fwrite( ace_cc_yytext, ace_cc_yyleng, 1, ace_cc_yyout )
 #endif
 //FUZZ: enable check_for_lack_ACE_OS
 
diff --git a/TAO/performance-tests/POA/Demux/demux_test_server.cpp b/TAO/performance-tests/POA/Demux/demux_test_server.cpp
index 4fbf97860a0..986c3735279 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_server.cpp
+++ b/TAO/performance-tests/POA/Demux/demux_test_server.cpp
@@ -199,7 +199,7 @@ Demux_Test_Server::init (int argc, ACE_TCHAR *argv [])
       char poa_name [128];
 
       ACE_OS::memset (poa_name, 0, 128);
-      int n_matched = fscanf (this->poa_fp_, "%s", poa_name);
+      (void) fscanf (this->poa_fp_, "%s", poa_name);
 
       try
         {
@@ -270,7 +270,7 @@ Demux_Test_Server::init (int argc, ACE_TCHAR *argv [])
 
                   ACE_OS::memset (servant_name, 0, 128);
 
-                  n_matched = fscanf (this->servant_fp_, "%s", servant_name);
+                  (void) fscanf (this->servant_fp_, "%s", servant_name);
 
                   ACE_DEBUG ((LM_DEBUG,
                               "Activating Servant with Name : %s\n",
diff --git a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp
index 025e7008629..1e5a798c3c5 100644
--- a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.cpp
@@ -7,7 +7,6 @@
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/AnyTypeCode/Marshal.h"
-#include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/debug.h"
 #include "tao/CDR.h"
 #include "tao/SystemException.h"
diff --git a/TAO/tao/AnyTypeCode/BasicTypeTraits.h b/TAO/tao/AnyTypeCode/BasicTypeTraits.h
index ab3b3dfa917..73b3c0b4109 100644
--- a/TAO/tao/AnyTypeCode/BasicTypeTraits.h
+++ b/TAO/tao/AnyTypeCode/BasicTypeTraits.h
@@ -12,9 +12,6 @@
  */
 //=============================================================================
 
-#ifndef BASIC_TYPE_TRAITS_H
-#define BASIC_TYPE_TRAITS_H
-
 #include "tao/AnyTypeCode/BasicTypeTraits_T.h"
 #include "tao/AnyTypeCode/Any.h"
 
@@ -470,4 +467,3 @@ namespace TAO
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
-#endif /* BASIC_TYPE_TRAITS_H */
diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp b/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp
index 3860c6fb999..d0b35721fe7 100644
--- a/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp
@@ -11,7 +11,6 @@
 
 #include "tao/CDR.h"
 #include "tao/ORB_Core.h"
-#include "tao/TypeCodeFactory_Adapter.h"
 
 #include "ace/OS_NS_string.h"
 
diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode.h b/TAO/tao/AnyTypeCode/Union_TypeCode.h
index 95ccbb33a3c..bbb9d119b00 100644
--- a/TAO/tao/AnyTypeCode/Union_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Union_TypeCode.h
@@ -31,7 +31,6 @@ namespace TAO
 {
   namespace TypeCode
   {
-    template <typename StringType, typename TypeCodeType> class Case;
 
     /**
      * @class Union
diff --git a/TAO/tao/Array_Traits_T.h b/TAO/tao/Array_Traits_T.h
index 459e03c3405..1d3b98edb1e 100644
--- a/TAO/tao/Array_Traits_T.h
+++ b/TAO/tao/Array_Traits_T.h
@@ -70,7 +70,7 @@ struct array_traits
         begin, end, &TAO::Array_Traits<forany_type>::zero);
   }
 
-# if !defined (ACE_LACKS_MEMBER_TEMPLATES)
+# ifndef ACE_LACKS_MEMBER_TEMPLATES
   // Allow MSVC++ >= 8 checked iterators to be used.
   template <typename iter>
   inline static void copy_range(
@@ -81,7 +81,7 @@ struct array_traits
       TAO::Array_Traits<forany_type>::copy(*dst, *i);
     }
   }
-# else
+#else
   inline static void copy_range(
       value_type * begin, value_type * end, value_type *dst)
   {
@@ -92,7 +92,7 @@ struct array_traits
   }
 # endif  /* !ACE_LACKS_MEMBER_TEMPLATES */
 
-# if !defined (ACE_LACKS_MEMBER_TEMPLATES)
+#ifndef ACE_LACKS_MEMBER_TEMPLATES
   // Allow MSVC++ >= 8 checked iterators to be used.
   template <typename iter>
   inline static void copy_swap_range(
@@ -100,13 +100,13 @@ struct array_traits
   {
     copy_range(begin, end, dst);
   }
-# else
+#else
   inline static void copy_swap_range(
       value_type * begin, value_type * end, value_type *dst)
   {
     copy_range(begin, end, dst);
   }
-# endif  /* !ACE_LACKS_MEMBER_TEMPLATES */
+#endif  /* !ACE_LACKS_MEMBER_TEMPLATES */
 };
 
 } // namespace details
diff --git a/TAO/tao/FoxResource/FoxResource_Loader.h b/TAO/tao/FoxResource/FoxResource_Loader.h
index c44b431222a..9788c6ecb40 100644
--- a/TAO/tao/FoxResource/FoxResource_Loader.h
+++ b/TAO/tao/FoxResource/FoxResource_Loader.h
@@ -24,7 +24,7 @@
 
 #include "tao/Versioned_Namespace.h"
 
-#include <fx.h>
+#include <fox/fx.h>
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/GIOP_Message_State.cpp b/TAO/tao/GIOP_Message_State.cpp
index c4265219b9d..288a224bb88 100644
--- a/TAO/tao/GIOP_Message_State.cpp
+++ b/TAO/tao/GIOP_Message_State.cpp
@@ -215,8 +215,7 @@ TAO_GIOP_Message_State::read_ulong (const char *rd_ptr) const
 #if !defined (ACE_DISABLE_SWAP_ON_READ)
   if (!(this->byte_order_ != ACE_CDR_BYTE_ORDER))
     {
-      ACE_CDR::ULong* pul = reinterpret_cast<ACE_CDR::ULong*> (buf);
-      x = *pul;
+      x = *reinterpret_cast<ACE_CDR::ULong*> (buf);
     }
   else
     {
diff --git a/TAO/tao/IORTable/IORTable.pidl b/TAO/tao/IORTable/IORTable.pidl
index fe08dabafc0..a0e3348f697 100644
--- a/TAO/tao/IORTable/IORTable.pidl
+++ b/TAO/tao/IORTable/IORTable.pidl
@@ -23,9 +23,6 @@
  */
 // ================================================================
 
-#ifndef TAO_IORTABLE_IORTABLE_PIDL
-#define TAO_IORTABLE_IORTABLE_PIDL
-
 /// Define a module to avoid namespace pollution
 module IORTable
 {
@@ -80,5 +77,3 @@ module IORTable
       raises (NotFound);
   };
 };
-
-#endif /* TAO_IORTABLE_IORTABLE_PIDL */
diff --git a/TAO/tao/ImR_Client/ImplRepo.pidl b/TAO/tao/ImR_Client/ImplRepo.pidl
index 2cbee7c7825..dbbabe5f789 100644
--- a/TAO/tao/ImR_Client/ImplRepo.pidl
+++ b/TAO/tao/ImR_Client/ImplRepo.pidl
@@ -15,9 +15,6 @@
  */
 //=============================================================================
 
-#ifndef TAO_IMRCLIENT_IMPLREPO_PIDL
-#define TAO_IMRCLIENT_IMPLREPO_PIDL
-
 #include "tao/ImR_Client/ServerObject.pidl"
 
 module ImplementationRepository
@@ -177,5 +174,3 @@ module ImplementationRepository
     oneway void shutdown(in boolean activators, in boolean servers);
   };
 };
-
-#endif /* TAO_IMRCLIENT_IMPLREPO_PIDL */
diff --git a/TAO/tao/ImR_Client/ServerObject.pidl b/TAO/tao/ImR_Client/ServerObject.pidl
index dff1b816359..a22c1b3ea65 100644
--- a/TAO/tao/ImR_Client/ServerObject.pidl
+++ b/TAO/tao/ImR_Client/ServerObject.pidl
@@ -15,9 +15,6 @@
  */
 //=============================================================================
 
-#ifndef TAO_IMRCLIENT_SERVEROBJECT_PIDL
-#define TAO_IMRCLIENT_SERVEROBJECT_PIDL
-
 module ImplementationRepository
 {
   /**
@@ -37,5 +34,3 @@ module ImplementationRepository
     oneway void shutdown ();
   };
 };
-
-#endif /* TAO_IMRCLIENT_SERVEROBJECT_PIDL */
diff --git a/TAO/tao/Load_Protocol_Factory_T.h b/TAO/tao/Load_Protocol_Factory_T.h
index d161a8e7ef5..433f0a2796b 100644
--- a/TAO/tao/Load_Protocol_Factory_T.h
+++ b/TAO/tao/Load_Protocol_Factory_T.h
@@ -18,8 +18,6 @@
 #include /**/ "ace/pre.h"
 
 #include "tao/Protocol_Factory.h"
-#include "tao/Resource_Factory.h"
-#include "tao/debug.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/Dynamic_Service.h"
 
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index 3f9023adf5a..7dca097ea4e 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -1722,9 +1722,25 @@ CORBA::ValueFactory
 CORBA::ORB::register_value_factory (const char *repository_id,
                                     CORBA::ValueFactory factory)
 {
-  this->check_shutdown ();
+  TAO_Valuetype_Adapter *vta = this->orb_core ()->valuetype_adapter ();
+
+  if (vta)
+    {
+      int const result = vta->vf_map_rebind (repository_id, factory);
 
-  return this->orb_core_->register_value_factory (repository_id, factory);
+      if (result == 0) // No previous factory found
+        {
+          return 0;
+        }
+
+      if (result == -1)
+        {
+          // Error on bind.
+          throw ::CORBA::MARSHAL ();
+        }
+    }
+
+  return factory;    // previous factory was found
 }
 #endif
 
@@ -1732,9 +1748,13 @@ CORBA::ORB::register_value_factory (const char *repository_id,
 void
 CORBA::ORB::unregister_value_factory (const char *repository_id)
 {
-  this->check_shutdown ();
+  TAO_Valuetype_Adapter *vta = this->orb_core ()->valuetype_adapter ();
 
-  this->orb_core_->unregister_value_factory (repository_id);
+  if (vta)
+    {
+      // Dont care whther it was successful or not!
+      (void) vta->vf_map_unbind (repository_id);
+    }
 }
 #endif
 
@@ -1742,9 +1762,14 @@ CORBA::ORB::unregister_value_factory (const char *repository_id)
 CORBA::ValueFactory
 CORBA::ORB::lookup_value_factory (const char *repository_id)
 {
-  this->check_shutdown ();
+  TAO_Valuetype_Adapter *vta = this->orb_core ()->valuetype_adapter ();
+
+  if (vta)
+    {
+      return vta->vf_map_find (repository_id);
+    }
 
-  return this->orb_core_->lookup_value_factory (repository_id);
+  return 0;
 }
 #endif
 
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index feaa9585a37..a8a2bb42e09 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -2307,12 +2307,8 @@ TAO_ORB_Core::shutdown (CORBA::Boolean wait_for_completion)
     tm->wait ();
 
   // Explicitly destroy the valuetype adapter
-  {
-    ACE_GUARD (TAO_SYNCH_MUTEX, monitor, this->lock_);
-
-    delete this->valuetype_adapter_;
-    this->valuetype_adapter_ = 0;
-  }
+  delete this->valuetype_adapter_;
+  this->valuetype_adapter_ = 0;
 
   // Explicitly destroy the object reference table since it
   // contains references to objects, which themselves may contain
@@ -3474,82 +3470,6 @@ TAO_ORB_Core::valuetype_adapter (void)
   return this->valuetype_adapter_;
 }
 
-// *************************************************************
-// Valuetype factory operations
-// *************************************************************
-
-#if !defined(CORBA_E_MICRO)
-CORBA::ValueFactory
-TAO_ORB_Core::register_value_factory (const char *repository_id,
-                                      CORBA::ValueFactory factory)
-{
-  if (this->valuetype_adapter ())
-    {
-      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0);
-
-      if (this->valuetype_adapter_ == 0)
-        {
-          return 0;
-        }
-
-      int const result =
-        this->valuetype_adapter_->vf_map_rebind (repository_id, factory);
-
-      if (result == 0) // No previous factory found
-        {
-          return 0;
-        }
-
-      if (result == -1)
-        {
-          // Error on bind.
-          throw ::CORBA::MARSHAL ();
-        }
-    }
-
-  return factory;    // previous factory was found
-}
-#endif
-
-#if !defined(CORBA_E_MICRO)
-void
-TAO_ORB_Core::unregister_value_factory (const char *repository_id)
-{
-  if (this->valuetype_adapter ())
-    {
-      ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
-
-      if (this->valuetype_adapter_ == 0)
-        {
-          return;
-        }
-
-      // Dont care whther it was successful or not!
-      (void) this->valuetype_adapter_->vf_map_unbind (repository_id);
-    }
-}
-#endif
-
-#if !defined(CORBA_E_MICRO)
-CORBA::ValueFactory
-TAO_ORB_Core::lookup_value_factory (const char *repository_id)
-{
-  if (this->valuetype_adapter ())
-    {
-      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0);
-
-      if (this->valuetype_adapter_ == 0)
-        {
-          return 0;
-        }
-
-      return this->valuetype_adapter_->vf_map_find (repository_id);
-    }
-
-  return 0;
-}
-#endif
-
 // ****************************************************************
 
 TAO_Export TAO_ORB_Core *
diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h
index 603a5543866..42c2e3b296a 100644
--- a/TAO/tao/ORB_Core.h
+++ b/TAO/tao/ORB_Core.h
@@ -820,21 +820,6 @@ public:
   /// Return the valuetype adapter
   TAO_Valuetype_Adapter *valuetype_adapter (void);
 
-#if !defined(CORBA_E_MICRO)
-  // Value factory operations  (CORBA 2.3 ptc/98-10-05 Ch. 4.2 p.4-7)
-  CORBA::ValueFactory register_value_factory (
-    const char *repository_id,
-    CORBA::ValueFactory factory);
-#endif
-
-#if !defined(CORBA_E_MICRO)
-  void unregister_value_factory (const char * repository_id);
-#endif
-
-#if !defined(CORBA_E_MICRO)
-  CORBA::ValueFactory lookup_value_factory (const char *repository_id);
-#endif
-
   /// Get the IOR Interceptor adapter. If not created, this method will try
   /// to create one.
   TAO_IORInterceptor_Adapter *ior_interceptor_adapter (void);
diff --git a/TAO/tao/Object_Key.pidl b/TAO/tao/Object_Key.pidl
index 327cd2844c4..0cfdffbaedf 100644
--- a/TAO/tao/Object_Key.pidl
+++ b/TAO/tao/Object_Key.pidl
@@ -16,12 +16,7 @@
 // After generation the file diffs/Object_Key.diff must be used to manually
 // patch this file
 
-#ifndef TAO_OBJECTKEY_PIDL
-#define TAO_OBJECTKEY_PIDL
-
 module TAO
 {
   typedef sequence<octet> ObjectKey;
 };
-
-#endif /* TAO_OBJECTKEY_PIDL */
diff --git a/TAO/tao/Object_Reference_Traits_T.h b/TAO/tao/Object_Reference_Traits_T.h
index 2d490ef3442..7216a8d6ffd 100644
--- a/TAO/tao/Object_Reference_Traits_T.h
+++ b/TAO/tao/Object_Reference_Traits_T.h
@@ -43,7 +43,7 @@ struct object_reference_traits_decorator
     std::generate(begin, end, &derived::default_initializer);
   }
 
-# if !defined (ACE_LACKS_MEMBER_TEMPLATES)
+# ifndef ACE_LACKS_MEMBER_TEMPLATES
   // Allow MSVC++ >= 8 checked iterators to be used.
   template <typename iter>
   inline static void copy_range(
@@ -51,7 +51,7 @@ struct object_reference_traits_decorator
   {
     std::transform(begin, end, dst, &derived::duplicate);
   }
-# else
+#else
   inline static void copy_range(
       object_type ** begin, object_type ** end, object_type ** dst)
   {
@@ -59,7 +59,7 @@ struct object_reference_traits_decorator
   }
 # endif  /* !ACE_LACKS_MEMBER_TEMPLATES */
 
-# if !defined (ACE_LACKS_MEMBER_TEMPLATES)
+#ifndef ACE_LACKS_MEMBER_TEMPLATES
   // Allow MSVC++ >= 8 checked iterators to be used.
   template <typename iter>
   inline static void copy_swap_range(
@@ -67,13 +67,13 @@ struct object_reference_traits_decorator
   {
     std::swap_ranges(begin, end, dst);
   }
-# else
+#else
   inline static void copy_swap_range(
       object_type ** begin, object_type ** end, object_type ** dst)
   {
     std::swap_ranges(begin, end, dst);
   }
-# endif  /* !ACE_LACKS_MEMBER_TEMPLATES */
+#endif  /* !ACE_LACKS_MEMBER_TEMPLATES */
 
   inline static void release_range(
       object_type ** begin, object_type ** end)
diff --git a/TAO/tao/PI_Server/Policy_Creator_T.h b/TAO/tao/PI_Server/Policy_Creator_T.h
index 807a2278e85..23ce59f29a3 100644
--- a/TAO/tao/PI_Server/Policy_Creator_T.h
+++ b/TAO/tao/PI_Server/Policy_Creator_T.h
@@ -16,7 +16,6 @@
 #include /**/ "ace/pre.h"
 
 #include "tao/ORB_Constants.h"
-#include "tao/PolicyC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/tao/PortableServer/Any_SArg_Traits.h b/TAO/tao/PortableServer/Any_SArg_Traits.h
index b03b3fbf5cc..94980dc0c0b 100644
--- a/TAO/tao/PortableServer/Any_SArg_Traits.h
+++ b/TAO/tao/PortableServer/Any_SArg_Traits.h
@@ -22,7 +22,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/PortableServer/Var_Size_SArgument_T.h"
-#include "tao/PortableServer/SArg_Traits_T.h"
 #include "tao/PortableServer/portableserver_export.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h
index 02213483f81..339a0054114 100644
--- a/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h
+++ b/TAO/tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h
@@ -17,7 +17,7 @@
 
 #include "tao/PortableServer/portableserver_export.h"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
+#ifndef ACE_LACKS_PRAGMA_ONCE
 # pragma once
 #endif /* !ACE_LACKS_PRAGMA_ONCE */
 
diff --git a/TAO/tao/PortableServer/Upcall_Command.h b/TAO/tao/PortableServer/Upcall_Command.h
index bfd4b9a49b3..8ba85735a94 100644
--- a/TAO/tao/PortableServer/Upcall_Command.h
+++ b/TAO/tao/PortableServer/Upcall_Command.h
@@ -17,7 +17,7 @@
 
 #include "tao/PortableServer/portableserver_export.h"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
+#ifndef ACE_LACKS_PRAGMA_ONCE
 # pragma once
 #endif /* !ACE_LACKS_PRAGMA_ONCE */
 
diff --git a/TAO/tao/PortableServer/Upcall_Wrapper.h b/TAO/tao/PortableServer/Upcall_Wrapper.h
index 2138e0b62e9..13bcadd1970 100644
--- a/TAO/tao/PortableServer/Upcall_Wrapper.h
+++ b/TAO/tao/PortableServer/Upcall_Wrapper.h
@@ -19,7 +19,7 @@
 
 #include "tao/PortableServer/portableserver_export.h"
 
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
+#ifndef ACE_LACKS_PRAGMA_ONCE
 # pragma once
 #endif /* !ACE_LACKS_PRAGMA_ONCE */
 
diff --git a/TAO/tao/PortableServer/get_arg.h b/TAO/tao/PortableServer/get_arg.h
index d04f1194974..71edeef1282 100644
--- a/TAO/tao/PortableServer/get_arg.h
+++ b/TAO/tao/PortableServer/get_arg.h
@@ -29,7 +29,6 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/SArg_Traits_T.h"
 #include "tao/operation_details.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/RTScheduling/ThreadAction.h b/TAO/tao/RTScheduling/ThreadAction.h
index 2087805741e..d34023a9606 100644
--- a/TAO/tao/RTScheduling/ThreadAction.h
+++ b/TAO/tao/RTScheduling/ThreadAction.h
@@ -8,16 +8,19 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/RTScheduling/RTScheduler.h"
+#include "tao/RTScheduling/RTSchedulerC.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_RTScheduler_Export TAO_ThreadAction:
-  public RTScheduling::ThreadAction,
+public RTScheduling::ThreadAction,
   public ::CORBA::LocalObject
 {
-public:
-  virtual void _cxx_do (CORBA::VoidData data) = 0;
+ public:
+
+  virtual void do (CORBA::VoidData data
+       )
+      = 0;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/String_Traits_T.h b/TAO/tao/String_Traits_T.h
index 3c5c6424ff8..a72e5f20e93 100644
--- a/TAO/tao/String_Traits_T.h
+++ b/TAO/tao/String_Traits_T.h
@@ -41,7 +41,7 @@ struct string_traits_decorator
     std::generate(begin, end, &derived::default_initializer);
   }
 
-# if !defined (ACE_LACKS_MEMBER_TEMPLATES)
+# ifndef ACE_LACKS_MEMBER_TEMPLATES
   // Allow MSVC++ >= 8 checked iterators to be used.
   template <typename iter>
   inline static void copy_range(
@@ -49,7 +49,7 @@ struct string_traits_decorator
   {
     std::transform(begin, end, dst, &derived::duplicate);
   }
-# else
+# else 
   inline static void copy_range(
       char_type ** begin, char_type ** end, char_type ** dst)
   {
@@ -57,7 +57,7 @@ struct string_traits_decorator
   }
 # endif  /* !ACE_LACKS_MEMBER_TEMPLATES */
 
-# if !defined (ACE_LACKS_MEMBER_TEMPLATES)
+#ifndef ACE_LACKS_MEMBER_TEMPLATES
   // Allow MSVC++ >= 8 checked iterators to be used.
   template <typename iter>
   inline static void copy_swap_range(
@@ -65,13 +65,13 @@ struct string_traits_decorator
   {
     std::swap_ranges(begin, end, dst);
   }
-# else
+#else
   inline static void copy_swap_range(
       char_type ** begin, char_type ** end, char_type ** dst)
   {
     std::swap_ranges(begin, end, dst);
   }
-# endif  /* !ACE_LACKS_MEMBER_TEMPLATES */
+#endif  /* !ACE_LACKS_MEMBER_TEMPLATES */
 
   inline static void release_range(
       char_type ** begin, char_type ** end)
diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp
index af47b9385ea..32780f0ffb1 100644
--- a/TAO/tao/TAO_Internal.cpp
+++ b/TAO/tao/TAO_Internal.cpp
@@ -30,7 +30,6 @@
 #include "ace/ACE.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/Static_Object_Lock.h"
-#include "ace/OS_NS_sys_stat.h"
 
 ACE_RCSID (tao,
            TAO_Internal,
@@ -65,11 +64,10 @@ namespace
    * sets apply_values to true
    *
    */
-  int
-  parse_global_args_i (int &argc,
-                       ACE_TCHAR **argv,
-                       ACE_ARGV &svc_config_argv,
-                       bool apply_values);
+  int parse_global_args_i (int &argc,
+                           ACE_TCHAR **argv,
+                           ACE_ARGV &svc_config_argv,
+                           bool apply_values);
 
   /**
    * Parses the supplied command-line arguments to extract any that
@@ -83,24 +81,8 @@ namespace
    */
   int
   parse_svcconf_args_i (int &argc,
-                        ACE_TCHAR **argv,
-                        ACE_ARGV &svc_config_argv);
-
-  /**
-   * Checks if there is -ORBGestalt option with non-GLOBAL value.
-   *
-   * @brief Modifies the argc to reflect any arguments it has
-   * "consumed"
-   *
-   * If the first ORB has some special configuration and uses non
-   * GLOBAL gestalt then it's expected the this configuration will
-   * not become default for other ORBs created after it. This function
-   * allows to avoid the above situation.
-   */
-  bool
-  using_global_gestalt_i (int &argc,
-                          ACE_TCHAR **argv,
-                          bool &skip_service_config_open);
+                       ACE_TCHAR **argv,
+                       ACE_ARGV &svc_config_argv);
 
   /**
    * Initialize the ACE Service Configurator with the process-global
@@ -119,10 +101,8 @@ namespace
    *       reentrant meaning that it is really no longer necessary to
    *       do so.
    */
-  void
-  register_global_services_i (ACE_Service_Gestalt * pcfg);
-  void
-  register_additional_services_i (ACE_Service_Gestalt * pcfg);
+  void register_global_services_i (ACE_Service_Gestalt * pcfg);
+  void register_additional_services_i (ACE_Service_Gestalt * pcfg);
 
   /**
    * Parses the supplied command-line arguments to extract any
@@ -144,12 +124,11 @@ namespace
    * @return @c 0 if successful, @c -1 with @c errno set if failure.
    *
    */
-  int
-  open_private_services_i (ACE_Intrusive_Auto_Ptr<ACE_Service_Gestalt> pcfg,
-                           int & argc,
-                           ACE_TCHAR **argv,
-                           bool skip_service_config_open = false,
-                           bool ignore_default_svc_conf_file = false);
+  int open_private_services_i (ACE_Intrusive_Auto_Ptr<ACE_Service_Gestalt> pcfg,
+                               int & argc,
+                               ACE_TCHAR **argv,
+                               bool skip_service_config_open = false,
+                               bool ignore_default_svc_conf_file = false);
 
   /**
    * Number of times open_services() has been called.  Incremented by
@@ -291,15 +270,10 @@ TAO::ORB::open_global_services (int argc, ACE_TCHAR **argv)
 
   bool skip_service_config_open = false; // by default we shouldn't
 
-  if (using_global_gestalt_i (tmpargc,
-                              tmpargv,
-                              skip_service_config_open))
-    {
-      if (parse_svcconf_args_i (tmpargc,
-              tmpargv,
-              global_svc_config_argv) == -1)
-        return -1;
-    }
+  if (parse_svcconf_args_i (tmpargc,
+          tmpargv,
+          global_svc_config_argv) == -1)
+    return -1;
 
   if (parse_private_args_i (tmpargc,
           tmpargv,
@@ -795,21 +769,6 @@ namespace
             svc_config_argv.add (ACE_TEXT ("-f"));
             svc_config_argv.add (current_arg, true);
           }
-        else if (arg_shifter.cur_arg_strncasecmp
-                 (ACE_TEXT ("-ORBSvcConfDirective")) == 0)
-          {
-            const ACE_TCHAR *current_arg =
-              arg_shifter.get_the_parameter (ACE_TEXT ("-ORBSvcConfDirective"));
-
-            // This is used to pass arguments to the Service
-            // Configurator using the "command line" to provide
-            // configuration information rather than using a svc.conf
-            // file.  Pass the "-S" to the service configurator.
-            svc_config_argv.add (ACE_TEXT ("-S"));
-            svc_config_argv.add (current_arg, true); // quote args!
-
-            arg_shifter.consume_arg ();
-          }
         else
           {
             // Any arguments that don't match are ignored so that the
@@ -842,6 +801,18 @@ namespace
             arg_shifter.consume_arg ();
           }
         else if (0 != (current_arg = arg_shifter.get_the_parameter
+                       (ACE_TEXT ("-ORBSvcConfDirective"))))
+          {
+            // This is used to pass arguments to the Service
+            // Configurator using the "command line" to provide
+            // configuration information rather than using a svc.conf
+            // file.  Pass the "-S" to the service configurator.
+            svc_config_argv.add (ACE_TEXT ("-S"));
+            svc_config_argv.add (current_arg, true); // quote args!
+
+            arg_shifter.consume_arg ();
+          }
+        else if (0 != (current_arg = arg_shifter.get_the_parameter
                        (ACE_TEXT ("-ORBServiceConfigLoggerKey"))))
           {
             svc_config_argv.add (ACE_TEXT ("-k"));
@@ -956,55 +927,4 @@ namespace
       }
     return 0;
   } /* parse_global_args_i */
-
-  bool
-  using_global_gestalt_i (int &argc,
-                          ACE_TCHAR **argv,
-                          bool &skip_service_config_open)
-  {
-    bool with_global_gestalt = true;
-
-    ACE_Arg_Shifter arg_shifter (argc, argv);
-
-    while (arg_shifter.is_anything_left ())
-      {
-        if (0 == arg_shifter.cur_arg_strncasecmp (ACE_TEXT ("-ORBGestalt")))
-          {
-            // Skip -ORBGestalt. This option is necessary in later stages.
-            arg_shifter.ignore_arg ();
-
-            // This should set current_arg to the value of ORBGestalt option.
-            const ACE_TCHAR *current_arg = arg_shifter.get_current ();
-
-            if (0 != current_arg &&
-                ACE_OS::strcasecmp (current_arg, ACE_TEXT("GLOBAL")) != 0)
-              {
-                with_global_gestalt = false;
-
-                ACE_stat exists;
-                if (ACE_OS::stat (ACE_DEFAULT_SVC_CONF, &exists) == 0)
-                  {
-                    // In case svc.conf exists and we are asked for a local
-                    // gestalt then no matter whether -ORBSvcConf or
-                    // -ORBSvcConfDirective are provided or not we ignore them
-                    // while setting up a global gestalt. They will be
-                    // processed later in a local gestalt.
-                    skip_service_config_open = true;
-                  }
-              }
-
-            // Skip anything that goes after -ORBGestalt.
-            arg_shifter.ignore_arg ();
-          }
-        // Can't interpret this argument.
-        // Move on to the next argument.
-        else
-          {
-            // Any arguments that don't match are ignored so
-            // that the caller can still use them.
-            arg_shifter.ignore_arg ();
-          }
-      }
-    return with_global_gestalt;
-  } /* using_global_gestalt_i */
 } // anonymous namespace.
diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp
index 3fe918c3a02..2a8b1684b90 100644
--- a/TAO/tao/Transport.cpp
+++ b/TAO/tao/Transport.cpp
@@ -167,7 +167,7 @@ TAO_Transport::TAO_Transport (CORBA::ULong tag,
 #if TAO_HAS_TRANSPORT_CURRENT == 1
   , stats_ (0)
 #endif /* TAO_HAS_TRANSPORT_CURRENT == 1 */
-  , flush_in_post_open_ (false)
+  , flush_in_post_open_ (0)
 {
   ACE_NEW (this->messaging_object_,
             TAO_GIOP_Message_Base (orb_core,
diff --git a/TAO/tao/TransportCurrent/Current_ORBInitializer.h b/TAO/tao/TransportCurrent/Current_ORBInitializer.h
index 1265c4e9682..34487cd14a3 100644
--- a/TAO/tao/TransportCurrent/Current_ORBInitializer.h
+++ b/TAO/tao/TransportCurrent/Current_ORBInitializer.h
@@ -30,7 +30,7 @@ namespace TAO
   {
 
     template <typename Impl>
-    class Current_ORBInitializer
+    class TAO_Transport_Current_Export Current_ORBInitializer
       : public Current_ORBInitializer_Base
     {
     public:
diff --git a/TAO/tao/TransportCurrent/IIOP_Current_Impl.h b/TAO/tao/TransportCurrent/IIOP_Current_Impl.h
index 5d6beeb0eae..99fac36e54e 100644
--- a/TAO/tao/TransportCurrent/IIOP_Current_Impl.h
+++ b/TAO/tao/TransportCurrent/IIOP_Current_Impl.h
@@ -17,8 +17,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/orbconf.h"
-
 #if TAO_HAS_TRANSPORT_CURRENT == 1
 
 #include "tao/TransportCurrent/TC_IIOPC.h"
diff --git a/TAO/tao/TransportCurrent/IIOP_Transport_Current.h b/TAO/tao/TransportCurrent/IIOP_Transport_Current.h
index c99479cb0b9..9a59cc00f27 100644
--- a/TAO/tao/TransportCurrent/IIOP_Transport_Current.h
+++ b/TAO/tao/TransportCurrent/IIOP_Transport_Current.h
@@ -1,8 +1,6 @@
 // -*- C++ -*-
 // $Id$
 
-#ifndef IIOP_TRANSPORT_CURRENT_H
-#define IIOP_TRANSPORT_CURRENT_H
 
 #include "tao/TransportCurrent/TCC.h"
 #include "tao/TransportCurrent/TC_IIOPC.h"
@@ -17,4 +15,3 @@ static int tao_iiop_transport_current_initializer_called =
 
 #endif /* TAO_AS_STATIC_LIBS */
 
-#endif /* IIOP_TRANSPORT_CURRENT_H */
diff --git a/TAO/tao/TransportCurrent/Transport_Current.h b/TAO/tao/TransportCurrent/Transport_Current.h
index e9ed39b36ff..09809f4ee88 100644
--- a/TAO/tao/TransportCurrent/Transport_Current.h
+++ b/TAO/tao/TransportCurrent/Transport_Current.h
@@ -1,9 +1,6 @@
 // -*- C++ -*-
 // $Id$
 
-#ifndef TRANSPORT_CURRENT_H
-#define TRANSPORT_CURRENT_H
-
 #include "tao/TransportCurrent/TCC.h"
 #include "tao/TransportCurrent/Current_Loader.h"
 
@@ -16,4 +13,3 @@ static int tao_transport_current_initializer_called =
 
 #endif /* TAO_AS_STATIC_LIBS */
 
-#endif /* TRANSPORT_CURRENT_H */
diff --git a/TAO/tao/Utils/Servant_Var.inl b/TAO/tao/Utils/Servant_Var.inl
index 8c7c03374be..c1e7465356e 100644
--- a/TAO/tao/Utils/Servant_Var.inl
+++ b/TAO/tao/Utils/Servant_Var.inl
@@ -179,7 +179,7 @@ TAO::Utils::Servant_Var<T>::_retn (void)
   return rval;
 }
 
-#if !defined (ACE_LACKS_MEMBER_TEMPLATES)
+#ifndef ACE_LACKS_MEMBER_TEMPLATES
 template <class X, class Y>
 ACE_INLINE bool
 operator== (typename TAO::Utils::Servant_Var<X> const & x,
diff --git a/TAO/tao/Value_Traits_T.h b/TAO/tao/Value_Traits_T.h
index cebe01f58dd..2783c43084d 100644
--- a/TAO/tao/Value_Traits_T.h
+++ b/TAO/tao/Value_Traits_T.h
@@ -44,7 +44,7 @@ struct value_traits
     // Noop for value sequences
   }
 
-# if !defined (ACE_LACKS_MEMBER_TEMPLATES)
+# ifndef ACE_LACKS_MEMBER_TEMPLATES
   // Allow MSVC++ >= 8 checked iterators to be used.
   template <typename iter>
   inline static void copy_range(
@@ -60,7 +60,7 @@ struct value_traits
   }
 # endif  /* !ACE_LACKS_MEMBER_TEMPLATES */
 
-# if !defined (ACE_LACKS_MEMBER_TEMPLATES)
+#ifndef ACE_LACKS_MEMBER_TEMPLATES
   // Allow MSVC++ >= 8 checked iterators to be used.
   template <typename iter>
   inline static void copy_swap_range(
@@ -68,13 +68,13 @@ struct value_traits
   {
     copy_range(begin, end, dst);
   }
-# else
+#else
   inline static void copy_swap_range(
       value_type * begin, value_type * end, value_type * dst)
   {
     copy_range(begin, end, dst);
   }
-# endif  /* !ACE_LACKS_MEMBER_TEMPLATES */
+#endif  /* !ACE_LACKS_MEMBER_TEMPLATES */
 };
 
 } // namespace details
diff --git a/TAO/tao/Valuetype/Valuetype_Traits_Base_T.h b/TAO/tao/Valuetype/Valuetype_Traits_Base_T.h
index b65320ecfd3..13dfe7ad06d 100644
--- a/TAO/tao/Valuetype/Valuetype_Traits_Base_T.h
+++ b/TAO/tao/Valuetype/Valuetype_Traits_Base_T.h
@@ -10,7 +10,7 @@
  * @author Carlos O'Ryan
  */
 
-#include "tao/Valuetype/Value_VarOut_T.h"
+#include "tao/Objref_VarOut_T.h"
 
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/tao/Valuetype/Valuetype_Traits_T.h b/TAO/tao/Valuetype/Valuetype_Traits_T.h
index 74b93e3065c..ae21fe9e4d9 100644
--- a/TAO/tao/Valuetype/Valuetype_Traits_T.h
+++ b/TAO/tao/Valuetype/Valuetype_Traits_T.h
@@ -42,7 +42,7 @@ struct valuetype_traits_decorator
     std::generate(begin, end, &derived::default_initializer);
   }
 
-# if !defined (ACE_LACKS_MEMBER_TEMPLATES)
+# ifndef ACE_LACKS_MEMBER_TEMPLATES
   // Allow MSVC++ >= 8 checked iterators to be used.
   template <typename iter>
   inline static void copy_range(
@@ -50,15 +50,15 @@ struct valuetype_traits_decorator
   {
     std::transform(begin, end, dst, &derived::duplicate);
   }
-# else
+#else
   inline static void copy_range(
       object_type ** begin, object_type ** end, object_type ** dst)
   {
     std::transform(begin, end, dst, &derived::duplicate);
   }
-# endif  /* ACE_LACKS_MEMBER_TEMPLATES */
+#endif  /* ACE_LACKS_MEMBER_TEMPLATES */
 
-# if !defined (ACE_LACKS_MEMBER_TEMPLATES)
+#ifndef ACE_LACKS_MEMBER_TEMPLATES
   // Allow MSVC++ >= 8 checked iterators to be used.
   template <typename iter>
   inline static void copy_swap_range(
@@ -66,13 +66,13 @@ struct valuetype_traits_decorator
   {
     std::swap_ranges(begin, end, dst);
   }
-# else
+#else
   inline static void copy_swap_range(
       object_type ** begin, object_type ** end, object_type ** dst)
   {
     std::swap_ranges(begin, end, dst);
   }
-# endif  /* ACE_LACKS_MEMBER_TEMPLATES */
+#endif  /* ACE_LACKS_MEMBER_TEMPLATES */
 
   inline static void release_range(
       object_type ** begin, object_type ** end)
diff --git a/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc b/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc
index e50d4d3e003..e2c4e4f5bb7 100644
--- a/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc
+++ b/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc
@@ -8,7 +8,7 @@ project(*idl): taoidldefaults {
   custom_only = 1
 }
 
-project(*Server): taoserver {
+project(*Server): taoserver, messaging {
   after += *idl
   Source_Files {
     TestC.cpp
@@ -22,8 +22,7 @@ project(*Server): taoserver {
   }
 }
 
-project(*Client): taoserver {
-  exename = client
+project(*Client): taoclient, messaging {
   after += *idl
   Source_Files {
     TestC.cpp
@@ -36,11 +35,12 @@ project(*Client): taoserver {
   }
 }
 
-project(*Shutdown): taoclient {
+project(*Shutdown): taoclient, messaging {
   exename = shutdown
   after += *idl
   Source_Files {
     TestC.cpp
+    TestS.cpp
     shutdown.cpp
   }
   IDL_Files {
diff --git a/TAO/tests/Bug_1361_Regression/Echo.cpp b/TAO/tests/Bug_1361_Regression/Echo.cpp
index bdfc3b0d967..2a576562d39 100644
--- a/TAO/tests/Bug_1361_Regression/Echo.cpp
+++ b/TAO/tests/Bug_1361_Regression/Echo.cpp
@@ -49,4 +49,5 @@ Echo::echo_payload_out (Test::Payload_out data)
       // Kill the app
       ACE::terminate_process (ACE_OS::getpid ());
     }
+
 }
diff --git a/TAO/tests/Bug_1361_Regression/client.cpp b/TAO/tests/Bug_1361_Regression/client.cpp
index 57ae006f44f..a4ecf15abba 100644
--- a/TAO/tests/Bug_1361_Regression/client.cpp
+++ b/TAO/tests/Bug_1361_Regression/client.cpp
@@ -2,6 +2,8 @@
 
 #include "Echo.h"
 #include "ORB_Task.h"
+#include "tao/Messaging/Messaging.h"
+#include "tao/AnyTypeCode/Any.h"
 #include "tao/Utils/Servant_Var.h"
 #include "tao/ORB_Core.h"
 #include "ace/Get_Opt.h"
@@ -65,6 +67,29 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
 
+      CORBA::Object_var object =
+        orb->resolve_initial_references ("PolicyCurrent");
+
+      CORBA::PolicyCurrent_var policy_current =
+        CORBA::PolicyCurrent::_narrow (object.in ());
+
+      if (CORBA::is_nil (policy_current.in ()))
+        {
+          ACE_ERROR ((LM_ERROR, "ERROR: Nil policy current\n"));
+          return 1;
+        }
+      CORBA::Any scope_as_any;
+      scope_as_any <<= Messaging::SYNC_WITH_TRANSPORT;
+
+      CORBA::PolicyList policies(1); policies.length (1);
+      policies[0] =
+        orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
+                            scope_as_any);
+
+      policy_current->set_policy_overrides (policies, CORBA::ADD_OVERRIDE);
+
+      policies[0]->destroy ();
+
       if (parse_args (argc, argv) != 0)
         return 1;
 
diff --git a/TAO/tests/Bug_1361_Regression/server.cpp b/TAO/tests/Bug_1361_Regression/server.cpp
index ae617a640da..9e389c155c5 100644
--- a/TAO/tests/Bug_1361_Regression/server.cpp
+++ b/TAO/tests/Bug_1361_Regression/server.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "Echo_Caller.h"
+#include "tao/Messaging/Messaging.h"
 #include "tao/Utils/Servant_Var.h"
 #include "tao/ORB_Core.h"
 #include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_1361_Regression/shutdown.cpp b/TAO/tests/Bug_1361_Regression/shutdown.cpp
index cdf5316cc59..d4c8e2320bb 100644
--- a/TAO/tests/Bug_1361_Regression/shutdown.cpp
+++ b/TAO/tests/Bug_1361_Regression/shutdown.cpp
@@ -3,6 +3,9 @@
 #include "TestC.h"
 #include "ace/Get_Opt.h"
 
+// FUZZ: disable check_for_streams_include
+#include "ace/streams.h"
+
 ACE_RCSID(Bug_1361_Regression, shutdown, "$Id$")
 
 #if defined (ACE_OPENVMS)
diff --git a/TAO/tests/Bug_3812_Regression/Bug_3812_Regression.cpp b/TAO/tests/Bug_3812_Regression/Bug_3812_Regression.cpp
deleted file mode 100644
index e485f7447a6..00000000000
--- a/TAO/tests/Bug_3812_Regression/Bug_3812_Regression.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-// $Id$
-#include "ace/Get_Opt.h"
-#include "ace/Argv_Type_Converter.h"
-#include "ace/SString.h"
-#include "ace/Manual_Event.h"
-#include "ace/Task.h"
-#include "ace/OS.h"
-
-#include "tao/Transport_Cache_Manager_T.h"
-#include "tao/ORB.h"
-#include "tao/Condition.h"
-
-class mock_transport;
-class mock_tdi;
-class mock_ps;
-
-static int global_purged_count = 0;
-
-#include "mock_tdi.h"
-#include "mock_transport.h"
-#include "mock_ps.h"
-
-static TCM* tcm = 0;
-static int result = 0;
-static TAO_SYNCH_MUTEX test_lock;
-static TAO_Condition<TAO_SYNCH_MUTEX> test_condition(test_lock);
-static int n_threads = 1;
-
-int
-parse_args (int argc, ACE_TCHAR *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("t:"));
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 't':
-        n_threads = ACE_OS::atoi(get_opts.opt_arg());
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-t <n_threads>"
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-class Client_Task : public ACE_Task_Base
-{
-  public : 
-   Client_Task (mock_tdi& tdi, mock_transport& trans)
-   : tdi_ (tdi),
-     trans_ (trans)
-   {
-   }
-   
-   
-  ~Client_Task () {};
-   
-  void process_listen_point ()
-  {
-    this->trans_.purge_entry ();
-    // Allocate a new char to avoid the cache_transport malloc/free entry
-    // on same address which makes it harder to verify test result.
-    char*x = new char[1];
-    tcm->cache_transport (&tdi_, &trans_);
-    this->trans_.make_idle();
-    delete x;
-  }
-   
-  int svc ()
-  {
-    ACE_Guard<TAO_SYNCH_MUTEX> lock (test_lock);
-    process_listen_point ();
-    test_condition.signal ();
-    return 0;
-  };
-   
-   
- private:
-    mock_tdi& tdi_;
-    mock_transport& trans_;
-};
-
-
-
-
-int
-ACE_TMAIN(int argc, ACE_TCHAR *argv[])
-{
-  try
-    {
-      // We need an ORB to get an ORB core
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      size_t const transport_max = 10;
-      int cache_maximum = 10;
-      int purging_percentage = 20;
-      mock_transport mytransport(orb->orb_core ());
-      mock_tdi mytdi;
-      mock_ps* myps = new mock_ps(1);
-      TCM my_cache (purging_percentage, myps, cache_maximum, false, 0);
-
-      tcm = &my_cache;
-      tcm->cache_transport (&mytdi, &mytransport);
-
-      Client_Task client_task(mytdi, mytransport);
-      if (client_task.activate (THR_NEW_LWP | THR_JOINABLE, 2, 1) == -1)
-        {
-          ACE_ERROR ((LM_ERROR, "Error activating client task\n"));
-        }
-       
-      client_task.wait ();
-      
-      orb->destroy ();
-
-    }
-  catch (const CORBA::Exception&)
-    {
-      // Ignore exceptions..
-    }
-  return result;
-}
diff --git a/TAO/tests/Bug_3812_Regression/Makefile.am b/TAO/tests/Bug_3812_Regression/Makefile.am
deleted file mode 100755
index ec325af2e83..00000000000
--- a/TAO/tests/Bug_3812_Regression/Makefile.am
+++ /dev/null
@@ -1,72 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## C:\OCI\TAO\doc\ACE\bin\mwc.pl -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.TCM_Bug_3549_Regression.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Bug_3549_Regression
-
-Bug_3549_Regression_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Bug_3549_Regression_SOURCES = \
-  Bug_3549_Regression.cpp \
-  mock_ps.h \
-  mock_tdi.h \
-  mock_transport.h
-
-Bug_3549_Regression_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Makefile.TCM_Bug_3558_Regression.am
-
-if BUILD_EXCEPTIONS
-
-noinst_PROGRAMS += Bug_3558_Regression
-
-Bug_3558_Regression_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-Bug_3558_Regression_SOURCES = \
-  Bug_3558_Regression.cpp \
-  mock_ps.h \
-  mock_tdi.h \
-  mock_transport.h
-
-Bug_3558_Regression_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_EXCEPTIONS
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/tests/Bug_3812_Regression/mock_ps.h b/TAO/tests/Bug_3812_Regression/mock_ps.h
deleted file mode 100644
index 6c6631d8c07..00000000000
--- a/TAO/tests/Bug_3812_Regression/mock_ps.h
+++ /dev/null
@@ -1,13 +0,0 @@
-// $Id$
-
-class mock_ps
-{
-public:
-  mock_ps (int max) : maximum_ (max) {}
-  void update_item (mock_transport*) {}
-  int cache_maximum () { return this->maximum_;}
-private:
-  int maximum_;
-};
-
-
diff --git a/TAO/tests/Bug_3812_Regression/mock_tdi.h b/TAO/tests/Bug_3812_Regression/mock_tdi.h
deleted file mode 100644
index 341b9b31626..00000000000
--- a/TAO/tests/Bug_3812_Regression/mock_tdi.h
+++ /dev/null
@@ -1,12 +0,0 @@
-// $Id$
-
-class mock_tdi
-{
-public:
-  mock_tdi () {}
-  u_long hash (void) {return static_cast<u_long> (reinterpret_cast<ptrdiff_t> (this));}
-  mock_tdi *duplicate (void) {return 0;}
-  CORBA::Boolean is_equivalent (const mock_tdi *) {return true;}
-
-};
-
diff --git a/TAO/tests/Bug_3812_Regression/mock_transport.h b/TAO/tests/Bug_3812_Regression/mock_transport.h
deleted file mode 100644
index 5101d883f2b..00000000000
--- a/TAO/tests/Bug_3812_Regression/mock_transport.h
+++ /dev/null
@@ -1,125 +0,0 @@
-// $Id$
-
-#include "tao/ORB_Core.h"
-
-typedef TAO::Transport_Cache_Manager_T<mock_transport, mock_tdi, mock_ps> TCM;
-
-extern TCM* tcm;
-extern int result;
-extern TAO_SYNCH_MUTEX test_lock;
-extern TAO_Condition<TAO_SYNCH_MUTEX> test_condition;
-
-
-class mock_transport
-{
-public:
-  mock_transport (TAO_ORB_Core *orb_core)
-      : id_(0)
-      , is_connected_(false)
-      , entry_(0)
-      , purging_order_ (0)
-      , purged_count_ (0)
-      , handler_lock_ (orb_core->resource_factory ()->create_cached_connection_lock ())
-  {}
-
-  size_t id (void) const {return id_;}
-  void id (size_t id) { this->id_ = id;}
-  unsigned long purging_order (void) const {return purging_order_;}
-  void purging_order (unsigned long purging_order) { this->purging_order_ = purging_order;}
-  bool is_connected (void) const {return is_connected_;}
-  void is_connected (bool is_connected) { this->is_connected_ = is_connected;}
-  ACE_Event_Handler::Reference_Count add_reference (void) {return 0;}
-  ACE_Event_Handler::Reference_Count remove_reference (void) {return 0;}
-
-  // Implementation needs be similar to TAO_Transport::cache_map_entry().
-  void cache_map_entry (TCM::HASH_MAP_ENTRY *entry) {  
-    ACE_GUARD (ACE_Lock, ace_mon, *this->handler_lock_);
-    ACE_DEBUG ((LM_DEBUG, "(%P|%t)cache_map_entry %X\n", entry));
-    this->entry_ = entry;
-  }
-  TCM::HASH_MAP_ENTRY *cache_map_entry (void) {return this->entry_;}
-  void close_connection (void) { purged_count_ = ++global_purged_count;};
-  int purged_count (void) { return this->purged_count_;}
-  bool can_be_purged (void) { return true;}
-  
-  // Implementation needs be similar to TAO_Transport::purge_entry().
-  int purge_entry (void)
-  {
-    TCM::HASH_MAP_ENTRY* entry = 0;
-    {
-      ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->handler_lock_, -1);
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t)purge_entry %X\n", this->entry_));
-      entry = this->entry_;
-      this->entry_ = 0;
-    }
-    return tcm->purge_entry (entry);
-  }
-
-  // Implementation needs be similar to TAO_Transport::make_idle().
-  // 
-  //  int
-  //  TAO_Transport::make_idle (void)
-  //  {
-  //    if (TAO_debug_level > 3)
-  //      {
-  //        ACE_DEBUG ((LM_DEBUG,
-  //                    ACE_TEXT ("TAO (%P|%t) - Transport[%d]::make_idle\n"),
-  //                    this->id ()));
-  //      }
-  //  
-  //    return this->transport_cache_manager ().make_idle (this->cache_map_entry_);
-  //  }
-
-  // Code are added to simulate the situation that the cached entry pointer passed
-  // to TCM to make entry idle is deleted by another thread b/c of re-cache transport
-  // and cause TCM make idle on an invalid entry. Otherwise we need delay and similar
-  // code in TCM::make_idl() to reproduce the problem.
-
-  int make_idle (void)
-  {
-    static bool is_first = true;
-    
-    ACE_DEBUG ((LM_DEBUG, "(%P|%t)make_idle pass entry %X\n", this->entry_));
-
-    TCM::HASH_MAP_ENTRY* entry = this->entry_;
-
-    // The first thread comes to this point, record the entry
-    // and wait for second thread to process listen point which
-    // re-cache transport.
-    if (is_first)
-    {
-      is_first = false;
-      test_condition.wait ();
-    }
-
-    ACE_DEBUG ((LM_DEBUG, "(%P|%t)make_idle execute on entry %X and now entry %X\n", 
-      entry, this->entry_));
-
-    // When the first thread is at this point, the entry is
-    // deleted by second thread, so make idle on the invalid
-    // entry cause SEGV. It's possible that the memory is still
-    // available then next checking if entry is changed should 
-    // confirm if the entry is valid or not.
-    int ret = tcm->make_idle (entry);
-    if (entry != this->entry_)
-    {
-      ACE_ERROR ((LM_ERROR, ACE_TEXT ("(%P|%t)ERROR: Entry was changed  ")
-        ACE_TEXT ("after passing to TCM and before calling make_idl.\n")));
-      result = 1;
-    }
-    
-    return ret;
-  }
-
-
-private:
-  size_t id_;
-  bool is_connected_;
-  TCM::HASH_MAP_ENTRY *entry_;
-  unsigned long purging_order_;
-  /// When did we got purged
-  int purged_count_;
-  mutable ACE_Lock *handler_lock_;
-};
-
-
diff --git a/TAO/tests/Bug_3812_Regression/run_test.pl b/TAO/tests/Bug_3812_Regression/run_test.pl
deleted file mode 100755
index 231ddcd7576..00000000000
--- a/TAO/tests/Bug_3812_Regression/run_test.pl
+++ /dev/null
@@ -1,37 +0,0 @@
-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;
-use strict;
-
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-     & eval 'exec perl -S $0 $argv:q'
-     if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib "$ENV{ACE_ROOT}/bin";
-use PerlACE::TestTarget;
-
-my $status = 0;
-my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
-my $P = $server->CreateProcess ("Bug_3812_Regression");
-print "Running Bug_3812_Regression ...\n";
-my $result = $P->Spawn ();
-if ($result != 0) {
-    print "test FAILED\n";
-    $status = 1;
-}
-$result = $P->WaitKill(100*$server->ProcessStartWaitInterval());
-if ($result != 0) {
-    print "test FAILED\n";
-    $status = 1;
-}
-
-exit $status;
diff --git a/TAO/tests/Bug_3821_Regression/Bug_3821_Regression.mpc b/TAO/tests/Bug_3821_Regression/Bug_3821_Regression.mpc
deleted file mode 100644
index f409123f946..00000000000
--- a/TAO/tests/Bug_3821_Regression/Bug_3821_Regression.mpc
+++ /dev/null
@@ -1,20 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*idl): taoidldefaults {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
-project(*Test): taoclient {
-  after += *idl
-
-  Source_Files {
-    testC.cpp
-    test.cpp
-  }
-  IDL_Files {
-  }
-}
diff --git a/TAO/tests/Bug_3821_Regression/README b/TAO/tests/Bug_3821_Regression/README
deleted file mode 100644
index 5be18312f8c..00000000000
--- a/TAO/tests/Bug_3821_Regression/README
+++ /dev/null
@@ -1,16 +0,0 @@
-// $Id$
-
-Even if union uses enumeration as discriminant and all possible case
-are specified in IDL there are still possible a lot of other values because
-enumeration is int internally. Thus we need _default() function for such
-unions and handle this case during marshaling/demarshaling.
-
-Successful output:
-
-$>./run_test.pl
-Starting Test
-Ended Test
-
-Regression output: Basically the test should not compile if there is a
-regression. But if it compiles then any ERROR message should indicate the
-regression.
diff --git a/TAO/tests/Bug_3821_Regression/run_test.pl b/TAO/tests/Bug_3821_Regression/run_test.pl
deleted file mode 100755
index 26d61b07e92..00000000000
--- a/TAO/tests/Bug_3821_Regression/run_test.pl
+++ /dev/null
@@ -1,26 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-     & eval 'exec perl -S $0 $argv:q'
-     if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib "$ENV{ACE_ROOT}/bin";
-use PerlACE::TestTarget;
-
-$status = 0;
-
-my $client = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
-
-$CL = $client->CreateProcess ("client");
-
-print "Starting Test\n";
-$client_status = $CL->SpawnWaitKill ($client->ProcessStartWaitInterval());
-print "Ended Test\n";
-
-if ($client_status != 0) {
-    print STDERR "ERROR: client returned $client_status\n";
-    $status = 1;
-}
-
-exit $status;
diff --git a/TAO/tests/Bug_3821_Regression/test.cpp b/TAO/tests/Bug_3821_Regression/test.cpp
deleted file mode 100644
index 9769881aa19..00000000000
--- a/TAO/tests/Bug_3821_Regression/test.cpp
+++ /dev/null
@@ -1,301 +0,0 @@
-// $Id$
-
-#include "testC.h"
-#include "tao/CDR.h"
-
-ACE_RCSID(Test,
-          test,
-          "$Id$")
-
-namespace
-{
-  template<typename T>
-  int
-  marshal (TAO_OutputCDR &out, T const &t)
-  {
-    if (!(out << t))
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "ERROR: Cannot marshal\n"),
-                          -1);
-      }
-    return 0;
-  }
-
-  template<typename T>
-  int
-  demarshal (TAO_InputCDR &in, T &t,
-             test::Enumeration wrong_disc,
-             test::Enumeration expect_disc)
-  {
-    if (!(in >> t) || t._d () == wrong_disc || t._d () != expect_disc)
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "ERROR: Cannot demarshal\n"),
-                          -1);
-      }
-    return 0;
-  }
-
-  template<typename T>
-  int
-  demarshal (TAO_InputCDR &in, T &t,
-             CORBA::Boolean wrong_disc,
-             CORBA::Boolean expect_disc)
-  {
-    if (!(in >> t) || t._d () == wrong_disc || t._d () != expect_disc)
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "ERROR: Cannot demarshal\n"),
-                          -1);
-      }
-    return 0;
-  }
-
-  template<typename T>
-  int
-  demarshal (TAO_InputCDR &in, T &t,
-             CORBA::Char wrong_disc,
-             CORBA::Char expect_disc)
-  {
-    if (!(in >> t) || t._d () == wrong_disc || t._d () != expect_disc)
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "ERROR: Cannot demarshal\n"),
-                          -1);
-      }
-    return 0;
-  }
-
-  template<typename T>
-  int
-  demarshal (TAO_InputCDR &in, T &t,
-             CORBA::Long wrong_disc,
-             CORBA::Long expect_disc)
-  {
-    if (!(in >> t) || t._d () == wrong_disc || t._d () != expect_disc)
-      {
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "ERROR: Cannot demarshal\n"),
-                          -1);
-      }
-    return 0;
-  }
-}
-
-int
-ACE_TMAIN (int, ACE_TCHAR *[])
-{
-  int error= 0;
-
-  try
-    {
-      // Marshal part.
-
-      TAO_OutputCDR cdr_out;
-
-      test::UnionAllCovered_EnumerationDiscriminant uac_ed_out;
-      // UnionAllCovered_EnumerationDiscriminant must have _default()
-      // despite it has cases for all possible
-      // values of enumeration. But since enumeration is just int it has
-      // much more values than those listed in IDL.
-      uac_ed_out._default ();
-      marshal (cdr_out, uac_ed_out);
-
-      test::UnionAllCovered_EnumerationDiscriminant uac_ed2_out;
-      uac_ed2_out._d (static_cast<test::Enumeration> (10));
-      marshal (cdr_out, uac_ed2_out);
-
-      test::UnionWithDefault_EnumerationDiscriminant uwd_ed_out;
-      uwd_ed_out._d (static_cast<test::Enumeration> (20));
-      marshal (cdr_out, uwd_ed_out);
-
-      test::UnionWithImplicitDefault_EnumerationDiscriminant uwid_ed_out;
-      uwid_ed_out._default ();
-      marshal (cdr_out, uwid_ed_out);
-
-      test::UnionWithImplicitDefault_EnumerationDiscriminant uwid_ed2_out;
-      uwid_ed2_out._d (static_cast<test::Enumeration> (30));
-      marshal (cdr_out, uwid_ed2_out);
-
-      test::UnionAllCovered_TypedefedEnumerationDiscriminant uac_ted_out;
-      // UnionAllCovered_TypedefedEnumerationDiscriminant must have _default()
-      // despite it has cases for all possible
-      // values of enumeration. But since enumeration is just int it has
-      // much more values than those listed in IDL.
-      uac_ted_out._default ();
-      marshal (cdr_out, uac_ted_out);
-
-      test::UnionAllCovered_TypedefedEnumerationDiscriminant uac_ted2_out;
-      uac_ted2_out._d (static_cast<test::Enumeration> (40));
-      marshal (cdr_out, uac_ted2_out);
-
-      test::UnionWithDefault_TypedefedEnumerationDiscriminant uwd_ted_out;
-      uwd_ted_out._d (static_cast<test::Enumeration> (50));
-      marshal (cdr_out, uwd_ted_out);
-
-      test::UnionWithImplicitDefault_TypedefedEnumerationDiscriminant uwid_ted_out;
-      uwid_ted_out._default ();
-      marshal (cdr_out, uwid_ted_out);
-
-      test::UnionWithImplicitDefault_TypedefedEnumerationDiscriminant uwid_ted2_out;
-      uwid_ted2_out._d (static_cast<test::Enumeration> (60));
-      marshal (cdr_out, uwid_ted2_out);
-
-      test::UnionAllCovered_BooleanDiscriminant uac_bd_out;
-      // uac_bd_out._default (); // no _default() since all labels are covered.
-      uac_bd_out._d (static_cast<CORBA::Boolean> (3));
-      marshal (cdr_out, uac_bd_out);
-
-      test::UnionAllCovered_BooleanDiscriminant uac_bd2_out;
-      uac_bd2_out._d (static_cast<CORBA::Boolean> (5));
-      marshal (cdr_out, uac_bd2_out);
-
-      test::UnionWithDefault_BooleanDiscriminant uwd_bd_out;
-      uwd_bd_out._d (static_cast<CORBA::Boolean> (7));
-      marshal (cdr_out, uwd_bd_out);
-
-      test::UnionWithImplicitDefault_BooleanDiscriminant uwid_bd_out;
-      uwid_bd_out._default ();
-      marshal (cdr_out, uwid_bd_out);
-
-      test::UnionWithImplicitDefault_BooleanDiscriminant uwid_bd2_out;
-      uwid_bd2_out._d (static_cast<CORBA::Boolean> (9));
-      marshal (cdr_out, uwid_bd2_out);
-
-      test::UnionAllCovered_CharDiscriminant uac_cd_out;
-      // uac_cd_out._default (); // no _default() since all labels are covered.
-      marshal (cdr_out, uac_cd_out);
-
-      test::UnionAllCovered_CharDiscriminant uac_cd2_out;
-      uac_cd2_out._d (100);
-      marshal (cdr_out, uac_cd2_out);
-
-      test::UnionWithDefault_CharDiscriminant uwd_cd_out;
-      uwd_cd_out._d (110);
-      marshal (cdr_out, uwd_cd_out);
-
-      test::UnionWithImplicitDefault_CharDiscriminant uwid_cd_out;
-      uwid_cd_out._default ();
-      marshal (cdr_out, uwid_cd_out);
-
-      test::UnionWithImplicitDefault_CharDiscriminant uwid_cd2_out;
-      uwid_cd2_out._d (120);
-      marshal (cdr_out, uwid_cd2_out);
-
-      test::UnionWithDefault_LongDiscriminant uwd_ld_out;
-      uwd_ld_out._d (1000);
-      marshal (cdr_out, uwd_ld_out);
-
-      test::UnionWithImplicitDefault_LongDiscriminant uwid_ld_out;
-      uwid_ld_out._default ();
-      marshal (cdr_out, uwid_ld_out);
-
-      test::UnionWithImplicitDefault_LongDiscriminant uwid_ld2_out;
-      uwid_ld2_out._d (2000);
-      marshal (cdr_out, uwid_ld2_out);
-
-      // Demarshal part.
-
-      TAO_InputCDR cdr_in (cdr_out);
-
-      test::UnionAllCovered_EnumerationDiscriminant uac_ed_in;
-      uac_ed_in._d (test::Enum1);
-      demarshal (cdr_in, uac_ed_in, test::Enum1, uac_ed_out._d ());
-
-      test::UnionAllCovered_EnumerationDiscriminant uac_ed2_in;
-      uac_ed2_in._d (test::Enum1);
-      demarshal (cdr_in, uac_ed2_in, test::Enum1, uac_ed_out._d ());
-
-      test::UnionWithDefault_EnumerationDiscriminant uwd_ed_in;
-      uwd_ed_in._d (test::Enum1);
-      demarshal (cdr_in, uwd_ed_in, test::Enum1, uwd_ed_out._d ());
-
-      test::UnionWithImplicitDefault_EnumerationDiscriminant uwid_ed_in;
-      uwid_ed_in._d (test::Enum1);
-      demarshal (cdr_in, uwid_ed_in, test::Enum1, uwid_ed_out._d ());
-
-      test::UnionWithImplicitDefault_EnumerationDiscriminant uwid_ed2_in;
-      uwid_ed2_in._d (test::Enum1);
-      demarshal (cdr_in, uwid_ed2_in, test::Enum1, uwid_ed_out._d ());
-
-      test::UnionAllCovered_TypedefedEnumerationDiscriminant uac_ted_in;
-      uac_ted_in._d (test::Enum1);
-      demarshal (cdr_in, uac_ted_in, test::Enum1, uac_ted_out._d ());
-
-      test::UnionAllCovered_TypedefedEnumerationDiscriminant uac_ted2_in;
-      uac_ted2_in._d (test::Enum1);
-      demarshal (cdr_in, uac_ted2_in, test::Enum1, uac_ted_out._d ());
-
-      test::UnionWithDefault_TypedefedEnumerationDiscriminant uwd_ted_in;
-      uwd_ted_in._d (test::Enum1);
-      demarshal (cdr_in, uwd_ted_in, test::Enum1, uwd_ted_out._d ());
-
-      test::UnionWithImplicitDefault_TypedefedEnumerationDiscriminant uwid_ted_in;
-      uwid_ted_in._d (test::Enum1);
-      demarshal (cdr_in, uwid_ted_in, test::Enum1, uwid_ted_out._d ());
-
-      test::UnionWithImplicitDefault_TypedefedEnumerationDiscriminant uwid_ted2_in;
-      uwid_ted2_in._d (test::Enum1);
-      demarshal (cdr_in, uwid_ted2_in, test::Enum1, uwid_ted_out._d ());
-
-      test::UnionAllCovered_BooleanDiscriminant uac_bd_in;
-      uac_bd_in._d (false);
-      demarshal (cdr_in, uac_bd_in, false, uac_bd_out._d ());
-
-      test::UnionAllCovered_BooleanDiscriminant uac_bd2_in;
-      uac_bd2_in._d (false);
-      demarshal (cdr_in, uac_bd2_in, false, uac_bd2_out._d ());
-
-      test::UnionWithDefault_BooleanDiscriminant uwd_bd_in;
-      uwd_bd_in._d (false);
-      demarshal (cdr_in, uwd_bd_in, false, uwd_bd_out._d ());
-
-      test::UnionWithImplicitDefault_BooleanDiscriminant uwid_bd_in;
-      uwid_bd_in._d (true);
-      demarshal (cdr_in, uwid_bd_in, true, uwid_bd_out._d ());
-
-      test::UnionWithImplicitDefault_BooleanDiscriminant uwid_bd2_in;
-      uwid_bd2_in._d (false);
-      demarshal (cdr_in, uwid_bd2_in, false, uwid_bd2_out._d ());
-
-      test::UnionAllCovered_CharDiscriminant uac_cd_in;
-      uac_cd_in._d ('a');
-      demarshal (cdr_in, uac_cd_in, 'a', uac_cd_out._d ());
-
-      test::UnionAllCovered_CharDiscriminant uac_cd2_in;
-      uac_cd2_in._d ('a');
-      demarshal (cdr_in, uac_cd2_in, 'a', uac_cd2_out._d ());
-
-      test::UnionWithDefault_CharDiscriminant uwd_cd_in;
-      uwd_cd_in._d ('\1');
-      demarshal (cdr_in, uwd_cd_in, '\1', uwd_cd_out._d ());
-
-      test::UnionWithImplicitDefault_CharDiscriminant uwid_cd_in;
-      uwid_cd_in._d ('\1');
-      demarshal (cdr_in, uwid_cd_in, '\1', uwid_cd_out._d ());
-
-      test::UnionWithImplicitDefault_CharDiscriminant uwid_cd2_in;
-      uwid_cd2_in._d ('\1');
-      demarshal (cdr_in, uwid_cd2_in, '\1', uwid_cd_out._d ());
-
-      test::UnionWithDefault_LongDiscriminant uwd_ld_in;
-      uwd_ld_in._d (1);
-      demarshal (cdr_in, uwd_ld_in, 1, uwd_ld_out._d ());
-
-      test::UnionWithImplicitDefault_LongDiscriminant uwid_ld_in;
-      uwid_ld_in._d (1);
-      demarshal (cdr_in, uwid_ld_in, 1, uwid_ld_out._d ());
-
-      test::UnionWithImplicitDefault_LongDiscriminant uwid_ld2_in;
-      uwid_ld2_in._d (1);
-      demarshal (cdr_in, uwid_ld2_in, 1, uwid_ld_out._d ());
-    }
-  catch (const CORBA::Exception& ex)
-    {
-      ex._tao_print_exception ("Exception caught:");
-      error= 1;
-    }
-
-  return error;
-}
diff --git a/TAO/tests/Bug_3821_Regression/test.idl b/TAO/tests/Bug_3821_Regression/test.idl
deleted file mode 100644
index 27e38fef816..00000000000
--- a/TAO/tests/Bug_3821_Regression/test.idl
+++ /dev/null
@@ -1,159 +0,0 @@
-// $Id$
-
-module test {
-  enum Enumeration {
-    Enum1,
-    Enum2,
-    Enum3
-  };
-
-  union UnionAllCovered_EnumerationDiscriminant switch (Enumeration) {
-  case Enum1:
-    long e_enum1;
-  case Enum2:
-    long e_enum2;
-  case Enum3:
-    long e_enum3;
-  };
-
-  union UnionWithDefault_EnumerationDiscriminant switch (Enumeration) {
-  case Enum1:
-    long e_enum1;
-  case Enum2:
-    long e_enum2;
-  default:
-    long e_def;
-  };
-
-  union UnionWithImplicitDefault_EnumerationDiscriminant switch (Enumeration) {
-  case Enum1:
-    long e_enum1;
-  case Enum2:
-    long e_enum2;
-  };
-
-  typedef Enumeration TypedefedEnumeration;
-
-  union UnionAllCovered_TypedefedEnumerationDiscriminant switch (TypedefedEnumeration) {
-  case Enum1:
-    long e_enum1;
-  case Enum2:
-    long e_enum2;
-  case Enum3:
-    long e_enum3;
-  };
-
-  union UnionWithDefault_TypedefedEnumerationDiscriminant switch (TypedefedEnumeration) {
-  case Enum1:
-    long e_enum1;
-  case Enum2:
-    long e_enum2;
-  default:
-    long e_def;
-  };
-
-  union UnionWithImplicitDefault_TypedefedEnumerationDiscriminant switch (TypedefedEnumeration) {
-  case Enum1:
-    long e_enum1;
-  case Enum2:
-    long e_enum2;
-  };
-
-  union UnionAllCovered_BooleanDiscriminant switch (boolean)
-  {
-  case TRUE:
-    long e_true;
-  case FALSE:
-    long e_false;
-  };
-
-  union UnionWithDefault_BooleanDiscriminant switch (boolean)
-  {
-  case TRUE:
-    long e_true;
-  default:
-    long e_def;
-  };
-
-  union UnionWithImplicitDefault_BooleanDiscriminant switch (boolean)
-  {
-  case TRUE:
-    long e_true;
-  };
-
-  union UnionAllCovered_CharDiscriminant switch (char)
-  {
-  case '\000': case '\001': case '\002': case '\003': case '\004': case '\005': case '\006': case '\007':
-  case '\010': case '\011': case '\012': case '\013': case '\014': case '\015': case '\016': case '\017':
-  case '\020': case '\021': case '\022': case '\023': case '\024': case '\025': case '\026': case '\027':
-  case '\030': case '\031': case '\032': case '\033': case '\034': case '\035': case '\036': case '\037':
-  case '\040': case '\041': case '\042': case '\043': case '\044': case '\045': case '\046': case '\047':
-  case '\050': case '\051': case '\052': case '\053': case '\054': case '\055': case '\056': case '\057':
-  case '\060': case '\061': case '\062': case '\063': case '\064': case '\065': case '\066': case '\067':
-  case '\070': case '\071': case '\072': case '\073': case '\074': case '\075': case '\076': case '\077':
-
-  case '\100': case '\101': case '\102': case '\103': case '\104': case '\105': case '\106': case '\107':
-  case '\110': case '\111': case '\112': case '\113': case '\114': case '\115': case '\116': case '\117':
-  case '\120': case '\121': case '\122': case '\123': case '\124': case '\125': case '\126': case '\127':
-  case '\130': case '\131': case '\132': case '\133': case '\134': case '\135': case '\136': case '\137':
-  case '\140': case '\141': case '\142': case '\143': case '\144': case '\145': case '\146': case '\147':
-  case '\150': case '\151': case '\152': case '\153': case '\154': case '\155': case '\156': case '\157':
-  case '\160': case '\161': case '\162': case '\163': case '\164': case '\165': case '\166': case '\167':
-  case '\170': case '\171': case '\172': case '\173': case '\174': case '\175': case '\176': case '\177':
-
-  case '\200': case '\201': case '\202': case '\203': case '\204': case '\205': case '\206': case '\207':
-  case '\210': case '\211': case '\212': case '\213': case '\214': case '\215': case '\216': case '\217':
-  case '\220': case '\221': case '\222': case '\223': case '\224': case '\225': case '\226': case '\227':
-  case '\230': case '\231': case '\232': case '\233': case '\234': case '\235': case '\236': case '\237':
-  case '\240': case '\241': case '\242': case '\243': case '\244': case '\245': case '\246': case '\247':
-  case '\250': case '\251': case '\252': case '\253': case '\254': case '\255': case '\256': case '\257':
-  case '\260': case '\261': case '\262': case '\263': case '\264': case '\265': case '\266': case '\267':
-  case '\270': case '\271': case '\272': case '\273': case '\274': case '\275': case '\276': case '\277':
-
-  case '\300': case '\301': case '\302': case '\303': case '\304': case '\305': case '\306': case '\307':
-  case '\310': case '\311': case '\312': case '\313': case '\314': case '\315': case '\316': case '\317':
-  case '\320': case '\321': case '\322': case '\323': case '\324': case '\325': case '\326': case '\327':
-  case '\330': case '\331': case '\332': case '\333': case '\334': case '\335': case '\336': case '\337':
-  case '\340': case '\341': case '\342': case '\343': case '\344': case '\345': case '\346': case '\347':
-  case '\350': case '\351': case '\352': case '\353': case '\354': case '\355': case '\356': case '\357':
-  case '\360': case '\361': case '\362': case '\363': case '\364': case '\365': case '\366': case '\367':
-  case '\370': case '\371': case '\372': case '\373': case '\374': case '\375': case '\376': case '\377':
-    long e_chars;
-  };
-
-  union UnionWithDefault_CharDiscriminant switch (char)
-  {
-  case '\0': case '\1': case '\2': case '\3': case '\4': case '\5': case '\6': case '\7':
-    long e_chars;
-  default:
-    long e_def;
-  };
-
-  union UnionWithImplicitDefault_CharDiscriminant switch (char)
-  {
-  case '\0': case '\1': case '\2': case '\3': case '\4': case '\5': case '\6': case '\7':
-    long e_chars;
-  };
-
-  union UnionWithDefault_LongDiscriminant switch (long)
-  {
-  case 1:
-    long e_case1;
-  case 2:
-    long e_case2;
-  case 3:
-    long e_case3;
-  default:
-    long e_def;
-  };
-
-  union UnionWithImplicitDefault_LongDiscriminant switch (long)
-  {
-  case 1:
-    long e_case1;
-  case 2:
-    long e_case2;
-  case 3:
-    long e_case3;
-  };
-};
diff --git a/TAO/tests/Bug_3826_Regression/Bug_3826_Regression.mpc b/TAO/tests/Bug_3826_Regression/Bug_3826_Regression.mpc
deleted file mode 100644
index ab00104856d..00000000000
--- a/TAO/tests/Bug_3826_Regression/Bug_3826_Regression.mpc
+++ /dev/null
@@ -1,10 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*Server) : taoexe {
-  exename=server
-
-  Source_Files {
-    server.cpp
-  }
-}
diff --git a/TAO/tests/Bug_3826_Regression/README b/TAO/tests/Bug_3826_Regression/README
deleted file mode 100644
index 63740e99086..00000000000
--- a/TAO/tests/Bug_3826_Regression/README
+++ /dev/null
@@ -1,27 +0,0 @@
-// $Id$
-
-This test checks that if the first ORB is created with -ORBGestalt LOCAL
-then the settings from this ORB will not become default for the other ORBs
-created afterwards.
-
-_Success_
-
-$> ./run_test.pl
-Testing with -ORBSvcConf
-Initialize ORB instances...
-After ORB_init...
-'-ORBConnectionCacheMax' is applied to the first ORB only as expected.
-Testing with -ORBSvcConfDirective
-Initialize ORB instances...
-After ORB_init...
-'-ORBConnectionCacheMax' is applied to the first ORB only as expected.
-
-_Regression_
-
-$> ./run_test.pl
-Testing with -ORBSvcConf
-Initialize ORB instances...
-After ORB_init...
-ERROR: '-ORBConnectionCacheMax' is applied globally while it's expected to apply to the first ORB only.
-ERROR: <server> failed: 
-ERROR: server returned 255
diff --git a/TAO/tests/Bug_3826_Regression/orb_svc.conf b/TAO/tests/Bug_3826_Regression/orb_svc.conf
deleted file mode 100644
index 7288e7d425b..00000000000
--- a/TAO/tests/Bug_3826_Regression/orb_svc.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# $Id$
-
-static Resource_Factory "-ORBConnectionCacheMax 1"
diff --git a/TAO/tests/Bug_3826_Regression/run_test.pl b/TAO/tests/Bug_3826_Regression/run_test.pl
deleted file mode 100755
index 85ad6831f4d..00000000000
--- a/TAO/tests/Bug_3826_Regression/run_test.pl
+++ /dev/null
@@ -1,65 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-     & eval 'exec perl -S $0 $argv:q'
-     if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib "$ENV{ACE_ROOT}/bin";
-use PerlACE::TestTarget;
-
-$status = 0;
-$debug_level = '0';
-
-foreach $i (@ARGV) {
-    if ($i eq '-debug') {
-        $debug_level = '10';
-    }
-}
-
-my $server = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
-
-my $svc_conf = "orb_svc.conf";
-my $server_svc_conf = $server->LocalFile ($svc_conf);
-
-print STDOUT "Testing with -ORBSvcConf\n";
-
-$SV = $server->CreateProcess ("server",
-    "-a \"AAA -ORBdebuglevel $debug_level -ORBSvcConf $server_svc_conf -ORBGestalt LOCAL\" " .
-    "-b \"BBB\"");
-
-$server_status = $SV->SpawnWaitKill ($server->ProcessStartWaitInterval());
-
-if ($server_status != 0) {
-    print STDERR "ERROR: server returned $server_status\n";
-    exit 1;
-}
-
-print STDOUT "Testing with default svc.conf\n";
-
-$SV = $server->CreateProcess ("server",
-    "-a \"AAA -ORBdebuglevel $debug_level -ORBGestalt LOCAL\" " .
-    "-b \"BBB\"");
-
-$server_status = $SV->SpawnWaitKill ($server->ProcessStartWaitInterval());
-
-if ($server_status != 0) {
-    print STDERR "ERROR: server returned $server_status\n";
-    exit 1;
-}
-
-print STDOUT "Testing with -ORBSvcConfDirective\n";
-
-$SV = $server->CreateProcess ("server",
-    "-a \"AAA -ORBdebuglevel $debug_level -ORBGestalt LOCAL " .
-        "-ORBSvcConfDirective \\\"static Resource_Factory \\\\\\\"-ORBConnectionCacheMax 1\\\\\\\"\\\"\" " .
-    "-b \"BBB\"");
-
-$server_status = $SV->SpawnWaitKill ($server->ProcessStartWaitInterval());
-
-if ($server_status != 0) {
-    print STDERR "ERROR: server returned $server_status\n";
-    exit 1;
-}
-
-exit $status;
diff --git a/TAO/tests/Bug_3826_Regression/server.cpp b/TAO/tests/Bug_3826_Regression/server.cpp
deleted file mode 100644
index 93600fc53d2..00000000000
--- a/TAO/tests/Bug_3826_Regression/server.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-// $Id$
-
-#include "ace/Get_Opt.h"
-#include "ace/ARGV.h"
-#include "tao/ORB.h"
-#include "tao/ORB_Core.h"
-#include "tao/Resource_Factory.h"
-
-ACE_TCHAR const *orb1_args =
-  ACE_TEXT ("AAA -ORBGestalt LOCAL -ORBSvcConf MY_TEST_ORB_1.conf");
-ACE_TCHAR const *orb2_args =
-  ACE_TEXT ("BBB");
-
-int
-parse_args (int argc, ACE_TCHAR *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT ("a:b:"));
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'a':
-        orb1_args = get_opts.opt_arg ();
-        break;
-      case 'b':
-        orb2_args = get_opts.opt_arg ();
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           ACE_TEXT ("usage:  %s")
-                           ACE_TEXT (" -a <orb1_args>")
-                           ACE_TEXT (" -b <orb2_args>")
-                           ACE_TEXT ("\n"),
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-ACE_TMAIN (int argc, ACE_TCHAR *argv[])
-{
-  try
-    {
-      if (parse_args (argc, argv) != 0)
-        {
-          return 1;
-        }
-
-      ACE_ARGV orb1_argv (orb1_args);
-      int orb1_argc = orb1_argv.argc ();
-
-      ACE_ARGV orb2_argv (orb2_args);
-      int orb2_argc = orb2_argv.argc ();
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "Initialize ORB instances...\n"));
-
-      CORBA::ORB_var orb1 =
-        CORBA::ORB_init (orb1_argc, orb1_argv.argv (), "AAA");
-
-      CORBA::ORB_var orb2 =
-        CORBA::ORB_init (orb2_argc, orb2_argv.argv (), "BBB");
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "After ORB_init...\n"));
-
-      TAO_Resource_Factory *trf1 = orb1->orb_core ()->resource_factory ();
-
-      if (trf1 == 0)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             ACE_TEXT ("ERROR: Can not resolve ")
-                             ACE_TEXT ("Resource Factory for orb1.\n")),
-                            -1);
-        }
-
-      TAO_Resource_Factory *trf2 = orb2->orb_core ()->resource_factory ();
-
-      if (trf2 == 0)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             ACE_TEXT ("ERROR: Can not resolve ")
-                             ACE_TEXT ("Resource Factory for orb2.\n")),
-                            -1);
-        }
-
-      if (trf1->cache_maximum () == trf2->cache_maximum ())
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             ACE_TEXT ("ERROR: '-ORBConnectionCacheMax' is ")
-                             ACE_TEXT ("applied globally while it's expected ")
-                             ACE_TEXT ("to apply to the first ORB only.\n")),
-                            -1);
-        }
-
-      orb1->destroy ();
-      orb2->destroy ();
-
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("'-ORBConnectionCacheMax' is applied to the first ")
-                  ACE_TEXT ("ORB only as expected.\n")));
-    }
-  catch (CORBA::Exception const &ex)
-    {
-      ex._tao_print_exception ("Caught Exception in main:\n");
-      return 1;
-    }
-
-  return 0;
-}
diff --git a/TAO/tests/Bug_3826_Regression/svc.conf b/TAO/tests/Bug_3826_Regression/svc.conf
deleted file mode 100644
index 7288e7d425b..00000000000
--- a/TAO/tests/Bug_3826_Regression/svc.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# $Id$
-
-static Resource_Factory "-ORBConnectionCacheMax 1"
diff --git a/TAO/tests/Bug_3827_Regression/Bug_3827_Regression.mpc b/TAO/tests/Bug_3827_Regression/Bug_3827_Regression.mpc
deleted file mode 100644
index e289841bc90..00000000000
--- a/TAO/tests/Bug_3827_Regression/Bug_3827_Regression.mpc
+++ /dev/null
@@ -1,19 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*IDL): taoidldefaults, anytypecode {
-  IDL_Files {
-    Message.idl
-  }
-  custom_only = 1
-}
-
-project (*test) : taoexe, valuetype {
-  after     += *IDL
-  exename    = test
-
-  Source_Files {
-    MessageC.cpp
-    test.cpp
-  }
-}
diff --git a/TAO/tests/Bug_3827_Regression/Message.idl b/TAO/tests/Bug_3827_Regression/Message.idl
deleted file mode 100644
index 848d48e50a4..00000000000
--- a/TAO/tests/Bug_3827_Regression/Message.idl
+++ /dev/null
@@ -1,8 +0,0 @@
-// $Id$
-
-valuetype Message
-{
-  public string user;
-  public string subject;
-  public string text;
-};
diff --git a/TAO/tests/Bug_3827_Regression/README b/TAO/tests/Bug_3827_Regression/README
deleted file mode 100644
index 1c4b36b791b..00000000000
--- a/TAO/tests/Bug_3827_Regression/README
+++ /dev/null
@@ -1,18 +0,0 @@
-// $Id$
-
-Valuetype factory related operations from different threads
-after orb was just shutdown could result in SIGSEGV.
-
-_Expected Success Output_
-$> ./run_test.pl
-(29829|140197396228368) Event loop started
-(29829|140197437130512) Shutting down / destroying ORB
-(29829|140197396228368) Event loop finished
-
-_Expected Regression Output_
-$> ./run_test.pl
-(751|139948587792656) Event loop started
-(751|139948628694800) Shutting down / destroying ORB
-(751|139948587792656) Event loop finished
-ERROR: <test> exited with signal 11 : SEGV
-ERROR: server returned 255
diff --git a/TAO/tests/Bug_3827_Regression/run_test.pl b/TAO/tests/Bug_3827_Regression/run_test.pl
deleted file mode 100755
index 6134ec898b3..00000000000
--- a/TAO/tests/Bug_3827_Regression/run_test.pl
+++ /dev/null
@@ -1,30 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-     & eval 'exec perl -S $0 $argv:q'
-     if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib "$ENV{ACE_ROOT}/bin";
-use PerlACE::TestTarget;
-
-$status = 0;
-$debug_level = '0';
-
-foreach $i (@ARGV) {
-    if ($i eq '-debug') {
-        $debug_level = '10';
-    }
-}
-
-my $test = PerlACE::TestTarget::create_target (1) || die "Create target 1 failed\n";
-
-$SV = $test->CreateProcess ("test");
-$test_status = $SV->SpawnWaitKill ($test->ProcessStartWaitInterval());
-
-if ($test_status != 0) {
-    print STDERR "ERROR: test returned $test_status\n";
-    exit 1;
-}
-
-exit $status;
diff --git a/TAO/tests/Bug_3827_Regression/test.cpp b/TAO/tests/Bug_3827_Regression/test.cpp
deleted file mode 100644
index 22259070653..00000000000
--- a/TAO/tests/Bug_3827_Regression/test.cpp
+++ /dev/null
@@ -1,122 +0,0 @@
-// $Id$
-
-#include "MessageC.h"
-#include "ace/Task.h"
-#include "ace/OS_NS_unistd.h"
-
-int status = 0;
-
-class ORB_Task : public ACE_Task_Base
-{
-public:
-  ORB_Task (CORBA::ORB_ptr orb)
-    : orb_ (CORBA::ORB::_duplicate (orb))
-  {
-  }
-
-  virtual int svc (void)
-  {
-    try
-      {
-        ACE_DEBUG ((LM_DEBUG, "(%P|%t) Event loop started\n"));
-        this->orb_->run ();
-        ACE_DEBUG ((LM_DEBUG, "(%P|%t) Event loop finished\n"));
-      }
-    catch (const CORBA::Exception& )
-      {
-      }
-    return 0;
-  }
-
-private:
-  CORBA::ORB_var orb_;
-};
-
-class Worker_Task : public ACE_Task_Base
-{
-public:
-  Worker_Task (CORBA::ORB_ptr orb)
-    : orb_ (CORBA::ORB::_duplicate (orb))
-  {
-  }
-
-  virtual int svc (void)
-  {
-    try
-      {
-        Message_init *mi = new Message_init ();
-        CORBA::ValueFactoryBase_var safe (mi);
-
-        while (1)
-          {
-            CORBA::ValueFactoryBase_var tmp1 =
-              this->orb_->register_value_factory (mi->tao_repository_id (), mi);
-
-            CORBA::ValueFactoryBase_var tmp2 =
-              this->orb_->lookup_value_factory (mi->tao_repository_id ());
-
-            this->orb_->unregister_value_factory (mi->tao_repository_id ());
-          }
-      }
-    catch (const CORBA::BAD_INV_ORDER&)
-      {
-        // It's ok to ignore BAD_INV_ORDER which can be thrown after orb
-        // is shutdown from other thread.
-      }
-    catch (const CORBA::Exception&)
-      {
-        ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("ERROR: Unexpected exception.\n")));
-        status = 1;
-      }
-    return 0;
-  }
-
-private:
-  CORBA::ORB_var orb_;
-};
-
-int
-ACE_TMAIN (int argc, ACE_TCHAR *argv[])
-{
-  try
-    {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
-
-      ORB_Task orb_runner (orb.in ());
-      if (orb_runner.activate (THR_NEW_LWP | THR_JOINABLE, 1) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "ERROR: Can not start ORB thread\n"),
-                            -1);
-        }
-
-      ACE_OS::sleep (1);
-
-      Worker_Task work_runner (orb.in ());
-      if (work_runner.activate (THR_NEW_LWP | THR_JOINABLE, 10) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "ERROR: Can not start work threads\n"),
-                            -1);
-        }
-
-      ACE_OS::sleep (1);
-
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("(%P|%t) Shutting down / destroying ORB\n")));
-
-      orb->shutdown (false);
-
-      ACE_Thread_Manager::instance ()->wait ();
-
-      orb->destroy ();
-    }
-  catch (const CORBA::Exception& ex)
-    {
-      ex._tao_print_exception ("Exception caught:");
-      return 1;
-    }
-
-  return status;
-}
diff --git a/TAO/tests/Exposed_Policies/RT_Properties.cpp b/TAO/tests/Exposed_Policies/RT_Properties.cpp
index e50ee9913a3..904871942f6 100644
--- a/TAO/tests/Exposed_Policies/RT_Properties.cpp
+++ b/TAO/tests/Exposed_Policies/RT_Properties.cpp
@@ -36,27 +36,26 @@ RT_Properties::read_from (const ACE_TCHAR *file_name)
   char string_field[256];
   int int_field;
   unsigned int i = 0;
-  int n_matched;
 
   while (fscanf (fp, "%s", string_field) != EOF )
     {
       if (ACE_OS::strcmp (string_field, "Priority") == 0)
         {
-          n_matched = fscanf (fp, "%d", &int_field);
+          fscanf (fp, "%d", &int_field);
           rt_properties->priority (int_field);
         }
       else if (ACE_OS::strcmp (string_field, "Priority_Bands") == 0)
         {
-          n_matched = fscanf (fp, "%d", &int_field);
+          fscanf (fp, "%d", &int_field);
           rt_properties->priority_bands_.length (int_field);
 
         }
       else if (ACE_OS::strcmp (string_field, "Priority_Range") == 0)
         {
-          n_matched = fscanf (fp, "%d", &int_field);
+          fscanf (fp, "%d", &int_field);
           rt_properties->priority_bands_[i].low = int_field;
 
-          n_matched = fscanf (fp, "%d", &int_field);
+          fscanf (fp, "%d", &int_field);
           rt_properties->priority_bands_[i].high = int_field;
 
           ++i;
diff --git a/TAO/tests/IDL_Test/Bug_3819_Regression.idl b/TAO/tests/IDL_Test/Bug_3819_Regression.idl
deleted file mode 100644
index f5eff4a043f..00000000000
--- a/TAO/tests/IDL_Test/Bug_3819_Regression.idl
+++ /dev/null
@@ -1,11 +0,0 @@
-// $Id$
-
-module orange {
-    module apple {
-        valuetype Foo;
-        valuetype Foo;
-
-        component Bar;
-        component Bar;
-    };
-};
diff --git a/TAO/tests/IDL_Test/Bug_3821_Regression.idl b/TAO/tests/IDL_Test/Bug_3821_Regression.idl
deleted file mode 100644
index 27e38fef816..00000000000
--- a/TAO/tests/IDL_Test/Bug_3821_Regression.idl
+++ /dev/null
@@ -1,159 +0,0 @@
-// $Id$
-
-module test {
-  enum Enumeration {
-    Enum1,
-    Enum2,
-    Enum3
-  };
-
-  union UnionAllCovered_EnumerationDiscriminant switch (Enumeration) {
-  case Enum1:
-    long e_enum1;
-  case Enum2:
-    long e_enum2;
-  case Enum3:
-    long e_enum3;
-  };
-
-  union UnionWithDefault_EnumerationDiscriminant switch (Enumeration) {
-  case Enum1:
-    long e_enum1;
-  case Enum2:
-    long e_enum2;
-  default:
-    long e_def;
-  };
-
-  union UnionWithImplicitDefault_EnumerationDiscriminant switch (Enumeration) {
-  case Enum1:
-    long e_enum1;
-  case Enum2:
-    long e_enum2;
-  };
-
-  typedef Enumeration TypedefedEnumeration;
-
-  union UnionAllCovered_TypedefedEnumerationDiscriminant switch (TypedefedEnumeration) {
-  case Enum1:
-    long e_enum1;
-  case Enum2:
-    long e_enum2;
-  case Enum3:
-    long e_enum3;
-  };
-
-  union UnionWithDefault_TypedefedEnumerationDiscriminant switch (TypedefedEnumeration) {
-  case Enum1:
-    long e_enum1;
-  case Enum2:
-    long e_enum2;
-  default:
-    long e_def;
-  };
-
-  union UnionWithImplicitDefault_TypedefedEnumerationDiscriminant switch (TypedefedEnumeration) {
-  case Enum1:
-    long e_enum1;
-  case Enum2:
-    long e_enum2;
-  };
-
-  union UnionAllCovered_BooleanDiscriminant switch (boolean)
-  {
-  case TRUE:
-    long e_true;
-  case FALSE:
-    long e_false;
-  };
-
-  union UnionWithDefault_BooleanDiscriminant switch (boolean)
-  {
-  case TRUE:
-    long e_true;
-  default:
-    long e_def;
-  };
-
-  union UnionWithImplicitDefault_BooleanDiscriminant switch (boolean)
-  {
-  case TRUE:
-    long e_true;
-  };
-
-  union UnionAllCovered_CharDiscriminant switch (char)
-  {
-  case '\000': case '\001': case '\002': case '\003': case '\004': case '\005': case '\006': case '\007':
-  case '\010': case '\011': case '\012': case '\013': case '\014': case '\015': case '\016': case '\017':
-  case '\020': case '\021': case '\022': case '\023': case '\024': case '\025': case '\026': case '\027':
-  case '\030': case '\031': case '\032': case '\033': case '\034': case '\035': case '\036': case '\037':
-  case '\040': case '\041': case '\042': case '\043': case '\044': case '\045': case '\046': case '\047':
-  case '\050': case '\051': case '\052': case '\053': case '\054': case '\055': case '\056': case '\057':
-  case '\060': case '\061': case '\062': case '\063': case '\064': case '\065': case '\066': case '\067':
-  case '\070': case '\071': case '\072': case '\073': case '\074': case '\075': case '\076': case '\077':
-
-  case '\100': case '\101': case '\102': case '\103': case '\104': case '\105': case '\106': case '\107':
-  case '\110': case '\111': case '\112': case '\113': case '\114': case '\115': case '\116': case '\117':
-  case '\120': case '\121': case '\122': case '\123': case '\124': case '\125': case '\126': case '\127':
-  case '\130': case '\131': case '\132': case '\133': case '\134': case '\135': case '\136': case '\137':
-  case '\140': case '\141': case '\142': case '\143': case '\144': case '\145': case '\146': case '\147':
-  case '\150': case '\151': case '\152': case '\153': case '\154': case '\155': case '\156': case '\157':
-  case '\160': case '\161': case '\162': case '\163': case '\164': case '\165': case '\166': case '\167':
-  case '\170': case '\171': case '\172': case '\173': case '\174': case '\175': case '\176': case '\177':
-
-  case '\200': case '\201': case '\202': case '\203': case '\204': case '\205': case '\206': case '\207':
-  case '\210': case '\211': case '\212': case '\213': case '\214': case '\215': case '\216': case '\217':
-  case '\220': case '\221': case '\222': case '\223': case '\224': case '\225': case '\226': case '\227':
-  case '\230': case '\231': case '\232': case '\233': case '\234': case '\235': case '\236': case '\237':
-  case '\240': case '\241': case '\242': case '\243': case '\244': case '\245': case '\246': case '\247':
-  case '\250': case '\251': case '\252': case '\253': case '\254': case '\255': case '\256': case '\257':
-  case '\260': case '\261': case '\262': case '\263': case '\264': case '\265': case '\266': case '\267':
-  case '\270': case '\271': case '\272': case '\273': case '\274': case '\275': case '\276': case '\277':
-
-  case '\300': case '\301': case '\302': case '\303': case '\304': case '\305': case '\306': case '\307':
-  case '\310': case '\311': case '\312': case '\313': case '\314': case '\315': case '\316': case '\317':
-  case '\320': case '\321': case '\322': case '\323': case '\324': case '\325': case '\326': case '\327':
-  case '\330': case '\331': case '\332': case '\333': case '\334': case '\335': case '\336': case '\337':
-  case '\340': case '\341': case '\342': case '\343': case '\344': case '\345': case '\346': case '\347':
-  case '\350': case '\351': case '\352': case '\353': case '\354': case '\355': case '\356': case '\357':
-  case '\360': case '\361': case '\362': case '\363': case '\364': case '\365': case '\366': case '\367':
-  case '\370': case '\371': case '\372': case '\373': case '\374': case '\375': case '\376': case '\377':
-    long e_chars;
-  };
-
-  union UnionWithDefault_CharDiscriminant switch (char)
-  {
-  case '\0': case '\1': case '\2': case '\3': case '\4': case '\5': case '\6': case '\7':
-    long e_chars;
-  default:
-    long e_def;
-  };
-
-  union UnionWithImplicitDefault_CharDiscriminant switch (char)
-  {
-  case '\0': case '\1': case '\2': case '\3': case '\4': case '\5': case '\6': case '\7':
-    long e_chars;
-  };
-
-  union UnionWithDefault_LongDiscriminant switch (long)
-  {
-  case 1:
-    long e_case1;
-  case 2:
-    long e_case2;
-  case 3:
-    long e_case3;
-  default:
-    long e_def;
-  };
-
-  union UnionWithImplicitDefault_LongDiscriminant switch (long)
-  {
-  case 1:
-    long e_case1;
-  case 2:
-    long e_case2;
-  case 3:
-    long e_case3;
-  };
-};
diff --git a/TAO/tests/IDL_Test/IDL_Test.mpc b/TAO/tests/IDL_Test/IDL_Test.mpc
index 878c7ff525a..ab83b935ff1 100644
--- a/TAO/tests/IDL_Test/IDL_Test.mpc
+++ b/TAO/tests/IDL_Test/IDL_Test.mpc
@@ -23,8 +23,6 @@ project(*IDL): taoserver, messaging, gen_ostream {
     Bug_2616_Regression.idl
     Bug_2619_Regression.idl
     Bug_3243_Regression.idl
-    Bug_3819_Regression.idl
-    Bug_3821_Regression.idl
     enum_in_struct.idl
     full.idl
     fwd.idl
@@ -107,10 +105,8 @@ project(*DLL): taoidldefaults, taolib, messaging {
     Bug_2619_RegressionS.cpp
     Bug_3243_RegressionC.cpp
     Bug_3243_RegressionS.cpp
-    Bug_3819_RegressionC.cpp
-    Bug_3819_RegressionS.cpp
-    Bug_3821_RegressionC.cpp
-    Bug_3821_RegressionS.cpp
+    Bug_3243_RegressionC.cpp
+    Bug_3243_RegressionS.cpp
     constantsA.cpp
     constantsC.cpp
     constantsS.cpp
@@ -238,8 +234,6 @@ project(*NDDS_IDL): ndds_ts_defaults {
     Bug_2616_Regression.idl
     Bug_2619_Regression.idl
     Bug_3243_Regression.idl
-    Bug_3819_Regression.idl
-    Bug_3821_Regression.idl
     constants.idl
     dif2.idl
     enum_in_struct.idl
@@ -326,12 +320,6 @@ project(*NDDS_Lib): taolib, messaging, gen_ostream, nddslib {
     Bug_3243_Regression.cxx
     Bug_3243_RegressionPlugin.cxx
     Bug_3243_RegressionSupport.cxx
-    Bug_3819_Regression.cxx
-    Bug_3819_RegressionPlugin.cxx
-    Bug_3819_RegressionSupport.cxx
-//    Bug_3821_Regression.cxx
-//    Bug_3821_RegressionPlugin.cxx
-//    Bug_3821_RegressionSupport.cxx
   //  constants.cxx
   //  constantsPlugin.cxx
   //  constantsSupport.cxx
@@ -436,3 +424,5 @@ project(*NDDS_Lib): taolib, messaging, gen_ostream, nddslib {
   Template_Files {
   }
 }
+
+
diff --git a/TAO/utils/catior/README.catior b/TAO/utils/catior/README
index b26c06d951c..b26c06d951c 100644
--- a/TAO/utils/catior/README.catior
+++ b/TAO/utils/catior/README
diff --git a/TAO/utils/nslist/README.nslist b/TAO/utils/nslist/README
index 7f2b8ffd16c..7f2b8ffd16c 100644
--- a/TAO/utils/nslist/README.nslist
+++ b/TAO/utils/nslist/README